Replace deprecated base::NonThreadSafe in chrome/browser/devtools in favor of SequenceChecker.

chrome/browser/devtools/device/android_device_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.
 
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVICE_ANDROID_DEVICE_MANAGER_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVICE_ANDROID_DEVICE_MANAGER_H_
 
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "base/sequence_checker.h"
 #include "base/single_thread_task_runner.h"
-#include "base/threading/non_thread_safe.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace net {
 class StreamSocket;
 }
 
-class AndroidDeviceManager : public base::NonThreadSafe {
+class AndroidDeviceManager {
  public:
   using CommandCallback =
       base::Callback<void(int, const std::string&)>;
   using SocketCallback =
       base::Callback<void(int result, std::unique_ptr<net::StreamSocket>)>;
   // |body_head| should contain the body (WebSocket frame data) part that has
   // been read during processing the header (WebSocket handshake).
   using HttpUpgradeCallback =
       base::Callback<void(int result,
                           const std::string& extensions,
@@ skipping 66 matching lines @@
 
     scoped_refptr<Device> device_;
     WebSocketImpl* socket_impl_;
     Delegate* delegate_;
     base::WeakPtrFactory<AndroidWebSocket> weak_factory_;
     DISALLOW_COPY_AND_ASSIGN(AndroidWebSocket);
   };
 
   class DeviceProvider;
 
-  class Device : public base::RefCountedThreadSafe<Device>,
-                 public base::NonThreadSafe {
+  class Device : public base::RefCountedThreadSafe<Device> {
    public:
     void QueryDeviceInfo(const DeviceInfoCallback& callback);
 
     void OpenSocket(const std::string& socket_name,
                     const SocketCallback& callback);
 
     void SendJsonRequest(const std::string& socket_name,
                          const std::string& request,
                          const CommandCallback& callback);
 
@@ skipping 15 matching lines @@
 
     Device(scoped_refptr<base::SingleThreadTaskRunner> device_task_runner,
            scoped_refptr<DeviceProvider> provider,
            const std::string& serial);
 
     virtual ~Device();
 
     scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
     scoped_refptr<DeviceProvider> provider_;
     std::string serial_;
+
+    SEQUENCE_CHECKER(sequence_checker_);
+
     base::WeakPtrFactory<Device> weak_factory_;
 
     DISALLOW_COPY_AND_ASSIGN(Device);
   };
 
   typedef std::vector<scoped_refptr<Device> > Devices;
   typedef base::Callback<void(const Devices&)> DevicesCallback;
 
   class DeviceProvider : public base::RefCountedThreadSafe<DeviceProvider> {
    public:
@@ skipping 79 matching lines @@
 
   void UpdateDevices(const DevicesCallback& callback,
                      std::unique_ptr<DeviceDescriptors> descriptors);
 
   typedef std::map<std::string, base::WeakPtr<Device> > DeviceWeakMap;
 
   scoped_refptr<HandlerThread> handler_thread_;
   DeviceProviders providers_;
   DeviceWeakMap devices_;
 
+  SEQUENCE_CHECKER(sequence_checker_);
+
   base::WeakPtrFactory<AndroidDeviceManager> weak_factory_;
 };
 
 #endif  // CHROME_BROWSER_DEVTOOLS_DEVICE_ANDROID_DEVICE_MANAGER_H_