| Index: content/renderer/media/crypto/ppapi_decryptor.h
|
| diff --git a/content/renderer/media/crypto/ppapi_decryptor.h b/content/renderer/media/crypto/ppapi_decryptor.h
|
| index ed4523f33547b9095f2f8689eb70dc5374aa87b6..374b5c18af96a8373ce111231adb6d5a64f9859e 100644
|
| --- a/content/renderer/media/crypto/ppapi_decryptor.h
|
| +++ b/content/renderer/media/crypto/ppapi_decryptor.h
|
| @@ -50,21 +50,18 @@ class PpapiDecryptor : public media::MediaKeys,
|
|
|
| // media::MediaKeys implementation.
|
| void SetServerCertificate(
|
| - const uint8* certificate_data,
|
| - int certificate_data_length,
|
| + const std::vector<uint8_t>& certificate,
|
| scoped_ptr<media::SimpleCdmPromise> promise) override;
|
| void CreateSessionAndGenerateRequest(
|
| SessionType session_type,
|
| media::EmeInitDataType init_data_type,
|
| - const uint8* init_data,
|
| - int init_data_length,
|
| + const std::vector<uint8_t>& init_data,
|
| scoped_ptr<media::NewSessionCdmPromise> promise) override;
|
| void LoadSession(SessionType session_type,
|
| const std::string& session_id,
|
| scoped_ptr<media::NewSessionCdmPromise> promise) override;
|
| void UpdateSession(const std::string& session_id,
|
| - const uint8* response,
|
| - int response_length,
|
| + const std::vector<uint8_t>& response,
|
| scoped_ptr<media::SimpleCdmPromise> promise) override;
|
| void CloseSession(const std::string& session_id,
|
| scoped_ptr<media::SimpleCdmPromise> promise) override;
|
| @@ -113,7 +110,7 @@ class PpapiDecryptor : public media::MediaKeys,
|
| // Callbacks for |plugin_cdm_delegate_| to fire session events.
|
| void OnSessionMessage(const std::string& session_id,
|
| MediaKeys::MessageType message_type,
|
| - const std::vector<uint8>& message,
|
| + const std::vector<uint8_t>& message,
|
| const GURL& legacy_destination_url);
|
| void OnSessionKeysChange(const std::string& session_id,
|
| bool has_additional_usable_key,
|
| @@ -123,7 +120,7 @@ class PpapiDecryptor : public media::MediaKeys,
|
| void OnSessionClosed(const std::string& session_id);
|
| void OnLegacySessionError(const std::string& session_id,
|
| MediaKeys::Exception exception_code,
|
| - uint32 system_code,
|
| + uint32_t system_code,
|
| const std::string& error_description);
|
|
|
| void AttemptToResumePlayback();
|
|
|