Deprecate NonThreadSafe in components/invalidation in favor of SequenceChecker.

components/invalidation/impl/sync_invalidation_listener.cc

Index: components/invalidation/impl/sync_invalidation_listener.cc
diff --git a/components/invalidation/impl/sync_invalidation_listener.cc b/components/invalidation/impl/sync_invalidation_listener.cc
index 9473db66d8aac4ef534cf1ecb26be8a13caffeca..e46fecaa7529e44513f826eb290bff15d96ed4d6 100644
--- a/components/invalidation/impl/sync_invalidation_listener.cc
+++ b/components/invalidation/impl/sync_invalidation_listener.cc
@@ -40,12 +40,12 @@ SyncInvalidationListener::SyncInvalidationListener(
       ticl_state_(DEFAULT_INVALIDATION_ERROR),
       push_client_state_(DEFAULT_INVALIDATION_ERROR),
       weak_ptr_factory_(this) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   sync_network_channel_->AddObserver(this);
 }
 
 SyncInvalidationListener::~SyncInvalidationListener() {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   sync_network_channel_->RemoveObserver(this);
   Stop();
   DCHECK(!delegate_);
@@ -61,7 +61,7 @@ void SyncInvalidationListener::Start(
     const scoped_refptr<base::SequencedTaskRunner>&
         invalidation_state_tracker_task_runner,
     Delegate* delegate) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   Stop();
 
   sync_system_resources_.set_platform(client_info);
@@ -97,12 +97,12 @@ void SyncInvalidationListener::Start(
 
 void SyncInvalidationListener::UpdateCredentials(
     const std::string& email, const std::string& token) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   sync_network_channel_->UpdateCredentials(email, token);
 }
 
 void SyncInvalidationListener::UpdateRegisteredIds(const ObjectIdSet& ids) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   registered_ids_ = ids;
   // |ticl_state_| can go to INVALIDATIONS_ENABLED even without a
   // working XMPP connection (as observed by us), so check it instead
@@ -114,7 +114,7 @@ void SyncInvalidationListener::UpdateRegisteredIds(const ObjectIdSet& ids) {
 
 void SyncInvalidationListener::Ready(
     invalidation::InvalidationClient* client) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK_EQ(client, invalidation_client_.get());
   ticl_state_ = INVALIDATIONS_ENABLED;
   EmitStateChange();
@@ -125,7 +125,7 @@ void SyncInvalidationListener::Invalidate(
     invalidation::InvalidationClient* client,
     const invalidation::Invalidation& invalidation,
     const invalidation::AckHandle& ack_handle) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK_EQ(client, invalidation_client_.get());
   client->Acknowledge(ack_handle);
 
@@ -151,7 +151,7 @@ void SyncInvalidationListener::InvalidateUnknownVersion(
     invalidation::InvalidationClient* client,
     const invalidation::ObjectId& object_id,
     const invalidation::AckHandle& ack_handle) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK_EQ(client, invalidation_client_.get());
   DVLOG(1) << "InvalidateUnknownVersion";
   client->Acknowledge(ack_handle);
@@ -170,7 +170,7 @@ void SyncInvalidationListener::InvalidateUnknownVersion(
 void SyncInvalidationListener::InvalidateAll(
     invalidation::InvalidationClient* client,
     const invalidation::AckHandle& ack_handle) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK_EQ(client, invalidation_client_.get());
   DVLOG(1) << "InvalidateAll";
   client->Acknowledge(ack_handle);
@@ -190,7 +190,7 @@ void SyncInvalidationListener::InvalidateAll(
 // If a handler is registered, emit right away.  Otherwise, save it for later.
 void SyncInvalidationListener::DispatchInvalidations(
     const ObjectIdInvalidationMap& invalidations) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   ObjectIdInvalidationMap to_save = invalidations;
   ObjectIdInvalidationMap to_emit =
@@ -231,7 +231,7 @@ void SyncInvalidationListener::InformRegistrationStatus(
       invalidation::InvalidationClient* client,
       const invalidation::ObjectId& object_id,
       InvalidationListener::RegistrationState new_state) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK_EQ(client, invalidation_client_.get());
   DVLOG(1) << "InformRegistrationStatus: "
            << ObjectIdToString(object_id) << " " << new_state;
@@ -247,7 +247,7 @@ void SyncInvalidationListener::InformRegistrationFailure(
     const invalidation::ObjectId& object_id,
     bool is_transient,
     const std::string& error_message) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK_EQ(client, invalidation_client_.get());
   DVLOG(1) << "InformRegistrationFailure: "
            << ObjectIdToString(object_id)
@@ -275,7 +275,7 @@ void SyncInvalidationListener::ReissueRegistrations(
     invalidation::InvalidationClient* client,
     const std::string& prefix,
     int prefix_length) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK_EQ(client, invalidation_client_.get());
   DVLOG(1) << "AllRegistrationsLost";
   registration_manager_->MarkAllRegistrationsLost();
@@ -284,7 +284,7 @@ void SyncInvalidationListener::ReissueRegistrations(
 void SyncInvalidationListener::InformError(
     invalidation::InvalidationClient* client,
     const invalidation::ErrorInfo& error_info) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK_EQ(client, invalidation_client_.get());
   LOG(ERROR) << "Ticl error " << error_info.error_reason() << ": "
              << error_info.error_message()
@@ -332,7 +332,7 @@ void SyncInvalidationListener::Drop(
 }
 
 void SyncInvalidationListener::WriteState(const std::string& state) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DVLOG(1) << "WriteState";
   invalidation_state_tracker_task_runner_->PostTask(
       FROM_HERE,
@@ -342,7 +342,7 @@ void SyncInvalidationListener::WriteState(const std::string& state) {
 }
 
 void SyncInvalidationListener::DoRegistrationUpdate() {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   const ObjectIdSet& unregistered_ids =
       registration_manager_->UpdateRegisteredIds(registered_ids_);
   for (ObjectIdSet::iterator it = unregistered_ids.begin();
@@ -375,7 +375,7 @@ void SyncInvalidationListener::DoRegistrationUpdate() {
 
 void SyncInvalidationListener::RequestDetailedStatus(
     base::Callback<void(const base::DictionaryValue&)> callback) const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   sync_network_channel_->RequestDetailedStatus(callback);
   callback.Run(*CollectDebugData());
 }
@@ -403,12 +403,12 @@ SyncInvalidationListener::CollectDebugData() const {
 }
 
 void SyncInvalidationListener::StopForTest() {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   Stop();
 }
 
 void SyncInvalidationListener::Stop() {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (!invalidation_client_) {
     return;
   }
@@ -425,7 +425,7 @@ void SyncInvalidationListener::Stop() {
 }
 
 InvalidatorState SyncInvalidationListener::GetState() const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (ticl_state_ == INVALIDATION_CREDENTIALS_REJECTED ||
       push_client_state_ == INVALIDATION_CREDENTIALS_REJECTED) {
     // If either the ticl or the push client rejected our credentials,
@@ -443,12 +443,12 @@ InvalidatorState SyncInvalidationListener::GetState() const {
 }
 
 void SyncInvalidationListener::EmitStateChange() {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   delegate_->OnInvalidatorStateChange(GetState());
 }
 
 base::WeakPtr<AckHandler> SyncInvalidationListener::AsWeakPtr() {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   base::WeakPtr<AckHandler> weak_ptr = weak_ptr_factory_.GetWeakPtr();
   weak_ptr.get();  // Binds the pointer to this thread.
   return weak_ptr;
@@ -456,7 +456,7 @@ base::WeakPtr<AckHandler> SyncInvalidationListener::AsWeakPtr() {
 
 void SyncInvalidationListener::OnNetworkChannelStateChanged(
     InvalidatorState invalidator_state) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   push_client_state_ = invalidator_state;
   EmitStateChange();
 }