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

webkit/blob/blob_storage_controller.cc

Index: webkit/blob/blob_storage_controller.cc
diff --git a/webkit/blob/blob_storage_controller.cc b/webkit/blob/blob_storage_controller.cc
index 79508fc4b39c693edaf6e49f7a21b90db2276f0c..cf9cfb1669740c5d6958d46824da66af8ca26c4e 100644
--- a/webkit/blob/blob_storage_controller.cc
+++ b/webkit/blob/blob_storage_controller.cc
@@ -6,8 +6,8 @@
 
 #include "base/logging.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/upload_data.h"
 #include "webkit/blob/blob_data.h"
+#include "webkit/glue/webupload_data.h"
 
 namespace webkit_blob {
 
@@ -170,14 +170,14 @@ BlobData* BlobStorageController::GetBlobDataFromUrl(const GURL& url) {
 }
 
 void BlobStorageController::ResolveBlobReferencesInUploadData(
-    net::UploadData* upload_data) {
+    WebUploadData* upload_data) {
   DCHECK(upload_data);
 
-  std::vector<net::UploadData::Element>* uploads =
+  std::vector<WebUploadData::Element>* uploads =
       upload_data->elements_mutable();
-  std::vector<net::UploadData::Element>::iterator iter;
+  std::vector<WebUploadData::Element>::iterator iter;
   for (iter = uploads->begin(); iter != uploads->end();) {
-    if (iter->type() != net::UploadData::TYPE_BLOB) {
+    if (iter->type() != WebUploadData::TYPE_BLOB) {
       iter++;
       continue;
     }
@@ -209,14 +209,14 @@ void BlobStorageController::ResolveBlobReferencesInUploadData(
     // Note that we traverse from the bottom so that the elements can be
     // inserted in the original order.
     for (size_t i = blob_data->items().size(); i > 0; --i) {
-      iter = uploads->insert(iter, net::UploadData::Element());
+      iter = uploads->insert(iter, WebUploadData::Element());
 
       const BlobData::Item& item = blob_data->items().at(i - 1);
       switch (item.type) {
         case BlobData::TYPE_DATA:
           // TODO(jianli): Figure out how to avoid copying the data.
           // TODO(michaeln): Now that blob_data surives for the duration,
-          // maybe UploadData could take a raw ptr without having to copy.
+          // maybe WebUploadData could take a raw ptr without having to copy.
           iter->SetToBytes(
               &item.data.at(0) + static_cast<int>(item.offset),
               static_cast<int>(item.length));