Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

webkit/plugins/ppapi/content_decryptor_delegate.h

Index: webkit/plugins/ppapi/content_decryptor_delegate.h
diff --git a/webkit/plugins/ppapi/content_decryptor_delegate.h b/webkit/plugins/ppapi/content_decryptor_delegate.h
index 07f64cf187b421c02c372dc1dc8996c4f6178bc1..dba3423c55581f118fd5bd75bc49784f982e72c9 100644
--- a/webkit/plugins/ppapi/content_decryptor_delegate.h
+++ b/webkit/plugins/ppapi/content_decryptor_delegate.h
@@ -39,14 +39,15 @@ class WEBKIT_PLUGINS_EXPORT ContentDecryptorDelegate {
       PP_Instance pp_instance,
       const PPP_ContentDecryptor_Private* plugin_decryption_interface);
 
+  void Initialize(const std::string& key_system);
+
   void SetKeyEventCallbacks(const media::KeyAddedCB& key_added_cb,
                             const media::KeyErrorCB& key_error_cb,
                             const media::KeyMessageCB& key_message_cb,
                             const media::NeedKeyCB& need_key_cb);
 
   // Provides access to PPP_ContentDecryptor_Private.
-  bool GenerateKeyRequest(const std::string& key_system,
-                          const std::string& type,
+  bool GenerateKeyRequest(const std::string& type,
                           const uint8* init_data,
                           int init_data_length);
   bool AddKey(const std::string& session_id,
@@ -78,7 +79,9 @@ class WEBKIT_PLUGINS_EXPORT ContentDecryptorDelegate {
       const media::Decryptor::VideoDecodeCB& video_decode_cb);
 
   // PPB_ContentDecryptor_Private dispatching methods.
+  // TODO(ddorwin): Remove this method.
   void NeedKey(PP_Var key_system, PP_Var session_id, PP_Var init_data);
+  // TODO(ddorwin): Remove key_system_var parameter from these methods.
   void KeyAdded(PP_Var key_system, PP_Var session_id);
   void KeyMessage(PP_Var key_system,
                   PP_Var session_id,
@@ -128,6 +131,9 @@ class WEBKIT_PLUGINS_EXPORT ContentDecryptorDelegate {
   const PP_Instance pp_instance_;
   const PPP_ContentDecryptor_Private* const plugin_decryption_interface_;
 
+  // TODO(ddorwin): Remove after updating the Pepper API to not use key system.
+  std::string key_system_;
+
   // Callbacks for firing key events.
   media::KeyAddedCB key_added_cb_;
   media::KeyErrorCB key_error_cb_;