Remove DemuxerFactory and URL parameter from Pipeline.

media/base/mock_filters.h

Index: media/base/mock_filters.h
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index 22cde25ab837dab0b46ca66b2ecff4bd069fb34a..75058fc95e645ebd3f95abcb963d209d0d76938d 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -105,6 +105,7 @@ class MockDemuxer : public Demuxer {
  public:
   MockDemuxer();
 
+  MOCK_METHOD1(Initialize, void(const PipelineStatusCB& cb));
   virtual void set_host(DemuxerHost* demuxer_host);
   MOCK_METHOD1(Stop, void(const base::Closure& callback));
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
@@ -136,25 +137,6 @@ class MockDemuxer : public Demuxer {
   DISALLOW_COPY_AND_ASSIGN(MockDemuxer);
 };
 
-class MockDemuxerFactory : public DemuxerFactory {
- public:
-  explicit MockDemuxerFactory(MockDemuxer* demuxer);
-  virtual ~MockDemuxerFactory();
-
-  void SetError(PipelineStatus error);
-  void RunBuildCallback(const std::string& url, const BuildCallback& callback);
-
-  // DemuxerFactory methods.
-  MOCK_METHOD2(Build, void(const std::string& url,
-                           const BuildCallback& callback));
-
- private:
-  scoped_refptr<MockDemuxer> demuxer_;
-  PipelineStatus status_;
-
-  DISALLOW_COPY_AND_ASSIGN(MockDemuxerFactory);
-};
-
 class MockDemuxerStream : public DemuxerStream {
  public:
   MockDemuxerStream();
@@ -290,13 +272,8 @@ class MockFilterCollection {
   MockVideoRenderer* video_renderer() const { return video_renderer_; }
   MockAudioRenderer* audio_renderer() const { return audio_renderer_; }
 
-  scoped_ptr<FilterCollection> filter_collection() const {
-    return filter_collection(true, true, true, PIPELINE_OK).Pass();
-  }
-
-  scoped_ptr<FilterCollection> filter_collection(
-      bool include_demuxer, bool run_build_cb, bool run_build,
-      PipelineStatus build_status) const;
+  // Creates the FilterCollection containing the mocks.
+  scoped_ptr<FilterCollection> Create();
 
  private:
   scoped_refptr<MockDemuxer> demuxer_;
@@ -312,7 +289,8 @@ class MockFilterCollection {
 // Closure on behalf of the provided filter.  Can be used when mocking
 // the Initialize() and Seek() methods.
 void RunFilterCallback(::testing::Unused, const base::Closure& closure);
-void RunPipelineStatusCB(::testing::Unused, const PipelineStatusCB& status_cb);
+void RunPipelineStatusCB(const PipelineStatusCB& status_cb);
+void RunPipelineStatusCB2(::testing::Unused, const PipelineStatusCB& status_cb);
 void RunPipelineStatusCB3(::testing::Unused, const PipelineStatusCB& status_cb,
                           ::testing::Unused);
 void RunPipelineStatusCB4(::testing::Unused, const PipelineStatusCB& status_cb,
@@ -321,6 +299,10 @@ void RunPipelineStatusCB4(::testing::Unused, const PipelineStatusCB& status_cb,
 // provided filter.  Can be used when mocking the Stop() method.
 void RunStopFilterCallback(const base::Closure& closure);
 
+ACTION_P(RunPipelineStatusCBWithError, error) {
+  arg0.Run(error);
+}
+
 // Helper gmock action that calls SetError() on behalf of the provided filter.
 ACTION_P2(SetError, filter, error) {
   filter->host()->SetError(error);