Stop using ResourceController in ResourceThrottle

content/browser/loader/throttling_resource_handler.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/throttling_resource_handler.h"
 
 #include <utility>
 
 #include "content/browser/loader/resource_request_info_impl.h"
-#include "content/public/browser/resource_throttle.h"
+#include "content/public/browser/resource_controller.h"
 #include "content/public/common/resource_response.h"
 #include "net/url_request/url_request.h"
 
 namespace content {
 
 ThrottlingResourceHandler::ThrottlingResourceHandler(
     std::unique_ptr<ResourceHandler> next_handler,
     net::URLRequest* request,
     ScopedVector<ResourceThrottle> throttles)
     : LayeredResourceHandler(request, std::move(next_handler)),
       deferred_stage_(DEFERRED_NONE),
       throttles_(std::move(throttles)),
       next_index_(0),
       cancelled_by_resource_throttle_(false) {
   for (size_t i = 0; i < throttles_.size(); ++i) {
-    throttles_[i]->set_controller(this);
+    throttles_[i]->set_delegate(this);
     // Throttles must have a name, as otherwise, bugs where a throttle fails
     // to resume a request can be very difficult to debug.
     DCHECK(throttles_[i]->GetNameForLogging());
   }
 }
 
 ThrottlingResourceHandler::~ThrottlingResourceHandler() {
 }
 
 bool ThrottlingResourceHandler::OnRequestRedirected(
     const net::RedirectInfo& redirect_info,
     ResourceResponse* response,
     bool* defer) {
   DCHECK(!cancelled_by_resource_throttle_);
+  DCHECK(!*defer);
 
-  *defer = false;
   while (next_index_ < throttles_.size()) {
     int index = next_index_;
     throttles_[index]->WillRedirectRequest(redirect_info, defer);
     next_index_++;
     if (cancelled_by_resource_throttle_)
       return false;
     if (*defer) {
-      OnRequestDefered(index);
+      OnRequestDeferred(index);
       deferred_stage_ = DEFERRED_REDIRECT;
       deferred_redirect_ = redirect_info;
       deferred_response_ = response;
       return true;  // Do not cancel.
     }
   }
 
   next_index_ = 0;  // Reset for next time.
 
   return next_handler_->OnRequestRedirected(redirect_info, response, defer);
 }
 
 bool ThrottlingResourceHandler::OnWillStart(const GURL& url, bool* defer) {
   DCHECK(!cancelled_by_resource_throttle_);
+  DCHECK(!*defer);
 
-  *defer = false;
   while (next_index_ < throttles_.size()) {
     int index = next_index_;
     throttles_[index]->WillStartRequest(defer);
     next_index_++;
     if (cancelled_by_resource_throttle_)
       return false;
     if (*defer) {
-      OnRequestDefered(index);
+      OnRequestDeferred(index);
       deferred_stage_ = DEFERRED_START;
       deferred_url_ = url;
       return true;  // Do not cancel.
     }
   }
 
   next_index_ = 0;  // Reset for next time.
 
   return next_handler_->OnWillStart(url, defer);
 }
 
 bool ThrottlingResourceHandler::OnResponseStarted(ResourceResponse* response,
                                                   bool* defer) {
   DCHECK(!cancelled_by_resource_throttle_);
+  DCHECK(!*defer);
 
   while (next_index_ < throttles_.size()) {
     int index = next_index_;
     throttles_[index]->WillProcessResponse(defer);
     next_index_++;
     if (cancelled_by_resource_throttle_)
       return false;
     if (*defer) {
-      OnRequestDefered(index);
+      OnRequestDeferred(index);
       deferred_stage_ = DEFERRED_RESPONSE;
       deferred_response_ = response;
       return true;  // Do not cancel.
     }
   }
 
   next_index_ = 0;  // Reset for next time.
 
   return next_handler_->OnResponseStarted(response, defer);
 }
@@ skipping 73 matching lines @@
   deferred_response_.swap(response);
 
   bool defer = false;
   if (!OnResponseStarted(response.get(), &defer)) {
     controller()->Cancel();
   } else if (!defer) {
     controller()->Resume();
   }
 }
 
-void ThrottlingResourceHandler::OnRequestDefered(int throttle_index) {
+void ThrottlingResourceHandler::OnRequestDeferred(int throttle_index) {
   request()->LogBlockedBy(throttles_[throttle_index]->GetNameForLogging());
 }
 
 }  // namespace content