Let IndexedDBContextImpl create its own task runner

content/browser/indexed_db/indexed_db_factory_unittest.cc

 // Copyright 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 <stdint.h>
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/test/test_simple_task_runner.h"
-#include "base/threading/thread_task_runner_handle.h"
+#include "base/test/scoped_task_environment.h"
+#include "base/threading/sequenced_task_runner_handle.h"
 #include "content/browser/indexed_db/indexed_db_connection.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
 #include "content/browser/indexed_db/indexed_db_data_format_version.h"
 #include "content/browser/indexed_db/indexed_db_factory_impl.h"
 #include "content/browser/indexed_db/mock_indexed_db_callbacks.h"
 #include "content/browser/indexed_db/mock_indexed_db_database_callbacks.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "storage/browser/test/mock_quota_manager_proxy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseException.h"
@@ skipping 37 matching lines @@
  private:
   ~MockIDBFactory() override {}
 
   DISALLOW_COPY_AND_ASSIGN(MockIDBFactory);
 };
 
 }  // namespace
 
 class IndexedDBFactoryTest : public testing::Test {
  public:
+  IndexedDBFactoryTest()
+      : scoped_task_environment_(
+            base::test::ScopedTaskEnvironment::MainThreadType::UI),
+        quota_manager_proxy_(new MockQuotaManagerProxy(nullptr, nullptr)) {}
+
   void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
-    task_runner_ = new base::TestSimpleTaskRunner();
-    quota_manager_proxy_ = new MockQuotaManagerProxy(nullptr, nullptr);
-    context_ = new IndexedDBContextImpl(
-        temp_dir_.GetPath(), nullptr /* special_storage_policy */,
-        quota_manager_proxy_.get(), task_runner_.get());
+    context_ = new IndexedDBContextImpl(temp_dir_.GetPath(),
+                                        nullptr /* special_storage_policy */,
+                                        quota_manager_proxy_.get());
+    // Assign current task runner so that methods on factory can be invoked
+    // directly from test bodies.
+    context_->SetTaskRunnerForTesting(base::SequencedTaskRunnerHandle::Get());
     idb_factory_ = new MockIDBFactory(context_.get());
   }
 
   void TearDown() override {
     quota_manager_proxy_->SimulateQuotaManagerDestroyed();
   }
 
  protected:
-  IndexedDBFactoryTest() {}
   MockIDBFactory* factory() const { return idb_factory_.get(); }
   void clear_factory() { idb_factory_ = nullptr; }
   IndexedDBContextImpl* context() const { return context_.get(); }
 
  private:
   base::ScopedTempDir temp_dir_;
-  scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
+  scoped_refptr<MockQuotaManagerProxy> quota_manager_proxy_;
   scoped_refptr<IndexedDBContextImpl> context_;
   scoped_refptr<MockIDBFactory> idb_factory_;
-  scoped_refptr<MockQuotaManagerProxy> quota_manager_proxy_;
   TestBrowserThreadBundle thread_bundle_;
 
   DISALLOW_COPY_AND_ASSIGN(IndexedDBFactoryTest);
 };
 
 TEST_F(IndexedDBFactoryTest, BackingStoreLifetime) {
   const Origin origin1(GURL("http://localhost:81"));
   const Origin origin2(GURL("http://localhost:82"));
 
   base::ScopedTempDir temp_directory;
@@ skipping 120 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(DiskFullFactory);
 };
 
 class LookingForQuotaErrorMockCallbacks : public IndexedDBCallbacks {
  public:
   LookingForQuotaErrorMockCallbacks()
       : IndexedDBCallbacks(nullptr,
                            url::Origin(),
                            nullptr,
-                           base::ThreadTaskRunnerHandle::Get()),
+                           base::SequencedTaskRunnerHandle::Get()),
         error_called_(false) {}
   void OnError(const IndexedDBDatabaseError& error) override {
     error_called_ = true;
     EXPECT_EQ(blink::kWebIDBDatabaseExceptionQuotaError, error.code());
   }
   bool error_called() const { return error_called_; }
 
  private:
   ~LookingForQuotaErrorMockCallbacks() override {}
   bool error_called_;
@@ skipping 340 matching lines @@
     SCOPED_TRACE(test.origin);
     const Origin origin(GURL(test.origin));
     ASSERT_EQ(kWebIDBDataLossNone, try_open(origin, test.open_version_1));
     EXPECT_EQ(test.expected_data_loss, try_open(origin, test.open_version_2));
   }
 }
 
 }  // namespace
 
 }  // namespace content