Move Renderer permanent callbacks into RendererClient interface.

media/mojo/services/mojo_renderer_impl.cc

 // 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.
 
 #include "media/mojo/services/mojo_renderer_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "media/base/demuxer_stream_provider.h"
+#include "media/base/renderer_client.h"
 #include "media/mojo/services/mojo_demuxer_stream_impl.h"
 
 namespace media {
 
 MojoRendererImpl::MojoRendererImpl(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     interfaces::RendererPtr remote_renderer)
     : task_runner_(task_runner),
       remote_renderer_info_(remote_renderer.PassInterface()),
       binding_(this) {
   DVLOG(1) << __FUNCTION__;
 }
 
 MojoRendererImpl::~MojoRendererImpl() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 }
 
 // TODO(xhwang): Support |waiting_for_decryption_key_cb| and |statictics_cb|.
 // See http://crbug.com/585287

[xhwang, 2016/05/12 20:51:18]

You can remove this now.

[alokp, 2016/05/12 21:46:50]

Done.

 void MojoRendererImpl::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 */) {
+    media::RendererClient* client,
+    const PipelineStatusCB& init_cb) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(demuxer_stream_provider);
 
   // Bind |remote_renderer_| to the |task_runner_|.
   remote_renderer_.Bind(std::move(remote_renderer_info_));
 
   // If connection error has happened, fail immediately.
   if (remote_renderer_.encountered_error()) {
     task_runner_->PostTask(
         FROM_HERE, base::Bind(init_cb, PIPELINE_ERROR_INITIALIZATION_FAILED));
     return;
   }
 
   // Otherwise, set an error handler to catch the connection error.
   // Using base::Unretained(this) is safe because |this| owns
   // |remote_renderer_|, and the error handler can't be invoked once
   // |remote_renderer_| is destroyed.
   remote_renderer_.set_connection_error_handler(
       base::Bind(&MojoRendererImpl::OnConnectionError, base::Unretained(this)));
 
   demuxer_stream_provider_ = demuxer_stream_provider;
+  client_ = client;
   init_cb_ = init_cb;
-  buffering_state_cb_ = buffering_state_cb;
-  ended_cb_ = ended_cb;
-  error_cb_ = error_cb;
 
   // Create audio and video interfaces::DemuxerStream and bind its lifetime to
   // the pipe.
   DemuxerStream* const audio =
       demuxer_stream_provider_->GetStream(DemuxerStream::AUDIO);
   DemuxerStream* const video =
       demuxer_stream_provider_->GetStream(DemuxerStream::VIDEO);
 
   interfaces::DemuxerStreamPtr audio_stream;
   if (audio)
@@ skipping 82 matching lines @@
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   base::AutoLock auto_lock(lock_);
   time_ = base::TimeDelta::FromMicroseconds(time_usec);
 }
 
 void MojoRendererImpl::OnBufferingStateChange(
     interfaces::BufferingState state) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
-  buffering_state_cb_.Run(static_cast<media::BufferingState>(state));
+  client_->OnBufferingStateChange(static_cast<media::BufferingState>(state));
 }
 
 void MojoRendererImpl::OnEnded() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
-  ended_cb_.Run();
+  client_->OnEnded();
 }
 
 void MojoRendererImpl::OnError() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(init_cb_.is_null());
 
   // TODO(tim): Should we plumb error code from remote renderer?
   // http://crbug.com/410451.
-  error_cb_.Run(PIPELINE_ERROR_DECODE);
+  client_->OnError(PIPELINE_ERROR_DECODE);
 }
 
 void MojoRendererImpl::OnConnectionError() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (!init_cb_.is_null()) {
     base::ResetAndReturn(&init_cb_).Run(PIPELINE_ERROR_INITIALIZATION_FAILED);
     return;
   }
 
-  error_cb_.Run(PIPELINE_ERROR_DECODE);
+  client_->OnError(PIPELINE_ERROR_DECODE);
 }
 
 void MojoRendererImpl::OnInitialized(bool success) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(!init_cb_.is_null());
 
   base::ResetAndReturn(&init_cb_)
       .Run(success ? PIPELINE_OK : PIPELINE_ERROR_INITIALIZATION_FAILED);
 }
 
 }  // namespace media