Let IndexedDBContextImpl create its own task runner

content/browser/indexed_db/indexed_db_context_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_CONTEXT_IMPL_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_CONTEXT_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/indexed_db/indexed_db_factory.h"
 #include "content/public/browser/indexed_db_context.h"
+#include "storage/browser/quota/quota_manager_proxy.h"
+#include "storage/browser/quota/special_storage_policy.h"
 #include "storage/common/quota/quota_types.h"
 #include "url/gurl.h"
 
 namespace base {
 class ListValue;
 class FilePath;
 class SequencedTaskRunner;
 }
 
-namespace storage {
-class QuotaManagerProxy;
-class SpecialStoragePolicy;
-}
-
 namespace url {
 class Origin;
 }
 
 namespace content {
 
 class IndexedDBConnection;
 
 class CONTENT_EXPORT IndexedDBContextImpl
     : NON_EXPORTED_BASE(public IndexedDBContext) {
  public:
   // Recorded in histograms, so append only.
   enum ForceCloseReason {
     FORCE_CLOSE_DELETE_ORIGIN = 0,
     FORCE_CLOSE_BACKING_STORE_FAILURE,
     FORCE_CLOSE_INTERNALS_PAGE,
     FORCE_CLOSE_COPY_ORIGIN,
     FORCE_CLOSE_REASON_MAX
   };
 
   // The indexed db directory.
   static const base::FilePath::CharType kIndexedDBDirectory[];
 
   // If |data_path| is empty, nothing will be saved to disk.
-  IndexedDBContextImpl(const base::FilePath& data_path,
-                       storage::SpecialStoragePolicy* special_storage_policy,
-                       storage::QuotaManagerProxy* quota_manager_proxy,
-                       scoped_refptr<base::SequencedTaskRunner> task_runner);
+  IndexedDBContextImpl(
+      const base::FilePath& data_path,
+      scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy,
+      scoped_refptr<storage::QuotaManagerProxy> quota_manager_proxy);
 
   IndexedDBFactory* GetIDBFactory();
 
   // Disables the exit-time deletion of session-only data.
   void SetForceKeepSessionState() { force_keep_session_state_ = true; }
 
   // IndexedDBContext implementation:
   base::SequencedTaskRunner* TaskRunner() const override;
   std::vector<IndexedDBInfo> GetAllOriginsInfo() override;
   int64_t GetOriginDiskUsage(const GURL& origin_url) override;
   void DeleteForOrigin(const GURL& origin_url) override;
   void CopyOriginData(const GURL& origin_url,
                       IndexedDBContext* dest_context) override;
   base::FilePath GetFilePathForTesting(const GURL& origin_url) const override;
-  void SetTaskRunnerForTesting(base::SequencedTaskRunner* task_runner) override;
+  void ResetCachesForTesting() override;
 
   // TODO(jsbell): Replace IndexedDBContext members with these.
   int64_t GetOriginDiskUsage(const url::Origin& origin);
   void DeleteForOrigin(const url::Origin& origin);
   void CopyOriginData(const url::Origin& origin,
                       IndexedDBContext* dest_context);
   base::FilePath GetFilePathForTesting(const url::Origin& origin) const;
 
   // Methods called by IndexedDBDispatcherHost for quota support.
   void ConnectionOpened(const url::Origin& origin, IndexedDBConnection* db);
@@ skipping 20 matching lines @@
   // owning object.
   void ForceClose(const url::Origin origin, ForceCloseReason reason);
   // GetStoragePaths returns all paths owned by this database, in arbitrary
   // order.
   std::vector<base::FilePath> GetStoragePaths(const url::Origin& origin) const;
 
   base::FilePath data_path() const { return data_path_; }
   size_t GetConnectionCount(const url::Origin& origin);
   int GetOriginBlobFileCount(const url::Origin& origin);
 
+  // TODO(jsbell): Update tests to eliminate the need for this.
+  void SetTaskRunnerForTesting(
+      scoped_refptr<base::SequencedTaskRunner> task_runner);
+
   // For unit tests allow to override the |data_path_|.
   void set_data_path_for_testing(const base::FilePath& data_path) {
     data_path_ = data_path;
   }
 
   bool is_incognito() const { return data_path_.empty(); }
 
  protected:
   ~IndexedDBContextImpl() override;
 
@@ skipping 15 matching lines @@
   base::Time GetOriginLastModified(const url::Origin& origin);
 
   std::set<url::Origin>* GetOriginSet();
   bool AddToOriginSet(const url::Origin& origin) {
     return GetOriginSet()->insert(origin).second;
   }
   void RemoveFromOriginSet(const url::Origin& origin) {
     GetOriginSet()->erase(origin);
   }
 
-  // Only for testing.
-  void ResetCaches();
-
   scoped_refptr<IndexedDBFactory> factory_;
   base::FilePath data_path_;
   // If true, nothing (not even session-only data) should be deleted on exit.
   bool force_keep_session_state_;
   scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy_;
   scoped_refptr<storage::QuotaManagerProxy> quota_manager_proxy_;
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
   std::unique_ptr<std::set<url::Origin>> origin_set_;
   std::map<url::Origin, int64_t> origin_size_map_;
 
   DISALLOW_COPY_AND_ASSIGN(IndexedDBContextImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_CONTEXT_IMPL_H_