Index: media/filters/fake_video_decoder_unittest.cc |
diff --git a/media/filters/fake_video_decoder_unittest.cc b/media/filters/fake_video_decoder_unittest.cc |
index f335c02654dabc10019e4451d5016673fe2f7fb7..4bb9911a12373472edc20ca1fd445c8796c0135d 100644 |
--- a/media/filters/fake_video_decoder_unittest.cc |
+++ b/media/filters/fake_video_decoder_unittest.cc |
@@ -47,17 +47,17 @@ |
Destroy(); |
} |
- void InitializeWithConfigAndExpectResult(const VideoDecoderConfig& config, |
- bool success) { |
+ void InitializeWithConfigAndExpectStatus(const VideoDecoderConfig& config, |
+ PipelineStatus status) { |
decoder_->Initialize( |
- config, false, NewExpectedBoolCB(success), |
+ config, false, NewExpectedStatusCB(status), |
base::Bind(&FakeVideoDecoderTest::FrameReady, base::Unretained(this))); |
message_loop_.RunUntilIdle(); |
current_config_ = config; |
} |
void Initialize() { |
- InitializeWithConfigAndExpectResult(TestVideoConfig::Normal(), true); |
+ InitializeWithConfigAndExpectStatus(TestVideoConfig::Normal(), PIPELINE_OK); |
} |
void EnterPendingInitState() { |
@@ -252,7 +252,8 @@ |
TEST_P(FakeVideoDecoderTest, SimulateFailureToInitialize) { |
decoder_->SimulateFailureToInit(); |
- InitializeWithConfigAndExpectResult(TestVideoConfig::Normal(), false); |
+ InitializeWithConfigAndExpectStatus(TestVideoConfig::Normal(), |
+ DECODER_ERROR_NOT_SUPPORTED); |
Decode(); |
EXPECT_EQ(last_decode_status_, VideoDecoder::kDecodeError); |
} |
@@ -344,7 +345,7 @@ |
TEST_P(FakeVideoDecoderTest, Reinitialize) { |
Initialize(); |
ReadOneFrame(); |
- InitializeWithConfigAndExpectResult(TestVideoConfig::Large(), true); |
+ InitializeWithConfigAndExpectStatus(TestVideoConfig::Large(), PIPELINE_OK); |
ReadOneFrame(); |
} |
@@ -352,7 +353,8 @@ |
Initialize(); |
ReadOneFrame(); |
decoder_->SimulateFailureToInit(); |
- InitializeWithConfigAndExpectResult(TestVideoConfig::Normal(), false); |
+ InitializeWithConfigAndExpectStatus(TestVideoConfig::Normal(), |
+ DECODER_ERROR_NOT_SUPPORTED); |
Decode(); |
EXPECT_EQ(last_decode_status_, VideoDecoder::kDecodeError); |
} |