Move audio decoder initialization to AudioRendererImpl.

webkit/media/filter_helpers.cc

Index: webkit/media/filter_helpers.cc
diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc
index da963072a7df7e5dc0738da3bd6d6fd4f75c8ee8..d34cf52408cdd97e7af6042f22d78b8a59b9a724 100644
--- a/webkit/media/filter_helpers.cc
+++ b/webkit/media/filter_helpers.cc
@@ -30,10 +30,11 @@ static void AddDefaultDecodersToCollection(
     media::MessageLoopFactory* message_loop_factory,
     media::FilterCollection* filter_collection,
     ProxyDecryptor* proxy_decryptor) {
-  filter_collection->AddAudioDecoder(new media::FFmpegAudioDecoder(
-      base::Bind(&media::MessageLoopFactory::GetMessageLoop,
-                 base::Unretained(message_loop_factory),
-                 media::MessageLoopFactory::kDecoder)));
+  scoped_refptr<media::FFmpegAudioDecoder> ffmpeg_audio_decoder =
+      new media::FFmpegAudioDecoder(
+          base::Bind(&media::MessageLoopFactory::GetMessageLoop,
+                     base::Unretained(message_loop_factory),
+                     media::MessageLoopFactory::kDecoder));
 
   scoped_refptr<media::DecryptingVideoDecoder> decrypting_video_decoder =
       new media::DecryptingVideoDecoder(
@@ -50,6 +51,7 @@ static void AddDefaultDecodersToCollection(
                      media::MessageLoopFactory::kDecoder),
           proxy_decryptor);
 
+  filter_collection->GetAudioDecoders()->push_back(ffmpeg_audio_decoder);
   filter_collection->GetVideoDecoders()->push_back(decrypting_video_decoder);
   filter_collection->GetVideoDecoders()->push_back(ffmpeg_video_decoder);
 }