Move VideoDecoder initialization into VideoRendererBase.

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 1b2642285e014f90aa7f96c7a7508386d04f94ef..15af1adf0209b9032f69dd42b1a1caf135384b96 100644
--- a/webkit/media/filter_helpers.cc
+++ b/webkit/media/filter_helpers.cc
@@ -33,7 +33,7 @@ static void AddDefaultDecodersToCollection(
                      base::Unretained(message_loop_factory),
                      "VideoDecoderThread"),
           decryptor);
-  filter_collection->AddVideoDecoder(ffmpeg_video_decoder);
+  filter_collection->GetVideoDecoders().push_back(ffmpeg_video_decoder);
 }
 
 bool BuildMediaStreamCollection(const WebKit::WebURL& url,
@@ -48,16 +48,9 @@ bool BuildMediaStreamCollection(const WebKit::WebURL& url,
   if (!video_decoder)
     return false;
 
-  // Remove any "traditional" decoders (e.g. GpuVideoDecoder) from the
-  // collection.
-  // NOTE: http://crbug.com/110800 is about replacing this ad-hockery with

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

This comment should live on.

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

Done.

-  // something more designed.
-  scoped_refptr<media::VideoDecoder> old_videodecoder;
-  do {
-    filter_collection->SelectVideoDecoder(&old_videodecoder);
-  } while (old_videodecoder);
-
-  filter_collection->AddVideoDecoder(video_decoder);
+  // Remove all other decoders and just use the MediaStream one.
+  filter_collection->GetVideoDecoders().clear();
+  filter_collection->GetVideoDecoders().push_back(video_decoder);
 
   filter_collection->SetDemuxer(new media::DummyDemuxer(true, false));