Refactor ResourceHandler API.

content/browser/loader/layered_resource_handler.cc

Index: content/browser/loader/layered_resource_handler.cc
diff --git a/content/browser/loader/layered_resource_handler.cc b/content/browser/loader/layered_resource_handler.cc
index 133e492b1f04318066935475d63208f7c2d52f5f..4d985c0f3d892d079af5d05be1e42b122609f4a8 100644
--- a/content/browser/loader/layered_resource_handler.cc
+++ b/content/browser/loader/layered_resource_handler.cc
@@ -29,24 +29,24 @@ void LayeredResourceHandler::SetController(ResourceController* controller) {
   next_handler_->SetController(controller);
 }
 
-bool LayeredResourceHandler::OnRequestRedirected(
+void LayeredResourceHandler::OnRequestRedirected(
     const net::RedirectInfo& redirect_info,
     ResourceResponse* response,
-    bool* defer) {
+    bool* defer_or_cancel) {
   DCHECK(next_handler_.get());
-  return next_handler_->OnRequestRedirected(redirect_info, response, defer);
+  next_handler_->OnRequestRedirected(redirect_info, response, defer_or_cancel);
 }
 
-bool LayeredResourceHandler::OnResponseStarted(ResourceResponse* response,
-                                               bool* defer) {
+void LayeredResourceHandler::OnResponseStarted(ResourceResponse* response,
+                                               bool* defer_or_cancel) {
   DCHECK(next_handler_.get());
-  return next_handler_->OnResponseStarted(response, defer);
+  next_handler_->OnResponseStarted(response, defer_or_cancel);
 }
 
-bool LayeredResourceHandler::OnWillStart(const GURL& url,
-                                         bool* defer) {
+void LayeredResourceHandler::OnWillStart(const GURL& url,
+                                         bool* defer_or_cancel) {
   DCHECK(next_handler_.get());
-  return next_handler_->OnWillStart(url, defer);
+  next_handler_->OnWillStart(url, defer_or_cancel);
 }
 
 bool LayeredResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf,
@@ -56,9 +56,10 @@ bool LayeredResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf,
   return next_handler_->OnWillRead(buf, buf_size, min_size);
 }
 
-bool LayeredResourceHandler::OnReadCompleted(int bytes_read, bool* defer) {
+void LayeredResourceHandler::OnReadCompleted(int bytes_read,
+                                             bool* defer_or_cancel) {
   DCHECK(next_handler_.get());
-  return next_handler_->OnReadCompleted(bytes_read, defer);
+  next_handler_->OnReadCompleted(bytes_read, defer_or_cancel);
 }
 
 void LayeredResourceHandler::OnResponseCompleted(