Revert 69959 - Refactor PipelineImpl to use CompositeFilter to manage Filter ...

media/base/mock_filters.h

Index: media/base/mock_filters.h
===================================================================
--- media/base/mock_filters.h	(revision 69961)
+++ media/base/mock_filters.h	(working copy)
@@ -50,12 +50,7 @@
 // gmock will track the number of times the methods are executed.
 class MockFilterCallback {
  public:
-  MockFilterCallback() : run_destroy_callback_(true) {
-  }
-
-  MockFilterCallback(bool run_destroy_callback) :
-    run_destroy_callback_(run_destroy_callback) {
-  }
+  MockFilterCallback() {}
   virtual ~MockFilterCallback() {}
 
   MOCK_METHOD0(OnCallbackDestroyed, void());
@@ -66,7 +61,7 @@
   // destroyed.  Clients should use NiceMock<> or StrictMock<> depending on the
   // test.
   FilterCallback* NewCallback() {
-    return new CallbackImpl(this, run_destroy_callback_);
+    return new CallbackImpl(this);
   }
 
  private:
@@ -74,15 +69,12 @@
   // MockFilterCallback.
   class CallbackImpl : public CallbackRunner<Tuple0> {
    public:
-    explicit CallbackImpl(MockFilterCallback* mock_callback,
-                          bool run_destroy_callback)
-        : mock_callback_(mock_callback),
-          run_destroy_callback_(run_destroy_callback) {
+    explicit CallbackImpl(MockFilterCallback* mock_callback)
+        : mock_callback_(mock_callback) {
     }
 
     virtual ~CallbackImpl() {
-      if (run_destroy_callback_)
-        mock_callback_->OnCallbackDestroyed();
+      mock_callback_->OnCallbackDestroyed();
     }
 
     virtual void RunWithParams(const Tuple0& params) {
@@ -91,41 +83,13 @@
 
    private:
     MockFilterCallback* mock_callback_;
-    bool run_destroy_callback_;
 
     DISALLOW_COPY_AND_ASSIGN(CallbackImpl);
   };
 
-  bool run_destroy_callback_;
   DISALLOW_COPY_AND_ASSIGN(MockFilterCallback);
 };
 
-class MockFilter : public Filter {
- public:
-  MockFilter();
-  MockFilter(bool requires_message_loop);
-
-  // Filter implementation.
-  virtual bool requires_message_loop() const;
-  virtual const char* message_loop_name() const;
-
-  MOCK_METHOD1(Play, void(FilterCallback* callback));
-  MOCK_METHOD1(Pause, void(FilterCallback* callback));
-  MOCK_METHOD1(Flush, void(FilterCallback* callback));
-  MOCK_METHOD1(Stop, void(FilterCallback* callback));
-  MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
-  MOCK_METHOD2(Seek, void(base::TimeDelta time, FilterCallback* callback));
-  MOCK_METHOD0(OnAudioRendererDisabled, void());
-
- protected:
-  virtual ~MockFilter();
-
- private:
-  bool requires_message_loop_;
-
-  DISALLOW_COPY_AND_ASSIGN(MockFilter);
-};
-
 class MockDataSource : public DataSource {
  public:
   MockDataSource() {}