Revert 194993 "Remove reference counting from media::VideoDecode..."

trunk/src/media/filters/video_renderer_base.h

Index: trunk/src/media/filters/video_renderer_base.h
===================================================================
--- trunk/src/media/filters/video_renderer_base.h	(revision 195011)
+++ trunk/src/media/filters/video_renderer_base.h	(working copy)
@@ -8,7 +8,6 @@
 #include <deque>
 
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
@@ -44,8 +43,6 @@
   // Maximum duration of the last frame.
   static base::TimeDelta kMaxLastFrameDuration();
 
-  // |decoders| contains the VideoDecoders to use when initializing.
-  //
   // |paint_cb| is executed on the video frame timing thread whenever a new
   // frame is available for painting.
   //
@@ -58,7 +55,6 @@
   //
   // Setting |drop_frames_| to true causes the renderer to drop expired frames.
   VideoRendererBase(const scoped_refptr<base::MessageLoopProxy>& message_loop,
-                    ScopedVector<VideoDecoder> decoders,
                     const SetDecryptorReadyCB& set_decryptor_ready_cb,
                     const PaintCB& paint_cb,
                     const SetOpaqueCB& set_opaque_cb,
@@ -67,6 +63,7 @@
 
   // VideoRenderer implementation.
   virtual void Initialize(const scoped_refptr<DemuxerStream>& stream,
+                          const VideoDecoderList& decoders,
                           const PipelineStatusCB& init_cb,
                           const StatisticsCB& statistics_cb,
                           const TimeCB& max_time_cb,
@@ -132,17 +129,12 @@
   // A read is scheduled to replace the frame.
   void DropNextReadyFrame_Locked();
 
-  void ResetDecoder();
-  void StopDecoder(const base::Closure& callback);
-
   void TransitionToPrerolled_Locked();
 
   scoped_refptr<base::MessageLoopProxy> message_loop_;
   base::WeakPtrFactory<VideoRendererBase> weak_factory_;
   base::WeakPtr<VideoRendererBase> weak_this_;
 
-  scoped_ptr<VideoDecoderSelector> decoder_selector_;
-
   // Used for accessing data members.
   base::Lock lock_;