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

net/proxy/dhcp_proxy_script_fetcher_win.cc

 // 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.
 
 #include "net/proxy/dhcp_proxy_script_fetcher_win.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 45 matching lines @@
       num_pending_fetchers_(0),
       destination_string_(NULL),
       url_request_context_(url_request_context) {
   DCHECK(url_request_context_);
 
   worker_pool_ = new base::SequencedWorkerPool(
       kMaxDhcpLookupThreads, "PacDhcpLookup", base::TaskPriority::USER_VISIBLE);
 }
 
 DhcpProxyScriptFetcherWin::~DhcpProxyScriptFetcherWin() {
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   // Count as user-initiated if we are not yet in STATE_DONE.
   Cancel();
 
   worker_pool_->Shutdown();
 }
 
 int DhcpProxyScriptFetcherWin::Fetch(base::string16* utf16_text,
                                      const CompletionCallback& callback) {
   // TODO(joi): Remove ScopedTracker below once crbug.com/476182 is fixed.
   tracked_objects::ScopedTracker tracking_profile1(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "476182 DhcpProxyScriptFetcherWin::Fetch 1"));
 
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   if (state_ != STATE_START && state_ != STATE_DONE) {
     NOTREACHED();
     return ERR_UNEXPECTED;
   }
 
   if (!url_request_context_)
     return ERR_CONTEXT_SHUT_DOWN;
 
   state_ = STATE_WAIT_ADAPTERS;
   callback_ = callback;
@@ skipping 11 matching lines @@
           last_query_.get()),
       base::Bind(
           &DhcpProxyScriptFetcherWin::OnGetCandidateAdapterNamesDone,
           AsWeakPtr(),
           last_query_));
 
   return ERR_IO_PENDING;
 }
 
 void DhcpProxyScriptFetcherWin::Cancel() {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
 
   CancelImpl();
 }
 
 void DhcpProxyScriptFetcherWin::OnShutdown() {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
 
   // Back up callback, if there is one, as CancelImpl() will destroy it.
   net::CompletionCallback callback = std::move(callback_);
 
   // Cancel current request, if there is one.
   CancelImpl();
 
   // Prevent future network requests.
   url_request_context_ = nullptr;
 
   // Invoke callback with error, if present.
   if (callback)
     callback.Run(ERR_CONTEXT_SHUT_DOWN);
 }
 
 void DhcpProxyScriptFetcherWin::CancelImpl() {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
 
   if (state_ != STATE_DONE) {
     callback_.Reset();
     wait_timer_.Stop();
     state_ = STATE_DONE;
 
     for (FetcherVector::iterator it = fetchers_.begin();
          it != fetchers_.end();
          ++it) {
       (*it)->Cancel();
     }
 
     fetchers_.clear();
   }
 }
 
 void DhcpProxyScriptFetcherWin::OnGetCandidateAdapterNamesDone(
     scoped_refptr<AdapterQuery> query) {
   // TODO(joi): Remove ScopedTracker below once crbug.com/476182 is fixed.
   tracked_objects::ScopedTracker tracking_profile1(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "476182 "
           "DhcpProxyScriptFetcherWin::OnGetCandidateAdapterNamesDone 1"));
 
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
 
   // This can happen if this object is reused for multiple queries,
   // and a previous query was cancelled before it completed.
   if (query.get() != last_query_.get())
     return;
   last_query_ = NULL;
 
   // Enable unit tests to wait for this to happen; in production this function
   // call is a no-op.
   ImplOnGetCandidateAdapterNamesDone();
@@ skipping 30 matching lines @@
         ImplCreateAdapterFetcher());
     fetcher->Fetch(
         *it, base::Bind(&DhcpProxyScriptFetcherWin::OnFetcherDone,
                         base::Unretained(this)));
     fetchers_.push_back(std::move(fetcher));
   }
   num_pending_fetchers_ = fetchers_.size();
 }
 
 std::string DhcpProxyScriptFetcherWin::GetFetcherName() const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   return "win";
 }
 
 const GURL& DhcpProxyScriptFetcherWin::GetPacURL() const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   DCHECK_EQ(state_, STATE_DONE);
 
   return pac_url_;
 }
 
 void DhcpProxyScriptFetcherWin::OnFetcherDone(int result) {
   DCHECK(state_ == STATE_NO_RESULTS || state_ == STATE_SOME_RESULTS);
 
   if (--num_pending_fetchers_ == 0) {
     TransitionToDone();
@@ skipping 168 matching lines @@
 
 bool DhcpProxyScriptFetcherWin::AdapterQuery::ImplGetCandidateAdapterNames(
     std::set<std::string>* adapter_names) {
   return DhcpProxyScriptFetcherWin::GetCandidateAdapterNames(adapter_names);
 }
 
 DhcpProxyScriptFetcherWin::AdapterQuery::~AdapterQuery() {
 }
 
 }  // namespace net