Move ResourceResponse struct into the Content API, since it's used in Chrome. While at it, I also...

content/common/resource_messages.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // IPC messages for resource loading.
 
 // Multiply-included message file, hence no include guard.
 #include "base/shared_memory.h"
-#include "content/common/resource_response.h"
 #include "content/public/common/common_param_traits.h"
+#include "content/public/common/resource_response.h"
 #include "ipc/ipc_message_macros.h"
 #include "net/base/upload_data.h"
 
 #define IPC_MESSAGE_START ResourceMsgStart
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 
+IPC_STRUCT_TRAITS_BEGIN(content::ResourceResponseHead)
+  IPC_STRUCT_TRAITS_PARENT(webkit_glue::ResourceResponseInfo)
+  IPC_STRUCT_TRAITS_MEMBER(status)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(content::SyncLoadResult)
+  IPC_STRUCT_TRAITS_PARENT(content::ResourceResponseHead)
+  IPC_STRUCT_TRAITS_MEMBER(final_url)
+  IPC_STRUCT_TRAITS_MEMBER(data)
+IPC_STRUCT_TRAITS_END()
+
 IPC_STRUCT_TRAITS_BEGIN(webkit_glue::ResourceResponseInfo)
   IPC_STRUCT_TRAITS_MEMBER(request_time)
   IPC_STRUCT_TRAITS_MEMBER(response_time)
   IPC_STRUCT_TRAITS_MEMBER(headers)
   IPC_STRUCT_TRAITS_MEMBER(mime_type)
   IPC_STRUCT_TRAITS_MEMBER(charset)
   IPC_STRUCT_TRAITS_MEMBER(security_info)
   IPC_STRUCT_TRAITS_MEMBER(content_length)
   IPC_STRUCT_TRAITS_MEMBER(encoded_data_length)
   IPC_STRUCT_TRAITS_MEMBER(appcache_id)
   IPC_STRUCT_TRAITS_MEMBER(appcache_manifest_url)
   IPC_STRUCT_TRAITS_MEMBER(connection_id)
   IPC_STRUCT_TRAITS_MEMBER(connection_reused)
   IPC_STRUCT_TRAITS_MEMBER(load_timing)
   IPC_STRUCT_TRAITS_MEMBER(devtools_info)
   IPC_STRUCT_TRAITS_MEMBER(download_file_path)
   IPC_STRUCT_TRAITS_MEMBER(was_fetched_via_spdy)
   IPC_STRUCT_TRAITS_MEMBER(was_npn_negotiated)
   IPC_STRUCT_TRAITS_MEMBER(was_alternate_protocol_available)
   IPC_STRUCT_TRAITS_MEMBER(was_fetched_via_proxy)
   IPC_STRUCT_TRAITS_MEMBER(socket_address)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(ResourceResponseHead)
-  IPC_STRUCT_TRAITS_PARENT(webkit_glue::ResourceResponseInfo)
-  IPC_STRUCT_TRAITS_MEMBER(status)
-IPC_STRUCT_TRAITS_END()
-
-IPC_STRUCT_TRAITS_BEGIN(SyncLoadResult)
-  IPC_STRUCT_TRAITS_PARENT(ResourceResponseHead)
-  IPC_STRUCT_TRAITS_MEMBER(final_url)
-  IPC_STRUCT_TRAITS_MEMBER(data)
-IPC_STRUCT_TRAITS_END()
-
 // Parameters for a resource request.
 IPC_STRUCT_BEGIN(ResourceHostMsg_Request)
   // The request method: GET, POST, etc.
   IPC_STRUCT_MEMBER(std::string, method)
 
   // The requested URL.
   IPC_STRUCT_MEMBER(GURL, url)
 
   // Usually the URL of the document in the top-level window, which may be
   // checked by the third-party cookie blocking policy. Leaving it empty may
@@ skipping 49 matching lines @@
   IPC_STRUCT_MEMBER(int64, parent_frame_id)
 
   IPC_STRUCT_MEMBER(content::PageTransition, transition_type)
 IPC_STRUCT_END()
 
 // Resource messages sent from the browser to the renderer.
 
 // Sent when the headers are available for a resource request.
 IPC_MESSAGE_ROUTED2(ResourceMsg_ReceivedResponse,
                     int /* request_id */,
-                    ResourceResponseHead)
+                    content::ResourceResponseHead)
 
 // Sent when cached metadata from a resource request is ready.
 IPC_MESSAGE_ROUTED2(ResourceMsg_ReceivedCachedMetadata,
                     int /* request_id */,
                     std::vector<char> /* data */)
 
 // Sent as upload progress is being made.
 IPC_MESSAGE_ROUTED3(ResourceMsg_UploadProgress,
                     int /* request_id */,
                     int64 /* position */,
                     int64 /* size */)
 
 // Sent when the request has been redirected.  The receiver is expected to
 // respond with either a FollowRedirect message (if the redirect is to be
 // followed) or a CancelRequest message (if it should not be followed).
 IPC_MESSAGE_ROUTED3(ResourceMsg_ReceivedRedirect,
                     int /* request_id */,
                     GURL /* new_url */,
-                    ResourceResponseHead)
+                    content::ResourceResponseHead)
 
 // Sent when some data from a resource request is ready. The handle should
 // already be mapped into the process that receives this message.
 IPC_MESSAGE_ROUTED4(ResourceMsg_DataReceived,
                     int /* request_id */,
                     base::SharedMemoryHandle /* data */,
                     int /* data_len */,
                     int /* encoded_data_length */)
 
 // Sent when some data from a resource request has been downloaded to
@@ skipping 32 matching lines @@
 // as the parameter.
 IPC_MESSAGE_ROUTED3(ResourceHostMsg_FollowRedirect,
                     int /* request_id */,
                     bool /* has_new_first_party_for_cookies */,
                     GURL /* new_first_party_for_cookies */)
 
 // Makes a synchronous resource request via the browser.
 IPC_SYNC_MESSAGE_ROUTED2_1(ResourceHostMsg_SyncLoad,
                            int /* request_id */,
                            ResourceHostMsg_Request,
-                           SyncLoadResult)
+                           content::SyncLoadResult)
 
 // Sent when the renderer process is done processing a DataReceived
 // message.
 IPC_MESSAGE_ROUTED1(ResourceHostMsg_DataReceived_ACK,
                     int /* request_id */)
 
 // Sent when the renderer has processed a DataDownloaded message.
 IPC_MESSAGE_ROUTED1(ResourceHostMsg_DataDownloaded_ACK,
                     int /* request_id */)
 
 // Sent by the renderer process to acknowledge receipt of a
 // UploadProgress message.
 IPC_MESSAGE_ROUTED1(ResourceHostMsg_UploadProgress_ACK,
                     int /* request_id */)
 
 // Sent when the renderer process deletes a resource loader.
 IPC_MESSAGE_CONTROL1(ResourceHostMsg_ReleaseDownloadedFile,
                      int /* request_id */)