[Storage] Blob items are now shared between blobs. Ready for disk swap.

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"
@@ skipping 91 matching lines @@
     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_ptr<BlobDataBuilder> blob_data_builder(
         new BlobDataBuilder(blob_id0));
     scoped_ptr<BlobDataHandle> handle1 =
-        blob_storage_context.AddFinishedBlob(*blob_data_builder.get());
+        blob_storage_context.AddFinishedBlob(blob_data_builder.get());
 
     const std::string blob_id1("id-1");
-    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);
+    blob_data_builder.reset(
+        BlobDataBuilder::Create(blob_id1)
+            ->AppendData("BlobData")
+            ->AppendFile(base::FilePath(FILE_PATH_LITERAL("BlobFile.txt")), 0,
+                         20, time1));
     scoped_ptr<BlobDataHandle> handle2 =
-        blob_storage_context.AddFinishedBlob(*blob_data_builder.get());
+        blob_storage_context.AddFinishedBlob(blob_data_builder.get());
 
     // Setup upload data elements for comparison.
     auto blob_data = blob_data_builder->BuildSnapshot();
     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_element2.SetToFilePathRange(
         blob_data->items().at(1)->path(), blob_data->items().at(1)->offset(),
@@ skipping 178 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