Revert of Deletes mojo::Callback

media/mojo/services/mojo_renderer_service.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_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "media/base/media_keys.h"
@@ skipping 18 matching lines @@
       weak_factory_(this) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(renderer_);
 
   weak_this_ = weak_factory_.GetWeakPtr();
 }
 
 MojoRendererService::~MojoRendererService() {
 }
 
-void MojoRendererService::Initialize(mojom::RendererClientPtr client,
-                                     mojom::DemuxerStreamPtr audio,
-                                     mojom::DemuxerStreamPtr video,
-                                     const InitializeCallback& callback) {
+void MojoRendererService::Initialize(
+    mojom::RendererClientPtr client,
+    mojom::DemuxerStreamPtr audio,
+    mojom::DemuxerStreamPtr video,
+    const mojo::Callback<void(bool)>& callback) {
   DVLOG(1) << __FUNCTION__;
   DCHECK_EQ(state_, STATE_UNINITIALIZED);
   client_ = std::move(client);
   state_ = STATE_INITIALIZING;
   stream_provider_.reset(new DemuxerStreamProviderShim(
       std::move(audio), std::move(video),
       base::Bind(&MojoRendererService::OnStreamReady, weak_this_, callback)));
 }
 
-void MojoRendererService::Flush(const FlushCallback& callback) {
+void MojoRendererService::Flush(const mojo::Closure& callback) {
   DVLOG(2) << __FUNCTION__;
   DCHECK_EQ(state_, STATE_PLAYING);
 
   state_ = STATE_FLUSHING;
   CancelPeriodicMediaTimeUpdates();
   renderer_->Flush(
       base::Bind(&MojoRendererService::OnFlushCompleted, weak_this_, callback));
 }
 
 void MojoRendererService::StartPlayingFrom(int64_t time_delta_usec) {
   DVLOG(2) << __FUNCTION__ << ": " << time_delta_usec;
   renderer_->StartPlayingFrom(
       base::TimeDelta::FromMicroseconds(time_delta_usec));
   SchedulePeriodicMediaTimeUpdates();
 }
 
 void MojoRendererService::SetPlaybackRate(double playback_rate) {
   DVLOG(2) << __FUNCTION__ << ": " << playback_rate;
   DCHECK_EQ(state_, STATE_PLAYING);
   renderer_->SetPlaybackRate(playback_rate);
 }
 
 void MojoRendererService::SetVolume(float volume) {
   renderer_->SetVolume(volume);
 }
 
 void MojoRendererService::SetCdm(int32_t cdm_id,
-                                 const SetCdmCallback& callback) {
+                                 const mojo::Callback<void(bool)>& callback) {
   if (!mojo_cdm_service_context_) {
     DVLOG(1) << "CDM service context not available.";
     callback.Run(false);
     return;
   }
 
   scoped_refptr<MediaKeys> cdm = mojo_cdm_service_context_->GetCdm(cdm_id);
   if (!cdm) {
     DVLOG(1) << "CDM not found: " << cdm_id;
     callback.Run(false);
@@ skipping 40 matching lines @@
   DVLOG(2) << __FUNCTION__ << "(" << size.ToString() << ")";
   client_->OnVideoNaturalSizeChange(size);
 }
 
 void MojoRendererService::OnVideoOpacityChange(bool opaque) {
   DVLOG(2) << __FUNCTION__ << "(" << opaque << ")";
   client_->OnVideoOpacityChange(opaque);
 }
 
 void MojoRendererService::OnStreamReady(
-    const base::Callback<void(bool)>& callback) {
+    const mojo::Callback<void(bool)>& callback) {
   DCHECK_EQ(state_, STATE_INITIALIZING);
 
   renderer_->Initialize(
       stream_provider_.get(), this,
       base::Bind(&MojoRendererService::OnRendererInitializeDone, weak_this_,
                  callback));
 }
 
 void MojoRendererService::OnRendererInitializeDone(
-    const base::Callback<void(bool)>& callback,
+    const mojo::Callback<void(bool)>& callback,
     PipelineStatus status) {
   DVLOG(1) << __FUNCTION__;
   DCHECK_EQ(state_, STATE_INITIALIZING);
 
   if (status != PIPELINE_OK) {
     state_ = STATE_ERROR;
     callback.Run(false);
     return;
   }
 
@@ skipping 18 matching lines @@
 
 void MojoRendererService::SchedulePeriodicMediaTimeUpdates() {
   DVLOG(2) << __FUNCTION__;
   UpdateMediaTime(true);
   time_update_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(kTimeUpdateIntervalMs),
       base::Bind(&MojoRendererService::UpdateMediaTime, weak_this_, false));
 }
 
-void MojoRendererService::OnFlushCompleted(const FlushCallback& callback) {
+void MojoRendererService::OnFlushCompleted(const mojo::Closure& callback) {
   DVLOG(1) << __FUNCTION__;
   DCHECK_EQ(state_, STATE_FLUSHING);
   state_ = STATE_PLAYING;
   callback.Run();
 }
 
 void MojoRendererService::OnCdmAttached(
     scoped_refptr<MediaKeys> cdm,
-    const base::Callback<void(bool)>& callback,
+    const mojo::Callback<void(bool)>& callback,
     bool success) {
   DVLOG(1) << __FUNCTION__ << "(" << success << ")";
 
   if (success)
     cdm_ = cdm;
 
   callback.Run(success);
 }
 
 }  // namespace media