[Storage] Blob Storage Refactoring pt 1

content/browser/loader/upload_data_stream_builder_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/loader/upload_data_stream_builder.h"
 
 #include <algorithm>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "content/common/resource_request_body.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/base/upload_data_stream.h"
 #include "net/base/upload_file_element_reader.h"
 #include "storage/browser/blob/blob_storage_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
-using storage::BlobData;
-using storage::BlobDataHandle;
+using storage::BlobDataBuilder;
+using storage::BlobDataSnapshotHandle;
 using storage::BlobStorageContext;
 
 namespace content {
 namespace {
 
 bool AreElementsEqual(const net::UploadElementReader& reader,
                       const ResourceRequestBody::Element& element) {
   switch(element.type()) {
     case ResourceRequestBody::Element::TYPE_BYTES: {
       const net::UploadBytesElementReader* bytes_reader =
@@ skipping 63 matching lines @@
   base::MessageLoop message_loop;
   {
     // 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);
 
     BlobStorageContext blob_storage_context;
 
     const std::string blob_id0("id-0");
-    scoped_refptr<BlobData> blob_data(new BlobData(blob_id0));
-    scoped_ptr<BlobDataHandle> handle1 =
-        blob_storage_context.AddFinishedBlob(blob_data.get());
+    scoped_ptr<BlobDataBuilder> blob_data_builder(
+        new BlobDataBuilder(blob_id0));
+    scoped_ptr<BlobDataSnapshotHandle> handle1 =
+        blob_storage_context.AddFinishedBlob(*blob_data_builder.get());
 
     const std::string blob_id1("id-1");
-    blob_data = new BlobData(blob_id1);
-    blob_data->AppendData("BlobData");
-    blob_data->AppendFile(
+    blob_data_builder.reset(new BlobDataBuilder(blob_id1));
+    blob_data_builder->AppendData("BlobData");
+    blob_data_builder->AppendFile(
         base::FilePath(FILE_PATH_LITERAL("BlobFile.txt")), 0, 20, time1);
-    scoped_ptr<BlobDataHandle> handle2 =
-        blob_storage_context.AddFinishedBlob(blob_data.get());
+    scoped_ptr<BlobDataSnapshotHandle> handle2 =
+        blob_storage_context.AddFinishedBlob(*blob_data_builder.get());
 
     // Setup upload data elements for comparison.
+    auto blob_data = blob_data_builder->Build();
     ResourceRequestBody::Element blob_element1, blob_element2;
     blob_element1.SetToBytes(
-        blob_data->items().at(0).bytes() +
-        static_cast<int>(blob_data->items().at(0).offset()),
-        static_cast<int>(blob_data->items().at(0).length()));
+        blob_data->items().at(0)->bytes() +
+            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).path(),
-        blob_data->items().at(1).offset(),
-        blob_data->items().at(1).length(),
-        blob_data->items().at(1).expected_modification_time());
+        blob_data->items().at(1)->path(), blob_data->items().at(1)->offset(),
+        blob_data->items().at(1)->length(),
+        blob_data->items().at(1)->expected_modification_time());
 
     ResourceRequestBody::Element upload_element1, upload_element2;
     upload_element1.SetToBytes("Hello", 5);
     upload_element2.SetToFilePathRange(
         base::FilePath(FILE_PATH_LITERAL("foo1.txt")), 0, 20, time2);
 
     // Test no blob reference.
     scoped_refptr<ResourceRequestBody> request_body(new ResourceRequestBody());
     request_body->AppendBytes(
         upload_element1.bytes(),
@@ skipping 166 matching lines @@
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[6], blob_element2));
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[7], upload_element2));
   }
   // Clean up for ASAN.
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace content