Prerender: Add thread checks to PrerenderResourceThrottle

chrome/browser/prerender/prerender_resource_throttle.cc

Index: chrome/browser/prerender/prerender_resource_throttle.cc
diff --git a/chrome/browser/prerender/prerender_resource_throttle.cc b/chrome/browser/prerender/prerender_resource_throttle.cc
index df57aa36620930cec613afaab18205b7a9c4355b..cbc719c32bc48d1195dd6502f4c01c3d61e48e43 100644
--- a/chrome/browser/prerender/prerender_resource_throttle.cc
+++ b/chrome/browser/prerender/prerender_resource_throttle.cc
@@ -90,6 +90,7 @@ PrerenderResourceThrottle::PrerenderResourceThrottle(net::URLRequest* request)
 PrerenderResourceThrottle::~PrerenderResourceThrottle() {}
 
 void PrerenderResourceThrottle::WillStartRequest(bool* defer) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   const content::ResourceRequestInfo* info =
       content::ResourceRequestInfo::ForRequest(request_);
   *defer = true;
@@ -104,6 +105,7 @@ void PrerenderResourceThrottle::WillStartRequest(bool* defer) {
 void PrerenderResourceThrottle::WillRedirectRequest(
     const net::RedirectInfo& redirect_info,
     bool* defer) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   const content::ResourceRequestInfo* info =
       content::ResourceRequestInfo::ForRequest(request_);
   *defer = true;
@@ -119,6 +121,7 @@ void PrerenderResourceThrottle::WillRedirectRequest(
 }
 
 void PrerenderResourceThrottle::WillProcessResponse(bool* defer) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);

[clamy, 2017/01/10 12:22:46]

nit: either use content::BrowserThread::IO or BrowserThread::IO everywhere for
consistency.

[pasko, 2017/01/23 12:32:16]

Done.

   const content::ResourceRequestInfo* info =
       content::ResourceRequestInfo::ForRequest(request_);
   if (!info)
@@ -141,6 +144,7 @@ const char* PrerenderResourceThrottle::GetNameForLogging() const {
 }
 
 void PrerenderResourceThrottle::ResumeHandler() {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   request_->SetLoadFlags(request_->load_flags() | load_flags_);
   Resume();
 }
@@ -153,6 +157,7 @@ void PrerenderResourceThrottle::WillStartRequestOnUI(
     const GURL& url,
     const ResourceRequestInfo::WebContentsGetter& web_contents_getter,
     scoped_refptr<PrerenderThrottleInfo> prerender_throttle_info) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   bool cancel = false;
   PrerenderContents* prerender_contents =
       PrerenderContentsFromGetter(web_contents_getter);
@@ -213,6 +218,7 @@ void PrerenderResourceThrottle::WillRedirectRequestOnUI(
     bool is_no_store,
     const GURL& new_url,
     const ResourceRequestInfo::WebContentsGetter& web_contents_getter) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   bool cancel = false;
   PrerenderContents* prerender_contents =
       PrerenderContentsFromGetter(web_contents_getter);
@@ -256,6 +262,7 @@ void PrerenderResourceThrottle::WillProcessResponseOnUI(
     bool is_no_store,
     int redirect_count,
     scoped_refptr<PrerenderThrottleInfo> prerender_throttle_info) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(prerender_throttle_info);
   if (!prerender_throttle_info->manager())
     return;
@@ -273,12 +280,14 @@ void PrerenderResourceThrottle::WillProcessResponseOnUI(
 // static
 PrerenderContents* PrerenderResourceThrottle::PrerenderContentsFromGetter(
     const ResourceRequestInfo::WebContentsGetter& web_contents_getter) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (g_prerender_contents_for_testing)
     return g_prerender_contents_for_testing;
   return PrerenderContents::FromWebContents(web_contents_getter.Run());
 }
 
 void PrerenderResourceThrottle::SetPrerenderMode(PrerenderMode mode) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   load_flags_ = (mode == PREFETCH_ONLY) ? net::LOAD_PREFETCH : net::LOAD_NORMAL;
 }