Pass InitializeCDM() call through IPC to the browser.

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 29 matching lines @@
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaTimeUpdate, OnTimeUpdate)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPlayerReleased,
                         OnMediaPlayerReleased)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidEnterFullscreen, OnDidEnterFullscreen)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPlay, OnPlayerPlay)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_ReadFromDemuxer, OnReadFromDemuxer)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaSeekRequest, OnMediaSeekRequest)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaConfigRequest, OnMediaConfigRequest)
-    IPC_MESSAGE_HANDLER(MediaPlayerMsg_KeyAdded, OnKeyAdded)
-    IPC_MESSAGE_HANDLER(MediaPlayerMsg_KeyError, OnKeyError)
-    IPC_MESSAGE_HANDLER(MediaPlayerMsg_KeyMessage, OnKeyMessage)
+    IPC_MESSAGE_HANDLER(MediaKeysMsg_KeyAdded, OnKeyAdded)
+    IPC_MESSAGE_HANDLER(MediaKeysMsg_KeyError, OnKeyError)
+    IPC_MESSAGE_HANDLER(MediaKeysMsg_KeyMessage, OnKeyMessage)
   IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void WebMediaPlayerProxyImplAndroid::Initialize(
     int player_id,
     const GURL& url,
     media::MediaPlayerAndroid::SourceType source_type,
     const GURL& first_party_for_cookies) {
@@ skipping 113 matching lines @@
   Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id));
 }
 
 void WebMediaPlayerProxyImplAndroid::ReadFromDemuxerAck(
     int player_id,
     const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) {
   Send(new MediaPlayerHostMsg_ReadFromDemuxerAck(
       routing_id(), player_id, params));
 }
 
+void WebMediaPlayerProxyImplAndroid::InitializeCDM(
+    int media_keys_id,
+    const std::vector<uint8>& uuid) {
+  Send(new MediaKeysHostMsg_InitializeCDM(routing_id(), media_keys_id, uuid));
+}
+
 void WebMediaPlayerProxyImplAndroid::GenerateKeyRequest(
-    int player_id,
+    int media_keys_id,
     const std::string& type,
     const std::vector<uint8>& init_data) {
-  Send(new MediaPlayerHostMsg_GenerateKeyRequest(
-      routing_id(), player_id, type, init_data));
+  Send(new MediaKeysHostMsg_GenerateKeyRequest(
+      routing_id(), media_keys_id, type, init_data));
 }
 
-void WebMediaPlayerProxyImplAndroid::AddKey(int player_id,
+void WebMediaPlayerProxyImplAndroid::AddKey(int media_keys_id,
                                             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, init_data, session_id));
+  Send(new MediaKeysHostMsg_AddKey(
+      routing_id(), media_keys_id, key, init_data, session_id));
 }
 
 void WebMediaPlayerProxyImplAndroid::CancelKeyRequest(
-    int player_id,
+    int media_keys_id,
     const std::string& session_id) {
-  Send(new MediaPlayerHostMsg_CancelKeyRequest(
-      routing_id(), player_id, session_id));
+  Send(new MediaKeysHostMsg_CancelKeyRequest(
+      routing_id(), media_keys_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 44 matching lines @@
     player->OnMediaSeekRequest(time_to_seek);
   }
 }
 
 void WebMediaPlayerProxyImplAndroid::OnMediaConfigRequest(int player_id) {
   webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnMediaConfigRequest();
 }
 
-void WebMediaPlayerProxyImplAndroid::OnKeyAdded(int player_id,
+void WebMediaPlayerProxyImplAndroid::OnKeyAdded(int media_keys_id,
                                                 const std::string& session_id) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  webkit_media::WebMediaPlayerAndroid* player =
+      GetWebMediaPlayer(media_keys_id);
   if (player)
     player->OnKeyAdded(session_id);
 }
 
 void WebMediaPlayerProxyImplAndroid::OnKeyError(
-    int player_id,
+    int media_keys_id,
     const std::string& session_id,
     media::MediaKeys::KeyError error_code,
     int system_code) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  webkit_media::WebMediaPlayerAndroid* player =
+      GetWebMediaPlayer(media_keys_id);
   if (player)
     player->OnKeyError(session_id, error_code, system_code);
 }
 
 void WebMediaPlayerProxyImplAndroid::OnKeyMessage(
-    int player_id,
+    int media_keys_id,
     const std::string& session_id,
     const std::string& message,
     const std::string& destination_url) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  webkit_media::WebMediaPlayerAndroid* player =
+      GetWebMediaPlayer(media_keys_id);
   if (player)
     player->OnKeyMessage(session_id, message, destination_url);
 }
 
 }  // namespace content