Move ChunkDemuxer handling from WMPProxy to WMPI and remove ChunkDemuxerClient

webkit/media/filter_helpers.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/filter_helpers.h"
 
 #include "base/bind.h"
 #include "media/base/filter_collection.h"
 #include "media/base/message_loop_factory.h"
 #include "media/filters/chunk_demuxer.h"
@@ skipping 41 matching lines @@
   // NOTE: http://crbug.com/110800 is about replacing this ad-hockery with
   // something more designed.
   filter_collection->GetVideoDecoders()->clear();
   filter_collection->GetVideoDecoders()->push_back(video_decoder);
 
   filter_collection->SetDemuxer(new media::DummyDemuxer(true, false));
 
   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(
     const scoped_refptr<media::DataSource>& data_source,
     media::MessageLoopFactory* message_loop_factory,
     media::FilterCollection* filter_collection,
     media::Decryptor* decryptor) {
   filter_collection->SetDemuxer(new media::FFmpegDemuxer(
       message_loop_factory->GetMessageLoop(
           media::MessageLoopFactory::kPipeline),
       data_source));
 
   AddDefaultDecodersToCollection(message_loop_factory, filter_collection,
                                  decryptor);
 }
 
 }  // webkit_media