Refactor ResourceHandler API.

content/browser/loader/test_resource_handler.h

Index: content/browser/loader/test_resource_handler.h
diff --git a/content/browser/loader/test_resource_handler.h b/content/browser/loader/test_resource_handler.h
index 134f9a6e42c5f273647c215619382444be99a920..342aeed810891d6c21ed8f8f7d42382673f52669 100644
--- a/content/browser/loader/test_resource_handler.h
+++ b/content/browser/loader/test_resource_handler.h
@@ -40,15 +40,16 @@ class TestResourceHandler : 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;
@@ -108,6 +109,8 @@ class TestResourceHandler : public ResourceHandler {
   scoped_refptr<net::IOBuffer> buffer_;
   size_t buffer_size_;
 
+  ResourceController* controller_ = nullptr;
+
   bool on_will_start_result_ = true;
   bool on_response_started_result_ = true;
   bool on_will_read_result_ = true;