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..74874ccfa744b26de0c046e07e2ccd41f94c83ac 100644
--- a/content/browser/loader/stream_resource_handler.h
+++ b/content/browser/loader/stream_resource_handler.h
@@ -34,13 +34,14 @@ class StreamResourceHandler : public ResourceHandler {
   void SetController(ResourceController* controller) override;
 
   // Not needed, as this event handler ought to be the final resource.
-  bool OnRequestRedirected(const net::RedirectInfo& redirect_info,
+  void OnRequestRedirected(const net::RedirectInfo& redirect_info,
                            ResourceResponse* resp,
-                           bool* defer) override;
+                           bool* defer_or_cancel) override;
 
-  bool OnResponseStarted(ResourceResponse* resp, bool* defer) override;
+  void OnResponseStarted(ResourceResponse* resp,
+                         bool* defer_or_cancel) override;
 
-  bool OnWillStart(const GURL& url, bool* defer) override;
+  void OnWillStart(const GURL& url, bool* defer_or_cancel) override;
 
   // Create a new buffer to store received data.
   bool OnWillRead(scoped_refptr<net::IOBuffer>* buf,
@@ -48,7 +49,7 @@ 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, bool* defer_or_cancel) override;
 
   void OnResponseCompleted(const net::URLRequestStatus& status,
                            bool* defer) override;