| Index: media/filters/audio_decoder_selector_unittest.cc
|
| diff --git a/media/filters/audio_decoder_selector_unittest.cc b/media/filters/audio_decoder_selector_unittest.cc
|
| index 2bb1f6d263e7261c6e499518e3618dd1f4d53e3c..29570c97fbf2afb617a181af2335004fa88b3e57 100644
|
| --- a/media/filters/audio_decoder_selector_unittest.cc
|
| +++ b/media/filters/audio_decoder_selector_unittest.cc
|
| @@ -196,8 +196,7 @@ TEST_F(AudioDecoderSelectorTest, ClearStream_NoDecryptor_OneClearDecoder) {
|
| UseClearStream();
|
| InitializeDecoderSelector(kNoDecryptor, 1);
|
|
|
| - EXPECT_CALL(*decoder_1_, Initialize(_, _, _))
|
| - .WillOnce(RunCallback<1>(PIPELINE_OK));
|
| + EXPECT_CALL(*decoder_1_, Initialize(_, _, _)).WillOnce(RunCallback<1>(true));
|
| EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, IsNull()));
|
|
|
| SelectDecoder();
|
| @@ -219,10 +218,8 @@ TEST_F(AudioDecoderSelectorTest, ClearStream_NoDecryptor_MultipleClearDecoder) {
|
| UseClearStream();
|
| InitializeDecoderSelector(kNoDecryptor, 2);
|
|
|
| - EXPECT_CALL(*decoder_1_, Initialize(_, _, _))
|
| - .WillOnce(RunCallback<1>(DECODER_ERROR_NOT_SUPPORTED));
|
| - EXPECT_CALL(*decoder_2_, Initialize(_, _, _))
|
| - .WillOnce(RunCallback<1>(PIPELINE_OK));
|
| + EXPECT_CALL(*decoder_1_, Initialize(_, _, _)).WillOnce(RunCallback<1>(false));
|
| + EXPECT_CALL(*decoder_2_, Initialize(_, _, _)).WillOnce(RunCallback<1>(true));
|
| EXPECT_CALL(*this, OnDecoderSelected(decoder_2_, IsNull()));
|
|
|
| SelectDecoder();
|
| @@ -233,8 +230,7 @@ TEST_F(AudioDecoderSelectorTest,
|
| UseClearStream();
|
| InitializeDecoderSelector(kNoDecryptor, 2);
|
|
|
| - EXPECT_CALL(*decoder_1_, Initialize(_, _, _))
|
| - .WillOnce(RunCallback<1>(DECODER_ERROR_NOT_SUPPORTED));
|
| + EXPECT_CALL(*decoder_1_, Initialize(_, _, _)).WillOnce(RunCallback<1>(false));
|
| EXPECT_CALL(*decoder_2_, Initialize(_, _, _));
|
|
|
| SelectDecoderAndDestroy();
|
| @@ -246,8 +242,7 @@ TEST_F(AudioDecoderSelectorTest, ClearStream_HasDecryptor) {
|
| UseClearStream();
|
| InitializeDecoderSelector(kDecryptOnly, 1);
|
|
|
| - EXPECT_CALL(*decoder_1_, Initialize(_, _, _))
|
| - .WillOnce(RunCallback<1>(PIPELINE_OK));
|
| + EXPECT_CALL(*decoder_1_, Initialize(_, _, _)).WillOnce(RunCallback<1>(true));
|
| EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, IsNull()));
|
|
|
| SelectDecoder();
|
| @@ -297,8 +292,7 @@ TEST_F(AudioDecoderSelectorTest, EncryptedStream_DecryptOnly_OneClearDecoder) {
|
| UseEncryptedStream();
|
| InitializeDecoderSelector(kDecryptOnly, 1);
|
|
|
| - EXPECT_CALL(*decoder_1_, Initialize(_, _, _))
|
| - .WillOnce(RunCallback<1>(PIPELINE_OK));
|
| + EXPECT_CALL(*decoder_1_, Initialize(_, _, _)).WillOnce(RunCallback<1>(true));
|
| EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, NotNull()));
|
|
|
| SelectDecoder();
|
| @@ -322,10 +316,8 @@ TEST_F(AudioDecoderSelectorTest,
|
| UseEncryptedStream();
|
| InitializeDecoderSelector(kDecryptOnly, 2);
|
|
|
| - EXPECT_CALL(*decoder_1_, Initialize(_, _, _))
|
| - .WillOnce(RunCallback<1>(DECODER_ERROR_NOT_SUPPORTED));
|
| - EXPECT_CALL(*decoder_2_, Initialize(_, _, _))
|
| - .WillOnce(RunCallback<1>(PIPELINE_OK));
|
| + EXPECT_CALL(*decoder_1_, Initialize(_, _, _)).WillOnce(RunCallback<1>(false));
|
| + EXPECT_CALL(*decoder_2_, Initialize(_, _, _)).WillOnce(RunCallback<1>(true));
|
| EXPECT_CALL(*this, OnDecoderSelected(decoder_2_, NotNull()));
|
|
|
| SelectDecoder();
|
| @@ -336,8 +328,7 @@ TEST_F(AudioDecoderSelectorTest,
|
| UseEncryptedStream();
|
| InitializeDecoderSelector(kDecryptOnly, 2);
|
|
|
| - EXPECT_CALL(*decoder_1_, Initialize(_, _, _))
|
| - .WillOnce(RunCallback<1>(DECODER_ERROR_NOT_SUPPORTED));
|
| + EXPECT_CALL(*decoder_1_, Initialize(_, _, _)).WillOnce(RunCallback<1>(false));
|
| EXPECT_CALL(*decoder_2_, Initialize(_, _, _));
|
|
|
| SelectDecoderAndDestroy();
|
|
|