| Index: media/cdm/aes_decryptor.h
|
| diff --git a/media/cdm/aes_decryptor.h b/media/cdm/aes_decryptor.h
|
| index 5c7a06c2cc44a39af31bf2a4e649e5086dd1a01e..adfc965489992d8e9dafa5100a13813a516b86b8 100644
|
| --- a/media/cdm/aes_decryptor.h
|
| +++ b/media/cdm/aes_decryptor.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include <set>
|
| #include <string>
|
| +#include <vector>
|
|
|
| #include "base/basictypes.h"
|
| #include "base/containers/scoped_ptr_hash_map.h"
|
| @@ -39,21 +40,18 @@ class MEDIA_EXPORT AesDecryptor : public MediaKeys,
|
| ~AesDecryptor() override;
|
|
|
| // MediaKeys implementation.
|
| - void SetServerCertificate(const uint8* certificate_data,
|
| - int certificate_data_length,
|
| + void SetServerCertificate(const std::vector<uint8>& certificate,
|
| scoped_ptr<SimpleCdmPromise> promise) override;
|
| void CreateSessionAndGenerateRequest(
|
| SessionType session_type,
|
| EmeInitDataType init_data_type,
|
| - const uint8* init_data,
|
| - int init_data_length,
|
| + const std::vector<uint8>& init_data,
|
| scoped_ptr<NewSessionCdmPromise> promise) override;
|
| void LoadSession(SessionType session_type,
|
| const std::string& session_id,
|
| scoped_ptr<NewSessionCdmPromise> promise) override;
|
| void UpdateSession(const std::string& session_id,
|
| - const uint8* response,
|
| - int response_length,
|
| + const std::vector<uint8>& response,
|
| scoped_ptr<SimpleCdmPromise> promise) override;
|
| void CloseSession(const std::string& session_id,
|
| scoped_ptr<SimpleCdmPromise> promise) override;
|
|
|