Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

media/base/android/media_drm_bridge.cc

Index: media/base/android/media_drm_bridge.cc
diff --git a/media/base/android/media_drm_bridge.cc b/media/base/android/media_drm_bridge.cc
index 687cec99306e24b4d08de7870ba01ab8b6f64e7c..8760900a8879af28953035571011e4d7ce01dec1 100644
--- a/media/base/android/media_drm_bridge.cc
+++ b/media/base/android/media_drm_bridge.cc
@@ -21,21 +21,18 @@ MediaDrmBridge::MediaDrmBridge(
 
 MediaDrmBridge::~MediaDrmBridge() {}
 
-bool MediaDrmBridge::GenerateKeyRequest(const std::string& key_system,
-                                        const std::string& type,
+bool MediaDrmBridge::GenerateKeyRequest(const std::string& type,
                                         const uint8* init_data,
                                         int init_data_length) {
   NOTIMPLEMENTED();
   return false;
 }
 
-void MediaDrmBridge::CancelKeyRequest(const std::string& key_system,
-                                      const std::string& session_id) {
+void MediaDrmBridge::CancelKeyRequest(const std::string& session_id) {
   NOTIMPLEMENTED();
 }
 
-void MediaDrmBridge::AddKey(const std::string& key_system,
-                            const uint8* key, int key_length,
+void MediaDrmBridge::AddKey(const uint8* key, int key_length,
                             const uint8* init_data, int init_data_length,
                             const std::string& session_id) {
   NOTIMPLEMENTED();