Refactor ResourceHandler API.

content/browser/loader/stream_resource_handler.cc

Index: content/browser/loader/stream_resource_handler.cc
diff --git a/content/browser/loader/stream_resource_handler.cc b/content/browser/loader/stream_resource_handler.cc
index 3560f98d17b9c84c252ac0f3f7b33c0de79abefb..932560bfd76549113cab3b2f0c40692d00cfb39b 100644
--- a/content/browser/loader/stream_resource_handler.cc
+++ b/content/browser/loader/stream_resource_handler.cc
@@ -24,21 +24,16 @@ void StreamResourceHandler::SetController(ResourceController* controller) {
   ResourceHandler::SetController(controller);
 }
 
-bool StreamResourceHandler::OnRequestRedirected(
+void StreamResourceHandler::OnRequestRedirected(
     const net::RedirectInfo& redirect_info,
     ResourceResponse* resp,
-    bool* defer) {
-  return true;
-}
+    bool* defer_or_cancel) {}
 
-bool StreamResourceHandler::OnResponseStarted(ResourceResponse* resp,
-                                              bool* defer) {
-  return true;
-}
+void StreamResourceHandler::OnResponseStarted(ResourceResponse* resp,
+                                              bool* defer_or_cancel) {}
 
-bool StreamResourceHandler::OnWillStart(const GURL& url, bool* defer) {
-  return true;
-}
+void StreamResourceHandler::OnWillStart(const GURL& url,
+                                        bool* defer_or_cancel) {}
 
 bool StreamResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf,
                                        int* buf_size,
@@ -47,9 +42,9 @@ bool StreamResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf,
   return true;
 }
 
-bool StreamResourceHandler::OnReadCompleted(int bytes_read, bool* defer) {
-  writer_.OnReadCompleted(bytes_read, defer);
-  return true;
+void StreamResourceHandler::OnReadCompleted(int bytes_read,
+                                            bool* defer_or_cancel) {
+  writer_.OnReadCompleted(bytes_read, defer_or_cancel);
 }
 
 void StreamResourceHandler::OnResponseCompleted(