Index: ppapi/proxy/ppapi_messages.h |
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h |
index ef6ae4ed9c6f97876cae4c71ff12b8cf8c797f08..6352e65c2d00e59f914a6f47c2ea30df7564b585 100644 |
--- a/ppapi/proxy/ppapi_messages.h |
+++ b/ppapi/proxy/ppapi_messages.h |
@@ -650,16 +650,16 @@ IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_Initialize, |
ppapi::proxy::SerializedVar /* key_system, String */) |
IPC_MESSAGE_ROUTED4(PpapiMsg_PPPContentDecryptor_CreateSession, |
PP_Instance /* instance */, |
- uint32_t /* reference_id */, |
+ uint32_t /* session_id */, |
ppapi::proxy::SerializedVar /* type, String */, |
ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */) |
IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_UpdateSession, |
PP_Instance /* instance */, |
- uint32_t /* reference_id */, |
+ uint32_t /* session_id */, |
ppapi::proxy::SerializedVar /* response, ArrayBuffer */) |
IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_ReleaseSession, |
PP_Instance /* instance */, |
- uint32_t /* reference_id */) |
+ uint32_t /* session_id */) |
IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_Decrypt, |
PP_Instance /* instance */, |
ppapi::proxy::PPPDecryptor_Buffer /* buffer */, |
@@ -984,22 +984,22 @@ IPC_SYNC_MESSAGE_ROUTED2_2( |
// PPB_ContentDecryptor_Dev messages handled in PPB_Instance_Proxy. |
IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_SessionCreated, |
PP_Instance /* instance */, |
- uint32_t /* reference_id */, |
- ppapi::proxy::SerializedVar /* session_id, String */) |
+ uint32_t /* session_id */, |
+ ppapi::proxy::SerializedVar /* web_session_id, String */) |
IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBInstance_SessionMessage, |
PP_Instance /* instance */, |
- uint32_t /* reference_id */, |
+ uint32_t /* session_id */, |
ppapi::proxy::SerializedVar /* message, ArrayBuffer */, |
ppapi::proxy::SerializedVar /* destination_url, String */) |
IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBInstance_SessionReady, |
PP_Instance /* instance */, |
- uint32_t /* reference_id */) |
+ uint32_t /* session_id */) |
IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBInstance_SessionClosed, |
PP_Instance /* instance */, |
- uint32_t /* reference_id */) |
+ uint32_t /* session_id */) |
IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBInstance_SessionError, |
PP_Instance /* instance */, |
- uint32_t /* reference_id */, |
+ uint32_t /* session_id */, |
int32_t /* media_error */, |
int32_t /* system_code */) |
IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverBlock, |