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 ff98e221927e64b983413c8b9c5d604cc20b5e07..ecd112b652b98b17c79b65e8eaecd979056fe126 100644
--- a/webkit/blob/blob_storage_controller_unittest.cc
+++ b/webkit/blob/blob_storage_controller_unittest.cc
@@ -6,13 +6,10 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
-#include "net/base/upload_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/blob/blob_data.h"
 #include "webkit/blob/blob_storage_controller.h"
 
-using net::UploadData;
-
 namespace webkit_blob {
 
 TEST(BlobStorageControllerTest, RegisterBlobUrl) {
@@ -76,161 +73,4 @@ TEST(BlobStorageControllerTest, RegisterBlobUrl) {
   EXPECT_TRUE(!blob_data_found);
 }
 
-TEST(BlobStorageControllerTest, ResolveBlobReferencesInUploadData) {
-  // Setup blob data for testing.
-  base::Time time1, time2;
-  base::Time::FromString("Tue, 15 Nov 1994, 12:45:26 GMT", &time1);
-  base::Time::FromString("Mon, 14 Nov 1994, 11:30:49 GMT", &time2);
-
-  BlobStorageController blob_storage_controller;
-  scoped_refptr<BlobData> blob_data(new BlobData());
-
-  GURL blob_url0("blob://url_0");
-  blob_storage_controller.AddFinishedBlob(blob_url0, blob_data);
-
-  blob_data->AppendData("BlobData");
-  blob_data->AppendFile(
-      FilePath(FILE_PATH_LITERAL("BlobFile.txt")), 0, 20, time1);
-
-  GURL blob_url1("blob://url_1");
-  blob_storage_controller.AddFinishedBlob(blob_url1, blob_data);
-
-  GURL blob_url2("blob://url_2");
-  blob_storage_controller.CloneBlob(blob_url2, blob_url1);
-
-  GURL blob_url3("blob://url_3");
-  blob_storage_controller.CloneBlob(blob_url3, blob_url2);
-
-  // Setup upload data elements for comparison.
-  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),
-      static_cast<int>(blob_data->items().at(0).length));
-  blob_element2.SetToFilePathRange(
-      blob_data->items().at(1).file_path,
-      blob_data->items().at(1).offset,
-      blob_data->items().at(1).length,
-      blob_data->items().at(1).expected_modification_time);
-
-  net::UploadElement 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());
-  upload_data->AppendBytes(
-      &upload_element1.bytes().at(0),
-      upload_element1.bytes().size());
-  upload_data->AppendFileRange(
-      upload_element2.file_path(),
-      upload_element2.file_range_offset(),
-      upload_element2.file_range_length(),
-      upload_element2.expected_file_modification_time());
-
-  blob_storage_controller.ResolveBlobReferencesInUploadData(upload_data.get());
-  ASSERT_EQ(upload_data->elements()->size(), 2U);
-  EXPECT_TRUE(upload_data->elements()->at(0) == upload_element1);
-  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->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->AppendBlob(blob_url1);
-
-  blob_storage_controller.ResolveBlobReferencesInUploadData(upload_data.get());
-  ASSERT_EQ(upload_data->elements()->size(), 2U);
-  EXPECT_TRUE(upload_data->elements()->at(0) == blob_element1);
-  EXPECT_TRUE(upload_data->elements()->at(1) == blob_element2);
-
-  // Test having one blob reference at the beginning.
-  upload_data = new UploadData();
-  upload_data->AppendBlob(blob_url1);
-  upload_data->AppendBytes(
-      &upload_element1.bytes().at(0),
-      upload_element1.bytes().size());
-  upload_data->AppendFileRange(
-      upload_element2.file_path(),
-      upload_element2.file_range_offset(),
-      upload_element2.file_range_length(),
-      upload_element2.expected_file_modification_time());
-
-  blob_storage_controller.ResolveBlobReferencesInUploadData(upload_data.get());
-  ASSERT_EQ(upload_data->elements()->size(), 4U);
-  EXPECT_TRUE(upload_data->elements()->at(0) == blob_element1);
-  EXPECT_TRUE(upload_data->elements()->at(1) == blob_element2);
-  EXPECT_TRUE(upload_data->elements()->at(2) == upload_element1);
-  EXPECT_TRUE(upload_data->elements()->at(3) == upload_element2);
-
-  // Test having one blob reference at the end.
-  upload_data = new UploadData();
-  upload_data->AppendBytes(
-      &upload_element1.bytes().at(0),
-      upload_element1.bytes().size());
-  upload_data->AppendFileRange(
-      upload_element2.file_path(),
-      upload_element2.file_range_offset(),
-      upload_element2.file_range_length(),
-      upload_element2.expected_file_modification_time());
-  upload_data->AppendBlob(blob_url1);
-
-  blob_storage_controller.ResolveBlobReferencesInUploadData(upload_data.get());
-  ASSERT_EQ(upload_data->elements()->size(), 4U);
-  EXPECT_TRUE(upload_data->elements()->at(0) == upload_element1);
-  EXPECT_TRUE(upload_data->elements()->at(1) == upload_element2);
-  EXPECT_TRUE(upload_data->elements()->at(2) == blob_element1);
-  EXPECT_TRUE(upload_data->elements()->at(3) == blob_element2);
-
-  // Test having one blob reference in the middle.
-  upload_data = new UploadData();
-  upload_data->AppendBytes(
-      &upload_element1.bytes().at(0),
-      upload_element1.bytes().size());
-  upload_data->AppendBlob(blob_url1);
-  upload_data->AppendFileRange(
-      upload_element2.file_path(),
-      upload_element2.file_range_offset(),
-      upload_element2.file_range_length(),
-      upload_element2.expected_file_modification_time());
-
-  blob_storage_controller.ResolveBlobReferencesInUploadData(upload_data.get());
-  ASSERT_EQ(upload_data->elements()->size(), 4U);
-  EXPECT_TRUE(upload_data->elements()->at(0) == upload_element1);
-  EXPECT_TRUE(upload_data->elements()->at(1) == blob_element1);
-  EXPECT_TRUE(upload_data->elements()->at(2) == blob_element2);
-  EXPECT_TRUE(upload_data->elements()->at(3) == upload_element2);
-
-  // Test having multiple blob references.
-  upload_data = new UploadData();
-  upload_data->AppendBlob(blob_url1);
-  upload_data->AppendBytes(
-      &upload_element1.bytes().at(0),
-      upload_element1.bytes().size());
-  upload_data->AppendBlob(blob_url2);
-  upload_data->AppendBlob(blob_url3);
-  upload_data->AppendFileRange(
-      upload_element2.file_path(),
-      upload_element2.file_range_offset(),
-      upload_element2.file_range_length(),
-      upload_element2.expected_file_modification_time());
-
-  blob_storage_controller.ResolveBlobReferencesInUploadData(upload_data.get());
-  ASSERT_EQ(upload_data->elements()->size(), 8U);
-  EXPECT_TRUE(upload_data->elements()->at(0) == blob_element1);
-  EXPECT_TRUE(upload_data->elements()->at(1) == blob_element2);
-  EXPECT_TRUE(upload_data->elements()->at(2) == upload_element1);
-  EXPECT_TRUE(upload_data->elements()->at(3) == blob_element1);
-  EXPECT_TRUE(upload_data->elements()->at(4) == blob_element2);
-  EXPECT_TRUE(upload_data->elements()->at(5) == blob_element1);
-  EXPECT_TRUE(upload_data->elements()->at(6) == blob_element2);
-  EXPECT_TRUE(upload_data->elements()->at(7) == upload_element2);
-}
-
 }  // namespace webkit_blob