Revert of Deletes mojo::Callback

media/mojo/services/mojo_renderer_service.cc

Index: media/mojo/services/mojo_renderer_service.cc
diff --git a/media/mojo/services/mojo_renderer_service.cc b/media/mojo/services/mojo_renderer_service.cc
index 5d75037717ddbf1c1c740f2bd094fb6db27daa56..9c6f2adf0d11eb581920b6ee7244d8dadd8f09fa 100644
--- a/media/mojo/services/mojo_renderer_service.cc
+++ b/media/mojo/services/mojo_renderer_service.cc
@@ -36,10 +36,11 @@
 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);
@@ -49,7 +50,7 @@
       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);
 
@@ -77,7 +78,7 @@
 }
 
 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);
@@ -138,7 +139,7 @@
 }
 
 void MojoRendererService::OnStreamReady(
-    const base::Callback<void(bool)>& callback) {
+    const mojo::Callback<void(bool)>& callback) {
   DCHECK_EQ(state_, STATE_INITIALIZING);
 
   renderer_->Initialize(
@@ -148,7 +149,7 @@
 }
 
 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);
@@ -187,7 +188,7 @@
       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;
@@ -196,7 +197,7 @@
 
 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 << ")";