Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

webkit/renderer/media/webmediaplayer_impl.h

Index: webkit/renderer/media/webmediaplayer_impl.h
diff --git a/webkit/renderer/media/webmediaplayer_impl.h b/webkit/renderer/media/webmediaplayer_impl.h
index 9bb8044317a24e8a21da04e6e0e6a2293dca69cf..4a67739e637b48401edec5a816b840c2aac727a2 100644
--- a/webkit/renderer/media/webmediaplayer_impl.h
+++ b/webkit/renderer/media/webmediaplayer_impl.h
@@ -40,7 +40,6 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvider.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"
-#include "webkit/renderer/media/crypto/key_systems.h"
 #include "webkit/renderer/media/crypto/proxy_decryptor.h"
 
 class RenderAudioSourceProvider;
@@ -189,17 +188,14 @@ class WebMediaPlayerImpl
   void OnPipelineBufferingState(
       media::Pipeline::BufferingState buffering_state);
   void OnDemuxerOpened(scoped_ptr<WebKit::WebMediaSource> media_source);
-  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& default_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);