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

Unified Diff: media/filters/chunk_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/chunk_demuxer.cc ('k') | media/filters/decoder_selector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer_unittest.cc
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc
index 7653ee79bcdacedc8c6453f4420d64e8daa479fc..4ae5b9ca05d1c9efdf86d02e89755f59c6d369ef 100644
--- a/media/filters/chunk_demuxer_unittest.cc
+++ b/media/filters/chunk_demuxer_unittest.cc
@@ -178,9 +178,7 @@ class ChunkDemuxerTest : public ::testing::Test {
return GenerateCluster(46, 66, 5);
}
- ChunkDemuxerTest()
- : media_log_(new StrictMock<MockMediaLog>()),
- append_window_end_for_next_append_(kInfiniteDuration) {
+ ChunkDemuxerTest() : append_window_end_for_next_append_(kInfiniteDuration) {
init_segment_received_cb_ = base::Bind(
&ChunkDemuxerTest::InitSegmentReceived, base::Unretained(this));
CreateNewDemuxer();
@@ -192,7 +190,7 @@ class ChunkDemuxerTest : public ::testing::Test {
Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb = base::Bind(
&ChunkDemuxerTest::OnEncryptedMediaInitData, base::Unretained(this));
demuxer_.reset(
- new ChunkDemuxer(open_cb, encrypted_media_init_data_cb, media_log_));
+ new ChunkDemuxer(open_cb, encrypted_media_init_data_cb, &media_log_));
}
virtual ~ChunkDemuxerTest() {
@@ -1298,11 +1296,11 @@ class ChunkDemuxerTest : public ::testing::Test {
return true;
}
+ StrictMock<MockMediaLog> media_log_;
+
base::MessageLoop message_loop_;
MockDemuxerHost host_;
- scoped_refptr<StrictMock<MockMediaLog>> media_log_;
-
std::unique_ptr<ChunkDemuxer> demuxer_;
Demuxer::MediaTracksUpdatedCB init_segment_received_cb_;
« no previous file with comments | « media/filters/chunk_demuxer.cc ('k') | media/filters/decoder_selector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698