Move AudioRenderer out of Filter heirarchy.

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 c52cc823632fdf0039581fc3d0111c7c8639d5d0..65860dbd28d5cf599b89fdb76bfdf0fd595185e3 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -197,23 +197,21 @@ class MockAudioRenderer : public AudioRenderer {
  public:
   MockAudioRenderer();
 
-  // Filter implementation.
-  MOCK_METHOD1(SetHost, void(FilterHost* host));
+  // AudioRenderer implementation.
+  MOCK_METHOD6(Initialize, void(const scoped_refptr<AudioDecoder>& decoder,
+                                const PipelineStatusCB& init_cb,
+                                const base::Closure& underflow_cb,
+                                const TimeCB& time_cb,
+                                const base::Closure& ended_cb,
+                                const base::Closure& disabled_cb));
   MOCK_METHOD1(Play, void(const base::Closure& callback));
   MOCK_METHOD1(Pause, void(const base::Closure& callback));
   MOCK_METHOD1(Flush, void(const base::Closure& callback));
   MOCK_METHOD1(Stop, void(const base::Closure& callback));
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
   MOCK_METHOD2(Seek, void(base::TimeDelta time, const PipelineStatusCB& cb));
-
-  // AudioRenderer implementation.
-  MOCK_METHOD4(Initialize, void(const scoped_refptr<AudioDecoder>& decoder,
-                                const PipelineStatusCB& init_cb,
-                                const base::Closure& underflow_cb,
-                                const TimeCB& time_cb));
   MOCK_METHOD0(HasEnded, bool());
   MOCK_METHOD1(SetVolume, void(float volume));
-
   MOCK_METHOD1(ResumeAfterUnderflow, void(bool buffer_more_audio));
 
  protected:
@@ -285,19 +283,6 @@ class MockFilterCollection {
   DISALLOW_COPY_AND_ASSIGN(MockFilterCollection);
 };
 
-// Helper gmock functions that immediately executes and destroys the
-// Closure on behalf of the provided filter. Can be used when mocking
-// the Initialize() and Seek() methods.
-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,
-                          ::testing::Unused, ::testing::Unused);
-// Helper gmock function that immediately executes the Closure on behalf of the
-// provided filter. Can be used when mocking the Stop() method.
-void RunClosure(const base::Closure& closure);
-
 // Helper gmock action that calls SetError() on behalf of the provided filter.
 ACTION_P2(SetError, filter, error) {
   filter->host()->SetError(error);
@@ -309,6 +294,10 @@ ACTION_P2(SetDuration, filter, duration) {
   filter->host()->SetDuration(duration);
 }
 
+ACTION(RunClosure) {
+  arg0.Run();
+}
+
 // Helper mock statistics callback.
 class MockStatisticsCB {
  public: