| Index: content/renderer/media/crypto/ppapi_decryptor.cc
|
| diff --git a/content/renderer/media/crypto/ppapi_decryptor.cc b/content/renderer/media/crypto/ppapi_decryptor.cc
|
| index a70249a27109fdaa9b03220822295042a9dee94c..ba856629999af34dd0174959b8008d8d1524e5df 100644
|
| --- a/content/renderer/media/crypto/ppapi_decryptor.cc
|
| +++ b/content/renderer/media/crypto/ppapi_decryptor.cc
|
| @@ -90,8 +90,7 @@ PpapiDecryptor::~PpapiDecryptor() {
|
| }
|
|
|
| void PpapiDecryptor::SetServerCertificate(
|
| - const uint8* certificate_data,
|
| - int certificate_data_length,
|
| + const std::vector<uint8>& certificate,
|
| scoped_ptr<media::SimpleCdmPromise> promise) {
|
| DVLOG(2) << __FUNCTION__;
|
| DCHECK(render_loop_proxy_->BelongsToCurrentThread());
|
| @@ -101,15 +100,13 @@ void PpapiDecryptor::SetServerCertificate(
|
| return;
|
| }
|
|
|
| - CdmDelegate()->SetServerCertificate(
|
| - certificate_data, certificate_data_length, promise.Pass());
|
| + CdmDelegate()->SetServerCertificate(certificate, promise.Pass());
|
| }
|
|
|
| void PpapiDecryptor::CreateSessionAndGenerateRequest(
|
| SessionType session_type,
|
| media::EmeInitDataType init_data_type,
|
| - const uint8* init_data,
|
| - int init_data_length,
|
| + const std::vector<uint8>& init_data,
|
| scoped_ptr<media::NewSessionCdmPromise> promise) {
|
| DVLOG(2) << __FUNCTION__;
|
| DCHECK(render_loop_proxy_->BelongsToCurrentThread());
|
| @@ -120,8 +117,7 @@ void PpapiDecryptor::CreateSessionAndGenerateRequest(
|
| }
|
|
|
| CdmDelegate()->CreateSessionAndGenerateRequest(session_type, init_data_type,
|
| - init_data, init_data_length,
|
| - promise.Pass());
|
| + init_data, promise.Pass());
|
| }
|
|
|
| void PpapiDecryptor::LoadSession(
|
| @@ -140,8 +136,7 @@ void PpapiDecryptor::LoadSession(
|
|
|
| void PpapiDecryptor::UpdateSession(
|
| const std::string& session_id,
|
| - const uint8* response,
|
| - int response_length,
|
| + const std::vector<uint8>& response,
|
| scoped_ptr<media::SimpleCdmPromise> promise) {
|
| DCHECK(render_loop_proxy_->BelongsToCurrentThread());
|
|
|
| @@ -149,8 +144,7 @@ void PpapiDecryptor::UpdateSession(
|
| promise->reject(INVALID_STATE_ERROR, 0, "CdmDelegate() does not exist.");
|
| return;
|
| }
|
| - CdmDelegate()->UpdateSession(session_id, response, response_length,
|
| - promise.Pass());
|
| + CdmDelegate()->UpdateSession(session_id, response, promise.Pass());
|
| }
|
|
|
| void PpapiDecryptor::CloseSession(const std::string& session_id,
|
|
|