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..fd0dd145cc80953bb9cad2a770c1763bd8851240 100644
--- a/content/browser/loader/layered_resource_handler.cc
+++ b/content/browser/loader/layered_resource_handler.cc
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "base/logging.h"
+#include "content/public/browser/resource_controller.h"
 
 namespace content {
 
@@ -18,35 +19,27 @@ LayeredResourceHandler::LayeredResourceHandler(
 LayeredResourceHandler::~LayeredResourceHandler() {
 }
 
-void LayeredResourceHandler::SetController(ResourceController* controller) {
-  ResourceHandler::SetController(controller);
-
-  // Pass the controller down to the next handler.  This method is intended to
-  // be overriden by subclasses of LayeredResourceHandler that need to insert a
-  // different ResourceController.
-
-  DCHECK(next_handler_.get());
-  next_handler_->SetController(controller);
-}
-
-bool LayeredResourceHandler::OnRequestRedirected(
+void LayeredResourceHandler::OnRequestRedirected(
     const net::RedirectInfo& redirect_info,
     ResourceResponse* response,
-    bool* defer) {
+    std::unique_ptr<ResourceController> controller) {
   DCHECK(next_handler_.get());
-  return next_handler_->OnRequestRedirected(redirect_info, response, defer);
+  next_handler_->OnRequestRedirected(redirect_info, response,
+                                     std::move(controller));
 }
 
-bool LayeredResourceHandler::OnResponseStarted(ResourceResponse* response,
-                                               bool* defer) {
+void LayeredResourceHandler::OnResponseStarted(
+    ResourceResponse* response,
+    std::unique_ptr<ResourceController> controller) {
   DCHECK(next_handler_.get());
-  return next_handler_->OnResponseStarted(response, defer);
+  next_handler_->OnResponseStarted(response, std::move(controller));
 }
 
-bool LayeredResourceHandler::OnWillStart(const GURL& url,
-                                         bool* defer) {
+void LayeredResourceHandler::OnWillStart(
+    const GURL& url,
+    std::unique_ptr<ResourceController> controller) {
   DCHECK(next_handler_.get());
-  return next_handler_->OnWillStart(url, defer);
+  next_handler_->OnWillStart(url, std::move(controller));
 }
 
 bool LayeredResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf,
@@ -56,16 +49,18 @@ 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,
+    std::unique_ptr<ResourceController> controller) {
   DCHECK(next_handler_.get());
-  return next_handler_->OnReadCompleted(bytes_read, defer);
+  next_handler_->OnReadCompleted(bytes_read, std::move(controller));
 }
 
 void LayeredResourceHandler::OnResponseCompleted(
     const net::URLRequestStatus& status,
-    bool* defer) {
+    std::unique_ptr<ResourceController> controller) {
   DCHECK(next_handler_.get());
-  next_handler_->OnResponseCompleted(status, defer);
+  next_handler_->OnResponseCompleted(status, std::move(controller));
 }
 
 void LayeredResourceHandler::OnDataDownloaded(int bytes_downloaded) {