Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(517)

Unified Diff: media/filters/audio_decoder_selector_unittest.cc

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Rebase. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/sender/h264_vt_encoder_unittest.cc ('k') | media/filters/audio_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a8a0cba971a338a06ef45dbd0cf07bd4b8e42ef7..937a883879046015835a92eef5f94a000dad7a0e 100644
--- a/media/filters/audio_decoder_selector_unittest.cc
+++ b/media/filters/audio_decoder_selector_unittest.cc
@@ -52,8 +52,7 @@ class AudioDecoderSelectorTest : public ::testing::Test {
};
AudioDecoderSelectorTest()
- : media_log_(new MediaLog()),
- traits_(media_log_),
+ : traits_(&media_log_),
demuxer_stream_(
new StrictMock<MockDemuxerStream>(DemuxerStream::AUDIO)),
decoder_1_(new StrictMock<MockAudioDecoder>()),
@@ -112,7 +111,7 @@ 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_), media_log_));
+ message_loop_.task_runner(), std::move(all_decoders_), &media_log_));
}
void SelectDecoder() {
@@ -141,7 +140,7 @@ class AudioDecoderSelectorTest : public ::testing::Test {
NOTREACHED();
}
- scoped_refptr<MediaLog> media_log_;
+ MediaLog media_log_;
// Stream traits specific to audio decoding.
DecoderStreamTraits<DemuxerStream::AUDIO> traits_;
« no previous file with comments | « media/cast/sender/h264_vt_encoder_unittest.cc ('k') | media/filters/audio_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698