Use TaskScheduler instead of SequencedWorkerPool in storage_partition_impl_map.cc.

content/browser/storage_partition_impl_map_unittest.cc

 // 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.
 
 #include "content/browser/storage_partition_impl_map.h"
 
 #include <utility>
 
 #include "base/files/file_util.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "content/public/browser/browser_thread.h"
+#include "base/test/scoped_task_environment.h"
 #include "content/public/test/test_browser_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 // Test that the Less comparison function is implemented properly to uniquely
 // identify storage partitions used as keys in a std::map.
 TEST(StoragePartitionConfigTest, OperatorLess) {
   StoragePartitionImplMap::StoragePartitionConfig c1(
       std::string(), std::string(), false);
@@ skipping 37 matching lines @@
 
   // Check for transitivity.
   EXPECT_TRUE(less(c1, c4));
 
   // Let's enforce that two identical elements obey strict weak ordering.
   EXPECT_TRUE(!less(c1, c2) && !less(c2, c1));
 }
 
 TEST(StoragePartitionImplMapTest, GarbageCollect) {
   TestBrowserContext browser_context;
-  base::MessageLoop message_loop;
+  base::test::ScopedTaskEnvironment scoped_task_environment;
   StoragePartitionImplMap storage_partition_impl_map(&browser_context);
 
   std::unique_ptr<base::hash_set<base::FilePath>> active_paths(
       new base::hash_set<base::FilePath>);
 
   base::FilePath active_path = browser_context.GetPath().Append(
       StoragePartitionImplMap::GetStoragePartitionPath(
           "active", std::string()));
   ASSERT_TRUE(base::CreateDirectory(active_path));
   active_paths->insert(active_path);
 
   base::FilePath inactive_path = browser_context.GetPath().Append(
       StoragePartitionImplMap::GetStoragePartitionPath(
           "inactive", std::string()));
   ASSERT_TRUE(base::CreateDirectory(inactive_path));
 
   base::RunLoop run_loop;
   storage_partition_impl_map.GarbageCollect(std::move(active_paths),
                                             run_loop.QuitClosure());
   run_loop.Run();
-  BrowserThread::GetBlockingPool()->FlushForTesting();
+  scoped_task_environment.RunUntilIdle();
 
   EXPECT_TRUE(base::PathExists(active_path));
   EXPECT_FALSE(base::PathExists(inactive_path));
 }
 
 }  // namespace content