summaryrefslogtreecommitdiffstats
path: root/media/mojo/services/mojo_cdm.cc
diff options
context:
space:
mode:
Diffstat (limited to 'media/mojo/services/mojo_cdm.cc')
-rw-r--r--media/mojo/services/mojo_cdm.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/media/mojo/services/mojo_cdm.cc b/media/mojo/services/mojo_cdm.cc
index 7822700..a857afe2 100644
--- a/media/mojo/services/mojo_cdm.cc
+++ b/media/mojo/services/mojo_cdm.cc
@@ -66,14 +66,15 @@ void MojoCdm::SetServerCertificate(const uint8_t* certificate_data,
base::Passed(&promise)));
}
-void MojoCdm::CreateSession(const std::string& init_data_type,
- const uint8_t* init_data,
- int init_data_length,
- SessionType session_type,
- scoped_ptr<NewSessionCdmPromise> promise) {
- remote_cdm_->CreateSession(
- init_data_type, CreateMojoArray(init_data, init_data_length),
+void MojoCdm::CreateSessionAndGenerateRequest(
+ SessionType session_type,
+ const std::string& init_data_type,
+ const uint8_t* init_data,
+ int init_data_length,
+ scoped_ptr<NewSessionCdmPromise> promise) {
+ remote_cdm_->CreateSessionAndGenerateRequest(
static_cast<mojo::ContentDecryptionModule::SessionType>(session_type),
+ init_data_type, CreateMojoArray(init_data, init_data_length),
base::Bind(&MojoCdm::OnPromiseResult<std::string>,
weak_factory_.GetWeakPtr(), base::Passed(&promise)));
}