| Index: media/cdm/ppapi/cdm_adapter.h
|
| diff --git a/media/cdm/ppapi/cdm_adapter.h b/media/cdm/ppapi/cdm_adapter.h
|
| index cd4738b856bdb3245f793c44524039ee14aa6c40..86ed996341f411e2e0b866ab2a5e2e53f1ebcd0f 100644
|
| --- a/media/cdm/ppapi/cdm_adapter.h
|
| +++ b/media/cdm/ppapi/cdm_adapter.h
|
| @@ -58,6 +58,9 @@ class CdmAdapter : public pp::Instance,
|
| // Note: Results of calls to these methods must be reported through the
|
| // PPB_ContentDecryptor_Private interface.
|
| virtual void Initialize(const std::string& key_system) OVERRIDE;
|
| + virtual void SetServerCertificate(
|
| + uint32_t promise_id,
|
| + pp::VarArrayBuffer server_certificate) OVERRIDE;
|
| virtual void CreateSession(uint32_t promise_id,
|
| const std::string& init_data_type,
|
| pp::VarArrayBuffer init_data,
|
| @@ -67,15 +70,12 @@ class CdmAdapter : public pp::Instance,
|
| virtual void UpdateSession(uint32_t promise_id,
|
| const std::string& web_session_id,
|
| pp::VarArrayBuffer response) OVERRIDE;
|
| - // TODO(jrummell): Pass this function through Pepper and add OVERRIDE.
|
| virtual void CloseSession(uint32_t promise_id,
|
| const std::string& web_session_id);
|
| - // TODO(jrummell): Rename to RemoveSession().
|
| - virtual void ReleaseSession(uint32_t promise_id,
|
| - const std::string& web_session_id) OVERRIDE;
|
| - // TODO(jrummell): Pass this function through Pepper and add OVERRIDE.
|
| + virtual void RemoveSession(uint32_t promise_id,
|
| + const std::string& web_session_id) OVERRIDE;
|
| virtual void GetUsableKeyIds(uint32_t promise_id,
|
| - const std::string& web_session_id);
|
| + const std::string& web_session_id) OVERRIDE;
|
| virtual void Decrypt(
|
| pp::Buffer_Dev encrypted_buffer,
|
| const PP_EncryptedBlockInfo& encrypted_block_info) OVERRIDE;
|
|
|