Create blobs from Disk Cache entries.

content/browser/loader/upload_data_stream_builder.cc

Index: content/browser/loader/upload_data_stream_builder.cc
diff --git a/content/browser/loader/upload_data_stream_builder.cc b/content/browser/loader/upload_data_stream_builder.cc
index c497c16c0a769ea50c20469ba1fc44e47708dc31..ee62a1a07b9367995f0769ffec95e39325f1aace 100644
--- a/content/browser/loader/upload_data_stream_builder.cc
+++ b/content/browser/loader/upload_data_stream_builder.cc
@@ -4,16 +4,23 @@
 
 #include "content/browser/loader/upload_data_stream_builder.h"
 
+#include <utility>
+
 #include "base/logging.h"
 #include "content/browser/fileapi/upload_file_system_file_element_reader.h"
 #include "content/common/resource_request_body.h"
 #include "net/base/elements_upload_data_stream.h"
 #include "net/base/upload_bytes_element_reader.h"
+#include "net/base/upload_disk_cache_entry_element_reader.h"
 #include "net/base/upload_file_element_reader.h"
 #include "storage/browser/blob/blob_data_handle.h"
 #include "storage/browser/blob/blob_data_snapshot.h"
 #include "storage/browser/blob/blob_storage_context.h"
 
+namespace disk_cache {
+class Entry;
+}
+
 namespace content {
 namespace {
 
@@ -60,11 +67,35 @@ class FileElementReader : public net::UploadFileElementReader {
   DISALLOW_COPY_AND_ASSIGN(FileElementReader);
 };
 
+class DiskCacheElementReader : public net::UploadDiskCacheEntryElementReader {

[mmenke, 2015/06/17 19:11:15]

We have a short comment on the others.  Worth commenting on this one, too?

[gavinp, 2015/06/18 18:50:54]

Done. Comment recapitulates the next line of code less than the other ones at
the cost of being less verbose.

+ public:
+  DiskCacheElementReader(ResourceRequestBody* resource_request_body,
+                         disk_cache::Entry* disk_cache_entry,
+                         int disk_cache_stream_index,
+                         const ResourceRequestBody::Element& element)
+      : net::UploadDiskCacheEntryElementReader(disk_cache_entry,
+                                               disk_cache_stream_index,
+                                               element.offset(),
+                                               element.length()),
+        resource_request_body_(resource_request_body) {
+    DCHECK_EQ(ResourceRequestBody::Element::TYPE_DISK_CACHE_ENTRY,
+              element.type());
+  }
+
+  ~DiskCacheElementReader() override {}
+
+ private:
+  scoped_refptr<ResourceRequestBody> resource_request_body_;

[mmenke, 2015/06/17 19:11:15]

Need to include base/ref_counted.h (Pre-existing problem)

[gavinp, 2015/06/18 18:50:54]

Done.

+
+  DISALLOW_COPY_AND_ASSIGN(DiskCacheElementReader);
+};
+
 void ResolveBlobReference(
     ResourceRequestBody* body,
     storage::BlobStorageContext* blob_context,
     const ResourceRequestBody::Element& element,
-    std::vector<const ResourceRequestBody::Element*>* resolved_elements) {
+    std::vector<std::pair<const ResourceRequestBody::Element*,
+                          const storage::BlobDataItem*>>* resolved_elements) {
   DCHECK(blob_context);
   scoped_ptr<storage::BlobDataHandle> handle =
       blob_context->GetBlobDataFromUUID(element.blob_uuid());
@@ -84,7 +115,8 @@ void ResolveBlobReference(
   // Append the elements in the referenced blob data.
   for (const auto& item : snapshot->items()) {
     DCHECK_NE(storage::DataElement::TYPE_BLOB, item->type());
-    resolved_elements->push_back(item->data_element_ptr());
+    resolved_elements->push_back(
+        std::make_pair(item->data_element_ptr(), item.get()));
   }
   const void* key = snapshot.get();
   body->SetUserData(key, snapshot.release());
@@ -97,19 +129,26 @@ scoped_ptr<net::UploadDataStream> UploadDataStreamBuilder::Build(
     storage::BlobStorageContext* blob_context,
     storage::FileSystemContext* file_system_context,
     base::TaskRunner* file_task_runner) {
+

[mmenke, 2015/06/17 19:11:15]

optional nit:  I've seen senior people discourage blank lines at the start of
methods.

[gavinp, 2015/06/18 18:50:54]

Done. I agree with those people discouraging this.

   // Resolve all blob elements.
-  std::vector<const ResourceRequestBody::Element*> resolved_elements;
+  std::vector<std::pair<const ResourceRequestBody::Element*,
+                        const storage::BlobDataItem*>> resolved_elements;

[mmenke, 2015/06/17 19:11:15]

Old issue, but should include <vector>

[gavinp, 2015/06/18 18:50:54]

Done.

   for (size_t i = 0; i < body->elements()->size(); ++i) {
     const ResourceRequestBody::Element& element = (*body->elements())[i];
-    if (element.type() == ResourceRequestBody::Element::TYPE_BLOB)
+    if (element.type() == ResourceRequestBody::Element::TYPE_BLOB) {
       ResolveBlobReference(body, blob_context, element, &resolved_elements);
-    else
-      resolved_elements.push_back(&element);
+    } else if (element.type() !=
+               ResourceRequestBody::Element::TYPE_DISK_CACHE_ENTRY) {
+      resolved_elements.push_back(std::make_pair(&element, nullptr));
+    } else {
+      NOTREACHED();
+    }
   }
 
   ScopedVector<net::UploadElementReader> element_readers;
-  for (size_t i = 0; i < resolved_elements.size(); ++i) {
-    const ResourceRequestBody::Element& element = *resolved_elements[i];
+  for (const auto& element_and_blob_item_pair : resolved_elements) {
+    const ResourceRequestBody::Element& element =
+        *element_and_blob_item_pair.first;
     switch (element.type()) {
       case ResourceRequestBody::Element::TYPE_BYTES:
         element_readers.push_back(new BytesElementReader(body, element));
@@ -135,6 +174,17 @@ scoped_ptr<net::UploadDataStream> UploadDataStreamBuilder::Build(
         // TODO(dmurph): Create blob reader and store the snapshot in there.
         NOTREACHED();
         break;
+      case ResourceRequestBody::Element::TYPE_DISK_CACHE_ENTRY: {

[mmenke, 2015/06/17 19:11:15]

There's a notreached for this case in the first loop, so if we ever have this
type of element in the list, we won't even add it to resolved_elements, will we?

The test is passing, so I guess I must be missing something?

[gavinp, 2015/06/18 18:50:54]

Yes. There was a long chat between me and michaeln about this issue in a few
earlier revisions of this patch that you can find. The path that I think you
might be missing is that if a DataElement passed to
UploadDataStreamBuilder::Build() is of TYPE_BLOB, it not directly inserted into
|resolved_elements|, instead it's resolved by ResolveBlobReference(). That path
will find the DataElement as well as the BlobDataItem.

[mmenke, 2015/06/18 20:49:05]

Ah...yea.  Just unexpected that a blob is both an element type, and a container
of sub element types.

+        // TODO(gavinp): If Build() is called with a DataElement of
+        // TYPE_DISK_CACHE_ENTRY then this code won't work because we won't call
+        // ResolveBlobReference() and so we won't find |item|. Is this OK?
+        const storage::BlobDataItem* item = element_and_blob_item_pair.second;

[mmenke, 2015/06/17 19:11:16]

element_and_blob_item_pair.second is never populated, is it?

+        element_readers.push_back(
+            new DiskCacheElementReader(body, item->disk_cache_entry(),
+                                       item->disk_cache_stream_index(),
+                                       element));
+        break;
+        }

[mmenke, 2015/06/17 19:11:15]

nit:  -2 indent for the close brace.

[gavinp, 2015/06/18 18:50:54]

Done.

       case ResourceRequestBody::Element::TYPE_UNKNOWN:
         NOTREACHED();
         break;