Remove DemuxerFactory and URL parameter from Pipeline.

media/base/filter_collection.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 "media/base/filter_collection.h"
 
 #include "base/logging.h"
 #include "media/base/audio_decoder.h"
 
 namespace media {
 
 FilterCollection::FilterCollection() {}
 
 FilterCollection::~FilterCollection() {}
 
-void FilterCollection::SetDemuxerFactory(scoped_ptr<DemuxerFactory> factory) {
-  DCHECK(factory.get());
-  demuxer_factory_ = factory.Pass();
+void FilterCollection::SetDemuxer(const scoped_refptr<Demuxer>& demuxer) {
+  demuxer_ = demuxer;
 }
 
-DemuxerFactory* FilterCollection::GetDemuxerFactory() {
-  return demuxer_factory_.get();
+const scoped_refptr<Demuxer>& FilterCollection::GetDemuxer() {
+  return demuxer_;
 }
 
 void FilterCollection::AddAudioDecoder(AudioDecoder* audio_decoder) {
   audio_decoders_.push_back(audio_decoder);
 }
 
 void FilterCollection::AddVideoDecoder(VideoDecoder* video_decoder) {
   video_decoders_.push_back(video_decoder);
 }
 
@@ skipping 65 matching lines @@
     ++it;
   }
 
   if (it != filters_.end()) {
     *filter_out = it->second.get();
     filters_.erase(it);
   }
 }
 
 }  // namespace media