Replace MockFilterCallback with MockCallback and simplify unit tests.

media/base/mock_filters.h

 // Copyright (c) 2011 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.
 //
 // A new breed of mock media filters, this time using gmock!  Feel free to add
 // actions if you need interesting side-effects (i.e., copying data to the
 // buffer passed into MockDataSource::Read()).
 //
 // Don't forget you can use StrictMock<> and NiceMock<> if you want the mock
 // filters to fail the test or do nothing when an unexpected method is called.
 // http://code.google.com/p/googlemock/wiki/CookBook#Nice_Mocks_and_Strict_Mocks
 
 #ifndef MEDIA_BASE_MOCK_FILTERS_H_
 #define MEDIA_BASE_MOCK_FILTERS_H_
 
 #include <string>
 
-#include "base/callback.h"
 #include "media/base/filters.h"
 #include "media/base/filter_collection.h"
 #include "media/base/video_frame.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace media {
 
 // Use this template to test for object destruction by setting expectations on
 // the method OnDestroy().
 //
 // TODO(scherkus): not sure about the naming...  perhaps contribute this back
 // to gmock itself!
 template<class MockClass>
 class Destroyable : public MockClass {
  public:
   Destroyable() {}
 
   MOCK_METHOD0(OnDestroy, void());
 
  protected:
   virtual ~Destroyable() {
     OnDestroy();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Destroyable);
 };
 
-// Helper class used to test that callbacks are executed.  It is recommend you
-// combine this class with StrictMock<> to verify that the callback is executed.
-// You can reuse the same instance of a MockFilterCallback many times since
-// gmock will track the number of times the methods are executed.
-class MockFilterCallback {
- public:
-  MockFilterCallback();
-  MockFilterCallback(bool run_destroy_callback);
-  virtual ~MockFilterCallback();
-
-  MOCK_METHOD0(OnCallbackDestroyed, void());
-  MOCK_METHOD0(OnFilterCallback, void());
-
-  // Helper method to create a new callback for this mock.  The callback will
-  // call OnFilterCallback() when executed and OnCallbackDestroyed() when
-  // destroyed.  Clients should use NiceMock<> or StrictMock<> depending on the
-  // test.
-  FilterCallback* NewCallback();
-
- private:
-  // Private implementation of CallbackRunner used to trigger expectations on
-  // 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) {
-    }
-
-    virtual ~CallbackImpl() {
-      if (run_destroy_callback_)
-        mock_callback_->OnCallbackDestroyed();
-    }
-
-    virtual void RunWithParams(const Tuple0& params) {
-      mock_callback_->OnFilterCallback();
-    }
-
-   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));
@@ skipping 258 matching lines @@
 
 // Helper gmock action that calls DisableAudioRenderer() on behalf of the
 // provided filter.
 ACTION_P(DisableAudioRenderer, filter) {
   filter->host()->DisableAudioRenderer();
 }
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MOCK_FILTERS_H_