| 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 d3532e4926223a4411326ed0675b02420c5b68af..0e64bef57cc100f6911a553aa77b8be40fbcc2b8 100644
|
| --- a/media/filters/audio_decoder_selector_unittest.cc
|
| +++ b/media/filters/audio_decoder_selector_unittest.cc
|
| @@ -51,7 +51,9 @@ class AudioDecoderSelectorTest : public ::testing::Test {
|
| };
|
|
|
| AudioDecoderSelectorTest()
|
| - : demuxer_stream_(
|
| + : media_log_(new MediaLog()),
|
| + traits_(media_log_),
|
| + demuxer_stream_(
|
| new StrictMock<MockDemuxerStream>(DemuxerStream::AUDIO)),
|
| decoder_1_(new StrictMock<MockAudioDecoder>()),
|
| decoder_2_(new StrictMock<MockAudioDecoder>()) {
|
| @@ -111,12 +113,12 @@ class AudioDecoderSelectorTest : public ::testing::Test {
|
| all_decoders_.begin() + num_decoders, all_decoders_.end());
|
|
|
| decoder_selector_.reset(new AudioDecoderSelector(
|
| - message_loop_.task_runner(), std::move(all_decoders_), new MediaLog()));
|
| + message_loop_.task_runner(), std::move(all_decoders_), media_log_));
|
| }
|
|
|
| void SelectDecoder() {
|
| decoder_selector_->SelectDecoder(
|
| - demuxer_stream_.get(), cdm_context_.get(),
|
| + &traits_, demuxer_stream_.get(), cdm_context_.get(),
|
| base::Bind(&AudioDecoderSelectorTest::MockOnDecoderSelected,
|
| base::Unretained(this)),
|
| base::Bind(&AudioDecoderSelectorTest::OnDecoderOutput),
|
| @@ -140,6 +142,11 @@ class AudioDecoderSelectorTest : public ::testing::Test {
|
| NOTREACHED();
|
| }
|
|
|
| + scoped_refptr<MediaLog> media_log_;
|
| +
|
| + // Stream traits specific to audio decoding.
|
| + DecoderStreamTraits<DemuxerStream::AUDIO> traits_;
|
| +
|
| // Declare |decoder_selector_| after |demuxer_stream_| and |decryptor_| since
|
| // |demuxer_stream_| and |decryptor_| should outlive |decoder_selector_|.
|
| std::unique_ptr<StrictMock<MockDemuxerStream>> demuxer_stream_;
|
|
|