Move audio decoder initialization to AudioRendererImpl.

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 08354a7f8a5cc8dc71f810651a33a060032f4948..e9f2be55891d891e932f39d535267bc35f16551f 100644
--- a/media/base/filter_collection.h
+++ b/media/base/filter_collection.h
@@ -25,6 +25,7 @@ class VideoRenderer;
 // http://crbug.com/110800
 class MEDIA_EXPORT FilterCollection {
  public:
+  typedef std::list<scoped_refptr<AudioDecoder> > AudioDecoderList;
   typedef std::list<scoped_refptr<VideoDecoder> > VideoDecoderList;
 
   FilterCollection();
@@ -46,15 +47,15 @@ class MEDIA_EXPORT FilterCollection {
   // If the required filter cannot be found, NULL is returned.
   // If a filter is returned it is removed from the collection.
   // Filters are selected in FIFO order.
-  void SelectAudioDecoder(scoped_refptr<AudioDecoder>* out);
   void SelectAudioRenderer(scoped_refptr<AudioRenderer>* out);
   void SelectVideoRenderer(scoped_refptr<VideoRenderer>* out);
 
+  AudioDecoderList* GetAudioDecoders();

[acolwell GONE FROM CHROMIUM, 2012/10/15 21:00:07]

Do we really want a list here? We don't have more than one audio decoder.

[xhwang, 2012/10/15 22:52:23]

The reason I work on this CL now is to be prepared for adding another audio
decoder: DecryptingAudioDecoder.

   VideoDecoderList* GetVideoDecoders();
 
  private:
   scoped_refptr<Demuxer> demuxer_;
-  std::list<scoped_refptr<AudioDecoder> > audio_decoders_;
+  AudioDecoderList audio_decoders_;
   VideoDecoderList video_decoders_;
   std::list<scoped_refptr<AudioRenderer> > audio_renderers_;
   std::list<scoped_refptr<VideoRenderer> > video_renderers_;