[TaskScheduler] Support TaskRunnerHandles from parallel tasks.

base/task_scheduler/task_tracker_unittest.cc

Index: base/task_scheduler/task_tracker_unittest.cc
diff --git a/base/task_scheduler/task_tracker_unittest.cc b/base/task_scheduler/task_tracker_unittest.cc
index ea924ce89499afe3d48ad2a4789d1d9277047201..de73e50d9b8a7bd4823103c48e66c112a4483b56 100644
--- a/base/task_scheduler/task_tracker_unittest.cc
+++ b/base/task_scheduler/task_tracker_unittest.cc
@@ -19,10 +19,9 @@
 #include "base/task_scheduler/test_utils.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/platform_thread.h"
-#include "base/threading/sequenced_task_runner_handle.h"
 #include "base/threading/simple_thread.h"
+#include "base/threading/task_runner_handle.h"
 #include "base/threading/thread_restrictions.h"
-#include "base/threading/thread_task_runner_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
@@ -336,19 +335,19 @@ static void RunTaskRunnerHandleVerificationTask(TaskTracker* tracker,
 
   // Confirm that the test conditions are right (no TaskRunnerHandles set
   // already).
-  EXPECT_FALSE(ThreadTaskRunnerHandle::IsSet());
-  EXPECT_FALSE(SequencedTaskRunnerHandle::IsSet());
+  EXPECT_FALSE(TaskRunnerHandle::HasSingleThreadTaskScope());
+  EXPECT_FALSE(TaskRunnerHandle::HasSequencedTaskScope());
 
   tracker->RunTask(verify_task);
 
   // TaskRunnerHandle state is reset outside of task's scope.
-  EXPECT_FALSE(ThreadTaskRunnerHandle::IsSet());
-  EXPECT_FALSE(SequencedTaskRunnerHandle::IsSet());
+  EXPECT_FALSE(TaskRunnerHandle::HasSingleThreadTaskScope());
+  EXPECT_FALSE(TaskRunnerHandle::HasSequencedTaskScope());
 }
 
 static void VerifyNoTaskRunnerHandle() {
-  EXPECT_FALSE(ThreadTaskRunnerHandle::IsSet());
-  EXPECT_FALSE(SequencedTaskRunnerHandle::IsSet());
+  EXPECT_FALSE(TaskRunnerHandle::HasSingleThreadTaskScope());
+  EXPECT_FALSE(TaskRunnerHandle::HasSequencedTaskScope());
 }
 
 TEST_P(TaskSchedulerTaskTrackerTest, TaskRunnerHandleIsNotSetOnParallel) {
@@ -361,47 +360,44 @@ TEST_P(TaskSchedulerTaskTrackerTest, TaskRunnerHandleIsNotSetOnParallel) {
   RunTaskRunnerHandleVerificationTask(&tracker_, verify_task.get());
 }
 
-static void VerifySequencedTaskRunnerHandle(
+static void VerifySequencedTaskScope(
     const SequencedTaskRunner* expected_task_runner) {
-  EXPECT_FALSE(ThreadTaskRunnerHandle::IsSet());
-  EXPECT_TRUE(SequencedTaskRunnerHandle::IsSet());
-  EXPECT_EQ(expected_task_runner, SequencedTaskRunnerHandle::Get());
+  EXPECT_FALSE(TaskRunnerHandle::HasSingleThreadTaskScope());
+  EXPECT_TRUE(TaskRunnerHandle::HasSequencedTaskScope());
+  EXPECT_EQ(expected_task_runner, TaskRunnerHandle::GetSequenced());
 }
 
-TEST_P(TaskSchedulerTaskTrackerTest,
-       SequencedTaskRunnerHandleIsSetOnSequenced) {
+TEST_P(TaskSchedulerTaskTrackerTest, SequencedTaskScopeIsSetOnSequenced) {
   scoped_refptr<SequencedTaskRunner> test_task_runner(new TestSimpleTaskRunner);
 
-  // Create a task that will verify that SequencedTaskRunnerHandle is properly
+  // Create a task that will verify that SequencedTaskScope is properly
   // set to |test_task_runner| in its scope per |sequenced_task_runner_ref|
   // being set to it.
-  std::unique_ptr<Task> verify_task(
-      new Task(FROM_HERE, Bind(&VerifySequencedTaskRunnerHandle,
-                               base::Unretained(test_task_runner.get())),
-               TaskTraits().WithShutdownBehavior(GetParam()), TimeDelta()));
+  std::unique_ptr<Task> verify_task(new Task(
+      FROM_HERE,
+      Bind(&VerifySequencedTaskScope, base::Unretained(test_task_runner.get())),
+      TaskTraits().WithShutdownBehavior(GetParam()), TimeDelta()));
   verify_task->sequenced_task_runner_ref = test_task_runner;
 
   RunTaskRunnerHandleVerificationTask(&tracker_, verify_task.get());
 }
 
-static void VerifyThreadTaskRunnerHandle(
+static void VerifySingleThreadTaskScope(
     const SingleThreadTaskRunner* expected_task_runner) {
-  EXPECT_TRUE(ThreadTaskRunnerHandle::IsSet());
-  // SequencedTaskRunnerHandle inherits ThreadTaskRunnerHandle for thread.
-  EXPECT_TRUE(SequencedTaskRunnerHandle::IsSet());
-  EXPECT_EQ(expected_task_runner, ThreadTaskRunnerHandle::Get());
+  EXPECT_TRUE(TaskRunnerHandle::HasSingleThreadTaskScope());
+  EXPECT_TRUE(TaskRunnerHandle::HasSequencedTaskScope());
+  EXPECT_EQ(expected_task_runner, TaskRunnerHandle::GetSingleThreaded());
 }
 
-TEST_P(TaskSchedulerTaskTrackerTest,
-       ThreadTaskRunnerHandleIsSetOnSingleThreaded) {
+TEST_P(TaskSchedulerTaskTrackerTest, SingleThreadTaskScope) {
   scoped_refptr<SingleThreadTaskRunner> test_task_runner(
       new TestSimpleTaskRunner);
 
-  // Create a task that will verify that ThreadTaskRunnerHandle is properly set
+  // Create a task that will verify that SingleThreadTaskScope is properly set
   // to |test_task_runner| in its scope per |single_thread_task_runner_ref|
   // being set on it.
   std::unique_ptr<Task> verify_task(
-      new Task(FROM_HERE, Bind(&VerifyThreadTaskRunnerHandle,
+      new Task(FROM_HERE, Bind(&VerifySingleThreadTaskScope,
                                base::Unretained(test_task_runner.get())),
                TaskTraits().WithShutdownBehavior(GetParam()), TimeDelta()));
   verify_task->single_thread_task_runner_ref = test_task_runner;