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

media/tools/player_x11/player_x11.cc

Index: media/tools/player_x11/player_x11.cc
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index e9254e1799ee1d38269bf989874e596114b5c23c..7b029fcc0d1f4fcf30a2a75f8a11cf9981c322d1 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -113,12 +113,13 @@ bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop,
   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),