Move VideoDecoder initialization into VideoRendererBase.

media/base/filter_collection.h

Index: media/base/filter_collection.h
diff --git a/media/base/filter_collection.h b/media/base/filter_collection.h
index 6d2b0cdd8932fa94df32e29e9bee93f7d38b51d4..6a0bb693c38cfc3a64b00b5708b176ffe86431b1 100644
--- a/media/base/filter_collection.h
+++ b/media/base/filter_collection.h
@@ -25,6 +25,8 @@ class VideoRenderer;
 // http://crbug.com/110800
 class MEDIA_EXPORT FilterCollection {
  public:
+  typedef std::list<scoped_refptr<VideoDecoder> > VideoDecoderList;
+
   FilterCollection();
   ~FilterCollection();
 
@@ -34,7 +36,6 @@ class MEDIA_EXPORT FilterCollection {
 
   // Adds a filter to the collection.
   void AddAudioDecoder(AudioDecoder* audio_decoder);
-  void AddVideoDecoder(VideoDecoder* video_decoder);
   void AddAudioRenderer(AudioRenderer* audio_renderer);
   void AddVideoRenderer(VideoRenderer* video_renderer);
 
@@ -49,14 +50,15 @@ class MEDIA_EXPORT FilterCollection {
   // If a filter is returned it is removed from the collection.
   // Filters are selected in FIFO order.
   void SelectAudioDecoder(scoped_refptr<AudioDecoder>* out);
-  void SelectVideoDecoder(scoped_refptr<VideoDecoder>* out);
   void SelectAudioRenderer(scoped_refptr<AudioRenderer>* out);
   void SelectVideoRenderer(scoped_refptr<VideoRenderer>* out);
 
+  VideoDecoderList& GetVideoDecoders();

[Ami GONE FROM CHROMIUM, 2012/08/09 20:30:18]

Return a pointer, never a non-const-ref in chromium style.

[acolwell GONE FROM CHROMIUM, 2012/08/09 22:23:32]

Done.

+
  private:
   scoped_refptr<Demuxer> demuxer_;
   std::list<scoped_refptr<AudioDecoder> > audio_decoders_;
-  std::list<scoped_refptr<VideoDecoder> > video_decoders_;
+  VideoDecoderList video_decoders_;
   std::list<scoped_refptr<AudioRenderer> > audio_renderers_;
   std::list<scoped_refptr<VideoRenderer> > video_renderers_;