[BlobAsync] Asynchronous Blob Construction Final Patch

storage/browser/blob/view_blob_internals_job.cc

 // Copyright (c) 2012 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 "storage/browser/blob/view_blob_internals_job.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/format_macros.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/url_request/url_request.h"
+#include "storage/browser/blob/blob_data_item.h"
 #include "storage/browser/blob/blob_storage_context.h"
+#include "storage/browser/blob/blob_storage_registry.h"
 #include "storage/browser/blob/internal_blob_data.h"
 
 namespace {
 
 const char kEmptyBlobStorageMessage[] = "No available blob data.";
 const char kContentType[] = "Content Type: ";
 const char kContentDisposition[] = "Content Disposition: ";
 const char kCount[] = "Count: ";
 const char kIndex[] = "Index: ";
 const char kType[] = "Type: ";
@@ skipping 97 matching lines @@
 int ViewBlobInternalsJob::GetData(
     std::string* mime_type,
     std::string* charset,
     std::string* data,
     const net::CompletionCallback& callback) const {
   mime_type->assign("text/html");
   charset->assign("UTF-8");
 
   data->clear();
   StartHTML(data);
-  if (blob_storage_context_->blob_map_.empty())
+  if (blob_storage_context_->registry_.blob_map_.empty())
     data->append(kEmptyBlobStorageMessage);
   else
     GenerateHTML(data);
   EndHTML(data);
   return net::OK;
 }
 
 void ViewBlobInternalsJob::GenerateHTML(std::string* out) const {
-  for (BlobStorageContext::BlobMap::const_iterator iter =
-           blob_storage_context_->blob_map_.begin();
-       iter != blob_storage_context_->blob_map_.end();
-       ++iter) {
+  for (BlobStorageRegistry::BlobMap::const_iterator iter =
+           blob_storage_context_->registry_.blob_map_.begin();
+       iter != blob_storage_context_->registry_.blob_map_.end(); ++iter) {
     AddHTMLBoldText(iter->first, out);
-    GenerateHTMLForBlobData(*iter->second->data, iter->second->refcount, out);
+    GenerateHTMLForBlobData(*iter->second->data, iter->second->content_type,
+                            iter->second->content_disposition,
+                            iter->second->refcount, out);
   }
-  if (!blob_storage_context_->public_blob_urls_.empty()) {
+  if (!blob_storage_context_->registry_.url_to_uuid_.empty()) {
     AddHorizontalRule(out);
-    for (BlobStorageContext::BlobURLMap::const_iterator iter =
-             blob_storage_context_->public_blob_urls_.begin();
-         iter != blob_storage_context_->public_blob_urls_.end();
-         ++iter) {
+    for (BlobStorageRegistry::URLMap::const_iterator iter =
+             blob_storage_context_->registry_.url_to_uuid_.begin();
+         iter != blob_storage_context_->registry_.url_to_uuid_.end(); ++iter) {
       AddHTMLBoldText(iter->first.spec(), out);
       StartHTMLList(out);
       AddHTMLListItem(kUUID, iter->second, out);
       EndHTMLList(out);
     }
   }
 }
 
 void ViewBlobInternalsJob::GenerateHTMLForBlobData(
     const InternalBlobData& blob_data,
+    const std::string& content_type,
+    const std::string& content_disposition,
     int refcount,
     std::string* out) {
   StartHTMLList(out);
 
   AddHTMLListItem(kRefcount, base::IntToString(refcount), out);
-  if (!blob_data.content_type().empty())
-    AddHTMLListItem(kContentType, blob_data.content_type(), out);
-  if (!blob_data.content_disposition().empty())
-    AddHTMLListItem(kContentDisposition, blob_data.content_disposition(), out);
+  if (!content_type.empty())
+    AddHTMLListItem(kContentType, content_type, out);
+  if (!content_disposition.empty())
+    AddHTMLListItem(kContentDisposition, content_disposition, out);
 
   bool has_multi_items = blob_data.items().size() > 1;
   if (has_multi_items) {
     AddHTMLListItem(kCount,
         base::UTF16ToUTF8(base::FormatNumber(blob_data.items().size())), out);
   }
 
   for (size_t i = 0; i < blob_data.items().size(); ++i) {
     if (has_multi_items) {
       AddHTMLListItem(kIndex, base::UTF16ToUTF8(base::FormatNumber(i)), out);
@@ skipping 49 matching lines @@
     }
 
     if (has_multi_items)
       EndHTMLList(out);
   }
 
   EndHTMLList(out);
 }
 
 }  // namespace storage