Remove DemuxerFactory and URL parameter from Pipeline.

media/base/filter_collection.h

Index: media/base/filter_collection.h
diff --git a/media/base/filter_collection.h b/media/base/filter_collection.h
index c3629a1513a170130bf9a582473811f2266cb519..402032d70de38334ad7f7e7a6e0dd30b261b5f5d 100644
--- a/media/base/filter_collection.h
+++ b/media/base/filter_collection.h
@@ -8,7 +8,7 @@
 #include <list>
 
 #include "base/memory/ref_counted.h"
-#include "media/base/demuxer_factory.h"
+#include "media/base/demuxer.h"
 #include "media/base/filters.h"
 
 namespace media {
@@ -22,9 +22,9 @@ class MEDIA_EXPORT FilterCollection {
   FilterCollection();
   ~FilterCollection();
 
-  // DemuxerFactory accessor methods.
-  void SetDemuxerFactory(scoped_ptr<DemuxerFactory> factory);
-  DemuxerFactory* GetDemuxerFactory();
+  // Demuxer accessor methods.
+  void SetDemuxer(Demuxer* demuxer);

[acolwell GONE FROM CHROMIUM, 2012/03/27 20:11:35]

nit: scoped_refptr<Demuxer>&?

[scherkus (not reviewing), 2012/03/27 20:44:09]

Done.

+  Demuxer* GetDemuxer();

[acolwell GONE FROM CHROMIUM, 2012/03/27 20:11:35]

nit: scoped_refptr<Demuxer>?

[scherkus (not reviewing), 2012/03/27 20:44:09]

Done.

 
   // Adds a filter to the collection.
   void AddAudioDecoder(AudioDecoder* audio_decoder);
@@ -60,7 +60,7 @@ class MEDIA_EXPORT FilterCollection {
   typedef std::pair<FilterType, scoped_refptr<Filter> > FilterListElement;
   typedef std::list<FilterListElement> FilterList;
   FilterList filters_;
-  scoped_ptr<DemuxerFactory> demuxer_factory_;
+  scoped_refptr<Demuxer> demuxer_;
   std::list<scoped_refptr<AudioDecoder> > audio_decoders_;
   std::list<scoped_refptr<VideoDecoder> > video_decoders_;