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

Unified Diff: media/filters/ffmpeg_video_decoder_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_video_decoder.cc ('k') | media/filters/frame_processor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_video_decoder_unittest.cc
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc
index 1fe0a654a848a753dd6f2418df69c9565a9f2531..72ca256ec53f971706f3f983ae182ff9cc2773e1 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -60,8 +60,7 @@ MATCHER(ContainsInvalidDataLog, "") {
class FFmpegVideoDecoderTest : public testing::Test {
public:
FFmpegVideoDecoderTest()
- : media_log_(new StrictMock<MockMediaLog>()),
- decoder_(new FFmpegVideoDecoder(media_log_)),
+ : decoder_(new FFmpegVideoDecoder(&media_log_)),
decode_cb_(base::Bind(&FFmpegVideoDecoderTest::DecodeDone,
base::Unretained(this))) {
FFmpegGlue::InitializeFFmpeg();
@@ -205,7 +204,7 @@ class FFmpegVideoDecoderTest : public testing::Test {
MOCK_METHOD1(DecodeDone, void(DecodeStatus));
- scoped_refptr<StrictMock<MockMediaLog>> media_log_;
+ StrictMock<MockMediaLog> media_log_;
base::MessageLoop message_loop_;
std::unique_ptr<FFmpegVideoDecoder> decoder_;
« no previous file with comments | « media/filters/ffmpeg_video_decoder.cc ('k') | media/filters/frame_processor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698