Split net::UploadData into two: for IPC and for upload handling

content/common/resource_messages.h

 // Copyright (c) 2012 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/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"
+#include "webkit/glue/resource_request_body.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_MEMBER(request_start)
   IPC_STRUCT_TRAITS_MEMBER(response_start)
@@ skipping 64 matching lines @@
   // object).
   IPC_STRUCT_MEMBER(ResourceType::Type, resource_type)
 
   // Used by plugin->browser requests to get the correct net::URLRequestContext.
   IPC_STRUCT_MEMBER(uint32, request_context)
 
   // Indicates which frame (or worker context) the request is being loaded into,
   // or kNoHostId.
   IPC_STRUCT_MEMBER(int, appcache_host_id)
 
-  // Optional upload data (may be null).
-  IPC_STRUCT_MEMBER(scoped_refptr<net::UploadData>, upload_data)
+  // Optional resource request body (may be null).
+  IPC_STRUCT_MEMBER(scoped_refptr<webkit_glue::ResourceRequestBody>,
+                    request_body)
 
   IPC_STRUCT_MEMBER(bool, download_to_file)
 
   // True if the request was user initiated.
   IPC_STRUCT_MEMBER(bool, has_user_gesture)
 
   // True if |frame_id| is the main frame of a RenderView.
   IPC_STRUCT_MEMBER(bool, is_main_frame)
 
   // Identifies the frame within the RenderView that sent the request.
@@ skipping 102 matching lines @@
                     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 */)