summaryrefslogtreecommitdiffstats
path: root/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
diff options
context:
space:
mode:
Diffstat (limited to 'media/cdm/ppapi/external_clear_key/clear_key_cdm.cc')
-rw-r--r--media/cdm/ppapi/external_clear_key/clear_key_cdm.cc17
1 files changed, 7 insertions, 10 deletions
diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
index ecb757e..62cde9c 100644
--- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
+++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
@@ -254,11 +254,10 @@ void ClearKeyCdm::CreateSession(uint32 promise_id,
base::Bind(&ClearKeyCdm::OnPromiseFailed,
base::Unretained(this),
promise_id)));
- decryptor_.CreateSession(std::string(init_data_type, init_data_type_size),
- init_data,
- init_data_size,
- ConvertSessionType(session_type),
- promise.Pass());
+ decryptor_.CreateSessionAndGenerateRequest(
+ ConvertSessionType(session_type),
+ std::string(init_data_type, init_data_type_size), init_data,
+ init_data_size, promise.Pass());
if (key_system_ == kExternalClearKeyFileIOTestKeySystem)
StartFileIOTest();
@@ -292,11 +291,9 @@ void ClearKeyCdm::LoadSession(uint32 promise_id,
base::Bind(&ClearKeyCdm::OnPromiseFailed,
base::Unretained(this),
promise_id)));
- decryptor_.CreateSession(std::string(kLoadableSessionContentType),
- NULL,
- 0,
- MediaKeys::TEMPORARY_SESSION,
- promise.Pass());
+ decryptor_.CreateSessionAndGenerateRequest(
+ MediaKeys::TEMPORARY_SESSION, std::string(kLoadableSessionContentType),
+ NULL, 0, promise.Pass());
}
void ClearKeyCdm::UpdateSession(uint32 promise_id,