Move ChunkDemuxer handling from WMPProxy to WMPI and remove ChunkDemuxerClient

webkit/media/filter_helpers.h

Index: webkit/media/filter_helpers.h
diff --git a/webkit/media/filter_helpers.h b/webkit/media/filter_helpers.h
index b130ddf87f62398a40f120b554af9fb01e3ae549..c5fd87d19407ecff2ffe5e4c80d94bd68a7c614b 100644
--- a/webkit/media/filter_helpers.h
+++ b/webkit/media/filter_helpers.h
@@ -10,7 +10,7 @@
 
 namespace media {
 class Decryptor;
-class ChunkDemuxerClient;
+class ChunkDemuxer;
 class DataSource;
 class FFmpegVideoDecoder;
 class FilterCollection;
@@ -35,13 +35,9 @@ bool BuildMediaStreamCollection(const WebKit::WebURL& url,
                                 media::FilterCollection* filter_collection);
 
 // Builds the required filters for handling media source URLs, adds them to
-// |filter_collection| and fills |video_decoder| returning true if successful.
-//
-// |filter_collection| is not modified if this method returns false.
-bool BuildMediaSourceCollection(
-    const WebKit::WebURL& url,
-    const WebKit::WebURL& media_source_url,
-    media::ChunkDemuxerClient* client,
+// |filter_collection|.
+void BuildMediaSourceCollection(
+    const scoped_refptr<media::ChunkDemuxer>& demuxer,
     media::MessageLoopFactory* message_loop_factory,
     media::FilterCollection* filter_collection,
     media::Decryptor* decryptor);