Replace deprecated base::NonThreadSafe in content in favor of SequenceChecker.

content/public/browser/notification_registrar.h

 // Copyright (c) 2012 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 CONTENT_PUBLIC_BROWSER_NOTIFICATION_REGISTRAR_H_
 #define CONTENT_PUBLIC_BROWSER_NOTIFICATION_REGISTRAR_H_
 
 #include <vector>
 
 #include "base/macros.h"
-#include "base/threading/non_thread_safe.h"
+#include "base/sequence_checker.h"
 #include "content/common/content_export.h"
 
 namespace content {
 
 class NotificationObserver;
 class NotificationSource;
 
 // Aids in registering for notifications and ensures that all registered
 // notifications are unregistered when the class is destroyed.
 //
 // The intended use is that you make a NotificationRegistrar member in your
 // class and use it to register your notifications instead of going through the
 // notification service directly. It will automatically unregister them for
 // you.
-class CONTENT_EXPORT NotificationRegistrar :
-    NON_EXPORTED_BASE(public base::NonThreadSafe) {
+class CONTENT_EXPORT NotificationRegistrar {
  public:
   // This class must not be derived from (we don't have a virtual destructor so
   // it won't work). Instead, use it as a member in your class.
   NotificationRegistrar();
   ~NotificationRegistrar();
 
   // Wrappers around NotificationService::[Add|Remove]Observer.
   void Add(NotificationObserver* observer,
            int type,
            const NotificationSource& source);
@@ skipping 18 matching lines @@
 
   // We keep registered notifications in a simple vector. This means we'll do
   // brute-force searches when removing them individually, but individual
   // removal is uncommon, and there will typically only be a couple of
   // notifications anyway.
   typedef std::vector<Record> RecordVector;
 
   // Lists all notifications we're currently registered for.
   RecordVector registered_;
 
+  SEQUENCE_CHECKER(sequence_checker_);
+
   DISALLOW_COPY_AND_ASSIGN(NotificationRegistrar);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_NOTIFICATION_REGISTRAR_H_