| 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 94d89285de59a65022b5340ec116f7ee2db8ed09..77a3b516f4bcd34f87b370e3c724870a374b4f7f 100644
|
| --- a/content/renderer/pepper/content_decryptor_delegate.cc
|
| +++ b/content/renderer/pepper/content_decryptor_delegate.cc
|
| @@ -243,10 +243,16 @@ ContentDecryptorDelegate::ContentDecryptorDelegate(
|
| ContentDecryptorDelegate::~ContentDecryptorDelegate() {
|
| }
|
|
|
| -void ContentDecryptorDelegate::Initialize(const std::string& key_system) {
|
| - // TODO(ddorwin): Add an Initialize method to PPP_ContentDecryptor_Private.
|
| +void ContentDecryptorDelegate::Initialize(const std::string& key_system,
|
| + const bool can_challenge_platform) {
|
| DCHECK(!key_system.empty());
|
| + DCHECK(key_system_.empty());
|
| key_system_ = key_system;
|
| +
|
| + plugin_decryption_interface_->Initialize(
|
| + pp_instance_,
|
| + StringVar::StringToPPVar(key_system_),
|
| + PP_FromBool(can_challenge_platform));
|
| }
|
|
|
| void ContentDecryptorDelegate::SetKeyEventCallbacks(
|
| @@ -267,7 +273,6 @@ bool ContentDecryptorDelegate::GenerateKeyRequest(const std::string& type,
|
|
|
| plugin_decryption_interface_->GenerateKeyRequest(
|
| pp_instance_,
|
| - StringVar::StringToPPVar(key_system_), // TODO(ddorwin): Remove.
|
| StringVar::StringToPPVar(type),
|
| init_data_array);
|
| return true;
|
|
|