| Index: webkit/media/crypto/ppapi/clear_key_cdm.cc
|
| diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.cc b/webkit/media/crypto/ppapi/clear_key_cdm.cc
|
| index 4c0e2d5842d84a6214ef923ef8795c85d73f2c59..faa66357d168d658555cbd76b61b8d78825e286b 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;
|
| }
|
|
|
|
|