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

net/base/network_delegate.cc

Index: net/base/network_delegate.cc
diff --git a/net/base/network_delegate.cc b/net/base/network_delegate.cc
index a40f7d6d7b9dd5a7592ccf2974895ebb2abde23a..43d47adedd69d7d0249a568eeaaa470d29417fa5 100644
--- a/net/base/network_delegate.cc
+++ b/net/base/network_delegate.cc
@@ -15,11 +15,15 @@
 
 namespace net {
 
+NetworkDelegate::~NetworkDelegate() {
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+}
+
 int NetworkDelegate::NotifyBeforeURLRequest(
     URLRequest* request, const CompletionCallback& callback,
     GURL* new_url) {
   TRACE_EVENT0(kNetTracingCategory, "NetworkDelegate::NotifyBeforeURLRequest");
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   DCHECK(request);
   DCHECK(!callback.is_null());
   // TODO(cbentzel): Remove ScopedTracker below once crbug.com/475753 is fixed.
@@ -35,7 +39,7 @@ int NetworkDelegate::NotifyBeforeStartTransaction(
     HttpRequestHeaders* headers) {
   TRACE_EVENT0(kNetTracingCategory,
                "NetworkDelegate::NotifyBeforeStartTransation");
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   DCHECK(headers);
   DCHECK(!callback.is_null());
   return OnBeforeStartTransaction(request, callback, headers);
@@ -46,7 +50,7 @@ void NetworkDelegate::NotifyBeforeSendHeaders(
     const ProxyInfo& proxy_info,
     const ProxyRetryInfoMap& proxy_retry_info,
     HttpRequestHeaders* headers) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   DCHECK(headers);
   OnBeforeSendHeaders(request, proxy_info, proxy_retry_info, headers);
 }
@@ -55,7 +59,7 @@ void NetworkDelegate::NotifyStartTransaction(
     URLRequest* request,
     const HttpRequestHeaders& headers) {
   TRACE_EVENT0(kNetTracingCategory, "NetworkDelegate::NotifyStartTransaction");
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   OnStartTransaction(request, headers);
 }
 
@@ -66,7 +70,7 @@ int NetworkDelegate::NotifyHeadersReceived(
     scoped_refptr<HttpResponseHeaders>* override_response_headers,
     GURL* allowed_unsafe_redirect_url) {
   TRACE_EVENT0(kNetTracingCategory, "NetworkDelegate::NotifyHeadersReceived");
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   DCHECK(original_response_headers);
   DCHECK(!callback.is_null());
   return OnHeadersReceived(request,
@@ -78,7 +82,7 @@ int NetworkDelegate::NotifyHeadersReceived(
 
 void NetworkDelegate::NotifyResponseStarted(URLRequest* request,
                                             int net_error) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   DCHECK(request);
 
   OnResponseStarted(request, net_error);
@@ -88,21 +92,21 @@ void NetworkDelegate::NotifyNetworkBytesReceived(URLRequest* request,
                                                  int64_t bytes_received) {
   TRACE_EVENT0(kNetTracingCategory,
                "NetworkDelegate::NotifyNetworkBytesReceived");
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   DCHECK_GT(bytes_received, 0);
   OnNetworkBytesReceived(request, bytes_received);
 }
 
 void NetworkDelegate::NotifyNetworkBytesSent(URLRequest* request,
                                              int64_t bytes_sent) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   DCHECK_GT(bytes_sent, 0);
   OnNetworkBytesSent(request, bytes_sent);
 }
 
 void NetworkDelegate::NotifyBeforeRedirect(URLRequest* request,
                                            const GURL& new_location) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   DCHECK(request);
   OnBeforeRedirect(request, new_location);
 }
@@ -111,7 +115,7 @@ void NetworkDelegate::NotifyCompleted(URLRequest* request,
                                       bool started,
                                       int net_error) {
   TRACE_EVENT0(kNetTracingCategory, "NetworkDelegate::NotifyCompleted");
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   DCHECK(request);
   // TODO(cbentzel): Remove ScopedTracker below once crbug.com/475753 is fixed.
   tracked_objects::ScopedTracker tracking_profile(
@@ -123,14 +127,14 @@ void NetworkDelegate::NotifyCompleted(URLRequest* request,
 void NetworkDelegate::NotifyURLRequestDestroyed(URLRequest* request) {
   TRACE_EVENT0(kNetTracingCategory,
                "NetworkDelegate::NotifyURLRequestDestroyed");
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   DCHECK(request);
   OnURLRequestDestroyed(request);
 }
 
 void NetworkDelegate::NotifyPACScriptError(int line_number,
                                            const base::string16& error) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   OnPACScriptError(line_number, error);
 }
 
@@ -139,13 +143,13 @@ NetworkDelegate::AuthRequiredResponse NetworkDelegate::NotifyAuthRequired(
     const AuthChallengeInfo& auth_info,
     const AuthCallback& callback,
     AuthCredentials* credentials) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   return OnAuthRequired(request, auth_info, callback, credentials);
 }
 
 bool NetworkDelegate::CanGetCookies(const URLRequest& request,
                                     const CookieList& cookie_list) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   DCHECK(!(request.load_flags() & LOAD_DO_NOT_SEND_COOKIES));
   return OnCanGetCookies(request, cookie_list);
 }
@@ -153,7 +157,7 @@ bool NetworkDelegate::CanGetCookies(const URLRequest& request,
 bool NetworkDelegate::CanSetCookie(const URLRequest& request,
                                    const std::string& cookie_line,
                                    CookieOptions* options) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   DCHECK(!(request.load_flags() & LOAD_DO_NOT_SAVE_COOKIES));
   return OnCanSetCookie(request, cookie_line, options);
 }
@@ -161,7 +165,7 @@ bool NetworkDelegate::CanSetCookie(const URLRequest& request,
 bool NetworkDelegate::CanAccessFile(const URLRequest& request,
                                     const base::FilePath& original_path,
                                     const base::FilePath& absolute_path) const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   return OnCanAccessFile(request, original_path, absolute_path);
 }
 
@@ -169,7 +173,7 @@ bool NetworkDelegate::CanEnablePrivacyMode(
     const GURL& url,
     const GURL& first_party_for_cookies) const {
   TRACE_EVENT0(kNetTracingCategory, "NetworkDelegate::CanEnablePrivacyMode");
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   return OnCanEnablePrivacyMode(url, first_party_for_cookies);
 }
 
@@ -181,30 +185,30 @@ bool NetworkDelegate::CancelURLRequestWithPolicyViolatingReferrerHeader(
     const URLRequest& request,
     const GURL& target_url,
     const GURL& referrer_url) const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   return OnCancelURLRequestWithPolicyViolatingReferrerHeader(
       request, target_url, referrer_url);
 }
 
 bool NetworkDelegate::CanQueueReportingReport(const url::Origin& origin) const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   return OnCanQueueReportingReport(origin);
 }
 
 bool NetworkDelegate::CanSendReportingReport(const url::Origin& origin) const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   return OnCanSendReportingReport(origin);
 }
 
 bool NetworkDelegate::CanSetReportingClient(const url::Origin& origin,
                                             const GURL& endpoint) const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   return OnCanSetReportingClient(origin, endpoint);
 }
 
 bool NetworkDelegate::CanUseReportingClient(const url::Origin& origin,
                                             const GURL& endpoint) const {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   return OnCanUseReportingClient(origin, endpoint);
 }