IndexedDB: Fixed support for empty blobs.

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 292 matching lines @@
         *(*upload->GetElementReaders())[5], blob_element1));
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[6], blob_element2));
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[7], upload_element2));
   }
   // Clean up for ASAN.
   base::RunLoop().RunUntilIdle();
 }
 
+TEST(UploadDataStreamBuilderTest, CreateUploadDataStreamWithEmptyBlob) {
+  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_ptr<BlobDataBuilder> blob_data_builder(
+        new BlobDataBuilder(blob_id0));
+    scoped_ptr<BlobDataHandle> handle1 =
+        blob_storage_context.AddFinishedBlob(blob_data_builder.get());
+
+    const std::string blob_id1("id-1");
+    const std::string kBlobData = "";
+    blob_data_builder.reset(new BlobDataBuilder(blob_id1));
+    blob_data_builder->AppendData(kBlobData);
+    blob_data_builder->AppendFile(
+        base::FilePath(FILE_PATH_LITERAL("BlobFile.txt")), 0, 20, time1);
+    scoped_ptr<BlobDataHandle> handle2 =
+        blob_storage_context.AddFinishedBlob(blob_data_builder.get());
+
+    ResourceRequestBody::Element blob_element1, blob_element2;
+    blob_element1.SetToBytes(kBlobData.c_str(), kBlobData.size());
+    blob_element2.SetToFilePathRange(
+        base::FilePath(FILE_PATH_LITERAL("BlobFile.txt")), 0, 20, time1);
+
+    scoped_refptr<ResourceRequestBody> request_body(new ResourceRequestBody());
+    scoped_ptr<net::UploadDataStream> upload(UploadDataStreamBuilder::Build(
+        request_body.get(), &blob_storage_context, NULL,
+        base::MessageLoopProxy::current().get()));
+
+    request_body = new ResourceRequestBody();
+    request_body->AppendBlob(blob_id1);
+    request_body->AppendBlob(blob_id1);
+    request_body->AppendBlob(blob_id1);
+
+    upload = UploadDataStreamBuilder::Build(
+        request_body.get(), &blob_storage_context, NULL,
+        base::MessageLoopProxy::current().get());
+    ASSERT_TRUE(upload->GetElementReaders());
+    ASSERT_EQ(6U, upload->GetElementReaders()->size());
+    EXPECT_TRUE(
+        AreElementsEqual(*(*upload->GetElementReaders())[0], blob_element1));

[jsbell, 2015/03/06 18:28:50]

Make a local reference to this to avoid the repeated
(*upload->GetElementReaders()) ?

+    EXPECT_TRUE(
+        AreElementsEqual(*(*upload->GetElementReaders())[1], blob_element2));
+    EXPECT_TRUE(
+        AreElementsEqual(*(*upload->GetElementReaders())[2], blob_element1));
+    EXPECT_TRUE(
+        AreElementsEqual(*(*upload->GetElementReaders())[3], blob_element2));
+    EXPECT_TRUE(
+        AreElementsEqual(*(*upload->GetElementReaders())[4], blob_element1));
+    EXPECT_TRUE(
+        AreElementsEqual(*(*upload->GetElementReaders())[5], blob_element2));
+  }
+  // Clean up for ASAN.
+  base::RunLoop().RunUntilIdle();
+}
 }  // namespace content