Allow closing IndexedDB database before deleting

content/browser/indexed_db/indexed_db_factory_impl.cc

Index: content/browser/indexed_db/indexed_db_factory_impl.cc
diff --git a/content/browser/indexed_db/indexed_db_factory_impl.cc b/content/browser/indexed_db/indexed_db_factory_impl.cc
index f25989dcfa1326f4a3ccdd6a467d431ed6aa1bfe..8299cec8d82dccfd1370dd4685bab43aa2e19a27 100644
--- a/content/browser/indexed_db/indexed_db_factory_impl.cc
+++ b/content/browser/indexed_db/indexed_db_factory_impl.cc
@@ -213,14 +213,15 @@ void IndexedDBFactoryImpl::DeleteDatabase(
     scoped_refptr<net::URLRequestContextGetter> request_context_getter,
     scoped_refptr<IndexedDBCallbacks> callbacks,
     const Origin& origin,
-    const base::FilePath& data_directory) {
+    const base::FilePath& data_directory,
+    bool force_close) {
   IDB_TRACE("IndexedDBFactoryImpl::DeleteDatabase");
   IndexedDBDatabase::Identifier unique_identifier(origin, name);
   const auto& it = database_map_.find(unique_identifier);
   if (it != database_map_.end()) {
     // If there are any connections to the database, directly delete the
     // database.
-    it->second->DeleteDatabase(callbacks);
+    it->second->DeleteDatabase(callbacks, force_close);
     return;
   }
 
@@ -282,7 +283,7 @@ void IndexedDBFactoryImpl::DeleteDatabase(
 
   database_map_[unique_identifier] = database.get();
   origin_dbs_.insert(std::make_pair(origin, database.get()));
-  database->DeleteDatabase(callbacks);
+  database->DeleteDatabase(callbacks, false /* force_close */);

[jsbell, 2017/01/20 23:33:40]

Reading this CL it's a little weird to see false passed here when a seemingly
equivalent flag was passed in to this method. It makes sense with more context
(i.e. that if there were any connections we never would have made it this far,
so the flag becomes a no-op).

What do you think about either adding a comment, an assertion (e.g.
DCHECK_EQ(database->ConnectionCount(), 0), or just passing the force_close flag
(even though it's a no-op)?

[eostroukhov, 2017/01/23 19:22:21]

I changed the code to pass the flag on.

   RemoveDatabaseFromMaps(unique_identifier);
   database = NULL;
   backing_store = NULL;