Allow closing IndexedDB database before deleting

content/browser/indexed_db/indexed_db_database.cc

 // Copyright (c) 2013 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_database.h"
 
 #include <math.h>
 
 #include <limits>
 #include <set>
@@ skipping 293 matching lines @@
     callbacks_->OnBlocked(db_->metadata_.version);
   }
 
   void OnConnectionClosed(IndexedDBConnection* connection) override {
     if (!db_->connections_.empty())
       return;
     DoDelete();
   }
 
   void DoDelete() {
-    leveldb::Status s =
-        db_->backing_store_->DeleteDatabase(db_->metadata_.name);
+    leveldb::Status s;
+    if (db_->backing_store_)
+      s = db_->backing_store_->DeleteDatabase(db_->metadata_.name);
     if (!s.ok()) {
       // TODO(jsbell): Consider including sanitized leveldb status message.
       IndexedDBDatabaseError error(blink::WebIDBDatabaseExceptionUnknownError,
                                    "Internal error deleting database.");
       callbacks_->OnError(error);
       if (s.IsCorruption()) {
         url::Origin origin = db_->backing_store_->origin();
         db_->backing_store_ = nullptr;
         db_->factory_->HandleBackingStoreCorruption(origin, error);
       }
@@ skipping 1514 matching lines @@
   transaction_count_++;
   transaction_coordinator_.DidCreateTransaction(transaction);
 }
 
 void IndexedDBDatabase::OpenConnection(
     std::unique_ptr<IndexedDBPendingConnection> connection) {
   AppendRequest(base::MakeUnique<OpenRequest>(this, std::move(connection)));
 }
 
 void IndexedDBDatabase::DeleteDatabase(
-    scoped_refptr<IndexedDBCallbacks> callbacks) {
+    scoped_refptr<IndexedDBCallbacks> callbacks,
+    bool force_close) {
   AppendRequest(base::MakeUnique<DeleteRequest>(this, callbacks));
+  // Close the connections only after the request is queued to make sure
+  // the store is still open.
+  if (force_close)
+    ForceClose();
 }
 
 void IndexedDBDatabase::ForceClose() {
   // IndexedDBConnection::ForceClose() may delete this database, so hold ref.
   scoped_refptr<IndexedDBDatabase> protect(this);
   auto it = connections_.begin();
   while (it != connections_.end()) {
     IndexedDBConnection* connection = *it++;
     connection->ForceClose();
   }
@@ skipping 81 matching lines @@
   if (status.IsCorruption()) {
     IndexedDBDatabaseError error(blink::WebIDBDatabaseExceptionUnknownError,
                                  message);
     factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
   } else {
     factory_->HandleBackingStoreFailure(backing_store_->origin());
   }
 }
 
 }  // namespace content