Revert of Deletes mojo::Callback

media/mojo/services/mojo_cdm_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_CDM_SERVICE_H_
 #define MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 37 matching lines @@
       mojo::InterfaceRequest<mojom::ContentDecryptionModule> request);
 
   ~MojoCdmService() final;
 
   // mojom::ContentDecryptionModule implementation.
   void SetClient(mojom::ContentDecryptionModuleClientPtr client) final;
   void Initialize(const mojo::String& key_system,
                   const mojo::String& security_origin,
                   mojom::CdmConfigPtr cdm_config,
                   const InitializeCallback& callback) final;
-  void SetServerCertificate(mojo::Array<uint8_t> certificate_data,
-                            const SetServerCertificateCallback& callback) final;
+  void SetServerCertificate(
+      mojo::Array<uint8_t> certificate_data,
+      const mojo::Callback<void(mojom::CdmPromiseResultPtr)>& callback) final;
   void CreateSessionAndGenerateRequest(
       mojom::ContentDecryptionModule::SessionType session_type,
       mojom::ContentDecryptionModule::InitDataType init_data_type,
       mojo::Array<uint8_t> init_data,
-      const CreateSessionAndGenerateRequestCallback& callback) final;
+      const mojo::Callback<void(mojom::CdmPromiseResultPtr, mojo::String)>&
+          callback) final;
   void LoadSession(mojom::ContentDecryptionModule::SessionType session_type,
                    const mojo::String& session_id,
-                   const LoadSessionCallback& callback) final;
-  void UpdateSession(const mojo::String& session_id,
-                     mojo::Array<uint8_t> response,
-                     const UpdateSessionCallback& callback) final;
-  void CloseSession(const mojo::String& session_id,
-                    const CloseSessionCallback& callback) final;
-  void RemoveSession(const mojo::String& session_id,
-                     const RemoveSessionCallback& callback) final;
+                   const mojo::Callback<void(mojom::CdmPromiseResultPtr,
+                                             mojo::String)>& callback) final;
+  void UpdateSession(
+      const mojo::String& session_id,
+      mojo::Array<uint8_t> response,
+      const mojo::Callback<void(mojom::CdmPromiseResultPtr)>& callback) final;
+  void CloseSession(
+      const mojo::String& session_id,
+      const mojo::Callback<void(mojom::CdmPromiseResultPtr)>& callback) final;
+  void RemoveSession(
+      const mojo::String& session_id,
+      const mojo::Callback<void(mojom::CdmPromiseResultPtr)>& callback) final;
 
   // Get CDM to be used by the media pipeline.
   scoped_refptr<MediaKeys> GetCdm();
 
  private:
   // Callback for CdmFactory::Create().
   void OnCdmCreated(const InitializeCallback& callback,
                     const scoped_refptr<MediaKeys>& cdm,
                     const std::string& error_message);
 
@@ skipping 36 matching lines @@
 
   base::WeakPtr<MojoCdmService> weak_this_;
   base::WeakPtrFactory<MojoCdmService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoCdmService);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_H_