Replace init_cb in Renderer::Initialize() with base::Closure.

media/filters/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/filters/renderer_impl.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/compiler_specific.h"
@@ skipping 34 matching lines @@
 RendererImpl::~RendererImpl() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   audio_renderer_.reset();
   video_renderer_.reset();
 
   FireAllPendingCallbacks();
 }
 
-void RendererImpl::Initialize(const PipelineStatusCB& init_cb,
+void RendererImpl::Initialize(const base::Closure& init_cb,
                               const StatisticsCB& statistics_cb,
                               const base::Closure& ended_cb,
                               const PipelineStatusCB& error_cb,
                               const BufferingStateCB& buffering_state_cb,
                               const TimeDeltaCB& get_duration_cb) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, STATE_UNINITIALIZED) << state_;
   DCHECK(!init_cb.is_null());
   DCHECK(!statistics_cb.is_null());
@@ skipping 148 matching lines @@
 }
 
 void RendererImpl::OnAudioRendererInitializeDone(PipelineStatus status) {
   DVLOG(1) << __FUNCTION__ << ": " << status;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, STATE_INITIALIZING) << state_;
   DCHECK(!init_cb_.is_null());
 
   if (status != PIPELINE_OK) {
     audio_renderer_.reset();
-    state_ = STATE_ERROR;
-    base::ResetAndReturn(&init_cb_).Run(status);
+    OnError(status);
     return;
   }
 
   if (audio_renderer_)
     time_source_ = audio_renderer_->GetTimeSource();
 
   InitializeVideoRenderer();
 }
 
 void RendererImpl::InitializeVideoRenderer() {
@@ skipping 27 matching lines @@
 
 void RendererImpl::OnVideoRendererInitializeDone(PipelineStatus status) {
   DVLOG(1) << __FUNCTION__ << ": " << status;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, STATE_INITIALIZING) << state_;
   DCHECK(!init_cb_.is_null());
 
   if (status != PIPELINE_OK) {
     audio_renderer_.reset();
     video_renderer_.reset();
-    state_ = STATE_ERROR;
-    base::ResetAndReturn(&init_cb_).Run(status);
+    OnError(status);
     return;
   }
 
   state_ = STATE_PLAYING;
   DCHECK(audio_renderer_ || video_renderer_);
-  base::ResetAndReturn(&init_cb_).Run(PIPELINE_OK);
+  base::ResetAndReturn(&init_cb_).Run();
 }
 
 void RendererImpl::FlushAudioRenderer() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, STATE_FLUSHING) << state_;
   DCHECK(!flush_cb_.is_null());
 
   if (!audio_renderer_) {
     OnAudioRendererFlushDone();
@@ skipping 266 matching lines @@
   // Pipeline will destroy |this| as the result of error.
   base::ResetAndReturn(&error_cb_).Run(error);
 
   FireAllPendingCallbacks();
 }
 
 void RendererImpl::FireAllPendingCallbacks() {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (!init_cb_.is_null())
-    base::ResetAndReturn(&init_cb_).Run(PIPELINE_ERROR_ABORT);
+    base::ResetAndReturn(&init_cb_).Run();
 
   if (!flush_cb_.is_null())
     base::ResetAndReturn(&flush_cb_).Run();
 }
 
 }  // namespace media