Encrypted Media: Support Audio Decrypt-Only.

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 379e2caad4a2cf7c31ff5b2cd825a747c2e8fc61..c5dfcdc1a940ee7458b579edd859c16e1351c550 100644
--- a/webkit/media/filter_helpers.cc
+++ b/webkit/media/filter_helpers.cc
@@ -6,9 +6,8 @@
 
 #include "base/bind.h"
 #include "media/base/filter_collection.h"
-#include "media/filters/decrypting_audio_decoder.h"
-#include "media/filters/decrypting_video_decoder.h"
 #include "media/filters/chunk_demuxer.h"
+#include "media/filters/decrypting_video_decoder.h"
 #include "media/filters/dummy_demuxer.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer.h"
@@ -35,17 +34,10 @@ static void AddDefaultDecodersToCollection(
   filter_collection->GetAudioDecoders()->push_back(ffmpeg_audio_decoder);
 
   if (proxy_decryptor) {
-    scoped_refptr<media::DecryptingAudioDecoder> decrypting_audio_decoder =
-        new media::DecryptingAudioDecoder(
-            message_loop,
-            base::Bind(&ProxyDecryptor::RequestDecryptorNotification,
-                       base::Unretained(proxy_decryptor)));
-    filter_collection->GetAudioDecoders()->push_back(decrypting_audio_decoder);
-
     scoped_refptr<media::DecryptingVideoDecoder> decrypting_video_decoder =
         new media::DecryptingVideoDecoder(
             message_loop,
-            base::Bind(&ProxyDecryptor::RequestDecryptorNotification,
+            base::Bind(&ProxyDecryptor::RegisterDecryptorReadyNotification,
                        base::Unretained(proxy_decryptor)));
     // TODO(xhwang): Ideally we should have decrypting video decoder after
     // regular video decoder since in the real world most videos are not