Nits follow-up to TaskToken CL

base/sequence_token.cc

 // Copyright 2016 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 "base/sequence_token.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/threading/thread_local.h"
 
 namespace base {
 
 namespace {
 
 base::StaticAtomicSequenceNumber g_sequence_token_generator;
 
 base::StaticAtomicSequenceNumber g_task_token_generator;
 
 LazyInstance<ThreadLocalPointer<const SequenceToken>>::Leaky
     tls_current_sequence_token = LAZY_INSTANCE_INITIALIZER;
 
 LazyInstance<ThreadLocalPointer<const TaskToken>>::Leaky
     tls_current_task_token = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 bool SequenceToken::operator==(const SequenceToken& other) const {
-  return token_ == other.token_ && token_ != kInvalidSequenceToken;
+  return token_ == other.token_ && IsValid();
 }
 
 bool SequenceToken::operator!=(const SequenceToken& other) const {
   return !(*this == other);
 }
 
 bool SequenceToken::IsValid() const {
   return token_ != kInvalidSequenceToken;
 }
 
 SequenceToken SequenceToken::Create() {
   return SequenceToken(g_sequence_token_generator.GetNext());
 }
 
 SequenceToken SequenceToken::GetForCurrentThread() {
   const SequenceToken* current_sequence_token =
       tls_current_sequence_token.Get().Get();
   return current_sequence_token ? *current_sequence_token : SequenceToken();
 }
 
 bool TaskToken::operator==(const TaskToken& other) const {
-  return token_ == other.token_ && token_ != kInvalidTaskToken;
+  return token_ == other.token_ && IsValid();
 }
 
 bool TaskToken::operator!=(const TaskToken& other) const {
   return !(*this == other);
 }
 
 bool TaskToken::IsValid() const {
   return token_ != kInvalidTaskToken;
 }
 
@@ skipping 17 matching lines @@
 
 ScopedSetSequenceTokenForCurrentThread::
     ~ScopedSetSequenceTokenForCurrentThread() {
   DCHECK_EQ(tls_current_sequence_token.Get().Get(), &sequence_token_);
   DCHECK_EQ(tls_current_task_token.Get().Get(), &task_token_);
   tls_current_sequence_token.Get().Set(nullptr);
   tls_current_task_token.Get().Set(nullptr);
 }
 
 }  // namespace base