| Index: media/cdm/proxy_decryptor.cc
|
| diff --git a/media/cdm/proxy_decryptor.cc b/media/cdm/proxy_decryptor.cc
|
| index 9260e1455b654fe434eb567f20c7630e21a9ef35..a93c1a20366221781fa1ca7b0b811ff3b13a9c5b 100644
|
| --- a/media/cdm/proxy_decryptor.cc
|
| +++ b/media/cdm/proxy_decryptor.cc
|
| @@ -216,9 +216,8 @@ void ProxyDecryptor::OnPermissionStatus(
|
| // on Android) and the permission status will be evaluated then.
|
| DVLOG_IF(1, !granted) << "Permission request rejected.";
|
|
|
| - media_keys_->CreateSessionAndGenerateRequest(
|
| - session_type, init_data_type, vector_as_array(&init_data),
|
| - init_data.size(), promise.Pass());
|
| + media_keys_->CreateSessionAndGenerateRequest(session_type, init_data_type,
|
| + init_data, promise.Pass());
|
| }
|
|
|
| void ProxyDecryptor::AddKey(const uint8* key,
|
| @@ -271,12 +270,14 @@ void ProxyDecryptor::AddKey(const uint8* key,
|
| GenerateJWKSet(key, key_length, init_data, init_data_length);
|
| DCHECK(!jwk.empty());
|
| media_keys_->UpdateSession(new_session_id,
|
| - reinterpret_cast<const uint8*>(jwk.data()),
|
| - jwk.size(), promise.Pass());
|
| + std::vector<uint8>(jwk.begin(), jwk.end()),
|
| + promise.Pass());
|
| return;
|
| }
|
|
|
| - media_keys_->UpdateSession(new_session_id, key, key_length, promise.Pass());
|
| + media_keys_->UpdateSession(new_session_id,
|
| + std::vector<uint8>(key, key + key_length),
|
| + promise.Pass());
|
| }
|
|
|
| void ProxyDecryptor::CancelKeyRequest(const std::string& session_id) {
|
|
|