Stop using ResourceController in ResourceThrottle

content/browser/loader/navigation_resource_throttle.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 "content/browser/loader/navigation_resource_throttle.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/loader/navigation_resource_handler.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_loader.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_data.h"
 #include "content/public/browser/resource_context.h"
-#include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/ssl_status.h"
 #include "content/public/common/referrer.h"
 #include "net/url_request/redirect_info.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job_factory.h"
 #include "ui/base/page_transition_types.h"
 
@@ skipping 298 matching lines @@
 void NavigationResourceThrottle::OnUIChecksPerformed(
     NavigationThrottle::ThrottleCheckResult result) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK_NE(NavigationThrottle::DEFER, result);
   if (in_cross_site_transition_) {
     on_transfer_done_result_ = result;
     return;
   }
 
   if (result == NavigationThrottle::CANCEL_AND_IGNORE) {
-    controller()->CancelAndIgnore();
+    CancelAndIgnore();
   } else if (result == NavigationThrottle::CANCEL) {
-    controller()->Cancel();
+    Cancel();
   } else if (result == NavigationThrottle::BLOCK_REQUEST) {
-    controller()->CancelWithError(net::ERR_BLOCKED_BY_CLIENT);
+    CancelWithError(net::ERR_BLOCKED_BY_CLIENT);
   } else {
-    controller()->Resume();
+    Resume();
   }
 }
 
 void NavigationResourceThrottle::InitiateTransfer() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   in_cross_site_transition_ = true;
   ResourceRequestInfoImpl* info =
       ResourceRequestInfoImpl::ForRequest(request_);
   ResourceDispatcherHostImpl::Get()->MarkAsTransferredNavigation(
       info->GetGlobalRequestID(),
       base::Bind(&NavigationResourceThrottle::OnTransferComplete,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void NavigationResourceThrottle::OnTransferComplete() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(in_cross_site_transition_);
   in_cross_site_transition_ = false;
 
   // If the results of the checks on the UI thread are known, unblock the
   // navigation. Otherwise, wait until the callback has executed.
   if (on_transfer_done_result_ != NavigationThrottle::DEFER) {
     OnUIChecksPerformed(on_transfer_done_result_);
     on_transfer_done_result_ = NavigationThrottle::DEFER;
   }
 }
 
 }  // namespace content