IndexedDBFactory now ForceCloses databases.

content/browser/indexed_db/indexed_db_factory.h

 // 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.
 
 #ifndef CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_FACTORY_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_FACTORY_H_
 
 #include <map>
 #include <set>
 
@@ skipping 32 matching lines @@
             const GURL& origin_url,
             const base::FilePath& data_directory);
 
   void DeleteDatabase(const base::string16& name,
                       scoped_refptr<IndexedDBCallbacks> callbacks,
                       const GURL& origin_url,
                       const base::FilePath& data_directory);
 
   void HandleBackingStoreFailure(const GURL& origin_url);
 
-  // Iterates over all databases; for diagnostics only.
-  std::vector<IndexedDBDatabase*> GetOpenDatabasesForOrigin(
-      const GURL& origin_url) const;
+  typedef std::multimap<GURL, IndexedDBDatabase*> OriginDbMap;

[jsbell, 2014/01/03 00:34:25]

Nit: capitalize 'DB' or spell it out (i.e. 'Database')

Nit: typedefs should be the first thing in the public: group -
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Declar...
(The indexeddb code violates this rule all over the place; we need to clean that
up at some point.)

[cmumford, 2014/01/03 21:34:01]

Done.

+  typedef OriginDbMap::const_iterator OriginDbMapIterator;
+  std::pair<OriginDbMapIterator, OriginDbMapIterator>
+      GetOpenDatabasesForOrigin(const GURL& origin_url) const;
 
   // Called by IndexedDBContext after all connections are closed, to
   // ensure the backing store closed immediately.
   void ForceClose(const GURL& origin_url);
 
   // Called by the IndexedDBContext destructor so the factory can do cleanup.
   void ContextDestroyed();
 
   // Called by an IndexedDBDatabase when it is actually deleted.
   void DatabaseDeleted(const IndexedDBDatabase::Identifier& identifier);
 
+  size_t GetConnectionCount(const GURL& origin_url) const;
+
  protected:
   friend class base::RefCountedThreadSafe<IndexedDBFactory>;
 
   virtual ~IndexedDBFactory();
 
   virtual scoped_refptr<IndexedDBBackingStore> OpenBackingStore(
       const GURL& origin_url,
       const base::FilePath& data_directory,
       blink::WebIDBDataLoss* data_loss,
       std::string* data_loss_reason,
@@ skipping 20 matching lines @@
   // Called internally after a database is closed, with some delay. If this
   // factory has the last reference, it will be released.
   void MaybeCloseBackingStore(const GURL& origin_url);
   bool HasLastBackingStoreReference(const GURL& origin_url) const;
 
   // Testing helpers, so unit tests don't need to grovel through internal state.
   bool IsDatabaseOpen(const GURL& origin_url,
                       const base::string16& name) const;
   bool IsBackingStoreOpen(const GURL& origin_url) const;
   bool IsBackingStorePendingClose(const GURL& origin_url) const;
+  void RemoveDatabaseFromMaps(const IndexedDBDatabase::Identifier& identifier);
 
   IndexedDBContextImpl* context_;
 
   typedef std::map<IndexedDBDatabase::Identifier,
                    IndexedDBDatabase*> IndexedDBDatabaseMap;
   IndexedDBDatabaseMap database_map_;
+  OriginDbMap origin_dbs_;
 
   typedef std::map<GURL, scoped_refptr<IndexedDBBackingStore> >
       IndexedDBBackingStoreMap;
   IndexedDBBackingStoreMap backing_store_map_;
 
   std::set<scoped_refptr<IndexedDBBackingStore> > session_only_backing_stores_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_FACTORY_H_