Revert of Deletes mojo::Callback

media/mojo/services/mojo_renderer_service.h

 // 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.
 
 #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_
 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_
 
 #include <stdint.h>
 
 #include <memory>
 
-#include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
 #include "media/base/buffering_state.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/renderer_client.h"
 #include "media/mojo/interfaces/renderer.mojom.h"
 #include "media/mojo/services/media_mojo_export.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
@@ skipping 15 matching lines @@
   MojoRendererService(
       base::WeakPtr<MojoCdmServiceContext> mojo_cdm_service_context,
       std::unique_ptr<media::Renderer> renderer,
       mojo::InterfaceRequest<mojom::Renderer> request);
   ~MojoRendererService() final;
 
   // mojom::Renderer implementation.
   void Initialize(mojom::RendererClientPtr client,
                   mojom::DemuxerStreamPtr audio,
                   mojom::DemuxerStreamPtr video,
-                  const InitializeCallback& callback) final;
-  void Flush(const FlushCallback& callback) final;
+                  const mojo::Callback<void(bool)>& callback) final;
+  void Flush(const mojo::Closure& callback) final;
   void StartPlayingFrom(int64_t time_delta_usec) final;
   void SetPlaybackRate(double playback_rate) final;
   void SetVolume(float volume) final;
-  void SetCdm(int32_t cdm_id, const SetCdmCallback& callback) final;
+  void SetCdm(int32_t cdm_id, const mojo::Callback<void(bool)>& callback) final;
 
  private:
   enum State {
     STATE_UNINITIALIZED,
     STATE_INITIALIZING,
     STATE_FLUSHING,
     STATE_PLAYING,
     STATE_ERROR
   };
 
   // RendererClient implementation.
   void OnError(PipelineStatus status) final;
   void OnEnded() final;
   void OnStatisticsUpdate(const PipelineStatistics& stats) final;
   void OnBufferingStateChange(BufferingState state) final;
   void OnWaitingForDecryptionKey() final;
   void OnVideoNaturalSizeChange(const gfx::Size& size) final;
   void OnVideoOpacityChange(bool opaque) final;
 
   // Called when the DemuxerStreamProviderShim is ready to go (has a config,
   // pipe handle, etc) and can be handed off to a renderer for use.
-  void OnStreamReady(const base::Callback<void(bool)>& callback);
+  void OnStreamReady(const mojo::Callback<void(bool)>& callback);
 
   // Called when |audio_renderer_| initialization has completed.
-  void OnRendererInitializeDone(const base::Callback<void(bool)>& callback,
+  void OnRendererInitializeDone(const mojo::Callback<void(bool)>& callback,
                                 PipelineStatus status);
 
   // Periodically polls the media time from the renderer and notifies the client
   // if the media time has changed since the last update.  If |force| is true,
   // the client is notified even if the time is unchanged.
   void UpdateMediaTime(bool force);
   void CancelPeriodicMediaTimeUpdates();
   void SchedulePeriodicMediaTimeUpdates();
 
   // Callback executed once Flush() completes.
-  void OnFlushCompleted(const FlushCallback& callback);
+  void OnFlushCompleted(const mojo::Closure& callback);
 
   // Callback executed once SetCdm() completes.
   void OnCdmAttached(scoped_refptr<MediaKeys> cdm,
-                     const base::Callback<void(bool)>& callback,
+                     const mojo::Callback<void(bool)>& callback,
                      bool success);
 
   mojo::StrongBinding<mojom::Renderer> binding_;
 
   base::WeakPtr<MojoCdmServiceContext> mojo_cdm_service_context_;
 
   State state_;
 
   std::unique_ptr<DemuxerStreamProviderShim> stream_provider_;
 
@@ skipping 13 matching lines @@
 
   base::WeakPtr<MojoRendererService> weak_this_;
   base::WeakPtrFactory<MojoRendererService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoRendererService);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_