Rename MediaKeys*Msg to Cdm*Msg.

This is the first step to separate CDM messages from MediaPlayer messages. In a
follow up CL, CDM messages will be moved to separate files.

BUG=315312
R=dcheng@chromium.org, ddorwin@chromium.org

Review URL: https://codereview.chromium.org/181483005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253665 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 43 insertions, 42 deletions

diff --git a/content/browser/media/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc
index 5d457e4..2848cd2 100644
--- a/content/browser/media/android/browser_media_player_manager.cc
+++ b/content/browser/media/android/browser_media_player_manager.cc
@@ -139,12 +139,11 @@ bool BrowserMediaPlayerManager::OnMessageReceived(const IPC::Message& msg) {
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyMediaPlayer, OnDestroyPlayer)
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyAllMediaPlayers,
                         DestroyAllMediaPlayers)
-    IPC_MESSAGE_HANDLER(MediaKeysHostMsg_InitializeCDM,
-                        OnInitializeCDM)
-    IPC_MESSAGE_HANDLER(MediaKeysHostMsg_CreateSession, OnCreateSession)
-    IPC_MESSAGE_HANDLER(MediaKeysHostMsg_UpdateSession, OnUpdateSession)
-    IPC_MESSAGE_HANDLER(MediaKeysHostMsg_ReleaseSession, OnReleaseSession)
-    IPC_MESSAGE_HANDLER(MediaKeysHostMsg_CancelAllPendingSessionCreations,
+    IPC_MESSAGE_HANDLER(CdmHostMsg_InitializeCDM, OnInitializeCDM)
+    IPC_MESSAGE_HANDLER(CdmHostMsg_CreateSession, OnCreateSession)
+    IPC_MESSAGE_HANDLER(CdmHostMsg_UpdateSession, OnUpdateSession)
+    IPC_MESSAGE_HANDLER(CdmHostMsg_ReleaseSession, OnReleaseSession)
+    IPC_MESSAGE_HANDLER(CdmHostMsg_CancelAllPendingSessionCreations,
                         OnCancelAllPendingSessionCreations)
 #if defined(VIDEO_HOLE)
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_NotifyExternalSurface,
@@ -417,7 +416,7 @@ void BrowserMediaPlayerManager::OnSessionCreated(
     int media_keys_id,
     uint32 session_id,
     const std::string& web_session_id) {
-  Send(new MediaKeysMsg_SessionCreated(
+  Send(new CdmMsg_SessionCreated(
       routing_id(), media_keys_id, session_id, web_session_id));
 }
 
@@ -426,18 +425,18 @@ void BrowserMediaPlayerManager::OnSessionMessage(
     uint32 session_id,
     const std::vector<uint8>& message,
     const GURL& destination_url) {
-  Send(new MediaKeysMsg_SessionMessage(
+  Send(new CdmMsg_SessionMessage(
       routing_id(), media_keys_id, session_id, message, destination_url));
 }
 
 void BrowserMediaPlayerManager::OnSessionReady(int media_keys_id,
                                                uint32 session_id) {
-  Send(new MediaKeysMsg_SessionReady(routing_id(), media_keys_id, session_id));
+  Send(new CdmMsg_SessionReady(routing_id(), media_keys_id, session_id));
 }
 
 void BrowserMediaPlayerManager::OnSessionClosed(int media_keys_id,
                                                 uint32 session_id) {
-  Send(new MediaKeysMsg_SessionClosed(routing_id(), media_keys_id, session_id));
+  Send(new CdmMsg_SessionClosed(routing_id(), media_keys_id, session_id));
 }
 
 void BrowserMediaPlayerManager::OnSessionError(
@@ -445,7 +444,7 @@ void BrowserMediaPlayerManager::OnSessionError(
     uint32 session_id,
     media::MediaKeys::KeyError error_code,
     int system_code) {
-  Send(new MediaKeysMsg_SessionError(
+  Send(new CdmMsg_SessionError(
       routing_id(), media_keys_id, session_id, error_code, system_code));
 }
 
@@ -623,7 +622,7 @@ void BrowserMediaPlayerManager::OnInitializeCDM(
 void BrowserMediaPlayerManager::OnCreateSession(
     int media_keys_id,
     uint32 session_id,
-    MediaKeysHostMsg_CreateSession_Type content_type,
+    CdmHostMsg_CreateSession_Type content_type,
     const std::vector<uint8>& init_data) {
   if (init_data.size() > kEmeInitDataMaximum) {
     LOG(WARNING) << "InitData for ID: " << media_keys_id
diff --git a/content/browser/media/android/browser_media_player_manager.h b/content/browser/media/android/browser_media_player_manager.h
index be8918b..7feb77b 100644
--- a/content/browser/media/android/browser_media_player_manager.h
+++ b/content/browser/media/android/browser_media_player_manager.h
@@ -142,7 +142,7 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
                        const GURL& frame_url);
   void OnCreateSession(int media_keys_id,
                        uint32 session_id,
-                       MediaKeysHostMsg_CreateSession_Type content_type,
+                       CdmHostMsg_CreateSession_Type content_type,
                        const std::vector<uint8>& init_data);
   void OnUpdateSession(int media_keys_id,
                        uint32 session_id,
@@ -181,7 +181,7 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
 
  private:
   // If |permitted| is false, it does nothing but send
-  // |MediaKeysMsg_SessionError| IPC message.
+  // |CdmMsg_SessionError| IPC message.
   // The primary use case is infobar permission callback, i.e., when infobar
   // can decide user's intention either from interacting with the actual info
   // bar or from the saved preference.
diff --git a/content/common/media/media_player_messages_android.h b/content/common/media/media_player_messages_android.h
index cf88d4e..7df0567 100644
--- a/content/common/media/media_player_messages_android.h
+++ b/content/common/media/media_player_messages_android.h
@@ -65,7 +65,6 @@ IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry)
 IPC_STRUCT_TRAITS_END()
 
 IPC_ENUM_TRAITS(MediaPlayerHostMsg_Initialize_Type)
-IPC_ENUM_TRAITS(MediaKeysHostMsg_CreateSession_Type)
 
 // Chrome for Android seek message sequence is:
 // 1. Renderer->Browser MediaPlayerHostMsg_Seek
@@ -285,50 +284,54 @@ IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_NotifyExternalSurface,
 
 // Messages for encrypted media extensions API ------------------------------
 // TODO(xhwang): Move the following messages to a separate file.
+#undef IPC_MESSAGE_START
+#define IPC_MESSAGE_START CdmMsgStart
 
-IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_InitializeCDM,
+IPC_ENUM_TRAITS(CdmHostMsg_CreateSession_Type)
+
+IPC_MESSAGE_ROUTED3(CdmHostMsg_InitializeCDM,
                     int /* media_keys_id */,
                     std::vector<uint8> /* uuid */,
                     GURL /* frame url */)
 
-IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_CreateSession,
+IPC_MESSAGE_ROUTED4(CdmHostMsg_CreateSession,
                     int /* media_keys_id */,
                     uint32_t /* session_id */,
-                    MediaKeysHostMsg_CreateSession_Type /* type */,
+                    CdmHostMsg_CreateSession_Type /* type */,
                     std::vector<uint8> /* init_data */)
 
-IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_UpdateSession,
+IPC_MESSAGE_ROUTED3(CdmHostMsg_UpdateSession,
                     int /* media_keys_id */,
                     uint32_t /* session_id */,
                     std::vector<uint8> /* response */)
 
-IPC_MESSAGE_ROUTED2(MediaKeysHostMsg_ReleaseSession,
+IPC_MESSAGE_ROUTED2(CdmHostMsg_ReleaseSession,
                     int /* media_keys_id */,
                     uint32_t /* session_id */)
 
-IPC_MESSAGE_ROUTED1(MediaKeysHostMsg_CancelAllPendingSessionCreations,
+IPC_MESSAGE_ROUTED1(CdmHostMsg_CancelAllPendingSessionCreations,
                     int /* media_keys_id */)
 
-IPC_MESSAGE_ROUTED3(MediaKeysMsg_SessionCreated,
+IPC_MESSAGE_ROUTED3(CdmMsg_SessionCreated,
                     int /* media_keys_id */,
                     uint32_t /* session_id */,
                     std::string /* web_session_id */)
 
-IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionMessage,
+IPC_MESSAGE_ROUTED4(CdmMsg_SessionMessage,
                     int /* media_keys_id */,
                     uint32_t /* session_id */,
                     std::vector<uint8> /* message */,
                     GURL /* destination_url */)
 
-IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionReady,
+IPC_MESSAGE_ROUTED2(CdmMsg_SessionReady,
                     int /* media_keys_id */,
                     uint32_t /* session_id */)
 
-IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionClosed,
+IPC_MESSAGE_ROUTED2(CdmMsg_SessionClosed,
                     int /* media_keys_id */,
                     uint32_t /* session_id */)
 
-IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionError,
+IPC_MESSAGE_ROUTED4(CdmMsg_SessionError,
                     int /* media_keys_id */,
                     uint32_t /* session_id */,
                     media::MediaKeys::KeyError /* error_code */,
diff --git a/content/common/media/media_player_messages_enums_android.h b/content/common/media/media_player_messages_enums_android.h
index 56625a0..3483d686 100644
--- a/content/common/media/media_player_messages_enums_android.h
+++ b/content/common/media/media_player_messages_enums_android.h
@@ -12,7 +12,7 @@ enum MediaPlayerHostMsg_Initialize_Type {
 };
 
 // Dictates the session type when an EME session is created.
-enum MediaKeysHostMsg_CreateSession_Type {
+enum CdmHostMsg_CreateSession_Type {
   CREATE_SESSION_TYPE_WEBM,
   CREATE_SESSION_TYPE_MP4,
 };
diff --git a/content/renderer/media/android/proxy_media_keys.cc b/content/renderer/media/android/proxy_media_keys.cc
index c2022e3..e49f5c0 100644
--- a/content/renderer/media/android/proxy_media_keys.cc
+++ b/content/renderer/media/android/proxy_media_keys.cc
@@ -52,7 +52,7 @@ bool ProxyMediaKeys::CreateSession(uint32 session_id,
                                    int init_data_length) {
   // TODO(xhwang): Move these checks up to blink and DCHECK here.
   // See http://crbug.com/342510
-  MediaKeysHostMsg_CreateSession_Type session_type;
+  CdmHostMsg_CreateSession_Type session_type;
   if (content_type == "audio/mp4" || content_type == "video/mp4") {
     session_type = CREATE_SESSION_TYPE_MP4;
   } else if (content_type == "audio/webm" || content_type == "video/webm") {
diff --git a/content/renderer/media/android/renderer_media_player_manager.cc b/content/renderer/media/android/renderer_media_player_manager.cc
index 414135c..38dc6dd 100644
--- a/content/renderer/media/android/renderer_media_player_manager.cc
+++ b/content/renderer/media/android/renderer_media_player_manager.cc
@@ -64,11 +64,11 @@ bool RendererMediaPlayerManager::OnMessageReceived(const IPC::Message& msg) {
     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;
@@ -243,16 +243,16 @@ void RendererMediaPlayerManager::InitializeCDM(int media_keys_id,
                                                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));
 }
 
@@ -260,20 +260,19 @@ 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::CancelAllPendingSessionCreations(
     int media_keys_id) {
-  Send(new MediaKeysHostMsg_CancelAllPendingSessionCreations(
-      routing_id(), media_keys_id));
+  Send(new CdmHostMsg_CancelAllPendingSessionCreations(routing_id(),
+                                                       media_keys_id));
 }
 
 void RendererMediaPlayerManager::OnSessionCreated(
diff --git a/content/renderer/media/android/renderer_media_player_manager.h b/content/renderer/media/android/renderer_media_player_manager.h
index 91a68e5..a28a22c 100644
--- a/content/renderer/media/android/renderer_media_player_manager.h
+++ b/content/renderer/media/android/renderer_media_player_manager.h
@@ -94,7 +94,7 @@ class RendererMediaPlayerManager : public RenderViewObserver {
                      const GURL& frame_url);
   void CreateSession(int media_keys_id,
                      uint32 session_id,
-                     MediaKeysHostMsg_CreateSession_Type type,
+                     CdmHostMsg_CreateSession_Type type,
                      const std::vector<uint8>& init_data);
   void UpdateSession(int media_keys_id,
                      uint32 session_id,