Make ThreadChecker::CalledOnValidThread() return true when called from the same task.

base/task_scheduler/task_tracker.cc

Index: base/task_scheduler/task_tracker.cc
diff --git a/base/task_scheduler/task_tracker.cc b/base/task_scheduler/task_tracker.cc
index 7de82bfb88dfcbd2f64bd92d1594331dcfe30a09..41451f9a36ca93c51ab8f6e633f39c915b9f1db1 100644
--- a/base/task_scheduler/task_tracker.cc
+++ b/base/task_scheduler/task_tracker.cc
@@ -11,7 +11,7 @@
 #include "base/debug/task_annotator.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
-#include "base/sequence_token.h"
+#include "base/sequence_and_task_token.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ -197,9 +197,10 @@ void TaskTracker::RunNextTaskInSequence(const Sequence* sequence) {
       TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN);
 
   {
-    // Set up SequenceToken as expected for the scope of the task.
-    ScopedSetSequenceTokenForCurrentThread
-        scoped_set_sequence_token_for_current_thread(sequence->token());
+    // Set up SequenceToken and TaskToken as expected for the scope of the task.
+    ScopedSetSequenceAndTaskTokenForCurrentThread
+        scoped_set_sequence_and_task_token_for_current_thread(
+            sequence->token());
 
     // Set up TaskRunnerHandle as expected for the scope of the task.
     std::unique_ptr<SequencedTaskRunnerHandle> sequenced_task_runner_handle;