Index: media/cdm/ppapi/cdm_adapter.h |
diff --git a/media/cdm/ppapi/cdm_adapter.h b/media/cdm/ppapi/cdm_adapter.h |
index 07b5ad1296a482d1311c3e40b5991d4c8477e6fc..0cc46e49193bc317ad3f404d5dfef04df32a5697 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,14 +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): Rename to CloseSession(). |
- virtual void ReleaseSession(uint32_t promise_id, |
- const std::string& web_session_id) OVERRIDE; |
- // TODO(jrummell): Pass these 2 functions through Pepper and add OVERRIDE. |
- virtual void RemoveSession(uint32_t promise_id, |
- const std::string& web_session_id); |
virtual void GetUsableKeyIds(uint32_t promise_id, |
ddorwin
2014/08/22 20:49:20
ditto
jrummell
2014/08/25 21:54:36
Done.
|
- const std::string& web_session_id); |
+ const std::string& web_session_id) OVERRIDE; |
+ virtual void CloseSession(uint32_t promise_id, |
+ const std::string& web_session_id) OVERRIDE; |
+ virtual void RemoveSession(uint32_t promise_id, |
+ const std::string& web_session_id) OVERRIDE; |
virtual void Decrypt( |
pp::Buffer_Dev encrypted_buffer, |
const PP_EncryptedBlockInfo& encrypted_block_info) OVERRIDE; |