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

webkit/blob/blob_storage_controller_unittest.cc

Index: webkit/blob/blob_storage_controller_unittest.cc
diff --git a/webkit/blob/blob_storage_controller_unittest.cc b/webkit/blob/blob_storage_controller_unittest.cc
index f98f449a205d530281074fce246c855a40851174..ea9b4c2d0c51226c6646dff2ab5ad405c6f5c2a2 100644
--- a/webkit/blob/blob_storage_controller_unittest.cc
+++ b/webkit/blob/blob_storage_controller_unittest.cc
@@ -10,8 +10,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/blob/blob_data.h"
 #include "webkit/blob/blob_storage_controller.h"
-
-using net::UploadData;
+#include "webkit/glue/webupload_data.h"
 
 namespace webkit_blob {
 
@@ -102,7 +101,7 @@ TEST(BlobStorageControllerTest, ResolveBlobReferencesInUploadData) {
   blob_storage_controller.CloneBlob(blob_url3, blob_url2);
 
   // Setup upload data elements for comparison.
-  UploadData::Element blob_element1, blob_element2;
+  WebUploadData::Element blob_element1, blob_element2;
   blob_element1.SetToBytes(
       blob_data->items().at(0).data.c_str() +
           static_cast<int>(blob_data->items().at(0).offset),
@@ -113,13 +112,13 @@ TEST(BlobStorageControllerTest, ResolveBlobReferencesInUploadData) {
       blob_data->items().at(1).length,
       blob_data->items().at(1).expected_modification_time);
 
-  UploadData::Element upload_element1, upload_element2;
+  WebUploadData::Element upload_element1, upload_element2;
   upload_element1.SetToBytes("Hello", 5);
   upload_element2.SetToFilePathRange(
       FilePath(FILE_PATH_LITERAL("foo1.txt")), 0, 20, time2);
 
   // Test no blob reference.
-  scoped_refptr<UploadData> upload_data(new UploadData());
+  scoped_refptr<WebUploadData> upload_data(new WebUploadData());
   upload_data->AppendBytes(
       &upload_element1.bytes().at(0),
       upload_element1.bytes().size());
@@ -135,14 +134,14 @@ TEST(BlobStorageControllerTest, ResolveBlobReferencesInUploadData) {
   EXPECT_TRUE(upload_data->elements()->at(1) == upload_element2);
 
   // Test having only one blob reference that refers to empty blob data.
-  upload_data = new UploadData();
+  upload_data = new WebUploadData();
   upload_data->AppendBlob(blob_url0);
 
   blob_storage_controller.ResolveBlobReferencesInUploadData(upload_data.get());
   ASSERT_EQ(upload_data->elements()->size(), 0U);
 
   // Test having only one blob reference.
-  upload_data = new UploadData();
+  upload_data = new WebUploadData();
   upload_data->AppendBlob(blob_url1);
 
   blob_storage_controller.ResolveBlobReferencesInUploadData(upload_data.get());
@@ -151,7 +150,7 @@ TEST(BlobStorageControllerTest, ResolveBlobReferencesInUploadData) {
   EXPECT_TRUE(upload_data->elements()->at(1) == blob_element2);
 
   // Test having one blob reference at the beginning.
-  upload_data = new UploadData();
+  upload_data = new WebUploadData();
   upload_data->AppendBlob(blob_url1);
   upload_data->AppendBytes(
       &upload_element1.bytes().at(0),
@@ -170,7 +169,7 @@ TEST(BlobStorageControllerTest, ResolveBlobReferencesInUploadData) {
   EXPECT_TRUE(upload_data->elements()->at(3) == upload_element2);
 
   // Test having one blob reference at the end.
-  upload_data = new UploadData();
+  upload_data = new WebUploadData();
   upload_data->AppendBytes(
       &upload_element1.bytes().at(0),
       upload_element1.bytes().size());
@@ -189,7 +188,7 @@ TEST(BlobStorageControllerTest, ResolveBlobReferencesInUploadData) {
   EXPECT_TRUE(upload_data->elements()->at(3) == blob_element2);
 
   // Test having one blob reference in the middle.
-  upload_data = new UploadData();
+  upload_data = new WebUploadData();
   upload_data->AppendBytes(
       &upload_element1.bytes().at(0),
       upload_element1.bytes().size());
@@ -208,7 +207,7 @@ TEST(BlobStorageControllerTest, ResolveBlobReferencesInUploadData) {
   EXPECT_TRUE(upload_data->elements()->at(3) == upload_element2);
 
   // Test having multiple blob references.
-  upload_data = new UploadData();
+  upload_data = new WebUploadData();
   upload_data->AppendBlob(blob_url1);
   upload_data->AppendBytes(
       &upload_element1.bytes().at(0),