Index: media/mojo/services/mojo_cdm_service.h |
diff --git a/media/mojo/services/mojo_cdm_service.h b/media/mojo/services/mojo_cdm_service.h |
index 2e1aa78225c6c3dbb2a9c6a8dce6d8db165f936b..b2df1faa12322c7a717df0896c1d5a72677db203 100644 |
--- a/media/mojo/services/mojo_cdm_service.h |
+++ b/media/mojo/services/mojo_cdm_service.h |
@@ -55,29 +55,23 @@ class MEDIA_MOJO_EXPORT MojoCdmService |
const mojo::String& security_origin, |
mojom::CdmConfigPtr cdm_config, |
const InitializeCallback& callback) final; |
- void SetServerCertificate( |
- mojo::Array<uint8_t> certificate_data, |
- const mojo::Callback<void(mojom::CdmPromiseResultPtr)>& callback) final; |
+ void SetServerCertificate(mojo::Array<uint8_t> certificate_data, |
+ const SetServerCertificateCallback& callback) final; |
void CreateSessionAndGenerateRequest( |
mojom::ContentDecryptionModule::SessionType session_type, |
mojom::ContentDecryptionModule::InitDataType init_data_type, |
mojo::Array<uint8_t> init_data, |
- const mojo::Callback<void(mojom::CdmPromiseResultPtr, mojo::String)>& |
- callback) final; |
+ const CreateSessionAndGenerateRequestCallback& callback) final; |
void LoadSession(mojom::ContentDecryptionModule::SessionType session_type, |
const mojo::String& session_id, |
- 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; |
+ 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; |
// Get CDM to be used by the media pipeline. |
scoped_refptr<MediaKeys> GetCdm(); |