Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

webkit/renderer/media/android/webmediaplayer_android.h

Index: webkit/renderer/media/android/webmediaplayer_android.h
diff --git a/webkit/renderer/media/android/webmediaplayer_android.h b/webkit/renderer/media/android/webmediaplayer_android.h
index 1944c9c377193648c06e570b82854ff22b86e898..a914d7489d8c19054756110d414a40c6b50f3f0e 100644
--- a/webkit/renderer/media/android/webmediaplayer_android.h
+++ b/webkit/renderer/media/android/webmediaplayer_android.h
@@ -208,18 +208,15 @@ class WebMediaPlayerAndroid
       const WebKit::WebString& key_system,
       const WebKit::WebString& session_id) OVERRIDE;
 
-  void OnKeyAdded(const std::string& key_system, const std::string& session_id);
-  void OnKeyError(const std::string& key_system,
-                  const std::string& session_id,
+  void OnKeyAdded(const std::string& session_id);
+  void OnKeyError(const std::string& session_id,
                   media::MediaKeys::KeyError error_code,
                   int system_code);
-  void OnKeyMessage(const std::string& key_system,
-                    const std::string& session_id,
+  void OnKeyMessage(const std::string& session_id,
                     const std::string& message,
                     const std::string& destination_url);
 
-  void OnNeedKey(const std::string& key_system,
-                 const std::string& type,
+  void OnNeedKey(const std::string& type,
                  const std::string& session_id,
                  scoped_ptr<uint8[]> init_data,
                  int init_data_size);