Refactor ResourceHandler API.

content/browser/loader/resource_loader_unittest.cc

Index: content/browser/loader/resource_loader_unittest.cc
diff --git a/content/browser/loader/resource_loader_unittest.cc b/content/browser/loader/resource_loader_unittest.cc
index 6ca2ac10da28978c4b8678b8264b62465151aa4a..6e92d1722fafe635463798b76c092ad9a075271f 100644
--- a/content/browser/loader/resource_loader_unittest.cc
+++ b/content/browser/loader/resource_loader_unittest.cc
@@ -325,30 +325,28 @@ class ResourceHandlerStub : public ResourceHandler {
     controller()->Resume();
   }
 
-  bool OnRequestRedirected(const net::RedirectInfo& redirect_info,
+  void OnRequestRedirected(const net::RedirectInfo& redirect_info,
                            ResourceResponse* response,
-                           bool* defer) override {
+                           bool* defer_or_cancel) override {
     redirect_response_ = response;
     received_request_redirected_ = true;
-    return true;
   }
 
-  bool OnResponseStarted(ResourceResponse* response, bool* defer) override {
+  void OnResponseStarted(ResourceResponse* response,
+                         bool* defer_or_cancel) override {
     EXPECT_FALSE(response_.get());
     response_ = response;
     observed_effective_connection_type_ =
         response->head.effective_connection_type;
-    return true;
   }
 
-  bool OnWillStart(const GURL& url, bool* defer) override {
+  void OnWillStart(const GURL& url, bool* defer_or_cancel) override {
     EXPECT_TRUE(start_url_.is_empty());
     start_url_ = url;
     if (defer_request_on_will_start_) {
-      *defer = true;
+      *defer_or_cancel = true;
       deferred_run_loop_.Quit();
     }
-    return true;
   }
 
   bool OnWillRead(scoped_refptr<net::IOBuffer>* buf,
@@ -365,7 +363,7 @@ class ResourceHandlerStub : public ResourceHandler {
     return true;
   }
 
-  bool OnReadCompleted(int bytes_read, bool* defer) override {
+  void OnReadCompleted(int bytes_read, bool* defer_or_cancel) override {
     EXPECT_TRUE(received_on_will_read_);
     EXPECT_TRUE(expect_reads_);
     EXPECT_FALSE(received_response_completed_);
@@ -374,7 +372,7 @@ class ResourceHandlerStub : public ResourceHandler {
       received_eof_ = true;
       if (defer_eof_) {
         defer_eof_ = false;
-        *defer = true;
+        *defer_or_cancel = true;
         deferred_run_loop_.Quit();
       }
     }
@@ -382,7 +380,10 @@ class ResourceHandlerStub : public ResourceHandler {
     // Need another OnWillRead() call before seeing an OnReadCompleted().
     received_on_will_read_ = false;
 
-    return !cancel_on_read_completed_;
+    if (cancel_on_read_completed_) {
+      *defer_or_cancel = true;
+      controller()->Cancel();
+    }
   }
 
   void OnResponseCompleted(const net::URLRequestStatus& status,