Move ChunkDemuxer handling from WMPProxy to WMPI and remove ChunkDemuxerClient

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 5975679ef8c4a7561fce3814e43619cacdd68be2..9740de48646627cd2d0ac04b0e2e58edb0d717d6 100644
--- a/webkit/media/filter_helpers.cc
+++ b/webkit/media/filter_helpers.cc
@@ -59,21 +59,15 @@ bool BuildMediaStreamCollection(const WebKit::WebURL& url,
   return true;
 }
 
-bool BuildMediaSourceCollection(
-    const WebKit::WebURL& url,
-    const WebKit::WebURL& media_source_url,
-    media::ChunkDemuxerClient* client,
+void BuildMediaSourceCollection(
+    const scoped_refptr<media::ChunkDemuxer>& demuxer,
     media::MessageLoopFactory* message_loop_factory,
     media::FilterCollection* filter_collection,
     media::Decryptor* decryptor) {
-  if (media_source_url.isEmpty() || url != media_source_url)
-    return false;
-
-  filter_collection->SetDemuxer(new media::ChunkDemuxer(client));
-
+  DCHECK(demuxer);
+  filter_collection->SetDemuxer(demuxer);
   AddDefaultDecodersToCollection(message_loop_factory, filter_collection,
                                  decryptor);
-  return true;
 }
 
 void BuildDefaultCollection(