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..b0ebfb3e1a4d6e5e31425df0922c466a0ec56e83 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -197,23 +197,20 @@ class MockAudioRenderer : public AudioRenderer {
  public:
   MockAudioRenderer();
 
-  // Filter implementation.
-  MOCK_METHOD1(SetHost, void(FilterHost* host));
+  // AudioRenderer implementation.
+  MOCK_METHOD1(SetHost, void(AudioRendererHost* host));
+  MOCK_METHOD4(Initialize, void(const scoped_refptr<AudioDecoder>& decoder,
+                                const PipelineStatusCB& init_cb,
+                                const base::Closure& underflow_cb,
+                                const TimeCB& time_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:
@@ -223,6 +220,21 @@ class MockAudioRenderer : public AudioRenderer {
   DISALLOW_COPY_AND_ASSIGN(MockAudioRenderer);
 };
 
+class MockAudioRendererHost : public AudioRendererHost {
+ public:
+  MockAudioRendererHost();
+
+  // AudioRendererHost implementation.
+  MOCK_METHOD0(AudioRendererEnded, void());
+  MOCK_METHOD0(AudioRendererDisabled, void());
+
+ protected:
+  virtual ~MockAudioRendererHost();
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MockAudioRendererHost);
+};
+
 class MockDecryptorClient : public DecryptorClient {
  public:
   MockDecryptorClient();