Track which IndexedDBBackingStores have been opened since boot.

content/browser/indexed_db/indexed_db_factory.cc

Index: content/browser/indexed_db/indexed_db_factory.cc
diff --git a/content/browser/indexed_db/indexed_db_factory.cc b/content/browser/indexed_db/indexed_db_factory.cc
index 663be9da0b0d435fec3cbccd723e298f25173df9..bf6e0b9dfd5bb3272381499e4ea931fd7fbd228e 100644
--- a/content/browser/indexed_db/indexed_db_factory.cc
+++ b/content/browser/indexed_db/indexed_db_factory.cc
@@ -171,7 +171,8 @@ void IndexedDBFactory::ReportOutstandingBlobs(const GURL& origin_url,
 void IndexedDBFactory::GetDatabaseNames(
     scoped_refptr<IndexedDBCallbacks> callbacks,
     const GURL& origin_url,
-    const base::FilePath& data_directory) {
+    const base::FilePath& data_directory,
+    net::URLRequestContext* request_context) {
   IDB_TRACE("IndexedDBFactory::GetDatabaseNames");
   // TODO(dgrogan): Plumb data_loss back to script eventually?
   blink::WebIDBDataLoss data_loss;
@@ -180,7 +181,7 @@ void IndexedDBFactory::GetDatabaseNames(
   scoped_refptr<IndexedDBBackingStore> backing_store =
       OpenBackingStore(origin_url,
                        data_directory,
-                       NULL /* request_context */,
+                       request_context,
                        &data_loss,
                        &data_loss_message,
                        &disk_full);
@@ -317,6 +318,25 @@ bool IndexedDBFactory::IsBackingStorePendingClose(const GURL& origin_url)
   return it->second->close_timer()->IsRunning();
 }
 
+scoped_refptr<IndexedDBBackingStore> IndexedDBFactory::OpenBackingStoreHelper(

[cmumford, 2014/04/29 16:08:34]

I'm missing the point of this function.

[ericu, 2014/04/29 18:24:19]

Ah, sorry--there's no actual point in this CL.  It's needed a couple of CLs from
now to enable mocking out part of the backend for testing.  I should have
mentioned that in the CL description.

I'm putting it in this CL because 1) I can split it off from a later, larger CL;
2) I'm mucking with the parameters to all these constructors, and that makes
merging messy while I've got multiple CLs in flight at the same time.  If you
prefer, I can push this change back to the CL that needs it, but I think that's
going to be the really big one at the end.

+    const GURL& origin_url,
+    const base::FilePath& data_directory,
+    net::URLRequestContext* request_context,
+    blink::WebIDBDataLoss* data_loss,
+    std::string* data_loss_message,
+    bool* disk_full,
+    bool first_time) {
+  return IndexedDBBackingStore::Open(this,
+                                     origin_url,
+                                     data_directory,
+                                     request_context,
+                                     data_loss,
+                                     data_loss_message,
+                                     disk_full,
+                                     context_->TaskRunner(),
+                                     first_time);
+}
+
 scoped_refptr<IndexedDBBackingStore> IndexedDBFactory::OpenBackingStore(
     const GURL& origin_url,
     const base::FilePath& data_directory,
@@ -333,20 +353,25 @@ scoped_refptr<IndexedDBBackingStore> IndexedDBFactory::OpenBackingStore(
   }
 
   scoped_refptr<IndexedDBBackingStore> backing_store;
+  bool first_time = false;
   if (open_in_memory) {
     backing_store =
         IndexedDBBackingStore::OpenInMemory(origin_url, context_->TaskRunner());
   } else {
-    backing_store = IndexedDBBackingStore::Open(this,
-                                                origin_url,
-                                                data_directory,
-                                                data_loss,
-                                                data_loss_message,
-                                                disk_full,
-                                                context_->TaskRunner());
+    first_time = !backends_opened_since_boot_.count(origin_url);
+
+    backing_store = OpenBackingStoreHelper(origin_url,
+                                           data_directory,
+                                           request_context,
+                                           data_loss,
+                                           data_loss_message,
+                                           disk_full,
+                                           first_time);
   }
 
   if (backing_store.get()) {
+    if (first_time)
+      backends_opened_since_boot_.insert(origin_url);

[cmumford, 2014/04/29 16:08:34]

If this is already a set why calculate/pass the first_time param? Why not just
let the set (backends_opened_since_boot_) do that by it's intrinsic nature?

[ericu, 2014/04/29 18:24:19]

I don't understand the question.  Do you mean why not just always call insert,
or why use a temporary variable instead of just passing
!backends_opened_since_boot_.count(origin_url)?  The former's a tiny
optimization [possibly unnecessary] and I think the latter makes the code a
little more readable.

     backing_store_map_[origin_url] = backing_store;
     // If an in-memory database, bind lifetime to this factory instance.
     if (open_in_memory)