Stop using ResourceController in ResourceThrottle

chrome/browser/loader/data_reduction_proxy_resource_throttle_android.cc

 // Copyright 2015 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 "chrome/browser/loader/data_reduction_proxy_resource_throttle_android.h"
 
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/resource_context.h"
-#include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/redirect_info.h"
 #include "net/url_request/url_request.h"
 
 using content::BrowserThread;
 using content::ResourceThrottle;
 using safe_browsing::SafeBrowsingService;
@@ skipping 47 matching lines @@
 
   // Save the redirect urls for possible malware detail reporting later.
   redirect_urls_.push_back(redirect_info.new_url);
 
   // We need to check the new URL before following the redirect.
   SBThreatType threat_type = CheckUrl();
   if (threat_type == safe_browsing::SB_THREAT_TYPE_SAFE)
     return;
 
   if (request_->load_flags() & net::LOAD_PREFETCH) {
-    controller()->Cancel();
+    Cancel();
     return;
   }
   const content::ResourceRequestInfo* info =
       content::ResourceRequestInfo::ForRequest(request_);
 
   state_ = STATE_DISPLAYING_BLOCKING_PAGE;
   security_interstitials::UnsafeResource unsafe_resource;
   unsafe_resource.url = redirect_info.new_url;
   unsafe_resource.original_url = request_->original_url();
   unsafe_resource.redirect_urls = redirect_urls_;
@@ skipping 45 matching lines @@
 // SafeBrowsingService::UrlCheckCallback implementation, called on the IO
 // thread when the user has decided to proceed with the current request, or
 // go back.
 void DataReductionProxyResourceThrottle::OnBlockingPageComplete(bool proceed) {
   CHECK(state_ == STATE_DISPLAYING_BLOCKING_PAGE);
   state_ = STATE_NONE;
 
   if (proceed)
     ResumeRequest();
   else
-    controller()->Cancel();
+    Cancel();
 }
 
 SBThreatType DataReductionProxyResourceThrottle::CheckUrl() {
   SBThreatType result = safe_browsing::SB_THREAT_TYPE_SAFE;
 
   // TODO(sgurun) Check for spdy proxy origin.
   if (request_->response_headers() == NULL)
     return result;
 
   if (request_->response_headers()->HasHeader("X-Phishing-Url"))
@@ skipping 10 matching lines @@
   }
 
   return result;
 }
 
 void DataReductionProxyResourceThrottle::ResumeRequest() {
   CHECK(state_ == STATE_NONE);
 
   // Inject the header before resuming the request.
   request_->SetExtraRequestHeaderByName(kUnsafeUrlProceedHeader, "1", true);
-  controller()->Resume();
+  Resume();
 }