Convert VideoDecoder::Initialize to use media::Status
Plumb MediaError through VideoDecoder::Initialize so that we can start
refining its usage everywhere.
Bug: 1043289
Change-Id: I3c4d7517901a8d186a045b7c9774ddad33859d0c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2042915
Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Frank Liberato <liberato@chromium.org>
Reviewed-by: Kenneth MacKay <kmackay@chromium.org>
Reviewed-by: Dan Sanders <sandersd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751948}
diff --git a/media/filters/decrypting_audio_decoder_unittest.cc b/media/filters/decrypting_audio_decoder_unittest.cc
index 8a485929..c364c73 100644
--- a/media/filters/decrypting_audio_decoder_unittest.cc
+++ b/media/filters/decrypting_audio_decoder_unittest.cc
@@ -83,7 +83,12 @@
kNoTimestamp);
decoded_frame_list_.push_back(decoded_frame_);
- decoder_->Initialize(config, cdm_context_.get(), NewExpectedBoolCB(success),
+ decoder_->Initialize(config, cdm_context_.get(),
+ base::BindOnce(
+ [](bool success, Status status) {
+ EXPECT_EQ(status.is_ok(), success);
+ },
+ success),
base::Bind(&DecryptingAudioDecoderTest::FrameReady,
base::Unretained(this)),
base::Bind(&DecryptingAudioDecoderTest::OnWaiting,
@@ -121,12 +126,13 @@
.WillOnce(RunOnceCallback<1>(true));
EXPECT_CALL(*decryptor_, RegisterNewKeyCB(Decryptor::kAudio, _))
.WillOnce(SaveArg<1>(&key_added_cb_));
- decoder_->Initialize(new_config, cdm_context_.get(),
- NewExpectedBoolCB(true),
- base::Bind(&DecryptingAudioDecoderTest::FrameReady,
- base::Unretained(this)),
- base::Bind(&DecryptingAudioDecoderTest::OnWaiting,
- base::Unretained(this)));
+ decoder_->Initialize(
+ new_config, cdm_context_.get(),
+ base::BindOnce([](Status status) { EXPECT_TRUE(status.is_ok()); }),
+ base::Bind(&DecryptingAudioDecoderTest::FrameReady,
+ base::Unretained(this)),
+ base::Bind(&DecryptingAudioDecoderTest::OnWaiting,
+ base::Unretained(this)));
}
// Decode |buffer| and expect DecodeDone to get called with |status|.