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

Unified Diff: media/filters/ffmpeg_video_decoder_unittest.cc

Issue 13813016: Remove reference counting from media::Demuxer and friends. (Closed) Base URL: http://git.chromium.org/chromium/src.git@vd_scoped
Patch Set: Created 7 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
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 863c317c214d2e502e0da4b0d633c219db030d7e..e9136eea8a15bb2d832d60051f796e2d7e26fc25 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -86,7 +86,7 @@ class FFmpegVideoDecoderTest : public testing::Test {
EXPECT_CALL(*demuxer_, video_decoder_config())
.WillRepeatedly(ReturnRef(config));
- decoder_->Initialize(demuxer_, NewExpectedStatusCB(status),
+ decoder_->Initialize(demuxer_.get(), NewExpectedStatusCB(status),
base::Bind(&MockStatisticsCB::OnStatistics,
base::Unretained(&statistics_cb_)));
@@ -200,7 +200,7 @@ class FFmpegVideoDecoderTest : public testing::Test {
MessageLoop message_loop_;
scoped_ptr<FFmpegVideoDecoder> decoder_;
- scoped_refptr<StrictMock<MockDemuxerStream> > demuxer_;
+ scoped_ptr<StrictMock<MockDemuxerStream> > demuxer_;
MockStatisticsCB statistics_cb_;
VideoDecoderConfig config_;

Powered by Google App Engine
This is Rietveld 408576698