Move Renderer permanent callbacks into RendererClient interface.

media/mojo/services/mojo_renderer_impl.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 MEDIA_MOJO_SERVICES_MOJO_RENDERER_IMPL_H_
 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_IMPL_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
@@ skipping 21 matching lines @@
 // which can be called on any thread.
 class MojoRendererImpl : public Renderer, public interfaces::RendererClient {
  public:
   MojoRendererImpl(
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
       interfaces::RendererPtr remote_renderer);
   ~MojoRendererImpl() override;
 
   // Renderer implementation.
   void Initialize(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) override;
+                  media::RendererClient* client,
+                  const PipelineStatusCB& init_cb) override;
   void SetCdm(CdmContext* cdm_context,
               const CdmAttachedCB& cdm_attached_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;
 
@@ skipping 12 matching lines @@
   void OnInitialized(bool success);
 
   // |task_runner| on which all methods are invoked, except for GetMediaTime(),
   // which can be called on any thread.
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   // Provider of audio/video DemuxerStreams. Must be valid throughout the
   // lifetime of |this|.
   DemuxerStreamProvider* demuxer_stream_provider_;
 
+  // Client of |this| renderer passed in Initialize.
+  media::RendererClient* client_;
+
   // This class is constructed on one thread and used exclusively on another
   // thread. This member is used to safely pass the RendererPtr from one thread
   // to another. It is set in the constructor and is consumed in Initialize().
   interfaces::RendererPtrInfo remote_renderer_info_;
 
   // Remote Renderer, bound to |task_runner_| during Initialize().
   interfaces::RendererPtr remote_renderer_;
 
   // Binding for RendererClient, bound to the |task_runner_|.
   mojo::Binding<RendererClient> binding_;
 
   // Callbacks passed to Initialize() that we forward messages from
   // |remote_renderer_| through.
   PipelineStatusCB init_cb_;
-  base::Closure ended_cb_;
-  PipelineStatusCB error_cb_;
-  BufferingStateCB buffering_state_cb_;
 
   // Lock used to serialize access for |time_|.
   mutable base::Lock lock_;
   base::TimeDelta time_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoRendererImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_RENDERER_IMPL_H_