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

Unified Diff: media/filters/frame_processor_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/frame_processor.cc ('k') | media/filters/gpu_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/frame_processor_unittest.cc
diff --git a/media/filters/frame_processor_unittest.cc b/media/filters/frame_processor_unittest.cc
index b08e7498ded7c3915dcca17bdb3bcbea5266f09e..679a6f47bde7f4e7e585badc228b4b3ed6bcaeaf 100644
--- a/media/filters/frame_processor_unittest.cc
+++ b/media/filters/frame_processor_unittest.cc
@@ -65,7 +65,7 @@ class FrameProcessorTest : public testing::TestWithParam<bool> {
base::Bind(
&FrameProcessorTestCallbackHelper::OnPossibleDurationIncrease,
base::Unretained(&callbacks_)),
- new MediaLog())),
+ &media_log_)),
append_window_end_(kInfiniteDuration),
frame_duration_(base::TimeDelta::FromMilliseconds(10)),
audio_id_(1),
@@ -264,6 +264,7 @@ class FrameProcessorTest : public testing::TestWithParam<bool> {
}
base::MessageLoop message_loop_;
+ MediaLog media_log_;
StrictMock<FrameProcessorTestCallbackHelper> callbacks_;
std::unique_ptr<FrameProcessor> frame_processor_;
@@ -307,14 +308,14 @@ class FrameProcessorTest : public testing::TestWithParam<bool> {
CHANNEL_LAYOUT_STEREO, 1000,
EmptyExtraData(), Unencrypted());
frame_processor_->OnPossibleAudioConfigUpdate(decoder_config);
- ASSERT_TRUE(audio_->UpdateAudioConfig(decoder_config, new MediaLog()));
+ ASSERT_TRUE(audio_->UpdateAudioConfig(decoder_config, &media_log_));
break;
}
case DemuxerStream::VIDEO: {
ASSERT_FALSE(video_);
video_.reset(new ChunkDemuxerStream(DemuxerStream::VIDEO, "2"));
- ASSERT_TRUE(video_->UpdateVideoConfig(TestVideoConfig::Normal(),
- new MediaLog()));
+ ASSERT_TRUE(
+ video_->UpdateVideoConfig(TestVideoConfig::Normal(), &media_log_));
break;
}
// TODO(wolenetz): Test text coded frame processing.
« no previous file with comments | « media/filters/frame_processor.cc ('k') | media/filters/gpu_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698