Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

media/base/android/media_source_player_unittest.cc

Index: media/base/android/media_source_player_unittest.cc
diff --git a/media/base/android/media_source_player_unittest.cc b/media/base/android/media_source_player_unittest.cc
index ee03c30cdab290196294772dcec5f2e0a5211539..e0ff044d33ea948e46b4d2dc8aee3ec02a5e50ae 100644
--- a/media/base/android/media_source_player_unittest.cc
+++ b/media/base/android/media_source_player_unittest.cc
@@ -55,15 +55,12 @@ class MockMediaPlayerManager : public MediaPlayerManager {
     return NULL;
   }
   virtual void OnKeyAdded(int key_id,
-                          const std::string& key_system,
                           const std::string& session_id) OVERRIDE {}
   virtual void OnKeyError(int key_id,
-                          const std::string& key_system,
                           const std::string& session_id,
                           media::MediaKeys::KeyError error_code,
                           int system_code) OVERRIDE {}
   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) OVERRIDE {}