Index: media/filters/video_renderer_base_unittest.cc |
diff --git a/media/filters/video_renderer_base_unittest.cc b/media/filters/video_renderer_base_unittest.cc |
index 31a2b7b77a6f37fee5523026ed2637e486c12c04..f7f50e21e350c1e70cc6ef3a86f6cb37c081145f 100644 |
--- a/media/filters/video_renderer_base_unittest.cc |
+++ b/media/filters/video_renderer_base_unittest.cc |
@@ -45,8 +45,12 @@ class VideoRendererBaseTest : public ::testing::Test { |
demuxer_stream_(new MockDemuxerStream()), |
video_config_(kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN, kVideoFormat, |
kCodedSize, kVisibleRect, kNaturalSize, NULL, 0, false) { |
+ ScopedVector<VideoDecoder> decoders; |
+ decoders.push_back(decoder_); |
+ |
renderer_.reset(new VideoRendererBase( |
message_loop_.message_loop_proxy(), |
+ decoders.Pass(), |
media::SetDecryptorReadyCB(), |
base::Bind(&VideoRendererBaseTest::OnPaint, base::Unretained(this)), |
base::Bind(&VideoRendererBaseTest::OnSetOpaque, base::Unretained(this)), |
@@ -118,11 +122,8 @@ class VideoRendererBaseTest : public ::testing::Test { |
} |
void CallInitialize(const PipelineStatusCB& status_cb) { |
- VideoRendererBase::VideoDecoderList decoders; |
- decoders.push_back(decoder_); |
renderer_->Initialize( |
demuxer_stream_, |
- decoders, |
status_cb, |
base::Bind(&MockStatisticsCB::OnStatistics, |
base::Unretained(&statistics_cb_object_)), |
@@ -295,7 +296,7 @@ class VideoRendererBaseTest : public ::testing::Test { |
protected: |
// Fixture members. |
scoped_ptr<VideoRendererBase> renderer_; |
- scoped_refptr<MockVideoDecoder> decoder_; |
+ MockVideoDecoder* decoder_; |
Ami GONE FROM CHROMIUM
2013/03/22 23:48:01
It's strange to hold this raw pointer after transf
scherkus (not reviewing)
2013/03/28 02:00:01
Done.
|
scoped_refptr<MockDemuxerStream> demuxer_stream_; |
MockStatisticsCB statistics_cb_object_; |