| Index: ppapi/proxy/ppapi_messages.h
|
| diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
|
| index cfdc9844196c0334b19f63c3c2f303b71d62cc1c..4b834c87f19bde96388ba06b87be733d7286a568 100644
|
| --- a/ppapi/proxy/ppapi_messages.h
|
| +++ b/ppapi/proxy/ppapi_messages.h
|
| @@ -46,11 +46,11 @@
|
| #include "ppapi/shared_impl/ppb_device_ref_shared.h"
|
| #include "ppapi/shared_impl/ppb_input_event_shared.h"
|
| #include "ppapi/shared_impl/ppb_network_list_private_shared.h"
|
| -#include "ppapi/shared_impl/ppb_url_request_info_shared.h"
|
| #include "ppapi/shared_impl/ppb_view_shared.h"
|
| #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h"
|
| #include "ppapi/shared_impl/private/ppb_host_resolver_shared.h"
|
| #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h"
|
| +#include "ppapi/shared_impl/url_request_info_data.h"
|
|
|
| #undef IPC_MESSAGE_EXPORT
|
| #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT
|
| @@ -200,7 +200,7 @@ IPC_STRUCT_TRAITS_BEGIN(ppapi::HostPortPair)
|
| IPC_STRUCT_TRAITS_MEMBER(port)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(ppapi::PPB_URLRequestInfo_Data)
|
| +IPC_STRUCT_TRAITS_BEGIN(ppapi::URLRequestInfoData)
|
| IPC_STRUCT_TRAITS_MEMBER(url)
|
| IPC_STRUCT_TRAITS_MEMBER(method)
|
| IPC_STRUCT_TRAITS_MEMBER(headers)
|
| @@ -221,7 +221,7 @@ IPC_STRUCT_TRAITS_BEGIN(ppapi::PPB_URLRequestInfo_Data)
|
| IPC_STRUCT_TRAITS_MEMBER(body)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(ppapi::PPB_URLRequestInfo_Data::BodyItem)
|
| +IPC_STRUCT_TRAITS_BEGIN(ppapi::URLRequestInfoData::BodyItem)
|
| IPC_STRUCT_TRAITS_MEMBER(is_file)
|
| IPC_STRUCT_TRAITS_MEMBER(data)
|
| // Note: we don't serialize file_ref.
|
| @@ -1073,7 +1073,7 @@ IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBURLLoader_Create,
|
| ppapi::HostResource /* result */)
|
| IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBURLLoader_Open,
|
| ppapi::HostResource /* loader */,
|
| - ppapi::PPB_URLRequestInfo_Data /* request_data */)
|
| + ppapi::URLRequestInfoData /* request_data */)
|
| IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBURLLoader_FollowRedirect,
|
| ppapi::HostResource /* loader */)
|
| IPC_SYNC_MESSAGE_ROUTED1_1(
|
| @@ -1331,7 +1331,7 @@ IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBFlash_GetProxyForURL,
|
| ppapi::proxy::SerializedVar /* result */)
|
| IPC_SYNC_MESSAGE_ROUTED4_1(PpapiHostMsg_PPBFlash_Navigate,
|
| PP_Instance /* instance */,
|
| - ppapi::PPB_URLRequestInfo_Data /* request_data */,
|
| + ppapi::URLRequestInfoData /* request_data */,
|
| std::string /* target */,
|
| PP_Bool /* from_user_action */,
|
| int32_t /* result */)
|
|
|