Move Renderer permanent callbacks into RendererClient interface.

media/base/renderer.h

Index: media/base/renderer.h
diff --git a/media/base/renderer.h b/media/base/renderer.h
index 89e349a9350d1c44564690a84bdc2391589e78d2..827ac9d950ab9eff59384dcdd091e51b4addbd2f 100644
--- a/media/base/renderer.h
+++ b/media/base/renderer.h
@@ -17,6 +17,7 @@
 namespace media {
 
 class DemuxerStreamProvider;
+class RendererClient;
 class VideoFrame;
 
 class MEDIA_EXPORT Renderer {
@@ -27,27 +28,13 @@ class MEDIA_EXPORT Renderer {
   virtual ~Renderer();
 
   // Initializes the Renderer with |demuxer_stream_provider|, executing
-  // |init_cb| upon completion.  If initialization fails, only |init_cb| (not
-  // |error_cb|) should be called.  |demuxer_stream_provider| must be valid for
+  // |init_cb| upon completion. |demuxer_stream_provider| must be valid for
   // the lifetime of the Renderer object.  |init_cb| must only be run after this
   // method has returned.  Firing |init_cb| may result in the immediate
   // destruction of the caller, so it must be run only prior to returning.
-  //
-  // Permanent callbacks:
-  // - |statistics_cb|: Executed periodically with rendering statistics.
-  // - |buffering_state_cb|: Executed when buffering state is changed.
-  // - |ended_cb|: Executed when rendering has reached the end of stream.
-  // - |error_cb|: Executed if any error was encountered after initialization.
-  // - |waiting_for_decryption_key_cb|: Executed whenever the key needed to
-  //                                    decrypt the stream is not available.
-  virtual 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) = 0;
+  virtual void Initialize(RendererClient* client,
+                          DemuxerStreamProvider* demuxer_stream_provider,
+                          const PipelineStatusCB& init_cb) = 0;

[xhwang, 2016/05/09 18:13:22]

Here and on AudioRenderer and VideoRenderer interfaces: We were follow the rule
of "putting input-only parameter before output parameters":

https://google.github.io/styleguide/cppguide.html#Function_Parameter_Ordering

The |client| is an output parameter. So let's put it after
|demuxer_stream_provider|?

[alokp, 2016/05/09 21:31:43]

Done.

 
   // Associates the |cdm_context| with this Renderer for decryption (and
   // decoding) of media data, then fires |cdm_attached_cb| with the result.