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

net/dns/dns_config_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_DNS_DNS_CONFIG_SERVICE_H_
 #define NET_DNS_DNS_CONFIG_SERVICE_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
-#include "base/threading/non_thread_safe.h"
+#include "base/threading/thread_checker.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 // Needed on shared build with MSVS2010 to avoid multiple definitions of
 // std::vector<IPEndPoint>.
 #include "net/base/address_list.h"
 #include "net/base/ip_endpoint.h"  // win requires size of IPEndPoint
 #include "net/base/net_export.h"
 #include "net/dns/dns_hosts.h"
 
 namespace base {
@@ skipping 59 matching lines @@
   bool edns0;
 
   // Indicates system configuration uses local IPv6 connectivity, e.g.,
   // DirectAccess. This is exposed for HostResolver to skip IPv6 probes,
   // as it may cause them to return incorrect results.
   bool use_local_ipv6;
 };
 
 // Service for reading system DNS settings, on demand or when signalled by
 // internal watchers and NetworkChangeNotifier.
-class NET_EXPORT_PRIVATE DnsConfigService
-    : NON_EXPORTED_BASE(public base::NonThreadSafe) {
+class NET_EXPORT_PRIVATE DnsConfigService {
  public:
   // Callback interface for the client, called on the same thread as
   // ReadConfig() and WatchConfig().
   typedef base::Callback<void(const DnsConfig& config)> CallbackType;
 
   // Creates the platform-specific DnsConfigService.
   static std::unique_ptr<DnsConfigService> CreateSystemService();
 
   DnsConfigService();
   virtual ~DnsConfigService();
@@ skipping 28 matching lines @@
   // Called when the current hosts have changed.
   void InvalidateHosts();
 
   // Called with new config. |config|.hosts is ignored.
   void OnConfigRead(const DnsConfig& config);
   // Called with new hosts. Rest of the config is assumed unchanged.
   void OnHostsRead(const DnsHosts& hosts);
 
   void set_watch_failed(bool value) { watch_failed_ = value; }
 
+  THREAD_CHECKER(thread_checker_);
+
  private:
   // The timer counts from the last Invalidate* until complete config is read.
   void StartTimer();
   void OnTimeout();
   // Called when the config becomes complete. Stops the timer.
   void OnCompleteConfig();
 
   CallbackType callback_;
 
   DnsConfig dns_config_;
@@ skipping 18 matching lines @@
 
   // Started in Invalidate*, cleared in On*Read.
   base::OneShotTimer timer_;
 
   DISALLOW_COPY_AND_ASSIGN(DnsConfigService);
 };
 
 }  // namespace net
 
 #endif  // NET_DNS_DNS_CONFIG_SERVICE_H_