Changes to the EME Pepper API

content/renderer/pepper/content_decryptor_delegate.cc

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..ff0f179c80b30686f94c781cbbce0714dacf2ab6 100644
--- a/content/renderer/pepper/content_decryptor_delegate.cc
+++ b/content/renderer/pepper/content_decryptor_delegate.cc
@@ -243,10 +243,17 @@ 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 PP_KeySystemFlags key_system_flags) {

[DaleCurtis, 2013/09/18 21:29:30]

const&

[jrummell, 2013/09/19 00:37:28]

Done.

   DCHECK(!key_system.empty());
+  DCHECK(key_system_.empty());
+

[ddorwin, 2013/09/18 21:26:53]

nit: I would put this after the assignment, which is separate from Initialize()

[jrummell, 2013/09/19 00:37:28]

Done.

   key_system_ = key_system;
+  plugin_decryption_interface_->Initialize(
+      pp_instance_,
+      StringVar::StringToPPVar(key_system_),
+      &key_system_flags);

[ddorwin, 2013/09/18 21:26:53]

Why address of? It's input only.

[jrummell, 2013/09/19 00:37:28]

The .idl generated interface is const struct PP_CdmConfigurationFlags* (in
ppapi/c/private/ppp_content_decryptor_private.h).

 }
 
 void ContentDecryptorDelegate::SetKeyEventCallbacks(
@@ -267,7 +274,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;