Remove DemuxerFactory and URL parameter from Pipeline.

media/base/filter_collection.h

 // 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.
 
 #ifndef MEDIA_BASE_FILTER_COLLECTION_H_
 #define MEDIA_BASE_FILTER_COLLECTION_H_
 
 #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 {
 
 class AudioDecoder;
 
 // This is a collection of Filter objects used to form a media playback
 // pipeline. See src/media/base/pipeline.h for more information.
 class MEDIA_EXPORT FilterCollection {
  public:
   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);
   void AddVideoDecoder(VideoDecoder* video_decoder);
   void AddAudioRenderer(AudioRenderer* filter);
   void AddVideoRenderer(VideoRenderer* filter);
 
   // Is the collection empty?
   bool IsEmpty() const;
 
@@ skipping 15 matching lines @@
   // downcasting of different filter types stored in the filters_ list.
   enum FilterType {
     AUDIO_RENDERER,
     VIDEO_RENDERER,
   };
 
   // List of filters managed by this collection.
   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_;
 
   // Helper function that adds a filter to the filter list.
   void AddFilter(FilterType filter_type, Filter* filter);
 
   // Helper function for SelectXXX() methods. It manages the
   // downcasting and mapping between FilterType and Filter class.
   template<FilterType filter_type, typename F>
   void SelectFilter(scoped_refptr<F>* filter_out);
 
   // Helper function that searches the filters list for a specific filter type.
   void SelectFilter(FilterType filter_type, scoped_refptr<Filter>* filter_out);
 
   DISALLOW_COPY_AND_ASSIGN(FilterCollection);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_FILTER_COLLECTION_H_