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

net/http/http_server_properties_impl.cc

Index: net/http/http_server_properties_impl.cc
diff --git a/net/http/http_server_properties_impl.cc b/net/http/http_server_properties_impl.cc
index abf4bf03e972d01382661f2d955ba06c913446bc..a02cf7869cddd51ffb5310f1d485abae00ecdcfc 100644
--- a/net/http/http_server_properties_impl.cc
+++ b/net/http/http_server_properties_impl.cc
@@ -38,12 +38,13 @@ HttpServerPropertiesImpl::HttpServerPropertiesImpl(
 }
 
 HttpServerPropertiesImpl::~HttpServerPropertiesImpl() {
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
 }
 
 void HttpServerPropertiesImpl::SetSpdyServers(
     std::vector<std::string>* spdy_servers,
     bool support_spdy) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   if (!spdy_servers)
     return;
 
@@ -181,7 +182,7 @@ void HttpServerPropertiesImpl::SetQuicServerInfoMap(
 void HttpServerPropertiesImpl::GetSpdyServerList(
     base::ListValue* spdy_server_list,
     size_t max_size) const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   DCHECK(spdy_server_list);
   spdy_server_list->Clear();
   size_t count = 0;
@@ -197,7 +198,7 @@ void HttpServerPropertiesImpl::GetSpdyServerList(
 }
 
 void HttpServerPropertiesImpl::Clear() {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   spdy_servers_map_.Clear();
   alternative_service_map_.Clear();
   canonical_host_to_origin_map_.clear();
@@ -208,7 +209,7 @@ void HttpServerPropertiesImpl::Clear() {
 
 bool HttpServerPropertiesImpl::SupportsRequestPriority(
     const url::SchemeHostPort& server) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   if (server.host().empty())
     return false;
 
@@ -227,7 +228,7 @@ bool HttpServerPropertiesImpl::SupportsRequestPriority(
 
 bool HttpServerPropertiesImpl::GetSupportsSpdy(
     const url::SchemeHostPort& server) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   if (server.host().empty())
     return false;
 
@@ -239,7 +240,7 @@ bool HttpServerPropertiesImpl::GetSupportsSpdy(
 void HttpServerPropertiesImpl::SetSupportsSpdy(
     const url::SchemeHostPort& server,
     bool support_spdy) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   if (server.host().empty())
     return;
 
@@ -255,7 +256,7 @@ void HttpServerPropertiesImpl::SetSupportsSpdy(
 
 bool HttpServerPropertiesImpl::RequiresHTTP11(
     const HostPortPair& host_port_pair) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   if (host_port_pair.host().empty())
     return false;
 
@@ -264,7 +265,7 @@ bool HttpServerPropertiesImpl::RequiresHTTP11(
 
 void HttpServerPropertiesImpl::SetHTTP11Required(
     const HostPortPair& host_port_pair) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   if (host_port_pair.host().empty())
     return;