| Index: media/filters/audio_decoder_unittest.cc
|
| diff --git a/media/filters/audio_decoder_unittest.cc b/media/filters/audio_decoder_unittest.cc
|
| index cd38e4201c37a696019c46a78081a0f5112ac4d7..42b00ee13b8118448597b277e622f1387856a10b 100644
|
| --- a/media/filters/audio_decoder_unittest.cc
|
| +++ b/media/filters/audio_decoder_unittest.cc
|
| @@ -161,13 +161,14 @@
|
| }
|
|
|
| void InitializeDecoder(const AudioDecoderConfig& config) {
|
| - InitializeDecoderWithResult(config, true);
|
| - }
|
| -
|
| - void InitializeDecoderWithResult(const AudioDecoderConfig& config,
|
| - bool success) {
|
| + InitializeDecoderWithStatus(config, PIPELINE_OK);
|
| + }
|
| +
|
| + void InitializeDecoderWithStatus(const AudioDecoderConfig& config,
|
| + PipelineStatus status) {
|
| decoder_->Initialize(
|
| - config, NewExpectedBoolCB(success),
|
| + config,
|
| + NewExpectedStatusCB(status),
|
| base::Bind(&AudioDecoderTest::OnDecoderOutput, base::Unretained(this)));
|
| base::RunLoop().RunUntilIdle();
|
| }
|
| @@ -402,7 +403,7 @@
|
| base::TimeDelta::FromMilliseconds(80),
|
| // Use a different codec delay than in the extradata.
|
| 100);
|
| - InitializeDecoderWithResult(decoder_config, false);
|
| + InitializeDecoderWithStatus(decoder_config, DECODER_ERROR_NOT_SUPPORTED);
|
| }
|
|
|
| TEST_P(FFmpegAudioDecoderBehavioralTest, InitializeWithBadConfig) {
|
| @@ -414,7 +415,7 @@
|
| NULL,
|
| 0,
|
| false);
|
| - InitializeDecoderWithResult(decoder_config, false);
|
| + InitializeDecoderWithStatus(decoder_config, DECODER_ERROR_NOT_SUPPORTED);
|
| }
|
|
|
| const DecodedBufferExpectations kSfxOpusExpectations[] = {
|
|
|