Refactor ResourceHandler API.

content/browser/loader/stream_resource_handler.h

Index: content/browser/loader/stream_resource_handler.h
diff --git a/content/browser/loader/stream_resource_handler.h b/content/browser/loader/stream_resource_handler.h
index 4f6201f1b2a73c32ba9a4e3575b95413491fc963..719c30bceb67764f22af2c02af8f69e8debf5758 100644
--- a/content/browser/loader/stream_resource_handler.h
+++ b/content/browser/loader/stream_resource_handler.h
@@ -18,6 +18,7 @@ class URLRequest;
 
 namespace content {
 
+class ResourceController;
 class StreamRegistry;
 
 // Redirect this resource to a stream.
@@ -31,16 +32,18 @@ class StreamResourceHandler : public ResourceHandler {
                         const GURL& origin);
   ~StreamResourceHandler() override;
 
-  void SetController(ResourceController* controller) override;
-
   // Not needed, as this event handler ought to be the final resource.
-  bool OnRequestRedirected(const net::RedirectInfo& redirect_info,
-                           ResourceResponse* resp,
-                           bool* defer) override;
+  void OnRequestRedirected(
+      const net::RedirectInfo& redirect_info,
+      ResourceResponse* resp,
+      std::unique_ptr<ResourceController> controller) override;
 
-  bool OnResponseStarted(ResourceResponse* resp, bool* defer) override;
+  void OnResponseStarted(
+      ResourceResponse* resp,
+      std::unique_ptr<ResourceController> controller) override;
 
-  bool OnWillStart(const GURL& url, bool* defer) override;
+  void OnWillStart(const GURL& url,
+                   std::unique_ptr<ResourceController> controller) override;
 
   // Create a new buffer to store received data.
   bool OnWillRead(scoped_refptr<net::IOBuffer>* buf,
@@ -48,10 +51,12 @@ class StreamResourceHandler : public ResourceHandler {
                   int min_size) override;
 
   // A read was completed, forward the data to the Stream.
-  bool OnReadCompleted(int bytes_read, bool* defer) override;
+  void OnReadCompleted(int bytes_read,
+                       std::unique_ptr<ResourceController> controller) override;
 
-  void OnResponseCompleted(const net::URLRequestStatus& status,
-                           bool* defer) override;
+  void OnResponseCompleted(
+      const net::URLRequestStatus& status,
+      std::unique_ptr<ResourceController> controller) override;
 
   void OnDataDownloaded(int bytes_downloaded) override;