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

media/filters/pipeline_integration_test_base.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 "media/filters/pipeline_integration_test_base.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "media/base/media_log.h"
 #include "media/filters/audio_renderer_impl.h"
@@ skipping 205 matching lines @@
                         need_key_cb),
       decryptor);
 }
 
 scoped_ptr<FilterCollection>
 PipelineIntegrationTestBase::CreateFilterCollection(
     const scoped_refptr<Demuxer>& demuxer,
     Decryptor* decryptor) {
   scoped_ptr<FilterCollection> collection(new FilterCollection());
   collection->SetDemuxer(demuxer);
-  scoped_refptr<VideoDecoder> video_decoder = new FFmpegVideoDecoder(
-      message_loop_.message_loop_proxy());
-  scoped_refptr<VpxVideoDecoder> vpx_decoder = new VpxVideoDecoder(
-      message_loop_.message_loop_proxy());
-  collection->GetVideoDecoders()->push_back(video_decoder);
-  collection->GetVideoDecoders()->push_back(vpx_decoder);
+
+  ScopedVector<VideoDecoder> video_decoders;
+  video_decoders.push_back(
+      new FFmpegVideoDecoder(message_loop_.message_loop_proxy()));
+  video_decoders.push_back(
+      new VpxVideoDecoder(message_loop_.message_loop_proxy()));
 
   // Disable frame dropping if hashing is enabled.
   scoped_ptr<VideoRenderer> renderer(new VideoRendererBase(
       message_loop_.message_loop_proxy(),
+      video_decoders.Pass(),
       base::Bind(&PipelineIntegrationTestBase::SetDecryptor,
                  base::Unretained(this), decryptor),
       base::Bind(&PipelineIntegrationTestBase::OnVideoRendererPaint,
                  base::Unretained(this)),
       base::Bind(&PipelineIntegrationTestBase::OnSetOpaque,
                  base::Unretained(this)),
       !hashing_enabled_));
   collection->SetVideoRenderer(renderer.Pass());
 
   audio_sink_ = new NullAudioSink(message_loop_.message_loop_proxy());
@@ skipping 40 matching lines @@
   base::MD5Final(&digest, &md5_context_);
   return base::MD5DigestToBase16(digest);
 }
 
 std::string PipelineIntegrationTestBase::GetAudioHash() {
   DCHECK(hashing_enabled_);
   return audio_sink_->GetAudioHashForTesting();
 }
 
 }  // namespace media