Refactor ResourceHandler API.

content/browser/download/save_file_resource_handler.cc

Index: content/browser/download/save_file_resource_handler.cc
diff --git a/content/browser/download/save_file_resource_handler.cc b/content/browser/download/save_file_resource_handler.cc
index 854c15a837437d19c9fd125f09266ac6a9f99b06..3269f5cb93e2e5b59ff7d33b1bb5eb8efa9003f9 100644
--- a/content/browser/download/save_file_resource_handler.cc
+++ b/content/browser/download/save_file_resource_handler.cc
@@ -10,6 +10,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "content/browser/download/save_file_manager.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/resource_controller.h"
 #include "net/base/io_buffer.h"
 #include "net/url_request/redirect_info.h"
 #include "net/url_request/url_request_status.h"
@@ -37,16 +38,15 @@ SaveFileResourceHandler::SaveFileResourceHandler(
 SaveFileResourceHandler::~SaveFileResourceHandler() {
 }
 
-bool SaveFileResourceHandler::OnRequestRedirected(
+void SaveFileResourceHandler::OnRequestRedirected(
     const net::RedirectInfo& redirect_info,
     ResourceResponse* response,
-    bool* defer) {
+    bool* defer_or_cancel) {
   final_url_ = redirect_info.new_url;
-  return true;
 }
 
-bool SaveFileResourceHandler::OnResponseStarted(ResourceResponse* response,
-                                                bool* defer) {
+void SaveFileResourceHandler::OnResponseStarted(ResourceResponse* response,
+                                                bool* defer_or_cancel) {
   // |save_manager_| consumes (deletes):
   SaveFileCreateInfo* info = new SaveFileCreateInfo(
       url_, final_url_, save_item_id_, save_package_id_, render_process_id_,
@@ -55,11 +55,14 @@ bool SaveFileResourceHandler::OnResponseStarted(ResourceResponse* response,
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&SaveFileManager::StartSave, save_manager_, info));
-  return true;
 }
 
-bool SaveFileResourceHandler::OnWillStart(const GURL& url, bool* defer) {
-  return authorization_state_ == AuthorizationState::AUTHORIZED;
+void SaveFileResourceHandler::OnWillStart(const GURL& url,
+                                          bool* defer_or_cancel) {
+  if (authorization_state_ != AuthorizationState::AUTHORIZED) {
+    controller()->Cancel();
+    *defer_or_cancel = true;
+  }
 }
 
 bool SaveFileResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf,
@@ -75,7 +78,8 @@ bool SaveFileResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf,
   return true;
 }
 
-bool SaveFileResourceHandler::OnReadCompleted(int bytes_read, bool* defer) {
+void SaveFileResourceHandler::OnReadCompleted(int bytes_read,
+                                              bool* defer_or_cancel) {
   DCHECK_EQ(AuthorizationState::AUTHORIZED, authorization_state_);
   DCHECK(read_buffer_.get());
   // We are passing ownership of this buffer to the save file manager.
@@ -85,7 +89,6 @@ bool SaveFileResourceHandler::OnReadCompleted(int bytes_read, bool* defer) {
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&SaveFileManager::UpdateSaveProgress, save_manager_,
                  save_item_id_, base::RetainedRef(buffer), bytes_read));
-  return true;
 }
 
 void SaveFileResourceHandler::OnResponseCompleted(