Move Renderer permanent callbacks into RendererClient interface.

chromecast/renderer/media/cma_renderer.h

 // Copyright 2014 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.
 
 #ifndef CHROMECAST_RENDERER_MEDIA_CMA_RENDERER_H_
 #define CHROMECAST_RENDERER_MEDIA_CMA_RENDERER_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 27 matching lines @@
 
 class CmaRenderer : public ::media::Renderer {
  public:
   CmaRenderer(std::unique_ptr<MediaPipelineProxy> media_pipeline,
               ::media::VideoRendererSink* video_renderer_sink,
               ::media::GpuVideoAcceleratorFactories* gpu_factories);
   ~CmaRenderer() override;
 
   // ::media::Renderer implementation:
   void Initialize(::media::DemuxerStreamProvider* demuxer_stream_provider,
-                  const ::media::PipelineStatusCB& init_cb,
-                  const ::media::StatisticsCB& statistics_cb,
-                  const ::media::BufferingStateCB& buffering_state_cb,
-                  const base::Closure& ended_cb,
-                  const ::media::PipelineStatusCB& error_cb,
-                  const base::Closure& waiting_for_decryption_key_cb) override;
+                  ::media::RendererClient* client,
+                  const ::media::PipelineStatusCB& init_cb) override;
   void Flush(const base::Closure& flush_cb) override;
   void StartPlayingFrom(base::TimeDelta time) override;
   void SetPlaybackRate(double playback_rate) override;
   void SetVolume(float volume) override;
   base::TimeDelta GetMediaTime() override;
   bool HasAudio() override;
   bool HasVideo() override;
   void SetCdm(::media::CdmContext* cdm_context,
               const ::media::CdmAttachedCB& cdm_attached_cb) override;
 
@@ skipping 39 matching lines @@
 
   scoped_refptr<BalancedMediaTaskRunnerFactory> media_task_runner_factory_;
   std::unique_ptr<MediaPipelineProxy> media_pipeline_;
   AudioPipelineProxy* audio_pipeline_;
   VideoPipelineProxy* video_pipeline_;
   ::media::VideoRendererSink* video_renderer_sink_;
 
   ::media::DemuxerStreamProvider* demuxer_stream_provider_;
 
   // Set of callbacks.
+  ::media::RendererClient* client_;
   ::media::PipelineStatusCB init_cb_;
-  ::media::StatisticsCB statistics_cb_;
-  base::Closure ended_cb_;
-  ::media::PipelineStatusCB error_cb_;
-  ::media::BufferingStateCB buffering_state_cb_;
   base::Closure flush_cb_;
-  base::Closure waiting_for_decryption_key_cb_;
 
   // Renderer state.
   // Used mostly for checking that transitions are correct.
   State state_;
   bool is_pending_transition_;
 
   bool has_audio_;
   bool has_video_;
 
   bool received_audio_eos_;
@@ skipping 20 matching lines @@
   base::WeakPtr<CmaRenderer> weak_this_;
   base::WeakPtrFactory<CmaRenderer> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CmaRenderer);
 };
 
 }  // namespace media
 }  // namespace chromecast
 
 #endif  // CHROMECAST_RENDERER_MEDIA_CMA_RENDERER_H_