Reduce/remove usage of BrowserThread in content/browser/loader.

content/browser/loader/resource_loader.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 "content/browser/loader/resource_loader.h"
 
 #include <utility>
 
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/appcache/appcache_interceptor.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/loader/detachable_resource_handler.h"
+#include "content/browser/loader/loader_globals.h"
 #include "content/browser/loader/resource_controller.h"
 #include "content/browser/loader/resource_handler.h"
 #include "content/browser/loader/resource_loader_delegate.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/browser/service_worker/service_worker_request_handler.h"
 #include "content/browser/service_worker/service_worker_response_info.h"
 #include "content/browser/ssl/ssl_client_auth_handler.h"
 #include "content/browser/ssl/ssl_manager.h"
 #include "content/public/browser/resource_dispatcher_host_login_delegate.h"
 #include "content/public/common/browser_side_navigation_policy.h"
@@ skipping 407 matching lines @@
 
   // bytes_read == -1 always implies an error.
   if (bytes_read == -1 || !request_->status().is_success()) {
     ResponseCompleted();
     return;
   }
 
   CompleteRead(bytes_read);
 }
 
 void ResourceLoader::CancelSSLRequest(int error,

[jam, 2017/03/29 15:44:32]

ResourceLoader is created from RDH, so we know it's created on the right thread.
so it should have a base::ThreadChecker member and it can use it in these
methods

[ananta, 2017/03/29 19:41:04]

Done.

                                       const net::SSLInfo* ssl_info) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK(
+      LoaderGlobals::Get()->io_thread_task_runner()->BelongsToCurrentThread());
 
   // The request can be NULL if it was cancelled by the renderer (as the
   // request of the user navigating to a new page from the location bar).
   if (!request_->is_pending())
     return;
   DVLOG(1) << "CancelSSLRequest() url: " << request_->url().spec();
 
   if (ssl_info) {
     request_->CancelWithSSLError(error, *ssl_info);
   } else {
     request_->CancelWithError(error);
   }
 }
 
 void ResourceLoader::ContinueSSLRequest() {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK(
+      LoaderGlobals::Get()->io_thread_task_runner()->BelongsToCurrentThread());
 
   DVLOG(1) << "ContinueSSLRequest() url: " << request_->url().spec();
 
   request_->ContinueDespiteLastError();
 }
 
 void ResourceLoader::ContinueWithCertificate(net::X509Certificate* cert) {
   DCHECK(ssl_client_auth_handler_);
   ssl_client_auth_handler_.reset();
   if (!cert) {
@@ skipping 331 matching lines @@
       UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", prefetch_status,
                                 STATUS_MAX);
     }
   } else if (request_->response_info().unused_since_prefetch) {
     TimeDelta total_time = base::TimeTicks::Now() - request_->creation_time();
     UMA_HISTOGRAM_TIMES("Net.Prefetch.TimeSpentOnPrefetchHit", total_time);
   }
 }
 
 }  // namespace content