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

webkit/tools/test_shell/simple_resource_loader_bridge.cc

Index: webkit/tools/test_shell/simple_resource_loader_bridge.cc
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index 106defad66030fd9701d0ed1164bcd3fe0550dc3..e17159fb28bacd1d4fddd9fa33c9ddc1171872b8 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -69,6 +69,7 @@
 #include "webkit/fileapi/file_system_url_request_job.h"
 #include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/webupload_data.h"
 #include "webkit/tools/test_shell/simple_appcache_system.h"
 #include "webkit/tools/test_shell/simple_file_system.h"
 #include "webkit/tools/test_shell/simple_file_writer.h"
@@ -279,7 +280,7 @@ struct RequestParams {
   ResourceType::Type request_type;
   int appcache_host_id;
   bool download_to_file;
-  scoped_refptr<net::UploadData> upload;
+  scoped_refptr<WebUploadData> upload;
 };
 
 // The interval for calls to RequestProxy::MaybeUpdateUploadProgress
@@ -431,7 +432,9 @@ class RequestProxy
     headers.AddHeadersFromString(params->headers);
     request_->SetExtraRequestHeaders(headers);
     request_->set_load_flags(params->load_flags);
-    request_->set_upload(params->upload.get());
+    scoped_refptr<net::UploadData> upload = new net::UploadData;
+    params->upload->PopulateUploadData(upload.get());
+    request_->set_upload(upload);
     SimpleAppCacheSystem::SetExtraRequestInfo(
         request_.get(), params->appcache_host_id, params->request_type);
 
@@ -877,7 +880,7 @@ class ResourceLoaderBridgeImpl : public ResourceLoaderBridge {
   virtual void AppendDataToUpload(const char* data, int data_len) {
     DCHECK(params_.get());
     if (!params_->upload)
-      params_->upload = new net::UploadData();
+      params_->upload = new WebUploadData();
     params_->upload->AppendBytes(data, data_len);
   }
 
@@ -888,7 +891,7 @@ class ResourceLoaderBridgeImpl : public ResourceLoaderBridge {
       const base::Time& expected_modification_time) {
     DCHECK(params_.get());
     if (!params_->upload)
-      params_->upload = new net::UploadData();
+      params_->upload = new WebUploadData();
     params_->upload->AppendFileRange(file_path, offset, length,
                                      expected_modification_time);
   }
@@ -896,14 +899,14 @@ class ResourceLoaderBridgeImpl : public ResourceLoaderBridge {
   virtual void AppendBlobToUpload(const GURL& blob_url) {
     DCHECK(params_.get());
     if (!params_->upload)
-      params_->upload = new net::UploadData();
+      params_->upload = new WebUploadData();
     params_->upload->AppendBlob(blob_url);
   }
 
   virtual void SetUploadIdentifier(int64 identifier) {
     DCHECK(params_.get());
     if (!params_->upload)
-      params_->upload = new net::UploadData();
+      params_->upload = new WebUploadData();
     params_->upload->set_identifier(identifier);
   }