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

media/tools/player_x11/player_x11.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 <signal.h>
 
 #include <iostream>  // NOLINT
 
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 95 matching lines @@
                   const PaintCB& paint_cb,
                   bool /* enable_audio */,
                   scoped_refptr<media::Pipeline>* pipeline,
                   MessageLoop* paint_message_loop) {
   // Create our filter factories.
   scoped_ptr<media::FilterCollection> collection(
       new media::FilterCollection());
   media::FFmpegNeedKeyCB need_key_cb = base::Bind(&NeedKey);
   collection->SetDemuxer(new media::FFmpegDemuxer(message_loop, data_source,
                                                   need_key_cb));
-  collection->GetVideoDecoders()->push_back(new media::FFmpegVideoDecoder(
-      message_loop));
 
-  // Create our video renderer and save a reference to it for painting.
+
+  ScopedVector<media::VideoDecoder> video_decoders;
+  video_decoders.push_back(new media::FFmpegVideoDecoder(message_loop));
   scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererBase(
       message_loop,
+      video_decoders.Pass(),
       media::SetDecryptorReadyCB(),
       base::Bind(&Paint, paint_message_loop, paint_cb),
       base::Bind(&SetOpaque),
       true));
   collection->SetVideoRenderer(video_renderer.Pass());
 
   ScopedVector<media::AudioDecoder> audio_decoders;
   audio_decoders.push_back(new media::FFmpegAudioDecoder(message_loop));
   scoped_ptr<media::AudioRenderer> audio_renderer(new media::AudioRendererImpl(
       message_loop,
@@ skipping 168 matching lines @@
   // Release callback which releases video renderer. Do this before cleaning up
   // X below since the video renderer has some X cleanup duties as well.
   paint_cb.Reset();
 
   XDestroyWindow(g_display, g_window);
   XCloseDisplay(g_display);
   g_audio_manager = NULL;
 
   return 0;
 }