Refactor ResourceHandler API.

content/browser/loader/navigation_resource_handler.h

Index: content/browser/loader/navigation_resource_handler.h
diff --git a/content/browser/loader/navigation_resource_handler.h b/content/browser/loader/navigation_resource_handler.h
index 9608807d665690a5c3b12787de94530152a8c7f4..299e8ac4b8cca86508c3f6b05e063fd886a81c33 100644
--- a/content/browser/loader/navigation_resource_handler.h
+++ b/content/browser/loader/navigation_resource_handler.h
@@ -43,15 +43,16 @@ class NavigationResourceHandler : public ResourceHandler {
 
   // ResourceHandler implementation.
   void SetController(ResourceController* controller) override;
-  bool OnRequestRedirected(const net::RedirectInfo& redirect_info,
+  void OnRequestRedirected(const net::RedirectInfo& redirect_info,
                            ResourceResponse* response,
-                           bool* defer) override;
-  bool OnResponseStarted(ResourceResponse* response, bool* defer) override;
-  bool OnWillStart(const GURL& url, bool* defer) override;
+                           bool* defer_or_cancel) override;
+  void OnResponseStarted(ResourceResponse* response,
+                         bool* defer_or_cancel) override;
+  void OnWillStart(const GURL& url, bool* defer_or_cancel) override;
   bool OnWillRead(scoped_refptr<net::IOBuffer>* buf,
                   int* buf_size,
                   int min_size) override;
-  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;
   void OnDataDownloaded(int bytes_downloaded) override;