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

Unified Diff: media/filters/ffmpeg_demuxer_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/filters/ffmpeg_demuxer.cc ('k') | media/filters/ffmpeg_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer_unittest.cc
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index 1c84ca97a2718a0b68334a19e9f3bed058bcbe7e..c828cfa2afbcfbf84c93ec82bb4ea9fdfcb06e35 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -108,7 +108,7 @@ class FFmpegDemuxerTest : public testing::Test {
demuxer_.reset(new FFmpegDemuxer(
base::ThreadTaskRunnerHandle::Get(), data_source_.get(),
- encrypted_media_init_data_cb, tracks_updated_cb, new MediaLog()));
+ encrypted_media_init_data_cb, tracks_updated_cb, &media_log_));
}
DemuxerStream* GetStream(DemuxerStream::Type type) {
@@ -246,6 +246,7 @@ class FFmpegDemuxerTest : public testing::Test {
// Fixture members.
base::test::ScopedTaskScheduler task_scheduler_;
+ MediaLog media_log_;
std::unique_ptr<FileDataSource> data_source_;
std::unique_ptr<FFmpegDemuxer> demuxer_;
StrictMock<MockDemuxerHost> host_;
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/filters/ffmpeg_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698