Chromium Code Reviews| 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 374b5c18af96a8373ce111231adb6d5a64f9859e..4c335cb103768c4c21ded4646dd1c6650e60f62c 100644 |
| --- a/content/renderer/media/crypto/ppapi_decryptor.h |
| +++ b/content/renderer/media/crypto/ppapi_decryptor.h |
| @@ -36,8 +36,6 @@ class PpapiDecryptor : public media::MediaKeys, |
| public: |
| static scoped_ptr<PpapiDecryptor> Create( |
| const std::string& key_system, |
| - bool allow_distinctive_identifier, |
| - bool allow_persistent_state, |
| const GURL& security_origin, |
| const CreatePepperCdmCB& create_pepper_cdm_cb, |
| const media::SessionMessageCB& session_message_cb, |
| @@ -48,6 +46,11 @@ class PpapiDecryptor : public media::MediaKeys, |
| ~PpapiDecryptor() override; |
| + void InitializeCdm(const std::string& key_system, |
|
sandersd (OOO until July 31)
2015/04/27 23:32:14
Perhaps this should be passed through the construc
ddorwin
2015/04/27 23:52:18
None of these values should be changeable AFTER cr
|
| + bool allow_distinctive_identifier, |
| + bool allow_persistent_state, |
| + scoped_ptr<media::SimpleCdmPromise> promise); |
|
ddorwin
2015/04/27 23:52:18
If this is going to be a public method, it should
|
| + |
| // media::MediaKeys implementation. |
| void SetServerCertificate( |
| const std::vector<uint8_t>& certificate, |
| @@ -95,9 +98,6 @@ class PpapiDecryptor : public media::MediaKeys, |
| private: |
| PpapiDecryptor( |
| - const std::string& key_system, |
| - bool allow_distinctive_identifier, |
| - bool allow_persistent_state, |
| scoped_ptr<PepperCdmWrapper> pepper_cdm_wrapper, |
| const media::SessionMessageCB& session_message_cb, |
| const media::SessionClosedCB& session_closed_cb, |