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 cf88d4e5e977b4d16163a0126ec17e00846c2433..7df05679a9fcf7ea904b4b7705391af4ea0b1f26 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 */, |