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

content/browser/loader/resource_dispatcher_host_browsertest.cc

Index: content/browser/loader/resource_dispatcher_host_browsertest.cc
diff --git a/content/browser/loader/resource_dispatcher_host_browsertest.cc b/content/browser/loader/resource_dispatcher_host_browsertest.cc
index d330139ebcabc3348245d0ac980146990661e86d..0230d9ad8457bca347fce61735e00af2a851ef08 100644
--- a/content/browser/loader/resource_dispatcher_host_browsertest.cc
+++ b/content/browser/loader/resource_dispatcher_host_browsertest.cc
@@ -20,6 +20,7 @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "build/build_config.h"
 #include "content/browser/download/download_manager_impl.h"
+#include "content/browser/loader/loader_globals.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_context.h"
@@ -60,14 +61,12 @@ class ResourceDispatcherHostBrowserTest : public ContentBrowserTest,
  protected:
   void SetUpOnMainThread() override {
     base::FilePath path = GetTestFilePath("", "");
-    BrowserThread::PostTask(

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

ditto, this is a browser test so it won't move. no need to change it.

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

Done.

-        BrowserThread::IO, FROM_HERE,
-        base::Bind(
-            &net::URLRequestMockHTTPJob::AddUrlHandlers, path,
-            make_scoped_refptr(content::BrowserThread::GetBlockingPool())));
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        base::Bind(&net::URLRequestFailedJob::AddUrlHandler));
+    LoaderGlobals::Get()->io_thread_task_runner()->PostTask(
+        FROM_HERE, base::Bind(&net::URLRequestMockHTTPJob::AddUrlHandlers, path,
+                              make_scoped_refptr(
+                                  content::BrowserThread::GetBlockingPool())));
+    LoaderGlobals::Get()->io_thread_task_runner()->PostTask(
+        FROM_HERE, base::Bind(&net::URLRequestFailedJob::AddUrlHandler));
   }
 
   void OnDownloadCreated(DownloadManager* manager,
@@ -256,8 +255,7 @@ std::unique_ptr<net::test_server::HttpResponse> CancelOnRequest(
   if (request.relative_url != relative_url)
     return nullptr;
 
-  content::BrowserThread::PostTask(
-      content::BrowserThread::IO,
+  LoaderGlobals::Get()->io_thread_task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&ResourceDispatcherHostImpl::CancelRequestsForProcess,
                  base::Unretained(ResourceDispatcherHostImpl::Get()),
@@ -623,7 +621,9 @@ class PreviewsStateResourceDispatcherHostDelegate
       AppCacheService* appcache_service,
       ResourceType resource_type,
       std::vector<std::unique_ptr<ResourceThrottle>>* throttles) override {
-    DCHECK_CURRENTLY_ON(BrowserThread::IO);
+    DCHECK(LoaderGlobals::Get()
+               ->io_thread_task_runner()
+               ->BelongsToCurrentThread());
     const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
     if (request->url() != main_frame_url_ && request->url() != subresource_url_
         && request->url() != iframe_url_)
@@ -644,14 +644,18 @@ class PreviewsStateResourceDispatcherHostDelegate
   }
 
   void SetDelegate() {
-    DCHECK_CURRENTLY_ON(BrowserThread::IO);
+    DCHECK(LoaderGlobals::Get()
+               ->io_thread_task_runner()
+               ->BelongsToCurrentThread());
     ResourceDispatcherHost::Get()->SetDelegate(this);
   }
 
   PreviewsState GetPreviewsState(
       const net::URLRequest& request,
       content::ResourceContext* resource_context) override {
-    DCHECK_CURRENTLY_ON(BrowserThread::IO);
+    DCHECK(LoaderGlobals::Get()
+               ->io_thread_task_runner()
+               ->BelongsToCurrentThread());
     EXPECT_FALSE(should_get_previews_state_called_);
     should_get_previews_state_called_ = true;
     EXPECT_EQ(main_frame_url_, request.url());
@@ -659,7 +663,9 @@ class PreviewsStateResourceDispatcherHostDelegate
   }
 
   void Reset(PreviewsState previews_state) {
-    DCHECK_CURRENTLY_ON(BrowserThread::IO);
+    DCHECK(LoaderGlobals::Get()
+               ->io_thread_task_runner()
+               ->BelongsToCurrentThread());
     main_frame_url_seen_ = false;
     subresource_url_seen_ = false;
     iframe_url_seen_ = false;
@@ -668,7 +674,9 @@ class PreviewsStateResourceDispatcherHostDelegate
   }
 
   void CheckResourcesRequested(bool should_get_previews_state_called) {
-    DCHECK_CURRENTLY_ON(BrowserThread::IO);
+    DCHECK(LoaderGlobals::Get()
+               ->io_thread_task_runner()
+               ->BelongsToCurrentThread());
     EXPECT_EQ(should_get_previews_state_called,
               should_get_previews_state_called_);
     EXPECT_TRUE(main_frame_url_seen_);
@@ -708,28 +716,26 @@ class PreviewsStateResourceDispatcherHostBrowserTest
         embedded_test_server()->GetURL("/image.jpg"),
         embedded_test_server()->GetURL("/title1.html")));
 
-    content::BrowserThread::PostTask(
-           content::BrowserThread::IO,
-           FROM_HERE,
-           base::Bind(&PreviewsStateResourceDispatcherHostDelegate::SetDelegate,
-                      base::Unretained(delegate_.get())));
+    LoaderGlobals::Get()->io_thread_task_runner()->PostTask(
+        FROM_HERE,
+        base::Bind(&PreviewsStateResourceDispatcherHostDelegate::SetDelegate,
+                   base::Unretained(delegate_.get())));
   }
 
   void Reset(PreviewsState previews_state) {
-    content::BrowserThread::PostTask(
-        content::BrowserThread::IO, FROM_HERE,
+    LoaderGlobals::Get()->io_thread_task_runner()->PostTask(
+        FROM_HERE,
         base::Bind(&PreviewsStateResourceDispatcherHostDelegate::Reset,
                    base::Unretained(delegate_.get()), previews_state));
   }
 
   void CheckResourcesRequested(
       bool should_get_previews_state_called) {
-    content::BrowserThread::PostTask(
-        content::BrowserThread::IO, FROM_HERE,
-        base::Bind(&PreviewsStateResourceDispatcherHostDelegate::
-                       CheckResourcesRequested,
-                   base::Unretained(delegate_.get()),
-                   should_get_previews_state_called));
+    LoaderGlobals::Get()->io_thread_task_runner()->PostTask(
+        FROM_HERE, base::Bind(&PreviewsStateResourceDispatcherHostDelegate::
+                                  CheckResourcesRequested,
+                              base::Unretained(delegate_.get()),
+                              should_get_previews_state_called));
   }
 
  private:
@@ -869,8 +875,8 @@ class RequestDataResourceDispatcherHostBrowserTest : public ContentBrowserTest {
 
     delegate_.reset(new RequestDataResourceDispatcherHostDelegate());
 
-    content::BrowserThread::PostTask(
-        content::BrowserThread::IO, FROM_HERE,
+    LoaderGlobals::Get()->io_thread_task_runner()->PostTask(
+        FROM_HERE,
         base::Bind(&RequestDataResourceDispatcherHostDelegate::SetDelegate,
                    base::Unretained(delegate_.get())));
   }