Remove WebMediaPlayerProxy::video_decoder_ & FFmpegVideoDecoder::set_decryptor.

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 9eaef4bdb61ce7b7fc55bb7608570cbeb77ec035..1b2642285e014f90aa7f96c7a7508386d04f94ef 100644
--- a/webkit/media/filter_helpers.cc
+++ b/webkit/media/filter_helpers.cc
@@ -21,18 +21,19 @@ namespace webkit_media {
 static void AddDefaultDecodersToCollection(
     media::MessageLoopFactory* message_loop_factory,
     media::FilterCollection* filter_collection,
-    media::Decryptor* decryptor,
-    scoped_refptr<media::FFmpegVideoDecoder>* ffmpeg_video_decoder) {
+    media::Decryptor* decryptor) {
   filter_collection->AddAudioDecoder(new media::FFmpegAudioDecoder(
       base::Bind(&media::MessageLoopFactory::GetMessageLoop,
                  base::Unretained(message_loop_factory),
                  "AudioDecoderThread")));
-  *ffmpeg_video_decoder = new media::FFmpegVideoDecoder(
-      base::Bind(&media::MessageLoopFactory::GetMessageLoop,
-                 base::Unretained(message_loop_factory),
-                 "VideoDecoderThread"));
-  (*ffmpeg_video_decoder)->set_decryptor(decryptor);
-  filter_collection->AddVideoDecoder(*ffmpeg_video_decoder);
+
+  scoped_refptr<media::FFmpegVideoDecoder> ffmpeg_video_decoder =
+      new media::FFmpegVideoDecoder(
+          base::Bind(&media::MessageLoopFactory::GetMessageLoop,
+                     base::Unretained(message_loop_factory),
+                     "VideoDecoderThread"),
+          decryptor);
+  filter_collection->AddVideoDecoder(ffmpeg_video_decoder);
 }
 
 bool BuildMediaStreamCollection(const WebKit::WebURL& url,
@@ -69,15 +70,14 @@ bool BuildMediaSourceCollection(
     media::ChunkDemuxerClient* client,
     media::MessageLoopFactory* message_loop_factory,
     media::FilterCollection* filter_collection,
-    media::Decryptor* decryptor,
-    scoped_refptr<media::FFmpegVideoDecoder>* video_decoder) {
+    media::Decryptor* decryptor) {
   if (media_source_url.isEmpty() || url != media_source_url)
     return false;
 
   filter_collection->SetDemuxer(new media::ChunkDemuxer(client));
 
   AddDefaultDecodersToCollection(message_loop_factory, filter_collection,
-                                 decryptor, video_decoder);
+                                 decryptor);
   return true;
 }
 
@@ -85,14 +85,13 @@ void BuildDefaultCollection(
     const scoped_refptr<media::DataSource>& data_source,
     media::MessageLoopFactory* message_loop_factory,
     media::FilterCollection* filter_collection,
-    media::Decryptor* decryptor,
-    scoped_refptr<media::FFmpegVideoDecoder>* video_decoder) {
+    media::Decryptor* decryptor) {
   filter_collection->SetDemuxer(new media::FFmpegDemuxer(
       message_loop_factory->GetMessageLoop("PipelineThread"),
       data_source));
 
   AddDefaultDecodersToCollection(message_loop_factory, filter_collection,
-                                 decryptor, video_decoder);
+                                 decryptor);
 }
 
 }  // webkit_media