Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

content/renderer/media/webmediaplayer_proxy_impl_android.cc

 // 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.
 
 #include "content/renderer/media/webmediaplayer_proxy_impl_android.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "content/common/media/media_player_messages_android.h"
 #include "webkit/renderer/media/android/webmediaplayer_android.h"
@@ skipping 167 matching lines @@
 
 void WebMediaPlayerProxyImplAndroid::ReadFromDemuxerAck(
     int player_id,
     const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) {
   Send(new MediaPlayerHostMsg_ReadFromDemuxerAck(
       routing_id(), player_id, params));
 }
 
 void WebMediaPlayerProxyImplAndroid::GenerateKeyRequest(
     int player_id,
-    const std::string& key_system,
     const std::string& type,
     const std::vector<uint8>& init_data) {
   Send(new MediaPlayerHostMsg_GenerateKeyRequest(
-      routing_id(), player_id, key_system, type, init_data));
+      routing_id(), player_id, type, init_data));
 }
 
 void WebMediaPlayerProxyImplAndroid::AddKey(int player_id,
-                                            const std::string& key_system,
                                             const std::vector<uint8>& key,
                                             const std::vector<uint8>& init_data,
                                             const std::string& session_id) {
   Send(new MediaPlayerHostMsg_AddKey(
-      routing_id(), player_id, key_system, key, init_data, session_id));
+      routing_id(), player_id, key, init_data, session_id));
 }
 
 void WebMediaPlayerProxyImplAndroid::CancelKeyRequest(
     int player_id,
-    const std::string& key_system,
     const std::string& session_id) {
   Send(new MediaPlayerHostMsg_CancelKeyRequest(
-      routing_id(), player_id, key_system, session_id));
+      routing_id(), player_id, session_id));
 }
 
 #if defined(GOOGLE_TV)
 void WebMediaPlayerProxyImplAndroid::RequestExternalSurface(
     int player_id, const gfx::RectF& geometry) {
   Send(new MediaPlayerHostMsg_NotifyExternalSurface(
       routing_id(), player_id, true, geometry));
 }
 
 void WebMediaPlayerProxyImplAndroid::DidCommitCompositorFrame() {
@@ skipping 45 matching lines @@
   }
 }
 
 void WebMediaPlayerProxyImplAndroid::OnMediaConfigRequest(int player_id) {
   webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnMediaConfigRequest();
 }
 
 void WebMediaPlayerProxyImplAndroid::OnKeyAdded(int player_id,
-                                                const std::string& key_system,
                                                 const std::string& session_id) {
   webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
-    player->OnKeyAdded(key_system, session_id);
+    player->OnKeyAdded(session_id);
 }
 
 void WebMediaPlayerProxyImplAndroid::OnKeyError(
     int player_id,
-    const std::string& key_system,
     const std::string& session_id,
     media::MediaKeys::KeyError error_code,
     int system_code) {
   webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
-    player->OnKeyError(key_system, session_id, error_code, system_code);
+    player->OnKeyError(session_id, error_code, system_code);
 }
 
 void WebMediaPlayerProxyImplAndroid::OnKeyMessage(
     int player_id,
-    const std::string& key_system,
     const std::string& session_id,
     const std::string& message,
     const std::string& destination_url) {
   webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
-    player->OnKeyMessage(key_system, session_id, message, destination_url);
+    player->OnKeyMessage(session_id, message, destination_url);
 }
 
 }  // namespace content