Reland: Remove reference counting from media::VideoDecoder and friends.

media/filters/video_renderer_base_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/debug/stack_trace.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 27 matching lines @@
 static const gfx::Rect kVisibleRect(16u, 16u);
 static const gfx::Size kNaturalSize(16u, 16u);
 
 class VideoRendererBaseTest : public ::testing::Test {
  public:
   VideoRendererBaseTest()
       : decoder_(new MockVideoDecoder()),
         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)),
         true));
 
     EXPECT_CALL(*demuxer_stream_, type())
         .WillRepeatedly(Return(DemuxerStream::VIDEO));
     EXPECT_CALL(*demuxer_stream_, video_decoder_config())
         .WillRepeatedly(ReturnRef(video_config_));
 
@@ skipping 51 matching lines @@
   }
 
   void InitializeRenderer(PipelineStatus expected) {
     SCOPED_TRACE(base::StringPrintf("InitializeRenderer(%d)", expected));
     WaitableMessageLoopEvent event;
     CallInitialize(event.GetPipelineStatusCB());
     event.RunAndWaitForStatus(expected);
   }
 
   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_)),
         base::Bind(&VideoRendererBaseTest::OnTimeUpdate,
                    base::Unretained(this)),
         base::Bind(&VideoRendererBaseTest::OnNaturalSizeChanged,
                    base::Unretained(this)),
         ended_event_.GetClosure(),
         error_event_.GetPipelineStatusCB(),
         base::Bind(&VideoRendererBaseTest::GetTime, base::Unretained(this)),
@@ skipping 152 matching lines @@
   void AdvanceTimeInMs(int time_ms) {
     DCHECK_EQ(&message_loop_, MessageLoop::current());
     base::AutoLock l(lock_);
     time_ += base::TimeDelta::FromMilliseconds(time_ms);
     DCHECK_LE(time_.InMicroseconds(), duration_.InMicroseconds());
   }
 
  protected:
   // Fixture members.
   scoped_ptr<VideoRendererBase> renderer_;
-  scoped_refptr<MockVideoDecoder> decoder_;
+  MockVideoDecoder* decoder_;  // Owned by |renderer_|.
   scoped_refptr<MockDemuxerStream> demuxer_stream_;
   MockStatisticsCB statistics_cb_object_;
 
  private:
   base::TimeDelta GetTime() {
     base::AutoLock l(lock_);
     return time_;
   }
 
   base::TimeDelta GetDuration() {
@@ skipping 342 matching lines @@
   InSequence s;
 
   EXPECT_CALL(*decoder_, Initialize(_, _, _))
       .WillOnce(RunCallback<1>(DECODER_ERROR_NOT_SUPPORTED));
   InitializeRenderer(DECODER_ERROR_NOT_SUPPORTED);
 
   Stop();
 }
 
 }  // namespace media