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

net/http/http_server_properties_impl.h

Index: net/http/http_server_properties_impl.h
diff --git a/net/http/http_server_properties_impl.h b/net/http/http_server_properties_impl.h
index 36e13e612e0e6340374f540380aa103cc3b19bd1..f5eb4bad191afe9b7dcd1e2f94afab8a640ce0a0 100644
--- a/net/http/http_server_properties_impl.h
+++ b/net/http/http_server_properties_impl.h
@@ -16,7 +16,7 @@
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "base/threading/non_thread_safe.h"
+#include "base/threading/thread_checker.h"
 #include "base/time/default_tick_clock.h"
 #include "base/values.h"
 #include "net/base/host_port_pair.h"
@@ -35,8 +35,7 @@ namespace net {
 // The implementation for setting/retrieving the HTTP server properties.
 class NET_EXPORT HttpServerPropertiesImpl
     : public HttpServerProperties,
-      public BrokenAlternativeServices::Delegate,
-      NON_EXPORTED_BASE(public base::NonThreadSafe) {
+      public BrokenAlternativeServices::Delegate {
  public:
   HttpServerPropertiesImpl();
   explicit HttpServerPropertiesImpl(
@@ -169,6 +168,8 @@ class NET_EXPORT HttpServerPropertiesImpl
   QuicServerInfoMap quic_server_info_map_;
   size_t max_server_configs_stored_in_properties_;
 
+  THREAD_CHECKER(thread_checker_);
+
   DISALLOW_COPY_AND_ASSIGN(HttpServerPropertiesImpl);
 };