IndexedDBFactory now ForceCloses databases.

content/browser/indexed_db/indexed_db_factory.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_factory.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "content/browser/indexed_db/indexed_db_backing_store.h"
@@ skipping 72 matching lines @@
     // Scope so that the implicit scoped_refptr<> is freed.
     IndexedDBBackingStoreMap::const_iterator it =
         backing_store_map_.find(origin_url);
     DCHECK(it != backing_store_map_.end());
     ptr = it->second.get();
   }
   return ptr->HasOneRef();
 }
 
 void IndexedDBFactory::ForceClose(const GURL& origin_url) {
+  std::vector<IndexedDBDatabase*> dbs = GetOpenDatabasesForOrigin(origin_url);

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

GetOpenDatabasesForOrigin is documented in the header as "for diagnostics only"
(since it's an O(N) scan). Either we're accepting that and the comment is now
wrong, or we should consider if we want to maintain a multimap as well.

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

I've got the multimap code written in another branch. Are we typically dealing
with enough connections to justify the added complexity? Let me know and I'll
bring the multimap in. At a minimum I need to fix the comment.

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

You're probably right that our numbers are typically low. So adjusting the
comments is probably fine, maybe add a // TODO(cmumford): Consider adding a
multimap here.

+  std::vector<IndexedDBDatabase*>::iterator i;

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

Nit: change i to it or iter

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

Done.

+  for (i = dbs.begin(); i != dbs.end(); ++i) {

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

Nit: No need for braces. The iterator initialization can also be done inside the
for clause to scope the iterator.

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

Done.

+    (*i)->ForceClose();
+  }
+
   if (backing_store_map_.find(origin_url) != backing_store_map_.end())
     ReleaseBackingStore(origin_url, true /* immediate */);
 }
 
 void IndexedDBFactory::ContextDestroyed() {
   // Timers on backing stores hold a reference to this factory. When the
   // context (which nominally owns this factory) is destroyed during thread
   // termination the timers must be stopped so that this factory and the
   // stores can be disposed of.
   for (IndexedDBBackingStoreMap::iterator it = backing_store_map_.begin();
@@ skipping 230 matching lines @@
   for (IndexedDBDatabaseMap::const_iterator it = database_map_.begin();
        it != database_map_.end();
        ++it) {
     if (it->first.first == origin_url)
       result.push_back(it->second);
   }
   return result;
 }
 
 }  // namespace content