Some changes to support incognito mode, and some small cleanup.

content/browser/indexed_db/indexed_db_callbacks.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 "content/browser/indexed_db/indexed_db_callbacks.h"
 
 #include <algorithm>
 
 #include "base/guid.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 168 matching lines @@
       ipc_object_id,
       IndexedDBDispatcherHost::ConvertMetadata(metadata)));
   dispatcher_host_ = NULL;
 }
 
 static std::string CreateBlobData(
     const IndexedDBBlobInfo& blob_info,
     scoped_refptr<IndexedDBDispatcherHost> dispatcher_host,
     webkit_blob::BlobStorageContext* blob_storage_context,
     base::TaskRunner* task_runner) {
+  std::string uuid = blob_info.uuid();
+  if (!uuid.empty()) {
+    // We're sending back a live blob, not a reference into our backing store.
+    scoped_ptr<webkit_blob::BlobDataHandle> blob_data_handle(
+        blob_storage_context->GetBlobDataFromUUID(uuid));
+    dispatcher_host->HoldBlobDataHandle(uuid, blob_data_handle);
+    return uuid;
+  }
   scoped_refptr<ShareableFileReference> shareable_file =
       ShareableFileReference::Get(blob_info.file_path());
   if (!shareable_file.get()) {
     shareable_file = ShareableFileReference::GetOrCreate(
         blob_info.file_path(),
         ShareableFileReference::DONT_DELETE_ON_FINAL_RELEASE,
         task_runner);
-    shareable_file->AddFinalReleaseCallback(blob_info.release_callback());
+    if (!blob_info.release_callback().is_null())
+      shareable_file->AddFinalReleaseCallback(blob_info.release_callback());
   }
 
-  std::string uuid(base::GenerateGUID());
+  uuid = base::GenerateGUID();
   scoped_refptr<webkit_blob::BlobData> blob_data =
       new webkit_blob::BlobData(uuid);
   blob_data->AppendFile(
       blob_info.file_path(), 0, blob_info.size(), blob_info.last_modified());
   scoped_ptr<webkit_blob::BlobDataHandle> blob_data_handle(
       blob_storage_context->AddFinishedBlob(blob_data.get()));
   dispatcher_host->HoldBlobDataHandle(uuid, blob_data_handle);
 
   return uuid;
 }
@@ skipping 53 matching lines @@
     std::vector<IndexedDBMsg_BlobOrFileInfo>* blob_or_file_info) {
   for (std::vector<IndexedDBBlobInfo>::const_iterator iter = blob_info.begin();
        iter != blob_info.end();
        ++iter) {
     if (iter->is_file()) {
       IndexedDBMsg_BlobOrFileInfo info;
       info.is_file = true;
       info.mime_type = iter->type();
       info.file_name = iter->file_name();
       info.file_path = iter->file_path().AsUTF16Unsafe();
-      DCHECK_NE(-1, iter->size());
       info.size = iter->size();
       info.last_modified = iter->last_modified().ToDoubleT();
       blob_or_file_info->push_back(info);
     } else {
       IndexedDBMsg_BlobOrFileInfo info;
       info.mime_type = iter->type();
       info.size = iter->size();
       blob_or_file_info->push_back(info);
     }
   }
 }
 
 void IndexedDBCallbacks::RegisterBlobsAndSend(
     const std::vector<IndexedDBBlobInfo>& blob_info,
     const base::Closure& callback) {
   std::vector<IndexedDBBlobInfo>::const_iterator iter;
   for (iter = blob_info.begin(); iter != blob_info.end(); ++iter) {
-    iter->mark_used_callback().Run();
+    if (!iter->mark_used_callback().is_null())
+      iter->mark_used_callback().Run();
   }
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, callback);
 }
 
 void IndexedDBCallbacks::OnSuccess(scoped_refptr<IndexedDBCursor> cursor,
                                    const IndexedDBKey& key,
                                    const IndexedDBKey& primary_key,
                                    IndexedDBValue* value) {
   DCHECK(dispatcher_host_.get());
@@ skipping 122 matching lines @@
   std::vector<IndexedDBValue>::iterator iter = values.begin();
   for (size_t i = 0; iter != values.end(); ++iter, ++i) {
     values_bits[i].swap(iter->bits);
     if (iter->blob_info.size()) {
       found_blob_info = true;
       FillInBlobData(iter->blob_info, &values_blob_infos[i]);
       std::vector<IndexedDBBlobInfo>::const_iterator blob_iter;
       for (blob_iter = iter->blob_info.begin();
            blob_iter != iter->blob_info.end();
            ++blob_iter) {
-        blob_iter->mark_used_callback().Run();
+        if (!blob_iter->mark_used_callback().is_null())
+          blob_iter->mark_used_callback().Run();
       }
     }
   }
 
   if (found_blob_info) {
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(BlobLookupForCursorPrefetch,
                    base::Owned(params.release()),
@@ skipping 112 matching lines @@
   DCHECK_EQ(kNoDatabase, ipc_database_id_);
   DCHECK_EQ(kNoDatabaseCallbacks, ipc_database_callbacks_id_);
   DCHECK_EQ(blink::WebIDBDataLossNone, data_loss_);
 
   dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessUndefined(
       ipc_thread_id_, ipc_callbacks_id_));
   dispatcher_host_ = NULL;
 }
 
 }  // namespace content