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

content/common/resource_dispatcher.cc

Index: content/common/resource_dispatcher.cc
diff --git a/content/common/resource_dispatcher.cc b/content/common/resource_dispatcher.cc
index 610d20c8f5822329dd5edb98ea527641b27b9d2a..83afb03dc0fc8a3a3e1cb8a829112af1cf0550d1 100644
--- a/content/common/resource_dispatcher.cc
+++ b/content/common/resource_dispatcher.cc
@@ -20,9 +20,9 @@
 #include "content/public/common/resource_response.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
-#include "net/base/upload_data.h"
 #include "net/http/http_response_headers.h"
 #include "webkit/glue/resource_type.h"
+#include "webkit/glue/webupload_data.h"
 
 using webkit_glue::ResourceLoaderBridge;
 using webkit_glue::ResourceResponseInfo;
@@ -151,7 +151,7 @@ void IPCResourceLoaderBridge::AppendDataToUpload(const char* data,
     return;
 
   if (!request_.upload_data)
-    request_.upload_data = new net::UploadData();
+    request_.upload_data = new WebUploadData();
   request_.upload_data->AppendBytes(data, data_len);
 }
 
@@ -161,7 +161,7 @@ void IPCResourceLoaderBridge::AppendFileRangeToUpload(
   DCHECK(request_id_ == -1) << "request already started";
 
   if (!request_.upload_data)
-    request_.upload_data = new net::UploadData();
+    request_.upload_data = new WebUploadData();
   request_.upload_data->AppendFileRange(path, offset, length,
                                         expected_modification_time);
 }
@@ -170,7 +170,7 @@ void IPCResourceLoaderBridge::AppendBlobToUpload(const GURL& blob_url) {
   DCHECK(request_id_ == -1) << "request already started";
 
   if (!request_.upload_data)
-    request_.upload_data = new net::UploadData();
+    request_.upload_data = new WebUploadData();
   request_.upload_data->AppendBlob(blob_url);
 }
 
@@ -178,7 +178,7 @@ void IPCResourceLoaderBridge::SetUploadIdentifier(int64 identifier) {
   DCHECK(request_id_ == -1) << "request already started";
 
   if (!request_.upload_data)
-    request_.upload_data = new net::UploadData();
+    request_.upload_data = new WebUploadData();
   request_.upload_data->set_identifier(identifier);
 }