Deprecate NonThreadSafe in components/invalidation in favor of SequenceChecker.

components/invalidation/impl/gcm_network_channel.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_INVALIDATION_IMPL_GCM_NETWORK_CHANNEL_H_
 #define COMPONENTS_INVALIDATION_IMPL_GCM_NETWORK_CHANNEL_H_
 
 #include <memory>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "base/threading/non_thread_safe.h"
+#include "base/sequence_checker.h"
 #include "components/invalidation/impl/gcm_network_channel_delegate.h"
 #include "components/invalidation/impl/sync_system_resources.h"
 #include "components/invalidation/public/invalidation_export.h"
 #include "net/base/backoff_entry.h"
 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
 class GoogleServiceAuthError;
 
@@ skipping 18 matching lines @@
   std::string registration_id_;
   gcm::GCMClient::Result registration_result_;
   int sent_messages_count_;
 };
 
 // GCMNetworkChannel is an implementation of SyncNetworkChannel that routes
 // messages through GCMService.
 class INVALIDATION_EXPORT GCMNetworkChannel
     : public SyncNetworkChannel,
       public net::URLFetcherDelegate,
-      public net::NetworkChangeNotifier::NetworkChangeObserver,
-      public base::NonThreadSafe {
+      public net::NetworkChangeNotifier::NetworkChangeObserver {
  public:
   GCMNetworkChannel(
       scoped_refptr<net::URLRequestContextGetter> request_context_getter,
       std::unique_ptr<GCMNetworkChannelDelegate> delegate);
 
   ~GCMNetworkChannel() override;
 
   // invalidation::NetworkChannel implementation.
   void SendMessage(const std::string& message) override;
   void SetMessageReceiver(
@@ skipping 56 matching lines @@
   // GCM and shuld include it in headers with outgoing message over http.
   std::string echo_token_;
 
   // State of gcm and http channels. GCMNetworkChannel will only report
   // INVALIDATIONS_ENABLED if both channels are online.
   bool gcm_channel_online_;
   bool http_channel_online_;
 
   GCMNetworkChannelDiagnostic diagnostic_info_;
 
+  SEQUENCE_CHECKER(sequence_checker_);
+
   base::WeakPtrFactory<GCMNetworkChannel> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMNetworkChannel);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_INVALIDATION_IMPL_GCM_NETWORK_CHANNEL_H_