IndexedDBFactory now ForceCloses databases.

content/browser/indexed_db/indexed_db_context_impl.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_context_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 317 matching lines @@
     origin_size_map_.erase(origin_url);
     space_available_map_.erase(origin_url);
   }
 }
 
 void IndexedDBContextImpl::ForceClose(const GURL origin_url) {
   DCHECK(TaskRunner()->RunsTasksOnCurrentThread());
   if (data_path_.empty() || !IsInOriginSet(origin_url))
     return;
 
-  if (connections_.find(origin_url) != connections_.end()) {
-    ConnectionSet& connections = connections_[origin_url];
-    ConnectionSet::iterator it = connections.begin();
-    while (it != connections.end()) {
-      // Remove before closing so callbacks don't double-erase
-      IndexedDBConnection* connection = *it;
-      DCHECK(connection->IsConnected());
-      connections.erase(it++);
-      connection->ForceClose();
-    }
-    DCHECK_EQ(connections_[origin_url].size(), 0UL);

[jsbell, 2013/12/20 00:24:42]

Maybe replace this with DCHECK_EQ(0UL, GetConnectionCount(origin_url)) for now?

[cmumford, 2013/12/20 18:09:26]

You mean to take that DCHECK_EQ and move it to after the call to
factory_->ForceClose()? I'll give that a try.

[jsbell, 2013/12/20 18:22:56]

Yep, that's what I was thinking.

-    connections_.erase(origin_url);
-  }
   if (factory_)
     factory_->ForceClose(origin_url);
 }
 
 size_t IndexedDBContextImpl::GetConnectionCount(const GURL& origin_url) {
   DCHECK(TaskRunner()->RunsTasksOnCurrentThread());
   if (data_path_.empty() || !IsInOriginSet(origin_url))
     return 0;
 
   if (connections_.find(origin_url) == connections_.end())
@@ skipping 220 matching lines @@
   origin_set_.reset();
   origin_size_map_.clear();
   space_available_map_.clear();
 }
 
 base::TaskRunner* IndexedDBContextImpl::TaskRunner() const {
   return task_runner_;
 }
 
 }  // namespace content