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

base/sequence_checker_unittest.cc

Index: base/sequence_checker_unittest.cc
diff --git a/base/sequence_checker_unittest.cc b/base/sequence_checker_unittest.cc
index 86e9298d9792d342af895805e237d42d917988c7..d6aca659d66f4967cbbdefc1e9cc33b9df6f2048 100644
--- a/base/sequence_checker_unittest.cc
+++ b/base/sequence_checker_unittest.cc
@@ -12,8 +12,8 @@
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
+#include "base/sequence_and_task_token.h"
 #include "base/sequence_checker_impl.h"
-#include "base/sequence_token.h"
 #include "base/single_thread_task_runner.h"
 #include "base/test/sequenced_worker_pool_owner.h"
 #include "base/threading/simple_thread.h"
@@ -79,8 +79,8 @@ void ExpectCalledOnValidSequence(SequenceCheckerImpl* sequence_checker) {
 void ExpectCalledOnValidSequenceWithSequenceToken(
     SequenceCheckerImpl* sequence_checker,
     SequenceToken sequence_token) {
-  ScopedSetSequenceTokenForCurrentThread
-      scoped_set_sequence_token_for_current_thread(sequence_token);
+  ScopedSetSequenceAndTaskTokenForCurrentThread
+      scoped_set_sequence_and_task_token_for_current_thread(sequence_token);
   ExpectCalledOnValidSequence(sequence_checker);
 }
 
@@ -97,8 +97,9 @@ TEST_F(SequenceCheckerTest, CallsAllowedOnSameThreadNoSequenceToken) {
 }
 
 TEST_F(SequenceCheckerTest, CallsAllowedOnSameThreadSameSequenceToken) {
-  ScopedSetSequenceTokenForCurrentThread
-      scoped_set_sequence_token_for_current_thread(SequenceToken::Create());
+  ScopedSetSequenceAndTaskTokenForCurrentThread
+      scoped_set_sequence_and_task_token_for_current_thread(
+          SequenceToken::Create());
   SequenceCheckerImpl sequence_checker;
   EXPECT_TRUE(sequence_checker.CalledOnValidSequence());
 }
@@ -112,8 +113,8 @@ TEST_F(SequenceCheckerTest, CallsDisallowedOnDifferentThreadsNoSequenceToken) {
 TEST_F(SequenceCheckerTest, CallsAllowedOnDifferentThreadsSameSequenceToken) {
   const SequenceToken sequence_token(SequenceToken::Create());
 
-  ScopedSetSequenceTokenForCurrentThread
-      scoped_set_sequence_token_for_current_thread(sequence_token);
+  ScopedSetSequenceAndTaskTokenForCurrentThread
+      scoped_set_sequence_and_task_token_for_current_thread(sequence_token);
   SequenceCheckerImpl sequence_checker;
   EXPECT_TRUE(sequence_checker.CalledOnValidSequence());
 
@@ -125,15 +126,17 @@ TEST_F(SequenceCheckerTest, CallsDisallowedOnSameThreadDifferentSequenceToken) {
   std::unique_ptr<SequenceCheckerImpl> sequence_checker;
 
   {
-    ScopedSetSequenceTokenForCurrentThread
-        scoped_set_sequence_token_for_current_thread(SequenceToken::Create());
+    ScopedSetSequenceAndTaskTokenForCurrentThread
+        scoped_set_sequence_and_task_token_for_current_thread(
+            SequenceToken::Create());
     sequence_checker.reset(new SequenceCheckerImpl);
   }
 
   {
     // Different SequenceToken.
-    ScopedSetSequenceTokenForCurrentThread
-        scoped_set_sequence_token_for_current_thread(SequenceToken::Create());
+    ScopedSetSequenceAndTaskTokenForCurrentThread
+        scoped_set_sequence_and_task_token_for_current_thread(
+            SequenceToken::Create());
     EXPECT_FALSE(sequence_checker->CalledOnValidSequence());
   }
 
@@ -145,8 +148,9 @@ TEST_F(SequenceCheckerTest, DetachFromSequence) {
   std::unique_ptr<SequenceCheckerImpl> sequence_checker;
 
   {
-    ScopedSetSequenceTokenForCurrentThread
-        scoped_set_sequence_token_for_current_thread(SequenceToken::Create());
+    ScopedSetSequenceAndTaskTokenForCurrentThread
+        scoped_set_sequence_and_task_token_for_current_thread(
+            SequenceToken::Create());
     sequence_checker.reset(new SequenceCheckerImpl);
   }
 
@@ -155,8 +159,9 @@ TEST_F(SequenceCheckerTest, DetachFromSequence) {
   {
     // Verify that CalledOnValidSequence() returns true when called with
     // a different sequence token after a call to DetachFromSequence().
-    ScopedSetSequenceTokenForCurrentThread
-        scoped_set_sequence_token_for_current_thread(SequenceToken::Create());
+    ScopedSetSequenceAndTaskTokenForCurrentThread
+        scoped_set_sequence_and_task_token_for_current_thread(
+            SequenceToken::Create());
     EXPECT_TRUE(sequence_checker->CalledOnValidSequence());
   }
 }