Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

media/base/android/media_player_manager.h

Index: media/base/android/media_player_manager.h
diff --git a/media/base/android/media_player_manager.h b/media/base/android/media_player_manager.h
index d63a8c0201431d34d96b1908f6c9680a68b1f8b3..69d679274536cc0ef215c23bed383669d8e7d948 100644
--- a/media/base/android/media_player_manager.h
+++ b/media/base/android/media_player_manager.h
@@ -116,19 +116,16 @@ class MEDIA_EXPORT MediaPlayerManager {
 
   // Called when the DRM engine wants to send a KeyAdded.
   virtual void OnKeyAdded(int key_id,
-                          const std::string& key_system,
                           const std::string& session_id) = 0;
 
   // Called when the DRM engine wants to send a KeyError.
   virtual void OnKeyError(int key_id,
-                          const std::string& key_system,
                           const std::string& session_id,
                           media::MediaKeys::KeyError error_code,
                           int system_code) = 0;
 
   // Called when the DRM engine wants to send a KeyMessage.
   virtual void OnKeyMessage(int key_id,
-                            const std::string& key_system,
                             const std::string& session_id,
                             const std::string& message,
                             const std::string& destination_url) = 0;