[BlobAsync] Asynchronous Blob Construction Final Patch

storage/browser/blob/blob_storage_registry.cc

 // Copyright 2015 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/blob_storage_registry.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 19 matching lines @@
 GURL ClearBlobUrlRef(const GURL& url) {
   size_t hash_pos = url.spec().find('#');
   if (hash_pos == std::string::npos)
     return url;
   return GURL(url.spec().substr(0, hash_pos));
 }
 
 }  // namespace
 
 BlobStorageRegistry::Entry::Entry(int refcount, BlobState state)
-    : refcount(refcount), state(state), exceeded_memory(false) {}
+    : refcount(refcount), state(state) {}
 
 BlobStorageRegistry::Entry::~Entry() {}
 
 bool BlobStorageRegistry::Entry::TestAndSetState(BlobState expected,
                                                  BlobState set) {
   if (state != expected)
     return false;
   state = set;
   return true;
 }
 
 BlobStorageRegistry::BlobStorageRegistry() {}
 
 BlobStorageRegistry::~BlobStorageRegistry() {
   // Note: We don't bother calling the construction complete callbacks, as we
   // are only being destructed at the end of the life of the browser process.
   // So it shouldn't matter.
 }
 
 BlobStorageRegistry::Entry* BlobStorageRegistry::CreateEntry(
-    const std::string& uuid) {
+    const std::string& uuid,
+    const std::string& content_type,
+    const std::string& content_disposition) {
   DCHECK(!ContainsKey(blob_map_, uuid));
-  Entry* entry = new Entry(1, BlobState::RESERVED);
-  blob_map_.add(uuid, make_scoped_ptr(entry));
-  return entry;
+  scoped_ptr<Entry> entry(new Entry(1, BlobState::PENDING));
+  entry->content_type = content_type;
+  entry->content_disposition = content_disposition;
+  Entry* entry_ptr = entry.get();
+  blob_map_.add(uuid, std::move(entry));
+  return entry_ptr;
 }
 
 bool BlobStorageRegistry::DeleteEntry(const std::string& uuid) {
   return blob_map_.erase(uuid) == 1;
 }
 
+bool BlobStorageRegistry::HasEntry(const std::string& uuid) const {
+  return blob_map_.find(uuid) != blob_map_.end();
+}
+
 BlobStorageRegistry::Entry* BlobStorageRegistry::GetEntry(
     const std::string& uuid) {
   BlobMap::iterator found = blob_map_.find(uuid);
   if (found == blob_map_.end())
     return nullptr;
   return found->second;
 }
 
+const BlobStorageRegistry::Entry* BlobStorageRegistry::GetEntry(
+    const std::string& uuid) const {
+  return const_cast<BlobStorageRegistry*>(this)->GetEntry(uuid);
+}
+
 bool BlobStorageRegistry::CreateUrlMapping(const GURL& blob_url,
                                            const std::string& uuid) {
   DCHECK(!BlobUrlHasRef(blob_url));
   if (blob_map_.find(uuid) == blob_map_.end() || IsURLMapped(blob_url))
     return false;
   url_to_uuid_[blob_url] = uuid;
   return true;
 }
 
 bool BlobStorageRegistry::DeleteURLMapping(const GURL& blob_url,
@@ skipping 19 matching lines @@
       url_to_uuid_.find(BlobUrlHasRef(url) ? ClearBlobUrlRef(url) : url);
   if (found == url_to_uuid_.end())
     return nullptr;
   Entry* entry = GetEntry(found->second);
   if (entry && uuid)
     uuid->assign(found->second);
   return entry;
 }
 
 }  // namespace storage