Let IndexedDBContextImpl create its own task runner

content/browser/indexed_db/indexed_db_quota_client_unittest.cc

 // Copyright (c) 2011 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 <map>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
-#include "base/test/test_simple_task_runner.h"
+#include "base/test/scoped_task_environment.h"
+#include "base/threading/sequenced_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
 #include "content/browser/indexed_db/indexed_db_quota_client.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "storage/browser/test/mock_quota_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Declared to shorten the line lengths.
 static const storage::StorageType kTemp = storage::kStorageTypeTemporary;
 static const storage::StorageType kPerm = storage::kStorageTypePersistent;
 
 namespace content {
 
 // Base class for our test fixtures.
 class IndexedDBQuotaClientTest : public testing::Test {
  public:
   const GURL kOriginA;
   const GURL kOriginB;
   const GURL kOriginOther;
 
   IndexedDBQuotaClientTest()
       : kOriginA("http://host"),
         kOriginB("http://host:8000"),
         kOriginOther("http://other"),
         usage_(0),
-        task_runner_(new base::TestSimpleTaskRunner),
+        scoped_task_environment_(
+            base::test::ScopedTaskEnvironment::MainThreadType::UI),
         weak_factory_(this) {
     browser_context_.reset(new TestBrowserContext());
 
     scoped_refptr<storage::QuotaManager> quota_manager =
         new MockQuotaManager(false /*in_memory*/, browser_context_->GetPath(),
                              base::ThreadTaskRunnerHandle::Get(),
-                             base::ThreadTaskRunnerHandle::Get(),
+                             base::SequencedTaskRunnerHandle::Get(),
                              browser_context_->GetSpecialStoragePolicy());
 
-    idb_context_ =
-        new IndexedDBContextImpl(browser_context_->GetPath(),
-                                 browser_context_->GetSpecialStoragePolicy(),
-                                 quota_manager->proxy(),
-                                 task_runner_.get());
+    idb_context_ = new IndexedDBContextImpl(
+        browser_context_->GetPath(),
+        browser_context_->GetSpecialStoragePolicy(), quota_manager->proxy());
     base::RunLoop().RunUntilIdle();
     setup_temp_dir();
   }
 
-  void FlushIndexedDBTaskRunner() { task_runner_->RunUntilIdle(); }
-
   void setup_temp_dir() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     base::FilePath indexeddb_dir =
         temp_dir_.GetPath().Append(IndexedDBContextImpl::kIndexedDBDirectory);
     ASSERT_TRUE(base::CreateDirectory(indexeddb_dir));
     idb_context()->set_data_path_for_testing(indexeddb_dir);
   }
 
   ~IndexedDBQuotaClientTest() override {
-    FlushIndexedDBTaskRunner();
+    scoped_task_environment_.RunUntilIdle();
     idb_context_ = NULL;
     browser_context_.reset();
     base::RunLoop().RunUntilIdle();
   }
 
   int64_t GetOriginUsage(storage::QuotaClient* client,
                          const GURL& origin,
                          storage::StorageType type) {
     usage_ = -1;
     client->GetOriginUsage(
         origin,
         type,
         base::Bind(&IndexedDBQuotaClientTest::OnGetOriginUsageComplete,
                    weak_factory_.GetWeakPtr()));
-    FlushIndexedDBTaskRunner();
-    base::RunLoop().RunUntilIdle();
+    scoped_task_environment_.RunUntilIdle();
     EXPECT_GT(usage_, -1);
     return usage_;
   }
 
   const std::set<GURL>& GetOriginsForType(storage::QuotaClient* client,
                                           storage::StorageType type) {
     origins_.clear();
     client->GetOriginsForType(
         type,
         base::Bind(&IndexedDBQuotaClientTest::OnGetOriginsComplete,
                    weak_factory_.GetWeakPtr()));
-    FlushIndexedDBTaskRunner();
-    base::RunLoop().RunUntilIdle();
+    scoped_task_environment_.RunUntilIdle();
     return origins_;
   }
 
   const std::set<GURL>& GetOriginsForHost(storage::QuotaClient* client,
                                           storage::StorageType type,
                                           const std::string& host) {
     origins_.clear();
     client->GetOriginsForHost(
         type,
         host,
         base::Bind(&IndexedDBQuotaClientTest::OnGetOriginsComplete,
                    weak_factory_.GetWeakPtr()));
-    FlushIndexedDBTaskRunner();
-    base::RunLoop().RunUntilIdle();
+    scoped_task_environment_.RunUntilIdle();
     return origins_;
   }
 
   storage::QuotaStatusCode DeleteOrigin(storage::QuotaClient* client,
                                         const GURL& origin_url) {
     delete_status_ = storage::kQuotaStatusUnknown;
     client->DeleteOriginData(
         origin_url,
         kTemp,
         base::Bind(&IndexedDBQuotaClientTest::OnDeleteOriginComplete,
                    weak_factory_.GetWeakPtr()));
-    FlushIndexedDBTaskRunner();
-    base::RunLoop().RunUntilIdle();
+    scoped_task_environment_.RunUntilIdle();
     return delete_status_;
   }
 
   IndexedDBContextImpl* idb_context() { return idb_context_.get(); }
 
   void SetFileSizeTo(const base::FilePath& path, int size) {
     std::string junk(size, 'a');
     ASSERT_EQ(size, base::WriteFile(path, junk.c_str(), size));
   }
 
@@ skipping 16 matching lines @@
     origins_ = origins;
   }
 
   void OnDeleteOriginComplete(storage::QuotaStatusCode code) {
     delete_status_ = code;
   }
 
   base::ScopedTempDir temp_dir_;
   int64_t usage_;
   std::set<GURL> origins_;
-  scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
   scoped_refptr<IndexedDBContextImpl> idb_context_;
   content::TestBrowserThreadBundle thread_bundle_;
   std::unique_ptr<TestBrowserContext> browser_context_;
   storage::QuotaStatusCode delete_status_;
   base::WeakPtrFactory<IndexedDBQuotaClientTest> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IndexedDBQuotaClientTest);
 };
 
 TEST_F(IndexedDBQuotaClientTest, GetOriginUsage) {
@@ skipping 59 matching lines @@
   EXPECT_EQ(1000, GetOriginUsage(&client, kOriginA, kTemp));
   EXPECT_EQ(50, GetOriginUsage(&client, kOriginB, kTemp));
 
   storage::QuotaStatusCode delete_status = DeleteOrigin(&client, kOriginA);
   EXPECT_EQ(storage::kQuotaStatusOk, delete_status);
   EXPECT_EQ(0, GetOriginUsage(&client, kOriginA, kTemp));
   EXPECT_EQ(50, GetOriginUsage(&client, kOriginB, kTemp));
 }
 
 }  // namespace content