Reland r253665 "Rename MediaKeys*Msg to Cdm*Msg."

content/renderer/media/android/renderer_media_player_manager.cc

 // Copyright 2013 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/android/renderer_media_player_manager.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "content/common/media/media_player_messages_android.h"
 #include "content/renderer/media/android/proxy_media_keys.h"
@@ skipping 46 matching lines @@
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_ConnectedToRemoteDevice,
                         OnConnectedToRemoteDevice)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_DisconnectedFromRemoteDevice,
                         OnDisconnectedFromRemoteDevice)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_RequestFullscreen,
                         OnRequestFullscreen)
     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(MediaKeysMsg_SessionCreated, OnSessionCreated)
-    IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionMessage, OnSessionMessage)
-    IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionReady, OnSessionReady)
-    IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionClosed, OnSessionClosed)
-    IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionError, OnSessionError)
+    IPC_MESSAGE_HANDLER(CdmMsg_SessionCreated, OnSessionCreated)
+    IPC_MESSAGE_HANDLER(CdmMsg_SessionMessage, OnSessionMessage)
+    IPC_MESSAGE_HANDLER(CdmMsg_SessionReady, OnSessionReady)
+    IPC_MESSAGE_HANDLER(CdmMsg_SessionClosed, OnSessionClosed)
+    IPC_MESSAGE_HANDLER(CdmMsg_SessionError, OnSessionError)
   IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void RendererMediaPlayerManager::Initialize(
     MediaPlayerHostMsg_Initialize_Type type,
     int player_id,
     const GURL& url,
     const GURL& first_party_for_cookies,
@@ skipping 154 matching lines @@
 void RendererMediaPlayerManager::ExitFullscreen(int player_id) {
   pending_fullscreen_frame_ = NULL;
   Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id));
 }
 
 void RendererMediaPlayerManager::InitializeCDM(int media_keys_id,
                                                ProxyMediaKeys* media_keys,
                                                const std::vector<uint8>& uuid,
                                                const GURL& frame_url) {
   RegisterMediaKeys(media_keys_id, media_keys);
-  Send(new MediaKeysHostMsg_InitializeCDM(
+  Send(new CdmHostMsg_InitializeCDM(
       routing_id(), media_keys_id, uuid, frame_url));
 }
 
 void RendererMediaPlayerManager::CreateSession(
     int media_keys_id,
     uint32 session_id,
-    MediaKeysHostMsg_CreateSession_Type type,
+    CdmHostMsg_CreateSession_Type type,
     const std::vector<uint8>& init_data) {
-  Send(new MediaKeysHostMsg_CreateSession(
+  Send(new CdmHostMsg_CreateSession(
       routing_id(), media_keys_id, session_id, type, init_data));
 }
 
 void RendererMediaPlayerManager::UpdateSession(
     int media_keys_id,
     uint32 session_id,
     const std::vector<uint8>& response) {
-  Send(new MediaKeysHostMsg_UpdateSession(
+  Send(new CdmHostMsg_UpdateSession(
       routing_id(), media_keys_id, session_id, response));
 }
 
 void RendererMediaPlayerManager::ReleaseSession(int media_keys_id,
                                                 uint32 session_id) {
-  Send(new MediaKeysHostMsg_ReleaseSession(
-      routing_id(), media_keys_id, session_id));
+  Send(new CdmHostMsg_ReleaseSession(routing_id(), media_keys_id, session_id));
 }
 
 void RendererMediaPlayerManager::DestroyCdm(int media_keys_id) {
-  Send(new MediaKeysHostMsg_DestroyCdm(routing_id(), media_keys_id));
+  Send(new CdmHostMsg_DestroyCdm(routing_id(), media_keys_id));
 }
 
 void RendererMediaPlayerManager::OnSessionCreated(
     int media_keys_id,
     uint32 session_id,
     const std::string& web_session_id) {
   if (web_session_id.length() > kEmeWebSessionIdMaximum) {
     OnSessionError(
         media_keys_id, session_id, media::MediaKeys::kUnknownError, 0);
     return;
@@ skipping 147 matching lines @@
 
     if (player && player->hasVideo()) {
       if (player->UpdateBoundaryRectangle())
         (*changes)[player_it->first] = player->GetBoundaryRectangle();
     }
   }
 }
 #endif  // defined(VIDEO_HOLE)
 
 }  // namespace content