Deprecate NonThreadSafe in net/ in favor of SequenceChecker/ThreadChecker.

net/proxy/proxy_service.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 NET_PROXY_PROXY_SERVICE_H_
 #define NET_PROXY_PROXY_SERVICE_H_
 
 #include <stddef.h>
 
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/threading/non_thread_safe.h"
+#include "base/threading/thread_checker.h"
 #include "net/base/completion_callback.h"
 #include "net/base/load_states.h"
 #include "net/base/net_export.h"
 #include "net/base/network_change_notifier.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_info.h"
 #include "net/proxy/proxy_server.h"
 #include "url/gurl.h"
 
 class GURL;
@@ skipping 12 matching lines @@
 class ProxyResolver;
 class ProxyResolverFactory;
 class ProxyResolverScriptData;
 class ProxyScriptFetcher;
 
 // This class can be used to resolve the proxy server to use when loading a
 // HTTP(S) URL.  It uses the given ProxyResolver to handle the actual proxy
 // resolution.  See ProxyResolverV8 for example.
 class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
                                 public NetworkChangeNotifier::DNSObserver,
-                                public ProxyConfigService::Observer,
-                                NON_EXPORTED_BASE(public base::NonThreadSafe) {
+                                public ProxyConfigService::Observer {
  public:
   // Enumerates the policy to use when sanitizing URLs for proxy resolution
   // (before passing them off to PAC scripts).
   enum class SanitizeUrlPolicy {
     // Do a basic level of sanitization for URLs:
     //   - strip embedded identities (ex: "username:password@")
     //   - strip the fragment (ex: "#blah")
     //
     // This is considered "unsafe" because it does not do any additional
     // stripping for https:// URLs.
@@ skipping 411 matching lines @@
 
   // The amount of time to stall requests following IP address changes.
   base::TimeDelta stall_proxy_auto_config_delay_;
 
   // Whether child ProxyScriptDeciders should use QuickCheck
   bool quick_check_enabled_;
 
   // The method to use for sanitizing URLs seen by the proxy resolver.
   SanitizeUrlPolicy sanitize_url_policy_;
 
+  THREAD_CHECKER(thread_checker_);
+
   DISALLOW_COPY_AND_ASSIGN(ProxyService);
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_SERVICE_H_