Allow closing IndexedDB database before deleting

content/child/indexed_db/webidbfactory_impl.cc

 // Copyright 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/child/indexed_db/webidbfactory_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "content/child/indexed_db/indexed_db_callbacks_impl.h"
 #include "content/child/indexed_db/indexed_db_database_callbacks_impl.h"
 #include "content/child/storage_util.h"
@@ skipping 27 matching lines @@
   void GetDatabaseNames(std::unique_ptr<IndexedDBCallbacksImpl> callbacks,
                         const url::Origin& origin);
   void Open(const base::string16& name,
             int64_t version,
             int64_t transaction_id,
             std::unique_ptr<IndexedDBCallbacksImpl> callbacks,
             std::unique_ptr<IndexedDBDatabaseCallbacksImpl> database_callbacks,
             const url::Origin& origin);
   void DeleteDatabase(const base::string16& name,
                       std::unique_ptr<IndexedDBCallbacksImpl> callbacks,
-                      const url::Origin& origin);
+                      const url::Origin& origin,
+                      bool force_close);
 
  private:
   scoped_refptr<IPC::SyncMessageFilter> sync_message_filter_;
   FactoryAssociatedPtr service_;
 
   DISALLOW_COPY_AND_ASSIGN(IOThreadHelper);
 };
 
 WebIDBFactoryImpl::WebIDBFactoryImpl(
     scoped_refptr<IPC::SyncMessageFilter> sync_message_filter,
@@ skipping 30 matching lines @@
   io_runner_->PostTask(
       FROM_HERE,
       base::Bind(&IOThreadHelper::Open, base::Unretained(io_helper_),
                  name.utf16(), version, transaction_id,
                  base::Passed(&callbacks_impl),
                  base::Passed(&database_callbacks_impl), url::Origin(origin)));
 }
 
 void WebIDBFactoryImpl::deleteDatabase(const WebString& name,
                                        WebIDBCallbacks* callbacks,
-                                       const WebSecurityOrigin& origin) {
+                                       const WebSecurityOrigin& origin,
+                                       bool force_close) {
   auto callbacks_impl = base::MakeUnique<IndexedDBCallbacksImpl>(
       base::WrapUnique(callbacks), IndexedDBCallbacksImpl::kNoTransaction,
       nullptr, io_runner_);
   io_runner_->PostTask(
       FROM_HERE,
       base::Bind(&IOThreadHelper::DeleteDatabase, base::Unretained(io_helper_),
                  name.utf16(), base::Passed(&callbacks_impl),
-                 url::Origin(origin)));
+                 url::Origin(origin), force_close));
 }
 
 WebIDBFactoryImpl::IOThreadHelper::IOThreadHelper(
     scoped_refptr<IPC::SyncMessageFilter> sync_message_filter)
     : sync_message_filter_(std::move(sync_message_filter)) {}
 
 WebIDBFactoryImpl::IOThreadHelper::~IOThreadHelper() {}
 
 FactoryAssociatedPtr& WebIDBFactoryImpl::IOThreadHelper::GetService() {
   if (!service_)
@@ skipping 37 matching lines @@
     std::unique_ptr<IndexedDBDatabaseCallbacksImpl> database_callbacks,
     const url::Origin& origin) {
   GetService()->Open(GetCallbacksProxy(std::move(callbacks)),
                      GetDatabaseCallbacksProxy(std::move(database_callbacks)),
                      origin, name, version, transaction_id);
 }
 
 void WebIDBFactoryImpl::IOThreadHelper::DeleteDatabase(
     const base::string16& name,
     std::unique_ptr<IndexedDBCallbacksImpl> callbacks,
-    const url::Origin& origin) {
+    const url::Origin& origin,
+    bool force_close) {
   GetService()->DeleteDatabase(GetCallbacksProxy(std::move(callbacks)), origin,
-                               name);
+                               name, force_close);
 }
 
 }  // namespace content