Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

webkit/renderer/media/crypto/ppapi/clear_key_cdm.h

Index: webkit/renderer/media/crypto/ppapi/clear_key_cdm.h
diff --git a/webkit/renderer/media/crypto/ppapi/clear_key_cdm.h b/webkit/renderer/media/crypto/ppapi/clear_key_cdm.h
index 822c9c4075e66cc126fcd21256ac58f81efda279..ed0f27030b9401f48223311bfb052469cce20057 100644
--- a/webkit/renderer/media/crypto/ppapi/clear_key_cdm.h
+++ b/webkit/renderer/media/crypto/ppapi/clear_key_cdm.h
@@ -85,17 +85,14 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
     // Resets the Client to a clean state.
     void Reset();
 
-    void KeyAdded(const std::string& key_system, const std::string& session_id);
-    void KeyError(const std::string& key_system,
-                  const std::string& session_id,
+    void KeyAdded(const std::string& session_id);
+    void KeyError(const std::string& session_id,
                   media::MediaKeys::KeyError error_code,
                   int system_code);
-    void KeyMessage(const std::string& key_system,
-                    const std::string& session_id,
+    void KeyMessage(const std::string& session_id,
                     const std::string& message,
                     const std::string& default_url);
-    void NeedKey(const std::string& key_system,
-                 const std::string& session_id,
+    void NeedKey(const std::string& session_id,
                  const std::string& type,
                  scoped_ptr<uint8[]> init_data, int init_data_length);