Chromium Code Reviews| Index: content/renderer/pepper/content_decryptor_delegate.cc |
| diff --git a/content/renderer/pepper/content_decryptor_delegate.cc b/content/renderer/pepper/content_decryptor_delegate.cc |
| index 8be0fba8a08461ba7930315082aa5c6900f4f803..11a9d207546df29e4713a1ef6af17c30687a3bf0 100644 |
| --- a/content/renderer/pepper/content_decryptor_delegate.cc |
| +++ b/content/renderer/pepper/content_decryptor_delegate.cc |
| @@ -355,6 +355,8 @@ ContentDecryptorDelegate::~ContentDecryptorDelegate() { |
| // TODO(jrummell): Remove |session_ready_cb| and |session_keys_change_cb|. |
|
ddorwin
2015/03/06 21:42:54
Can we do this now?
I guess it doesn't need to be
sandersd (OOO until July 31)
2015/03/06 22:36:58
After discussion with John, I've removed the TODO.
|
| void ContentDecryptorDelegate::Initialize( |
| const std::string& key_system, |
| + bool allow_distinctive_identifier, |
| + bool allow_persistent_state, |
| const media::SessionMessageCB& session_message_cb, |
| const media::SessionClosedCB& session_closed_cb, |
| const media::SessionErrorCB& session_error_cb, |
| @@ -373,7 +375,9 @@ void ContentDecryptorDelegate::Initialize( |
| fatal_plugin_error_cb_ = fatal_plugin_error_cb; |
| plugin_decryption_interface_->Initialize( |
| - pp_instance_, StringVar::StringToPPVar(key_system_)); |
| + pp_instance_, StringVar::StringToPPVar(key_system_), |
| + PP_FromBool(allow_distinctive_identifier), |
| + PP_FromBool(allow_persistent_state)); |
| } |
| void ContentDecryptorDelegate::InstanceCrashed() { |