Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

content/browser/android/media_player_manager_impl.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/browser/android/media_player_manager_impl.h"
 
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/android/media_resource_getter_impl.h"
 #include "content/browser/web_contents/web_contents_view_android.h"
 #include "content/common/media/media_player_messages_android.h"
@@ skipping 265 matching lines @@
     int player_id, base::TimeDelta time_to_seek, unsigned seek_request_id) {
   Send(new MediaPlayerMsg_MediaSeekRequest(
       routing_id(), player_id, time_to_seek, seek_request_id));
 }
 
 void MediaPlayerManagerImpl::OnMediaConfigRequest(int player_id) {
   Send(new MediaPlayerMsg_MediaConfigRequest(routing_id(), player_id));
 }
 
 void MediaPlayerManagerImpl::OnKeyAdded(int media_keys_id,
-                                        const std::string& key_system,
                                         const std::string& session_id) {
-  Send(new MediaPlayerMsg_KeyAdded(
-      routing_id(), media_keys_id, key_system, session_id));
+  Send(new MediaPlayerMsg_KeyAdded(routing_id(), media_keys_id, session_id));
 }
 
 void MediaPlayerManagerImpl::OnKeyError(int media_keys_id,
-                                        const std::string& key_system,
                                         const std::string& session_id,
                                         media::MediaKeys::KeyError error_code,
                                         int system_code) {
   Send(new MediaPlayerMsg_KeyError(routing_id(), media_keys_id,
-      key_system, session_id, error_code, system_code));
+                                   session_id, error_code, system_code));
 }
 
 void MediaPlayerManagerImpl::OnKeyMessage(int media_keys_id,
-                                          const std::string& key_system,
                                           const std::string& session_id,
                                           const std::string& message,
                                           const std::string& destination_url) {
-  Send(new MediaPlayerMsg_KeyMessage(routing_id(), media_keys_id,
-       key_system, session_id, message, destination_url));
+  Send(new MediaPlayerMsg_KeyMessage(routing_id(), media_keys_id, session_id,
+                                     message, destination_url));
 }
 
 #if defined(GOOGLE_TV)
 void MediaPlayerManagerImpl::AttachExternalVideoSurface(int player_id,
                                                         jobject surface) {
   MediaPlayerAndroid* player = GetPlayer(player_id);
   if (player) {
     player->SetVideoSurface(
         gfx::ScopedJavaSurface::AcquireExternalSurface(surface));
   }
@@ skipping 116 matching lines @@
 
 void MediaPlayerManagerImpl::OnMediaSeekRequestAck(
     int player_id, unsigned seek_request_id) {
   MediaPlayerAndroid* player = GetPlayer(player_id);
   if (player)
     player->OnSeekRequestAck(seek_request_id);
 }
 
 void MediaPlayerManagerImpl::OnGenerateKeyRequest(
     int media_keys_id,
-    const std::string& key_system,
     const std::string& type,
     const std::vector<uint8>& init_data) {
   // TODO(qinmin): add a new MediaDrmBridge if GetDrmBridge() returns NULL.
   MediaDrmBridge* drm_bridge = GetDrmBridge(media_keys_id);
   if (drm_bridge) {
-    drm_bridge->GenerateKeyRequest(key_system, type, &init_data[0],
-                                   init_data.size());
+    drm_bridge->GenerateKeyRequest(type, &init_data[0], init_data.size());
   }
 }
 
 void MediaPlayerManagerImpl::OnAddKey(int media_keys_id,
-                                      const std::string& key_system,
                                       const std::vector<uint8>& key,
                                       const std::vector<uint8>& init_data,
                                       const std::string& session_id) {
   MediaDrmBridge* drm_bridge = GetDrmBridge(media_keys_id);
   if (drm_bridge) {
-    drm_bridge->AddKey(key_system, &key[0], key.size(), &init_data[0],
-                       init_data.size(), session_id);
+    drm_bridge->AddKey(&key[0], key.size(), &init_data[0], init_data.size(),
+                       session_id);
   }
 }
 
 void MediaPlayerManagerImpl::OnCancelKeyRequest(int media_keys_id,
-                                                const std::string& key_system,
                                                 const std::string& session_id) {
   MediaDrmBridge* drm_bridge = GetDrmBridge(media_keys_id);
   if (drm_bridge)
-    drm_bridge->CancelKeyRequest(key_system, session_id);
+    drm_bridge->CancelKeyRequest(session_id);
 }
 
 void MediaPlayerManagerImpl::OnDurationChanged(
     int player_id, const base::TimeDelta& duration) {
   MediaPlayerAndroid* player = GetPlayer(player_id);
   if (player)
     player->DurationChanged(duration);
 }
 
 void MediaPlayerManagerImpl::AddPlayer(MediaPlayerAndroid* player) {
@@ skipping 15 matching lines @@
   for (ScopedVector<MediaDrmBridge>::iterator it = drm_bridges_.begin();
       it != drm_bridges_.end(); ++it) {
     if ((*it)->media_keys_id() == media_keys_id) {
       drm_bridges_.erase(it);
       break;
     }
   }
 }
 
 }  // namespace content