net: Make UploadData::Element an independent class

This is a part of the ongoing refactoring of net::UploadData.
UploadData::Element is renamed to UploadElement and is moved from upload_data.cc/h to upload_element.cc/h.

BUG=None
TEST=net_unittests
TBR=kinuko@chromium.org,darin@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10827425

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152481 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 6 deletions

diff --git a/webkit/blob/blob_storage_controller.cc b/webkit/blob/blob_storage_controller.cc
index 79508fc..6a10811 100644
--- a/webkit/blob/blob_storage_controller.cc
+++ b/webkit/blob/blob_storage_controller.cc
@@ -173,11 +173,11 @@ void BlobStorageController::ResolveBlobReferencesInUploadData(
     net::UploadData* upload_data) {
   DCHECK(upload_data);
 
-  std::vector<net::UploadData::Element>* uploads =
+  std::vector<net::UploadElement>* uploads =
       upload_data->elements_mutable();
-  std::vector<net::UploadData::Element>::iterator iter;
+  std::vector<net::UploadElement>::iterator iter;
   for (iter = uploads->begin(); iter != uploads->end();) {
-    if (iter->type() != net::UploadData::TYPE_BLOB) {
+    if (iter->type() != net::UploadElement::TYPE_BLOB) {
       iter++;
       continue;
     }
@@ -209,7 +209,7 @@ 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, net::UploadElement());
 
       const BlobData::Item& item = blob_data->items().at(i - 1);
       switch (item.type) {
diff --git a/webkit/blob/blob_storage_controller_unittest.cc b/webkit/blob/blob_storage_controller_unittest.cc
index f98f449..ff98e22 100644
--- a/webkit/blob/blob_storage_controller_unittest.cc
+++ b/webkit/blob/blob_storage_controller_unittest.cc
@@ -102,7 +102,7 @@ TEST(BlobStorageControllerTest, ResolveBlobReferencesInUploadData) {
   blob_storage_controller.CloneBlob(blob_url3, blob_url2);
 
   // Setup upload data elements for comparison.
-  UploadData::Element blob_element1, blob_element2;
+  net::UploadElement 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,7 +113,7 @@ TEST(BlobStorageControllerTest, ResolveBlobReferencesInUploadData) {
       blob_data->items().at(1).length,
       blob_data->items().at(1).expected_modification_time);
 
-  UploadData::Element upload_element1, upload_element2;
+  net::UploadElement upload_element1, upload_element2;
   upload_element1.SetToBytes("Hello", 5);
   upload_element2.SetToFilePathRange(
       FilePath(FILE_PATH_LITERAL("foo1.txt")), 0, 20, time2);