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

content/common/media/media_player_messages_android.h

Index: content/common/media/media_player_messages_android.h
diff --git a/content/common/media/media_player_messages_android.h b/content/common/media/media_player_messages_android.h
index a79960cdb6398b7265eeef15be32f37cd63eb5a3..07bc02075fddfa7d732bc08204ab329e59410328 100644
--- a/content/common/media/media_player_messages_android.h
+++ b/content/common/media/media_player_messages_android.h
@@ -26,7 +26,6 @@
 IPC_ENUM_TRAITS(media::AudioCodec)
 IPC_ENUM_TRAITS(media::DemuxerStream::Status)
 IPC_ENUM_TRAITS(media::DemuxerStream::Type)
-IPC_ENUM_TRAITS(media::MediaKeys::KeyError)
 IPC_ENUM_TRAITS(media::VideoCodec)
 
 IPC_STRUCT_TRAITS_BEGIN(media::DemuxerConfigs)
@@ -65,7 +64,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 +283,55 @@ 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_ENUM_TRAITS(media::MediaKeys::KeyError)
+IPC_ENUM_TRAITS(CdmHostMsg_CreateSession_Type)
 
-IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_InitializeCDM,
+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_DestroyCdm,
+IPC_MESSAGE_ROUTED1(CdmHostMsg_DestroyCdm,
                     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 */,