Refactor ResourceHandler API.

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"
@@ skipping 15 matching lines @@
     throttles_[i]->set_controller(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(
+void ThrottlingResourceHandler::OnRequestRedirected(
     const net::RedirectInfo& redirect_info,
     ResourceResponse* response,
-    bool* defer) {
+    bool* defer_or_cancel) {
   DCHECK(!cancelled_by_resource_throttle_);
 
-  *defer = false;
+  *defer_or_cancel = false;
   while (next_index_ < throttles_.size()) {
     int index = next_index_;
-    throttles_[index]->WillRedirectRequest(redirect_info, defer);
+    throttles_[index]->WillRedirectRequest(redirect_info, defer_or_cancel);
     next_index_++;
-    if (cancelled_by_resource_throttle_)
-      return false;
-    if (*defer) {
+    if (cancelled_by_resource_throttle_) {
+      // Nothing else to do here, already told controller() to cancel the
+      // request.
+      *defer_or_cancel = true;
+      return;
+    }
+    if (*defer_or_cancel) {
       OnRequestDefered(index);
       deferred_stage_ = DEFERRED_REDIRECT;
       deferred_redirect_ = redirect_info;
       deferred_response_ = response;
-      return true;  // Do not cancel.
+      return;
     }
   }
 
   next_index_ = 0;  // Reset for next time.
 
-  return next_handler_->OnRequestRedirected(redirect_info, response, defer);
+  return next_handler_->OnRequestRedirected(redirect_info, response,
+                                            defer_or_cancel);
 }
 
-bool ThrottlingResourceHandler::OnWillStart(const GURL& url, bool* defer) {
+void ThrottlingResourceHandler::OnWillStart(const GURL& url,
+                                            bool* defer_or_cancel) {
   DCHECK(!cancelled_by_resource_throttle_);
 
-  *defer = false;
+  *defer_or_cancel = false;
   while (next_index_ < throttles_.size()) {
     int index = next_index_;
-    throttles_[index]->WillStartRequest(defer);
+    throttles_[index]->WillStartRequest(defer_or_cancel);
     next_index_++;
-    if (cancelled_by_resource_throttle_)
-      return false;
-    if (*defer) {
+    if (cancelled_by_resource_throttle_) {
+      // Nothing else to do here, already told controller() to cancel the
+      // request.
+      *defer_or_cancel = true;
+      return;
+    }
+    if (*defer_or_cancel) {
       OnRequestDefered(index);
       deferred_stage_ = DEFERRED_START;
       deferred_url_ = url;
-      return true;  // Do not cancel.
+      return;
     }
   }
 
   next_index_ = 0;  // Reset for next time.
 
-  return next_handler_->OnWillStart(url, defer);
+  next_handler_->OnWillStart(url, defer_or_cancel);
 }
 
-bool ThrottlingResourceHandler::OnResponseStarted(ResourceResponse* response,
-                                                  bool* defer) {
+void ThrottlingResourceHandler::OnResponseStarted(ResourceResponse* response,
+                                                  bool* defer_or_cancel) {
   DCHECK(!cancelled_by_resource_throttle_);
 
   while (next_index_ < throttles_.size()) {
     int index = next_index_;
-    throttles_[index]->WillProcessResponse(defer);
+    throttles_[index]->WillProcessResponse(defer_or_cancel);
     next_index_++;
-    if (cancelled_by_resource_throttle_)
-      return false;
-    if (*defer) {
+    if (cancelled_by_resource_throttle_) {
+      // Nothing else to do here, already told controller() to cancel the
+      // request.
+      *defer_or_cancel = true;
+      return;
+    }
+    if (*defer_or_cancel) {
       OnRequestDefered(index);
       deferred_stage_ = DEFERRED_RESPONSE;
       deferred_response_ = response;
-      return true;  // Do not cancel.
+      return;
     }
   }
 
   next_index_ = 0;  // Reset for next time.
 
-  return next_handler_->OnResponseStarted(response, defer);
+  return next_handler_->OnResponseStarted(response, defer_or_cancel);
 }
 
 void ThrottlingResourceHandler::Cancel() {
   cancelled_by_resource_throttle_ = true;
   controller()->Cancel();
 }
 
 void ThrottlingResourceHandler::CancelAndIgnore() {
   cancelled_by_resource_throttle_ = true;
   controller()->CancelAndIgnore();
@@ skipping 26 matching lines @@
       break;
   }
 }
 
 void ThrottlingResourceHandler::ResumeStart() {
   DCHECK(!cancelled_by_resource_throttle_);
 
   GURL url = deferred_url_;
   deferred_url_ = GURL();
 
-  bool defer = false;
-  if (!OnWillStart(url, &defer)) {
-    controller()->Cancel();
-  } else if (!defer) {
+  bool defer_or_cancel = false;
+  OnWillStart(url, &defer_or_cancel);
+  if (!defer_or_cancel)
     controller()->Resume();
-  }
 }
 
 void ThrottlingResourceHandler::ResumeRedirect() {
   DCHECK(!cancelled_by_resource_throttle_);
 
   net::RedirectInfo redirect_info = deferred_redirect_;
   deferred_redirect_ = net::RedirectInfo();
   scoped_refptr<ResourceResponse> response;
   deferred_response_.swap(response);
 
-  bool defer = false;
-  if (!OnRequestRedirected(redirect_info, response.get(), &defer)) {
-    controller()->Cancel();
-  } else if (!defer) {
+  bool defer_or_cancel = false;
+  OnRequestRedirected(redirect_info, response.get(), &defer_or_cancel);
+  if (!defer_or_cancel)
     controller()->Resume();
-  }
 }
 
 void ThrottlingResourceHandler::ResumeResponse() {
   DCHECK(!cancelled_by_resource_throttle_);
 
   scoped_refptr<ResourceResponse> response;
   deferred_response_.swap(response);
 
-  bool defer = false;
-  if (!OnResponseStarted(response.get(), &defer)) {
-    controller()->Cancel();
-  } else if (!defer) {
+  bool defer_or_cancel = false;
+  OnResponseStarted(response.get(), &defer_or_cancel);
+  if (!defer_or_cancel)
     controller()->Resume();
-  }
 }
 
 void ThrottlingResourceHandler::OnRequestDefered(int throttle_index) {
   request()->LogBlockedBy(throttles_[throttle_index]->GetNameForLogging());
 }
 
 }  // namespace content