diff options
Diffstat (limited to 'webkit/media/crypto/ppapi')
| -rw-r--r-- | webkit/media/crypto/ppapi/cdm_wrapper.cc | 2 | ||||
| -rw-r--r-- | webkit/media/crypto/ppapi/clear_key_cdm.cc | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/webkit/media/crypto/ppapi/cdm_wrapper.cc b/webkit/media/crypto/ppapi/cdm_wrapper.cc index 25eadb0..cd5b917 100644 --- a/webkit/media/crypto/ppapi/cdm_wrapper.cc +++ b/webkit/media/crypto/ppapi/cdm_wrapper.cc @@ -652,7 +652,7 @@ void CdmWrapper::GenerateKeyRequest(const std::string& key_system, if (!cdm_) { if (!CreateCdmInstance(key_system)) { - SendUnknownKeyError(key_system, ""); + SendUnknownKeyError(key_system, std::string()); return; } } diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.cc b/webkit/media/crypto/ppapi/clear_key_cdm.cc index 4c0e2d5..faa6635 100644 --- a/webkit/media/crypto/ppapi/clear_key_cdm.cc +++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc @@ -249,7 +249,11 @@ cdm::Status ClearKeyCdm::AddKey(const char* session_id, DVLOG(1) << "AddKey()"; base::AutoLock auto_lock(client_lock_); ScopedResetter<Client> auto_resetter(&client_); - decryptor_.AddKey("", key, key_size, key_id, key_id_size, + decryptor_.AddKey(std::string(), + key, + key_size, + key_id, + key_id_size, std::string(session_id, session_id_size)); if (client_.status() != Client::kKeyAdded) @@ -268,7 +272,8 @@ cdm::Status ClearKeyCdm::CancelKeyRequest(const char* session_id, DVLOG(1) << "CancelKeyRequest()"; base::AutoLock auto_lock(client_lock_); ScopedResetter<Client> auto_resetter(&client_); - decryptor_.CancelKeyRequest("", std::string(session_id, session_id_size)); + decryptor_.CancelKeyRequest(std::string(), + std::string(session_id, session_id_size)); return cdm::kSuccess; } |