Deprecate NonThreadSafe in chrome/browser/chromeos/login in favor of SequenceChecker.

chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc

Index: chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc
diff --git a/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc b/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc
index 49e51f4a4a5c74373b51018614fb8d71d1754736..661bb8d3c5623a500cf8a7a244581fd18891adbd 100644
--- a/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc
+++ b/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc
@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
-#include "base/threading/non_thread_safe.h"
+#include "base/sequence_checker.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
@@ -32,17 +32,19 @@ namespace {
 const int64_t kMaxSessionRestoreTimeInSec = 60;
 
 // The set of blocked profiles.
-class ProfileSet : public base::NonThreadSafe, public std::set<Profile*> {
+class ProfileSet : public std::set<Profile*> {
  public:
   ProfileSet() {}
 
-  virtual ~ProfileSet() {}
+  virtual ~ProfileSet() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); }
 
   static ProfileSet* Get();
 
  private:
   friend struct ::base::LazyInstanceTraitsBase<ProfileSet>;
 
+  SEQUENCE_CHECKER(sequence_checker_);
+
   DISALLOW_COPY_AND_ASSIGN(ProfileSet);
 };