Index: media/filters/video_decoder_selector_unittest.cc |
diff --git a/media/filters/video_decoder_selector_unittest.cc b/media/filters/video_decoder_selector_unittest.cc |
index b2afbaaab6239467550965d5474b591bb08ff5f1..81da5a30274d5ee31b0c2c4b33f735e1f4378f74 100644 |
--- a/media/filters/video_decoder_selector_unittest.cc |
+++ b/media/filters/video_decoder_selector_unittest.cc |
@@ -49,7 +49,9 @@ class VideoDecoderSelectorTest : public ::testing::Test { |
}; |
VideoDecoderSelectorTest() |
- : demuxer_stream_( |
+ : media_log_(new MediaLog()), |
+ traits_(media_log_), |
+ demuxer_stream_( |
new StrictMock<MockDemuxerStream>(DemuxerStream::VIDEO)), |
decoder_1_(new StrictMock<MockVideoDecoder>()), |
decoder_2_(new StrictMock<MockVideoDecoder>()) { |
@@ -104,12 +106,12 @@ class VideoDecoderSelectorTest : public ::testing::Test { |
all_decoders_.begin() + num_decoders, all_decoders_.end()); |
decoder_selector_.reset(new VideoDecoderSelector( |
- 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(&VideoDecoderSelectorTest::MockOnDecoderSelected, |
base::Unretained(this)), |
base::Bind(&VideoDecoderSelectorTest::FrameReady, |
@@ -135,6 +137,11 @@ class VideoDecoderSelectorTest : public ::testing::Test { |
NOTREACHED(); |
} |
+ scoped_refptr<MediaLog> media_log_; |
+ |
+ // Stream traits specific to video decoding. |
+ DecoderStreamTraits<DemuxerStream::VIDEO> 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_; |