Move Renderer permanent callbacks into RendererClient interface.

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 420e3a548d5946899247b43d1bb050bf039858c2..c2447620c90c5535b8507e90df5d1a5a498e17e3 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -22,6 +22,7 @@
 #include "media/base/pipeline.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/renderer.h"
+#include "media/base/renderer_client.h"
 #include "media/base/text_track.h"
 #include "media/base/text_track_config.h"
 #include "media/base/time_source.h"
@@ -197,22 +198,31 @@ class MockAudioDecoder : public AudioDecoder {
   DISALLOW_COPY_AND_ASSIGN(MockAudioDecoder);
 };
 
+class MockRendererClient : public RendererClient {
+ public:
+  MockRendererClient();
+  ~MockRendererClient();
+
+  // RendererClient implementation.
+  MOCK_METHOD1(OnError, void(PipelineStatus));
+  MOCK_METHOD0(OnEnded, void());
+  MOCK_METHOD1(OnStatisticsUpdate, void(const PipelineStatistics&));
+  MOCK_METHOD1(OnBufferingStateChange, void(BufferingState));
+  MOCK_METHOD0(OnWaitingForDecryptionKey, void());
+};
+
 class MockVideoRenderer : public VideoRenderer {
  public:
   MockVideoRenderer();
   virtual ~MockVideoRenderer();
 
   // VideoRenderer implementation.
-  MOCK_METHOD9(Initialize,
+  MOCK_METHOD5(Initialize,
                void(DemuxerStream* stream,
-                    const PipelineStatusCB& init_cb,
                     CdmContext* cdm_context,
-                    const StatisticsCB& statistics_cb,
-                    const BufferingStateCB& buffering_state_cb,
-                    const base::Closure& ended_cb,
-                    const PipelineStatusCB& error_cb,
+                    RendererClient* client,
                     const TimeSource::WallClockTimeCB& wall_clock_time_cb,
-                    const base::Closure& waiting_for_decryption_key_cb));
+                    const PipelineStatusCB& init_cb));
   MOCK_METHOD1(Flush, void(const base::Closure& callback));
   MOCK_METHOD1(StartPlayingFrom, void(base::TimeDelta));
   MOCK_METHOD1(OnTimeStateChanged, void(bool));
@@ -227,15 +237,11 @@ class MockAudioRenderer : public AudioRenderer {
   virtual ~MockAudioRenderer();
 
   // AudioRenderer implementation.
-  MOCK_METHOD8(Initialize,
+  MOCK_METHOD4(Initialize,
                void(DemuxerStream* stream,
-                    const PipelineStatusCB& init_cb,
                     CdmContext* cdm_context,
-                    const StatisticsCB& statistics_cb,
-                    const BufferingStateCB& buffering_state_cb,
-                    const base::Closure& ended_cb,
-                    const PipelineStatusCB& error_cb,
-                    const base::Closure& waiting_for_decryption_key_cb));
+                    RendererClient* client,
+                    const PipelineStatusCB& init_cb));
   MOCK_METHOD0(GetTimeSource, TimeSource*());
   MOCK_METHOD1(Flush, void(const base::Closure& callback));
   MOCK_METHOD0(StartPlaying, void());
@@ -251,14 +257,10 @@ class MockRenderer : public Renderer {
   virtual ~MockRenderer();
 
   // Renderer implementation.
-  MOCK_METHOD7(Initialize,
+  MOCK_METHOD3(Initialize,
                void(DemuxerStreamProvider* demuxer_stream_provider,
-                    const PipelineStatusCB& init_cb,
-                    const StatisticsCB& statistics_cb,
-                    const BufferingStateCB& buffering_state_cb,
-                    const base::Closure& ended_cb,
-                    const PipelineStatusCB& error_cb,
-                    const base::Closure& waiting_for_decryption_key_cb));
+                    RendererClient* client,
+                    const PipelineStatusCB& init_cb));
   MOCK_METHOD1(Flush, void(const base::Closure& flush_cb));
   MOCK_METHOD1(StartPlayingFrom, void(base::TimeDelta timestamp));
   MOCK_METHOD1(SetPlaybackRate, void(double playback_rate));