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

net/dns/mock_host_resolver.h

 // Copyright (c) 2011 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_MOCK_HOST_RESOLVER_H_
 #define NET_DNS_MOCK_HOST_RESOLVER_H_
 
 #include <stddef.h>
 
 #include <list>
 #include <map>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/threading/non_thread_safe.h"
+#include "base/threading/thread_checker.h"
 #include "net/dns/host_resolver.h"
 #include "net/dns/host_resolver_proc.h"
 
 namespace net {
 
 class HostCache;
 class RuleBasedHostResolverProc;
 
 // Fills |*addrlist| with a socket address for |host_list| which should be a
 // comma-separated list of IPv4 or IPv6 literal(s) without enclosing brackets.
@@ skipping 20 matching lines @@
 //
 //   host_mapper->AddRule("*.com", "127.0.0.1");
 //
 // Replacement doesn't have to be string representing an IP address. It can
 // re-map one hostname to another as well.
 //
 // By default, MockHostResolvers include a single rule that maps all hosts to
 // 127.0.0.1.
 
 // Base class shared by MockHostResolver and MockCachingHostResolver.
-class MockHostResolverBase : public HostResolver,
-                             public base::SupportsWeakPtr<MockHostResolverBase>,
-                             public base::NonThreadSafe {
+class MockHostResolverBase
+    : public HostResolver,
+      public base::SupportsWeakPtr<MockHostResolverBase> {
  private:
   class RequestImpl;
 
  public:
   ~MockHostResolverBase() override;
 
   RuleBasedHostResolverProc* rules() { return rules_.get(); }
   void set_rules(RuleBasedHostResolverProc* rules) { rules_ = rules; }
 
   // Controls whether resolutions complete synchronously or asynchronously.
@@ skipping 68 matching lines @@
   bool synchronous_mode_;
   bool ondemand_mode_;
   scoped_refptr<RuleBasedHostResolverProc> rules_;
   std::unique_ptr<HostCache> cache_;
   RequestMap requests_;
   size_t next_request_id_;
 
   size_t num_resolve_;
   size_t num_resolve_from_cache_;
 
+  THREAD_CHECKER(thread_checker_);
+
   DISALLOW_COPY_AND_ASSIGN(MockHostResolverBase);
 };
 
 class MockHostResolver : public MockHostResolverBase {
  public:
   MockHostResolver() : MockHostResolverBase(false /*use_caching*/) {}
   ~MockHostResolver() override {}
 };
 
 // Same as MockHostResolver, except internally it uses a host-cache.
@@ skipping 144 matching lines @@
   void Init(HostResolverProc* proc);
 
  private:
   scoped_refptr<HostResolverProc> current_proc_;
   scoped_refptr<HostResolverProc> previous_proc_;
 };
 
 }  // namespace net
 
 #endif  // NET_DNS_MOCK_HOST_RESOLVER_H_