Add the IndexedDBActiveBlobRegistry, currently unused, to enable future blob

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>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "content/browser/indexed_db/indexed_db_callbacks.h"
 #include "content/browser/indexed_db/indexed_db_database.h"
 #include "content/browser/indexed_db/indexed_db_database_callbacks.h"
 #include "content/common/content_export.h"
 #include "url/gurl.h"
 
+namespace base {
+class TaskRunner;
+}
+
 namespace content {
 
 class IndexedDBBackingStore;
 class IndexedDBContextImpl;
 struct IndexedDBPendingConnection;
 
 class CONTENT_EXPORT IndexedDBFactory
     : NON_EXPORTED_BASE(public base::RefCountedThreadSafe<IndexedDBFactory>) {
  public:
   typedef std::multimap<GURL, IndexedDBDatabase*> OriginDBMap;
   typedef OriginDBMap::const_iterator OriginDBMapIterator;
 
   explicit IndexedDBFactory(IndexedDBContextImpl* context);
 
   // Notifications from weak pointers.
   void ReleaseDatabase(const IndexedDBDatabase::Identifier& identifier,
                        bool forcedClose);
 
   void GetDatabaseNames(scoped_refptr<IndexedDBCallbacks> callbacks,
                         const GURL& origin_url,
-                        const base::FilePath& data_directory);
+                        const base::FilePath& data_directory,
+                        base::TaskRunner* task_runner);
   void Open(const base::string16& name,
             const IndexedDBPendingConnection& connection,
             const GURL& origin_url,
-            const base::FilePath& data_directory);
+            const base::FilePath& data_directory,
+            base::TaskRunner* task_runner);
 
   void DeleteDatabase(const base::string16& name,
                       scoped_refptr<IndexedDBCallbacks> callbacks,
                       const GURL& origin_url,
-                      const base::FilePath& data_directory);
+                      const base::FilePath& data_directory,
+                      base::TaskRunner* task_runner);
 
   void HandleBackingStoreFailure(const GURL& origin_url);
 
   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 the IndexedDBActiveBlobRegistry.
+  virtual void ReportOutstandingBlobs(const GURL& origin_url,
+                                      bool blobs_outstanding);
+
   // 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,
-      bool* disk_full);
+      bool* disk_full,
+      base::TaskRunner* task_runner);

[jsbell, 2014/03/25 17:01:17]

Since the factory has a context reference, do we need to plumb the TaskRunner
through the various methods or can factory (or things with a factory reference)
grab it from the context?

[ericu, 2014/04/02 22:27:23]

I pulled it out of the factory param lists.  I did have to do a bit of test
fixup, since now it's pulling the task_runner from further away, but I think
that's not too bad.  However, I haven't exposed the task_runner [or context] on
IDBFactory to remove the parameter to e.g. the backing store, as it would mean
that the backing store tests would be pulling their task_runner from 3 classes
away, and injection for testing would then be a big mess.

[jsbell, 2014/04/02 22:32:42]

That's cool. I hadn't considered injection/testability.

 
   void ReleaseBackingStore(const GURL& origin_url, bool immediate);
   void CloseBackingStore(const GURL& origin_url);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(IndexedDBFactoryTest,
                            BackingStoreReleasedOnForcedClose);
   FRIEND_TEST_ALL_PREFIXES(IndexedDBFactoryTest,
                            BackingStoreReleaseDelayedOnClose);
   FRIEND_TEST_ALL_PREFIXES(IndexedDBFactoryTest, DatabaseFailedOpen);
@@ skipping 23 matching lines @@
   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_;
+  IndexedDBBackingStoreMap backing_stores_with_active_blobs_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_FACTORY_H_