DemuxerFactory is born!

media/base/pipeline_impl.h

Index: media/base/pipeline_impl.h
diff --git a/media/base/pipeline_impl.h b/media/base/pipeline_impl.h
index a5106d3ec74f310f516530cc301cde05b0a76d03..735cd8350eb36140795034f14d8489ae58d4b45d 100644
--- a/media/base/pipeline_impl.h
+++ b/media/base/pipeline_impl.h
@@ -100,7 +100,6 @@ class PipelineImpl : public Pipeline, public FilterHost {
   // Pipeline states, as described above.
   enum State {
     kCreated,
-    kInitDataSource,
     kInitDemuxer,
     kInitAudioDecoder,
     kInitAudioRenderer,
@@ -251,10 +250,8 @@ class PipelineImpl : public Pipeline, public FilterHost {
 
   // The following initialize methods are used to select a specific type of
   // Filter object from FilterCollection and initialize it asynchronously.
-  void InitializeDataSource();
-  void OnDataSourceBuilt(PipelineError error, DataSource* data_source);
-
-  void InitializeDemuxer(const scoped_refptr<DataSource>& data_source);
+  void InitializeDemuxer();
+  void OnDemuxerBuilt(PipelineError error, Demuxer* demuxer);
 
   // Returns true if the asynchronous action of creating decoder has started.
   // Returns false if this method did nothing because the corresponding