Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

media/base/android/media_player_manager.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BASE_ANDROID_MEDIA_PLAYER_MANAGER_H_
 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_MANAGER_H_
 
 #include "base/time.h"
 #include "media/base/android/demuxer_stream_player_params.h"
 #include "media/base/media_export.h"
@@ skipping 98 matching lines @@
 
   // Get the MediaDrmBridge object for the given media key Id.
   virtual media::MediaDrmBridge* GetDrmBridge(int media_keys_id) = 0;
 
   // TODO(xhwang): The following three methods needs to be decoupled from
   // MediaPlayerManager to support the W3C Working Draft version of the EME
   // spec.
 
   // 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;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_PLAYER_MANAGER_H_