Update Android IPC messages to EME WD

content/browser/media/android/browser_media_player_manager.cc

Index: content/browser/media/android/browser_media_player_manager.cc
diff --git a/content/browser/media/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc
index 2273b5cdc23e4ad81c7bcd4393ebe896a3d8d5e0..6a875fcc9c70d615ed76edb99458eb558dc89a1f 100644
--- a/content/browser/media/android/browser_media_player_manager.cc
+++ b/content/browser/media/android/browser_media_player_manager.cc
@@ -123,11 +123,9 @@ bool BrowserMediaPlayerManager::OnMessageReceived(const IPC::Message& msg) {
                         DestroyAllMediaPlayers)
     IPC_MESSAGE_HANDLER(MediaKeysHostMsg_InitializeCDM,
                         OnInitializeCDM)
-    IPC_MESSAGE_HANDLER(MediaKeysHostMsg_GenerateKeyRequest,
-                        OnGenerateKeyRequest)
-    IPC_MESSAGE_HANDLER(MediaKeysHostMsg_AddKey, OnAddKey)
-    IPC_MESSAGE_HANDLER(MediaKeysHostMsg_CancelKeyRequest,
-                        OnCancelKeyRequest)
+    IPC_MESSAGE_HANDLER(MediaKeysHostMsg_CreateSession, OnCreateSession)
+    IPC_MESSAGE_HANDLER(MediaKeysHostMsg_UpdateSession, OnUpdateSession)
+    IPC_MESSAGE_HANDLER(MediaKeysHostMsg_ReleaseSession, OnReleaseSession)
 #if defined(GOOGLE_TV)
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_NotifyExternalSurface,
                         OnNotifyExternalSurface)
@@ -355,7 +353,7 @@ void BrowserMediaPlayerManager::OnProtectedSurfaceRequested(int player_id) {
   // During the process, DisableFullscreenEncryptedMediaPlayback() may get
   // called before or after OnEnterFullscreen(). If it is called before
   // OnEnterFullscreen(), the player will not enter fullscreen. And it will
-  // retry the process once the GenerateKeyRequest is allowed to proceed
+  // retry the process once CreateSession() is allowed to proceed.
   // TODO(qinmin): make this flag default on android.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableGestureRequirementForMediaFullscreen)) {
@@ -368,9 +366,9 @@ void BrowserMediaPlayerManager::OnProtectedSurfaceRequested(int player_id) {
 void BrowserMediaPlayerManager::OnSessionCreated(
     int media_keys_id,
     uint32 reference_id,
-    const std::string& session_id) {
-  Send(new MediaKeysMsg_SetSessionId(
-      routing_id(), media_keys_id, reference_id, session_id));
+    const std::string& web_session_id) {
+  Send(new MediaKeysMsg_SessionCreated(
+      routing_id(), media_keys_id, reference_id, web_session_id));
 }
 
 void BrowserMediaPlayerManager::OnSessionMessage(
@@ -378,18 +376,20 @@ void BrowserMediaPlayerManager::OnSessionMessage(
     uint32 reference_id,
     const std::vector<uint8>& message,
     const std::string& destination_url) {
-  Send(new MediaKeysMsg_KeyMessage(
+  Send(new MediaKeysMsg_SessionMessage(
       routing_id(), media_keys_id, reference_id, message, destination_url));
 }
 
 void BrowserMediaPlayerManager::OnSessionReady(int media_keys_id,
                                                uint32 reference_id) {
-  Send(new MediaKeysMsg_KeyAdded(routing_id(), media_keys_id, reference_id));
+  Send(new MediaKeysMsg_SessionReady(
+      routing_id(), media_keys_id, reference_id));
 }
 
 void BrowserMediaPlayerManager::OnSessionClosed(int media_keys_id,
                                                 uint32 reference_id) {
-  // TODO(jrummell): Update Android calls and IPC names.
+  Send(new MediaKeysMsg_SessionClosed(
+      routing_id(), media_keys_id, reference_id));
 }
 
 void BrowserMediaPlayerManager::OnSessionError(
@@ -397,8 +397,8 @@ void BrowserMediaPlayerManager::OnSessionError(
     uint32 reference_id,
     media::MediaKeys::KeyError error_code,
     int system_code) {
-  Send(new MediaKeysMsg_KeyError(routing_id(), media_keys_id,
-                                 reference_id, error_code, system_code));
+  Send(new MediaKeysMsg_SessionError(
+      routing_id(), media_keys_id, reference_id, error_code, system_code));
 }
 
 #if defined(GOOGLE_TV)
@@ -552,7 +552,7 @@ void BrowserMediaPlayerManager::OnInitializeCDM(
   OnSetMediaKeys(media_keys_id, media_keys_id);
 }
 
-void BrowserMediaPlayerManager::OnGenerateKeyRequest(
+void BrowserMediaPlayerManager::OnCreateSession(
     int media_keys_id,
     uint32 reference_id,
     const std::string& type,
@@ -586,10 +586,10 @@ void BrowserMediaPlayerManager::OnGenerateKeyRequest(
                  init_data));
 }
 
-void BrowserMediaPlayerManager::OnAddKey(int media_keys_id,
-                                         uint32 reference_id,
-                                         const std::vector<uint8>& key,
-                                         const std::vector<uint8>& init_data) {
+void BrowserMediaPlayerManager::OnUpdateSession(
+    int media_keys_id,
+    uint32 reference_id,
+    const std::vector<uint8>& response) {
   MediaDrmBridge* drm_bridge = GetDrmBridge(media_keys_id);
   if (!drm_bridge) {
     DLOG(WARNING) << "No MediaDrmBridge for ID: " << media_keys_id << " found";
@@ -598,8 +598,7 @@ void BrowserMediaPlayerManager::OnAddKey(int media_keys_id,
     return;
   }
 
-  DCHECK(init_data.empty());
-  drm_bridge->UpdateSession(reference_id, &key[0], key.size());
+  drm_bridge->UpdateSession(reference_id, &response[0], response.size());

[palmer, 2013/12/06 19:07:32]

Validate the value of response.size() ? What if it's 0 or 0x7fffffff or
something crazy?

[jrummell, 2013/12/06 23:36:12]

0 is valid (although we don't currently have a use case for this). Limiting to
10K.

   // In EME v0.1b MediaKeys lives in the media element. So the |media_keys_id|
   // is the same as the |player_id|.
   // TODO(xhwang): Separate |media_keys_id| and |player_id|.
@@ -608,7 +607,7 @@ void BrowserMediaPlayerManager::OnAddKey(int media_keys_id,
     player->OnKeyAdded();
 }
 
-void BrowserMediaPlayerManager::OnCancelKeyRequest(
+void BrowserMediaPlayerManager::OnReleaseSession(
     int media_keys_id,
     uint32 reference_id) {
   MediaDrmBridge* drm_bridge = GetDrmBridge(media_keys_id);