[Storage] Blob Storage Refactoring pt 1

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 376e221d2a6e2ebd8b7f26247ecb6a9b57697a12..c1ec64bbe57787d58cdf60d5649d608a63b69234 100644
--- a/content/browser/loader/upload_data_stream_builder.cc
+++ b/content/browser/loader/upload_data_stream_builder.cc
@@ -12,9 +12,10 @@
 #include "net/base/upload_file_element_reader.h"
 #include "storage/browser/blob/blob_data_handle.h"
 #include "storage/browser/blob/blob_storage_context.h"
+#include "storage/common/blob/blob_data.h"
 
-using storage::BlobData;
-using storage::BlobDataHandle;
+using storage::BlobDataBuilder;

[michaeln, 2015/01/16 00:09:09]

i dont see where this is needed?

[dmurph, 2015/01/16 23:45:56]

Done.

+using storage::BlobDataSnapshotHandle;
 using storage::BlobStorageContext;

[michaeln, 2015/01/16 00:09:09]

i think all usages (except one which is easily changed) are qualified with the
namespace, i'd vote to drop the using declarations

[dmurph, 2015/01/16 23:45:56]

Done.

 
 namespace content {
@@ -68,7 +69,7 @@ void ResolveBlobReference(
     const ResourceRequestBody::Element& element,
     std::vector<const ResourceRequestBody::Element*>* resolved_elements) {
   DCHECK(blob_context);
-  scoped_ptr<storage::BlobDataHandle> handle =
+  scoped_ptr<storage::BlobDataSnapshotHandle> handle =
       blob_context->GetBlobDataFromUUID(element.blob_uuid());
   DCHECK(handle);
   if (!handle)
@@ -79,10 +80,9 @@ void ResolveBlobReference(
     return;
 
   // Append the elements in the referenced blob data.
-  for (size_t i = 0; i < handle->data()->items().size(); ++i) {
-    const BlobData::Item& item = handle->data()->items().at(i);
-    DCHECK_NE(BlobData::Item::TYPE_BLOB, item.type());
-    resolved_elements->push_back(&item);
+  for (const auto& item : handle->data()->items()) {
+    DCHECK_NE(storage::DataElement::TYPE_BLOB, item->type());
+    resolved_elements->push_back(item->data_element_ptr());
   }
 }