Use TaskScheduler instead of SequencedWorkerPool in sequenced_task_runner_handle_unittest.cc.

base/threading/sequenced_task_runner_handle_unittest.cc

Index: base/threading/sequenced_task_runner_handle_unittest.cc
diff --git a/base/threading/sequenced_task_runner_handle_unittest.cc b/base/threading/sequenced_task_runner_handle_unittest.cc
index 6f4948a3e7314b44e6ddbbd9eaaaf3b2807470b3..4a8f248f8e561dd2fec4254345ac182473c215f2 100644
--- a/base/threading/sequenced_task_runner_handle_unittest.cc
+++ b/base/threading/sequenced_task_runner_handle_unittest.cc
@@ -10,15 +10,13 @@
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/sequence_checker_impl.h"
 #include "base/sequenced_task_runner.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/test/sequenced_worker_pool_owner.h"
+#include "base/task_scheduler/post_task.h"
+#include "base/test/scoped_task_environment.h"
 #include "base/test/test_simple_task_runner.h"
-#include "base/threading/sequenced_worker_pool.h"
-#include "base/threading/simple_thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -29,8 +27,8 @@ class SequencedTaskRunnerHandleTest : public ::testing::Test {
  protected:
   // Verifies that the context it runs on has a SequencedTaskRunnerHandle
   // and that posting to it results in the posted task running in that same
-  // context (sequence). Runs |callback| on sequence when done.
-  static void VerifyCurrentSequencedTaskRunner(const Closure& callback) {
+  // context (sequence).
+  static void VerifyCurrentSequencedTaskRunner() {
     ASSERT_TRUE(SequencedTaskRunnerHandle::IsSet());
     scoped_refptr<SequencedTaskRunner> task_runner =
         SequencedTaskRunnerHandle::Get();
@@ -42,7 +40,7 @@ class SequencedTaskRunnerHandleTest : public ::testing::Test {
     task_runner->PostTask(
         FROM_HERE,
         base::BindOnce(&SequencedTaskRunnerHandleTest::CheckValidSequence,
-                       base::Passed(&sequence_checker), callback));
+                       base::Passed(&sequence_checker)));
   }
 
   // Verifies that there is no SequencedTaskRunnerHandle in the context it runs.
@@ -52,49 +50,32 @@ class SequencedTaskRunnerHandleTest : public ::testing::Test {
     callback.Run();
   }
 
- private:
   static void CheckValidSequence(
-      std::unique_ptr<SequenceCheckerImpl> sequence_checker,
-      const Closure& callback) {
+      std::unique_ptr<SequenceCheckerImpl> sequence_checker) {
     EXPECT_TRUE(sequence_checker->CalledOnValidSequence());
-    callback.Run();
   }
 
-  MessageLoop message_loop_;
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
 };
 
 TEST_F(SequencedTaskRunnerHandleTest, FromMessageLoop) {
-  RunLoop run_loop;
-  VerifyCurrentSequencedTaskRunner(run_loop.QuitClosure());
-  run_loop.Run();
+  VerifyCurrentSequencedTaskRunner();
+  RunLoop().RunUntilIdle();
 }
 
 TEST_F(SequencedTaskRunnerHandleTest, FromSequencedWorkerPoolTask) {

[gab, 2017/05/12 18:23:58]

rename test

[fdoray, 2017/05/15 13:20:15]

Done.

-  // Wrap the SequencedWorkerPool to avoid leaks due to its asynchronous
-  // destruction.
-  SequencedWorkerPoolOwner owner(3, "Test");
-  WaitableEvent event(WaitableEvent::ResetPolicy::AUTOMATIC,
-                      WaitableEvent::InitialState::NOT_SIGNALED);
-  owner.pool()->PostSequencedWorkerTask(
-      owner.pool()->GetSequenceToken(), FROM_HERE,
+  base::CreateSequencedTaskRunnerWithTraits({})->PostTask(
+      FROM_HERE,
       base::BindOnce(
-          &SequencedTaskRunnerHandleTest::VerifyCurrentSequencedTaskRunner,
-          base::Bind(&WaitableEvent::Signal, base::Unretained(&event))));
-  event.Wait();
+          &SequencedTaskRunnerHandleTest::VerifyCurrentSequencedTaskRunner));
+  scoped_task_environment_.RunUntilIdle();
 }
 
 TEST_F(SequencedTaskRunnerHandleTest, NoHandleFromUnsequencedTask) {
-  // Wrap the SequencedWorkerPool to avoid leaks due to its asynchronous
-  // destruction.
-  SequencedWorkerPoolOwner owner(3, "Test");
-  WaitableEvent event(WaitableEvent::ResetPolicy::AUTOMATIC,
-                      WaitableEvent::InitialState::NOT_SIGNALED);
-  owner.pool()->PostWorkerTask(
-      FROM_HERE,
-      base::BindOnce(
-          &SequencedTaskRunnerHandleTest::VerifyNoSequencedTaskRunner,
-          base::Bind(&WaitableEvent::Signal, base::Unretained(&event))));
-  event.Wait();
+  base::PostTask(FROM_HERE, base::BindOnce([]() {
+                   EXPECT_FALSE(SequencedTaskRunnerHandle::IsSet());
+                 }));
+  scoped_task_environment_.RunUntilIdle();
 }
 
 TEST(SequencedTaskRunnerHandleTestWithoutMessageLoop, FromHandleInScope) {