Deprecate NonThreadSafe in components/invalidation in favor of SequenceChecker.

components/invalidation/impl/registration_manager.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.
 //
 // A class that manages the registration of types for server-issued
 // notifications.
 
 #ifndef COMPONENTS_INVALIDATION_IMPL_REGISTRATION_MANAGER_H_
 #define COMPONENTS_INVALIDATION_IMPL_REGISTRATION_MANAGER_H_
 
 #include <map>
 #include <memory>
 
 #include "base/macros.h"
-#include "base/threading/non_thread_safe.h"
+#include "base/sequence_checker.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 // For invalidation::InvalidationListener::RegistrationState.
 #include "components/invalidation/public/invalidation_export.h"
 #include "components/invalidation/public/invalidation_util.h"
 #include "google/cacheinvalidation/include/invalidation-listener.h"
 #include "google/cacheinvalidation/include/types.h"
 
 namespace syncer {
 
 using ::invalidation::InvalidationListener;
 
 // Manages the details of registering types for invalidation.
 // Implements exponential backoff for repeated registration attempts
 // to the invalidation client.
 //
 // TODO(akalin): Consolidate exponential backoff code.  Other
 // implementations include the syncer thread (both versions) and XMPP
 // retries.  The most sophisticated one is URLRequestThrottler; making
 // that generic should work for everyone.
-class INVALIDATION_EXPORT RegistrationManager : public base::NonThreadSafe {
+class INVALIDATION_EXPORT RegistrationManager {
  public:
   // Constants for exponential backoff (used by tests).
   static const int kInitialRegistrationDelaySeconds;
   static const int kRegistrationDelayExponent;
   static const double kRegistrationDelayMaxJitter;
   static const int kMinRegistrationDelaySeconds;
   static const int kMaxRegistrationDelaySeconds;
 
   // Types used by testing functions.
   struct PendingRegistrationInfo {
@@ skipping 125 matching lines @@
   // Returns true iff the given object ID is registered.
   bool IsIdRegistered(const invalidation::ObjectId& id) const;
 
   std::map<invalidation::ObjectId,
            std::unique_ptr<RegistrationStatus>,
            ObjectIdLessThan>
       registration_statuses_;
   // Weak pointer.
   invalidation::InvalidationClient* invalidation_client_;
 
+  SEQUENCE_CHECKER(sequence_checker_);
+
   DISALLOW_COPY_AND_ASSIGN(RegistrationManager);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_INVALIDATION_IMPL_REGISTRATION_MANAGER_H_