Refactor ResourceHandler API.

content/browser/loader/mojo_async_resource_handler_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/loader/mojo_async_resource_handler.h"
 
 #include <string.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/run_loop.h"
 #include "content/browser/loader/resource_controller.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_request_info_impl.h"
+#include "content/browser/loader/test_resource_handler_wrapper.h"
 #include "content/browser/loader/test_url_loader_client.h"
 #include "content/common/resource_request_completion_status.h"
 #include "content/common/url_loader.mojom.h"
 #include "content/public/browser/appcache_service.h"
 #include "content/public/browser/navigation_data.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "content/public/browser/resource_throttle.h"
 #include "content/public/browser/stream_info.h"
 #include "content/public/common/resource_response.h"
@@ skipping 135 matching lines @@
     num_on_response_started_calls_expectation_ = expectation;
   }
 
  private:
   int num_on_response_started_calls_ = 0;
   int num_on_response_started_calls_expectation_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(TestResourceDispatcherHostDelegate);
 };
 
-class TestResourceController : public ResourceController {
- public:
-  TestResourceController() {}
-  ~TestResourceController() override {}
-
-  void Cancel() override { ADD_FAILURE() << "Cancel should not be called."; }
-
-  void CancelAndIgnore() override {
-    ADD_FAILURE() << "CancelAndIgnore should not be called.";
-  }
-
-  void CancelWithError(int error_code) override {
-    // While cancelling more than once is legal, none of these tests should do
-    // it.
-    EXPECT_FALSE(is_cancel_with_error_called_);
-
-    is_cancel_with_error_called_ = true;
-    error_ = error_code;
-    if (quit_closure_)
-      quit_closure_.Run();
-  }
-
-  void Resume() override { ++num_resume_calls_; }
-
-  void RunUntilCancelWithErrorCalled() {
-    base::RunLoop run_loop;
-    quit_closure_ = run_loop.QuitClosure();
-    run_loop.Run();
-  }
-
-  void set_quit_closure(const base::Closure& quit_closure) {
-    quit_closure_ = quit_closure;
-  }
-
-  bool is_cancel_with_error_called() const {
-    return is_cancel_with_error_called_;
-  }
-  int error() const { return error_; }
-  int num_resume_calls() const { return num_resume_calls_; }
-
- private:
-  bool is_cancel_with_error_called_ = false;
-  int error_ = net::OK;
-  int num_resume_calls_ = 0;
-  base::Closure quit_closure_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestResourceController);
-};
-
 class MojoAsyncResourceHandlerWithCustomDataPipeOperations
     : public MojoAsyncResourceHandler {
  public:
   MojoAsyncResourceHandlerWithCustomDataPipeOperations(
       net::URLRequest* request,
       ResourceDispatcherHostImpl* rdh,
       mojom::URLLoaderAssociatedRequest mojo_request,
       mojom::URLLoaderClientAssociatedPtr url_loader_client)
       : MojoAsyncResourceHandler(request,
                                  rdh,
@@ skipping 117 matching lines @@
     url_loader_factory_.FlushForTesting();
     DCHECK(weak_binding);
     TestURLLoaderFactory* factory_impl =
         static_cast<TestURLLoaderFactory*>(weak_binding->impl());
 
     mojom::URLLoaderClientAssociatedPtr client_ptr;
     client_ptr.Bind(factory_impl->PassClientPtrInfo());
     handler_.reset(new MojoAsyncResourceHandlerWithCustomDataPipeOperations(
         request_.get(), &rdh_, factory_impl->PassLoaderRequest(),
         std::move(client_ptr)));
-    handler_->SetController(&resource_controller_);
+    handler_wrapper_.reset(new TestResourceHandlerWrapper(handler_.get()));
   }
 
   virtual ~MojoAsyncResourceHandlerTestBase() {
     net::URLRequestFilter::GetInstance()->ClearHandlers();
     MojoAsyncResourceHandler::SetAllocationSizeForTesting(
         MojoAsyncResourceHandler::kDefaultAllocationSize);
     base::RunLoop().RunUntilIdle();
   }
 
   // Returns false if something bad happens.
-  bool CallOnWillStart() {
-    bool defer = false;
-    if (!handler_->OnWillStart(request_->url(), &defer)) {
-      ADD_FAILURE() << "OnWillStart returns false.";
-      return false;
-    }
-    if (defer) {
-      ADD_FAILURE() << "OnWillStart sets |defer| true.";
-      return false;
-    }
-    return true;
-  }
-
-  // Returns false if something bad happens.
   bool CallOnWillStartAndOnResponseStarted() {
     rdh_delegate_.set_num_on_response_started_calls_expectation(1);
-    if (!CallOnWillStart())
+    TestResourceHandlerWrapper::Result result =
+        handler_wrapper_->OnWillStart(request_->url());
+    EXPECT_EQ(TestResourceHandlerWrapper::Result::RESUME, result);
+    if (result != TestResourceHandlerWrapper::Result::RESUME)
       return false;
 
     scoped_refptr<ResourceResponse> response = new ResourceResponse();
-    bool defer = false;
-    if (!handler_->OnResponseStarted(response.get(), &defer)) {
-      ADD_FAILURE() << "OnResponseStarted returns false.";
+    result = handler_wrapper_->OnResponseStarted(response.get());
+    EXPECT_EQ(TestResourceHandlerWrapper::Result::RESUME, result);
+    if (result != TestResourceHandlerWrapper::Result::RESUME)
       return false;
-    }
-    if (defer) {
-      ADD_FAILURE() << "OnResponseStarted sets |defer| true.";
-      return false;
-    }
+
     if (url_loader_client_.has_received_response()) {
       ADD_FAILURE() << "URLLoaderClient unexpectedly gets a response.";
       return false;
     }
     url_loader_client_.RunUntilResponseReceived();
     return true;
   }
 
   TestBrowserThreadBundle thread_bundle_;
   TestResourceDispatcherHostDelegate rdh_delegate_;
   ResourceDispatcherHostImpl rdh_;
   mojom::URLLoaderFactoryPtr url_loader_factory_;
   mojom::URLLoaderAssociatedPtr url_loader_proxy_;
   TestURLLoaderClient url_loader_client_;
-  TestResourceController resource_controller_;
   std::unique_ptr<TestBrowserContext> browser_context_;
   std::unique_ptr<net::TestDelegate> url_request_delegate_;
   std::unique_ptr<net::URLRequest> request_;
   std::unique_ptr<MojoAsyncResourceHandlerWithCustomDataPipeOperations>
       handler_;
+  std::unique_ptr<TestResourceHandlerWrapper> handler_wrapper_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoAsyncResourceHandlerTestBase);
 };
 
 class MojoAsyncResourceHandlerTest : public MojoAsyncResourceHandlerTestBase,
                                      public ::testing::Test {};
 
 // This test class is parameterized with MojoAsyncResourceHandler's allocation
 // size.
 class MojoAsyncResourceHandlerWithAllocationSizeTest
     : public MojoAsyncResourceHandlerTestBase,
       public ::testing::TestWithParam<size_t> {
  protected:
   MojoAsyncResourceHandlerWithAllocationSizeTest() {
     MojoAsyncResourceHandler::SetAllocationSizeForTesting(GetParam());
   }
 };
 
 TEST_F(MojoAsyncResourceHandlerTest, InFlightRequests) {
   EXPECT_EQ(0, rdh_.num_in_flight_requests_for_testing());
   handler_ = nullptr;
   EXPECT_EQ(0, rdh_.num_in_flight_requests_for_testing());
 }
 
 TEST_F(MojoAsyncResourceHandlerTest, OnWillStart) {
-  bool defer = false;
-  EXPECT_TRUE(handler_->OnWillStart(request_->url(), &defer));
-  EXPECT_FALSE(defer);
+  EXPECT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnWillStart(request_->url()));
 }
 
 TEST_F(MojoAsyncResourceHandlerTest, OnResponseStarted) {
   rdh_delegate_.set_num_on_response_started_calls_expectation(1);
-  ASSERT_TRUE(CallOnWillStart());
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnWillStart(request_->url()));
 
   scoped_refptr<ResourceResponse> response = new ResourceResponse();
   response->head.content_length = 99;
   response->head.request_start =
       base::TimeTicks::UnixEpoch() + base::TimeDelta::FromDays(14);
   response->head.response_start =
       base::TimeTicks::UnixEpoch() + base::TimeDelta::FromDays(28);
 
-  bool defer = false;
-
   EXPECT_EQ(0, rdh_delegate_.num_on_response_started_calls());
   base::TimeTicks now1 = base::TimeTicks::Now();
-  ASSERT_TRUE(handler_->OnResponseStarted(response.get(), &defer));
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnResponseStarted(response.get()));
   base::TimeTicks now2 = base::TimeTicks::Now();
 
-  EXPECT_FALSE(defer);
   EXPECT_EQ(request_->creation_time(), response->head.request_start);
   EXPECT_LE(now1, response->head.response_start);
   EXPECT_LE(response->head.response_start, now2);
   EXPECT_EQ(1, rdh_delegate_.num_on_response_started_calls());
 
   url_loader_client_.RunUntilResponseReceived();
   EXPECT_EQ(response->head.request_start,
             url_loader_client_.response_head().request_start);
   EXPECT_EQ(response->head.response_start,
             url_loader_client_.response_head().response_start);
@@ skipping 14 matching lines @@
 TEST_F(MojoAsyncResourceHandlerTest, OnWillReadWithInsufficientResource) {
   rdh_.set_max_num_in_flight_requests_per_process(0);
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
 
   scoped_refptr<net::IOBuffer> io_buffer;
   int io_buffer_size = 0;
   EXPECT_FALSE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
   EXPECT_FALSE(io_buffer);
   EXPECT_EQ(0, io_buffer_size);
   EXPECT_EQ(1, rdh_.num_in_flight_requests_for_testing());
-  EXPECT_TRUE(resource_controller_.is_cancel_with_error_called());
-  EXPECT_EQ(net::ERR_INSUFFICIENT_RESOURCES, resource_controller_.error());
+  // TODO(mmenke):  Should make sure the class is cancelling with
+  // ERR_INSUFFICIENT_RESOURCES here (Which it isn't currently doing).
   handler_ = nullptr;
   EXPECT_EQ(0, rdh_.num_in_flight_requests_for_testing());
 }
 
 TEST_F(MojoAsyncResourceHandlerTest, OnWillReadAndOnReadCompleted) {
-  bool defer = false;
   scoped_refptr<net::IOBuffer> io_buffer;
   int io_buffer_size = 0;
 
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
   ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
   ASSERT_TRUE(io_buffer);
   // The buffer size that the mime sniffer requires implicitly.
   ASSERT_GE(io_buffer_size, kSizeMimeSnifferRequiresForFirstOnWillRead);
 
   url_loader_client_.RunUntilResponseBodyArrived();
   ASSERT_TRUE(url_loader_client_.response_body().is_valid());
 
   io_buffer->data()[0] = 'A';
   io_buffer->data()[1] = 'B';
-  ASSERT_TRUE(handler_->OnReadCompleted(2, &defer));
-  EXPECT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnReadCompleted(2));
 
   std::string contents;
   while (contents.size() < 2) {
     char buffer[16];
     uint32_t read_size = sizeof(buffer);
     MojoResult result =
         mojo::ReadDataRaw(url_loader_client_.response_body(), buffer,
                           &read_size, MOJO_READ_DATA_FLAG_NONE);
     if (result == MOJO_RESULT_SHOULD_WAIT) {
       base::RunLoop().RunUntilIdle();
       continue;
     }
     contents.append(buffer, read_size);
   }
   EXPECT_EQ("AB", contents);
 }
 
 TEST_F(MojoAsyncResourceHandlerTest,
        OnWillReadAndOnReadCompletedWithInsufficientInitialCapacity) {
   MojoAsyncResourceHandler::SetAllocationSizeForTesting(2);
 
-  bool defer = false;
   scoped_refptr<net::IOBuffer> io_buffer;
   int io_buffer_size = 0;
 
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
   ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
   ASSERT_TRUE(io_buffer);
   // The buffer size that the mime sniffer requires implicitly.
   ASSERT_GE(io_buffer_size, kSizeMimeSnifferRequiresForFirstOnWillRead);
 
   url_loader_client_.RunUntilResponseBodyArrived();
   ASSERT_TRUE(url_loader_client_.response_body().is_valid());
 
   const std::string data("abcdefgh");
   strcpy(io_buffer->data(), data.c_str());
-  ASSERT_TRUE(handler_->OnReadCompleted(data.size(), &defer));
-  EXPECT_TRUE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::CALLBACK_PENDING,
+            handler_wrapper_->OnReadCompleted(data.size()));
 
   std::string contents;
   while (contents.size() < data.size()) {
     // This is needed for Resume to be called.
     base::RunLoop().RunUntilIdle();
     char buffer[16];
     uint32_t read_size = sizeof(buffer);
     MojoResult result =
         mojo::ReadDataRaw(url_loader_client_.response_body(), buffer,
                           &read_size, MOJO_READ_DATA_FLAG_NONE);
     if (result == MOJO_RESULT_SHOULD_WAIT)
       continue;
     ASSERT_EQ(MOJO_RESULT_OK, result);
     contents.append(buffer, read_size);
   }
   EXPECT_EQ(data, contents);
-  EXPECT_EQ(0, resource_controller_.num_resume_calls());
+  EXPECT_EQ(TestResourceHandlerWrapper::Result::CALLBACK_PENDING,
+            handler_wrapper_->last_result());
 }
 
 TEST_F(MojoAsyncResourceHandlerTest,
        IOBufferFromOnWillReadShouldRemainValidEvenIfHandlerIsGone) {
   scoped_refptr<net::IOBuffer> io_buffer;
   int io_buffer_size = 0;
 
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
   ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
   ASSERT_TRUE(io_buffer);
   // The io_buffer size that the mime sniffer requires implicitly.
   ASSERT_GE(io_buffer_size, kSizeMimeSnifferRequiresForFirstOnWillRead);
 
   handler_ = nullptr;
   url_loader_client_.Unbind();
   base::RunLoop().RunUntilIdle();
 
   // Hopefully ASAN checks this operation's validity.
   io_buffer->data()[0] = 'A';
 }
 
 TEST_F(MojoAsyncResourceHandlerTest, OnResponseCompleted) {
-  bool defer = false;
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
 
   ResourceRequestInfoImpl::ForRequest(request_.get())
       ->set_was_ignored_by_handler(false);
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, net::OK);
 
   base::TimeTicks now1 = base::TimeTicks::Now();
-  handler_->OnResponseCompleted(status, &defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnResponseCompleted(status));
   base::TimeTicks now2 = base::TimeTicks::Now();
-  EXPECT_FALSE(defer);
 
   url_loader_client_.RunUntilComplete();
   EXPECT_TRUE(url_loader_client_.has_received_completion());
   EXPECT_EQ(net::OK, url_loader_client_.completion_status().error_code);
   EXPECT_FALSE(url_loader_client_.completion_status().was_ignored_by_handler);
   EXPECT_LE(now1, url_loader_client_.completion_status().completion_time);
   EXPECT_LE(url_loader_client_.completion_status().completion_time, now2);
   EXPECT_EQ(request_->GetTotalReceivedBytes(),
             url_loader_client_.completion_status().encoded_data_length);
 }
 
 // This test case sets different status values from OnResponseCompleted.
 TEST_F(MojoAsyncResourceHandlerTest, OnResponseCompleted2) {
   rdh_.SetDelegate(nullptr);
-  bool defer = false;
   // Don't use CallOnWillStartAndOnResponseStarted as this test case manually
   // sets the null delegate.
-  ASSERT_TRUE(CallOnWillStart());
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnWillStart(request_->url()));
   scoped_refptr<ResourceResponse> response = new ResourceResponse();
-  ASSERT_TRUE(handler_->OnResponseStarted(response.get(), &defer));
-  ASSERT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnResponseStarted(response.get()));
   ASSERT_FALSE(url_loader_client_.has_received_response());
   url_loader_client_.RunUntilResponseReceived();
 
   ResourceRequestInfoImpl::ForRequest(request_.get())
       ->set_was_ignored_by_handler(true);
   net::URLRequestStatus status(net::URLRequestStatus::CANCELED,
                                net::ERR_ABORTED);
 
   base::TimeTicks now1 = base::TimeTicks::Now();
-  handler_->OnResponseCompleted(status, &defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnResponseCompleted(status));
   base::TimeTicks now2 = base::TimeTicks::Now();
-  EXPECT_FALSE(defer);
 
   url_loader_client_.RunUntilComplete();
   EXPECT_TRUE(url_loader_client_.has_received_completion());
   EXPECT_EQ(net::ERR_ABORTED,
             url_loader_client_.completion_status().error_code);
   EXPECT_TRUE(url_loader_client_.completion_status().was_ignored_by_handler);
   EXPECT_LE(now1, url_loader_client_.completion_status().completion_time);
   EXPECT_LE(url_loader_client_.completion_status().completion_time, now2);
   EXPECT_EQ(request_->GetTotalReceivedBytes(),
             url_loader_client_.completion_status().encoded_data_length);
 }
 
 TEST_F(MojoAsyncResourceHandlerTest, OnResponseCompletedWithCanceledTimedOut) {
   net::URLRequestStatus status(net::URLRequestStatus::CANCELED,
                                net::ERR_TIMED_OUT);
-  bool defer = false;
 
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
-  handler_->OnResponseCompleted(status, &defer);
-  EXPECT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnResponseCompleted(status));
 
   url_loader_client_.RunUntilComplete();
   EXPECT_TRUE(url_loader_client_.has_received_completion());
   EXPECT_EQ(net::ERR_TIMED_OUT,
             url_loader_client_.completion_status().error_code);
 }
 
 TEST_F(MojoAsyncResourceHandlerTest, OnResponseCompletedWithFailedTimedOut) {
   net::URLRequestStatus status(net::URLRequestStatus::FAILED,
                                net::ERR_TIMED_OUT);
-  bool defer = false;
 
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
-  handler_->OnResponseCompleted(status, &defer);
-  EXPECT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnResponseCompleted(status));
 
   url_loader_client_.RunUntilComplete();
   EXPECT_TRUE(url_loader_client_.has_received_completion());
   EXPECT_EQ(net::ERR_TIMED_OUT,
             url_loader_client_.completion_status().error_code);
 }
 
 TEST_F(MojoAsyncResourceHandlerTest, ResponseCompletionShouldCloseDataPipe) {
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
 
   scoped_refptr<net::IOBuffer> io_buffer;
   int io_buffer_size = 0;
-  bool defer = false;
   ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
   url_loader_client_.RunUntilResponseBodyArrived();
   ASSERT_TRUE(url_loader_client_.response_body().is_valid());
-  ASSERT_TRUE(handler_->OnReadCompleted(0, &defer));
-  EXPECT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnReadCompleted(0));
 
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, net::OK);
-  handler_->OnResponseCompleted(status, &defer);
-  EXPECT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnResponseCompleted(status));
 
   url_loader_client_.RunUntilComplete();
   EXPECT_TRUE(url_loader_client_.has_received_completion());
   EXPECT_EQ(net::OK, url_loader_client_.completion_status().error_code);
 
   // This is needed because |*io_buffer| may keep the data producer alive.
   io_buffer = nullptr;
 
   while (true) {
     char buffer[16];
@@ skipping 10 matching lines @@
 TEST_F(MojoAsyncResourceHandlerTest, ResponseErrorDuringBodyTransmission) {
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
 
   scoped_refptr<net::IOBuffer> io_buffer;
   int io_buffer_size = 0;
   ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
   url_loader_client_.RunUntilResponseBodyArrived();
   ASSERT_TRUE(url_loader_client_.response_body().is_valid());
   ASSERT_GT(io_buffer_size, 0);
   memset(io_buffer->data(), 'a', io_buffer_size);
-  bool defer = false;
-  ASSERT_TRUE(handler_->OnReadCompleted(io_buffer_size, &defer));
-  // We don't care |defer|'s value here.
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::CALLBACK_PENDING,
+            handler_wrapper_->OnReadCompleted(io_buffer_size));
 
-  defer = false;
+  // Out of band cancel.
   net::URLRequestStatus status(net::URLRequestStatus::FAILED, net::ERR_FAILED);
-  handler_->OnResponseCompleted(status, &defer);
-  EXPECT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnResponseCompletedForOutOfBandCancel(status));
 
   url_loader_client_.RunUntilComplete();
   EXPECT_TRUE(url_loader_client_.has_received_completion());
   EXPECT_EQ(net::ERR_FAILED, url_loader_client_.completion_status().error_code);
 
   // This is needed because |*io_buffer| may keep the data producer alive.
   io_buffer = nullptr;
 
   std::string actual;
   while (true) {
@@ skipping 16 matching lines @@
 
 // In this case, an error is notified after OnWillRead, before OnReadCompleted.
 TEST_F(MojoAsyncResourceHandlerTest, ResponseErrorDuringBodyTransmission2) {
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
 
   scoped_refptr<net::IOBuffer> io_buffer;
   int io_buffer_size = 0;
   ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
   url_loader_client_.RunUntilResponseBodyArrived();
   ASSERT_TRUE(url_loader_client_.response_body().is_valid());
-  bool defer = false;
   net::URLRequestStatus status(net::URLRequestStatus::FAILED, net::ERR_FAILED);
-  handler_->OnResponseCompleted(status, &defer);
-  EXPECT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnResponseCompleted(status));
 
   url_loader_client_.RunUntilComplete();
   EXPECT_TRUE(url_loader_client_.has_received_completion());
   EXPECT_EQ(net::ERR_FAILED, url_loader_client_.completion_status().error_code);
 
   // This is needed because |*io_buffer| may keep the data producer alive.
   io_buffer = nullptr;
 
   while (true) {
     char buf[16];
     uint32_t read_size = sizeof(buf);
     MojoResult result =
         mojo::ReadDataRaw(url_loader_client_.response_body(), buf, &read_size,
                           MOJO_READ_DATA_FLAG_NONE);
     if (result == MOJO_RESULT_FAILED_PRECONDITION)
       break;
     ASSERT_EQ(MOJO_RESULT_SHOULD_WAIT, result);
     base::RunLoop().RunUntilIdle();
   }
 }
 
 TEST_F(MojoAsyncResourceHandlerTest, BeginWriteFailsOnWillRead) {
   handler_->set_begin_write_expectation(MOJO_RESULT_UNKNOWN);
   scoped_refptr<net::IOBuffer> io_buffer;
   int io_buffer_size = 0;
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
   ASSERT_FALSE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
-  EXPECT_FALSE(resource_controller_.is_cancel_with_error_called());
 }
 
 TEST_F(MojoAsyncResourceHandlerTest, BeginWriteReturnsShouldWaitOnWillRead) {
   handler_->set_begin_write_expectation(MOJO_RESULT_SHOULD_WAIT);
   scoped_refptr<net::IOBuffer> io_buffer;
   int io_buffer_size = 0;
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
   ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
   EXPECT_TRUE(io_buffer);
   EXPECT_GT(io_buffer_size, 0);
 }
 
 TEST_F(MojoAsyncResourceHandlerTest,
        BeginWriteReturnsShouldWaitOnWillReadAndThenReturnsOK) {
   handler_->set_begin_write_expectation(MOJO_RESULT_SHOULD_WAIT);
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
   size_t written = 0;
   while (true) {
     scoped_refptr<net::IOBuffer> io_buffer;
     int io_buffer_size = 0;
     ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
     EXPECT_TRUE(io_buffer);
     EXPECT_GT(io_buffer_size, 0);
     memset(io_buffer->data(), 'X', io_buffer_size);
     written += io_buffer_size;
-    bool defer = false;
-    ASSERT_TRUE(handler_->OnReadCompleted(io_buffer_size, &defer));
-    if (defer)
+    TestResourceHandlerWrapper::Result result =
+        handler_wrapper_->OnReadCompleted(io_buffer_size);
+    if (result == TestResourceHandlerWrapper::Result::CALLBACK_PENDING)
       break;
+    ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME, result);
   }
 
   url_loader_client_.RunUntilResponseBodyArrived();
   ASSERT_TRUE(url_loader_client_.response_body().is_valid());
   handler_->ResetBeginWriteExpectation();
   handler_->OnWritableForTesting();
 
   std::string actual;
   while (actual.size() < written) {
     char buf[16];
     uint32_t read_size = sizeof(buf);
     MojoResult result =
         mojo::ReadDataRaw(url_loader_client_.response_body(), buf, &read_size,
                           MOJO_READ_DATA_FLAG_NONE);
     ASSERT_TRUE(result == MOJO_RESULT_OK || result == MOJO_RESULT_SHOULD_WAIT);
     if (result == MOJO_RESULT_OK)
       actual.append(buf, read_size);
     base::RunLoop().RunUntilIdle();
   }
 
   EXPECT_EQ(std::string(written, 'X'), actual);
-  EXPECT_EQ(1, resource_controller_.num_resume_calls());
+  EXPECT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->last_result());
 }
 
 TEST_F(MojoAsyncResourceHandlerTest,
        EndWriteFailsOnWillReadWithInsufficientInitialCapacity) {
   MojoAsyncResourceHandler::SetAllocationSizeForTesting(2);
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
   handler_->set_end_write_expectation(MOJO_RESULT_UNKNOWN);
   scoped_refptr<net::IOBuffer> io_buffer;
   int io_buffer_size = 0;
   ASSERT_FALSE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
 }
 
 TEST_F(MojoAsyncResourceHandlerTest, EndWriteFailsOnReadCompleted) {
   scoped_refptr<net::IOBuffer> io_buffer;
   int io_buffer_size = 0;
-  bool defer = false;
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
   ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
 
   handler_->set_end_write_expectation(MOJO_RESULT_SHOULD_WAIT);
-  ASSERT_FALSE(handler_->OnReadCompleted(io_buffer_size, &defer));
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::CANCEL,
+            handler_wrapper_->OnReadCompleted(io_buffer_size));
 }
 
 TEST_F(MojoAsyncResourceHandlerTest,
        EndWriteFailsOnReadCompletedWithInsufficientInitialCapacity) {
   MojoAsyncResourceHandler::SetAllocationSizeForTesting(2);
   scoped_refptr<net::IOBuffer> io_buffer;
   int io_buffer_size = 0;
-  bool defer = false;
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
   ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
 
   handler_->set_end_write_expectation(MOJO_RESULT_SHOULD_WAIT);
-  ASSERT_FALSE(handler_->OnReadCompleted(io_buffer_size, &defer));
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::CANCEL,
+            handler_wrapper_->OnReadCompleted(io_buffer_size));
 }
 
 TEST_F(MojoAsyncResourceHandlerTest,
        EndWriteFailsOnResumeWithInsufficientInitialCapacity) {
   MojoAsyncResourceHandler::SetAllocationSizeForTesting(8);
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
   scoped_refptr<net::IOBuffer> io_buffer;
   int io_buffer_size = 0;
   ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
   url_loader_client_.RunUntilResponseBodyArrived();
   ASSERT_TRUE(url_loader_client_.response_body().is_valid());
 
   while (true) {
-    bool defer = false;
-    ASSERT_TRUE(handler_->OnReadCompleted(io_buffer_size, &defer));
     ASSERT_GE(io_buffer_size, 0);
-    if (defer)
+    TestResourceHandlerWrapper::Result result =
+        handler_wrapper_->OnReadCompleted(io_buffer_size);
+    if (result == TestResourceHandlerWrapper::Result::CALLBACK_PENDING)
       break;
+    ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME, result);
+
     ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
   }
 
   while (true) {
     char buf[16];
     uint32_t read_size = sizeof(buf);
     MojoResult result =
         mojo::ReadDataRaw(url_loader_client_.response_body(), buf, &read_size,
                           MOJO_READ_DATA_FLAG_NONE);
     if (result == MOJO_RESULT_SHOULD_WAIT)
       break;
     ASSERT_EQ(MOJO_RESULT_OK, result);
   }
 
   handler_->set_end_write_expectation(MOJO_RESULT_SHOULD_WAIT);
-  resource_controller_.RunUntilCancelWithErrorCalled();
+  handler_wrapper_->RunUntilCanceled();
   EXPECT_FALSE(url_loader_client_.has_received_completion());
-  EXPECT_TRUE(resource_controller_.is_cancel_with_error_called());
-  EXPECT_EQ(net::ERR_FAILED, resource_controller_.error());
+  EXPECT_EQ(TestResourceHandlerWrapper::Result::CANCEL,
+            handler_wrapper_->last_result());
+  EXPECT_EQ(net::ERR_FAILED, handler_wrapper_->net_error());
 }
 
 TEST_P(MojoAsyncResourceHandlerWithAllocationSizeTest,
        OnWillReadWithLongContents) {
-  bool defer = false;
   scoped_refptr<net::IOBuffer> io_buffer;
   int io_buffer_size = 0;
 
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
   ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
   ASSERT_TRUE(io_buffer);
   // The io_buffer size that the mime sniffer requires implicitly.
   ASSERT_GE(io_buffer_size, kSizeMimeSnifferRequiresForFirstOnWillRead);
   std::string expected;
   for (int i = 0; i < 3 * io_buffer_size + 2; ++i)
     expected += ('A' + i % 26);
 
-  ASSERT_TRUE(handler_->OnReadCompleted(0, &defer));
-  ASSERT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnReadCompleted(0));
 
   url_loader_client_.RunUntilResponseBodyArrived();
   ASSERT_TRUE(url_loader_client_.response_body().is_valid());
 
   size_t written = 0;
   std::string actual;
   while (actual.size() < expected.size()) {
-    while (written < expected.size() && !defer) {
+    while (written < expected.size() &&
+           handler_wrapper_->last_result() ==
+               TestResourceHandlerWrapper::Result::RESUME) {
       ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
       const size_t to_be_written = std::min(static_cast<size_t>(io_buffer_size),
                                             expected.size() - written);
       memcpy(io_buffer->data(), &expected[written], to_be_written);
-      ASSERT_TRUE(handler_->OnReadCompleted(to_be_written, &defer));
+
+      // Request should be resumed or paused.
+      ASSERT_NE(TestResourceHandlerWrapper::Result::CANCEL,
+                handler_wrapper_->OnReadCompleted(to_be_written));
+
       written += to_be_written;
     }
 
     char buf[16];
     uint32_t read_size = sizeof(buf);
     MojoResult result =
         mojo::ReadDataRaw(url_loader_client_.response_body(), buf, &read_size,
                           MOJO_READ_DATA_FLAG_NONE);
     if (result != MOJO_RESULT_SHOULD_WAIT) {
       ASSERT_EQ(MOJO_RESULT_OK, result);
       actual.append(buf, read_size);
     }
-    int resume_count = resource_controller_.num_resume_calls();
+
+    // Give mojo a chance pass data back and forth, and to request more data
+    // from the handler.
     base::RunLoop().RunUntilIdle();
-    // Continue writing if controller->Resume() is called.
-    defer = (resume_count == resource_controller_.num_resume_calls());
   }
   EXPECT_EQ(expected, actual);
 }
 
 TEST_P(MojoAsyncResourceHandlerWithAllocationSizeTest,
        BeginWriteFailsOnReadCompleted) {
   scoped_refptr<net::IOBuffer> io_buffer;
   int io_buffer_size = 0;
-  bool defer = false;
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
   ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
 
   handler_->set_begin_write_expectation(MOJO_RESULT_UNKNOWN);
-  ASSERT_FALSE(handler_->OnReadCompleted(io_buffer_size, &defer));
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::CANCEL,
+            handler_wrapper_->OnReadCompleted(io_buffer_size));
 }
 
 TEST_P(MojoAsyncResourceHandlerWithAllocationSizeTest,
        BeginWriteReturnsShouldWaitOnReadCompleted) {
   scoped_refptr<net::IOBuffer> io_buffer;
   int io_buffer_size = 0;
-  bool defer = false;
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
   ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
 
   handler_->set_begin_write_expectation(MOJO_RESULT_SHOULD_WAIT);
-  ASSERT_TRUE(handler_->OnReadCompleted(io_buffer_size, &defer));
-  EXPECT_TRUE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::CALLBACK_PENDING,
+            handler_wrapper_->OnReadCompleted(io_buffer_size));
 }
 
 TEST_P(MojoAsyncResourceHandlerWithAllocationSizeTest,
        BeginWriteFailsOnResume) {
-  bool defer = false;
   int io_buffer_size = 0;
   scoped_refptr<net::IOBuffer> io_buffer;
 
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
   ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
-  ASSERT_TRUE(handler_->OnReadCompleted(0, &defer));
-  ASSERT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnReadCompleted(0));
   url_loader_client_.RunUntilResponseBodyArrived();
   ASSERT_TRUE(url_loader_client_.response_body().is_valid());
 
-  while (!defer) {
+  while (true) {
     ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
-    ASSERT_TRUE(handler_->OnReadCompleted(io_buffer_size, &defer));
+    TestResourceHandlerWrapper::Result result =
+        handler_wrapper_->OnReadCompleted(io_buffer_size);
+    if (result == TestResourceHandlerWrapper::Result::CALLBACK_PENDING)
+      break;
+    ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME, result);
   }
   handler_->set_begin_write_expectation(MOJO_RESULT_UNKNOWN);
 
-  while (!resource_controller_.is_cancel_with_error_called()) {
+  while (handler_wrapper_->last_result() !=
+         TestResourceHandlerWrapper::Result::CANCEL) {
     char buf[256];
     uint32_t read_size = sizeof(buf);
     MojoResult result =
         mojo::ReadDataRaw(url_loader_client_.response_body(), buf, &read_size,
                           MOJO_READ_DATA_FLAG_NONE);
     ASSERT_TRUE(result == MOJO_RESULT_OK || result == MOJO_RESULT_SHOULD_WAIT);
     base::RunLoop().RunUntilIdle();
   }
 
   EXPECT_FALSE(url_loader_client_.has_received_completion());
-  EXPECT_EQ(net::ERR_FAILED, resource_controller_.error());
-  EXPECT_EQ(0, resource_controller_.num_resume_calls());
+  EXPECT_EQ(net::ERR_FAILED, handler_wrapper_->net_error());
 }
 
 TEST_P(MojoAsyncResourceHandlerWithAllocationSizeTest, CancelWhileWaiting) {
-  bool defer = false;
   ASSERT_TRUE(CallOnWillStartAndOnResponseStarted());
 
-  while (!defer) {
+  while (true) {
     scoped_refptr<net::IOBuffer> io_buffer;
     int io_buffer_size = 0;
     ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
-    ASSERT_TRUE(handler_->OnReadCompleted(io_buffer_size, &defer));
+    TestResourceHandlerWrapper::Result result =
+        handler_wrapper_->OnReadCompleted(io_buffer_size);
+    if (result == TestResourceHandlerWrapper::Result::CALLBACK_PENDING)
+      break;
+    ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME, result);
   }
 
   url_loader_client_.RunUntilResponseBodyArrived();
   ASSERT_TRUE(url_loader_client_.response_body().is_valid());
 
-  defer = false;
   net::URLRequestStatus status(net::URLRequestStatus::CANCELED,
                                net::ERR_ABORTED);
-  handler_->OnResponseCompleted(status, &defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnResponseCompletedForOutOfBandCancel(status));
 
   ASSERT_FALSE(url_loader_client_.has_received_completion());
   url_loader_client_.RunUntilComplete();
   EXPECT_EQ(net::ERR_ABORTED,
             url_loader_client_.completion_status().error_code);
 
   while (true) {
     char buffer[16];
     uint32_t read_size = sizeof(buffer);
     MojoResult result =
         mojo::ReadDataRaw(url_loader_client_.response_body(), buffer,
                           &read_size, MOJO_READ_DATA_FLAG_NONE);
     if (result == MOJO_RESULT_FAILED_PRECONDITION)
       break;
     base::RunLoop().RunUntilIdle();
     DCHECK(result == MOJO_RESULT_SHOULD_WAIT || result == MOJO_RESULT_OK);
   }
 
   base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(0, resource_controller_.num_resume_calls());
 }
 
 TEST_P(MojoAsyncResourceHandlerWithAllocationSizeTest, RedirectHandling) {
   rdh_delegate_.set_num_on_response_started_calls_expectation(1);
-  bool defer = false;
 
-  ASSERT_TRUE(handler_->OnWillStart(request_->url(), &defer));
-  ASSERT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnWillStart(request_->url()));
+
   scoped_refptr<ResourceResponse> response = new ResourceResponse();
   net::RedirectInfo redirect_info;
   redirect_info.status_code = 301;
-  ASSERT_TRUE(
-      handler_->OnRequestRedirected(redirect_info, response.get(), &defer));
-  ASSERT_TRUE(defer);
+  ASSERT_EQ(
+      TestResourceHandlerWrapper::Result::CALLBACK_PENDING,
+      handler_wrapper_->OnRequestRedirected(redirect_info, response.get()));
 
   ASSERT_FALSE(url_loader_client_.has_received_response());
   ASSERT_FALSE(url_loader_client_.has_received_redirect());
   url_loader_client_.RunUntilRedirectReceived();
 
   ASSERT_FALSE(url_loader_client_.has_received_response());
   ASSERT_TRUE(url_loader_client_.has_received_redirect());
   EXPECT_EQ(301, url_loader_client_.redirect_info().status_code);
 
-  EXPECT_EQ(0, resource_controller_.num_resume_calls());
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::CALLBACK_PENDING,
+            handler_wrapper_->last_result());
   handler_->FollowRedirect();
-  EXPECT_EQ(1, resource_controller_.num_resume_calls());
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->last_result());
 
   url_loader_client_.ClearHasReceivedRedirect();
   // Redirect once more.
-  defer = false;
   redirect_info.status_code = 302;
-  ASSERT_TRUE(
-      handler_->OnRequestRedirected(redirect_info, response.get(), &defer));
-  ASSERT_TRUE(defer);
+  ASSERT_EQ(
+      TestResourceHandlerWrapper::Result::CALLBACK_PENDING,
+      handler_wrapper_->OnRequestRedirected(redirect_info, response.get()));
 
   ASSERT_FALSE(url_loader_client_.has_received_response());
   ASSERT_FALSE(url_loader_client_.has_received_redirect());
   url_loader_client_.RunUntilRedirectReceived();
 
   ASSERT_FALSE(url_loader_client_.has_received_response());
   ASSERT_TRUE(url_loader_client_.has_received_redirect());
   EXPECT_EQ(302, url_loader_client_.redirect_info().status_code);
 
-  EXPECT_EQ(1, resource_controller_.num_resume_calls());
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::CALLBACK_PENDING,
+            handler_wrapper_->last_result());
   handler_->FollowRedirect();
-  EXPECT_EQ(2, resource_controller_.num_resume_calls());
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->last_result());
 
   // Give the final response.
-  defer = false;
-  ASSERT_TRUE(handler_->OnResponseStarted(response.get(), &defer));
-  ASSERT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnResponseStarted(response.get()));
 
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, net::OK);
-  handler_->OnResponseCompleted(status, &defer);
-  ASSERT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnResponseCompleted(status));
 
   ASSERT_FALSE(url_loader_client_.has_received_completion());
   url_loader_client_.RunUntilComplete();
 
   ASSERT_TRUE(url_loader_client_.has_received_response());
   ASSERT_TRUE(url_loader_client_.has_received_completion());
   EXPECT_EQ(net::OK, url_loader_client_.completion_status().error_code);
 }
 
+// Test the case where th other process tells the ResourceHandler to follow a
+// redirect, despite the fact that no redirect has been received yet.
 TEST_P(MojoAsyncResourceHandlerWithAllocationSizeTest,
        MalformedFollowRedirectRequest) {
   handler_->FollowRedirect();
 
   EXPECT_TRUE(handler_->has_received_bad_message());
-  EXPECT_EQ(0, resource_controller_.num_resume_calls());
 }
 
 // Typically ResourceHandler methods are called in this order.
 TEST_P(
     MojoAsyncResourceHandlerWithAllocationSizeTest,
     OnWillStartThenOnResponseStartedThenOnWillReadThenOnReadCompletedThenOnResponseCompleted) {
   rdh_delegate_.set_num_on_response_started_calls_expectation(1);
-  bool defer = false;
 
-  ASSERT_TRUE(handler_->OnWillStart(request_->url(), &defer));
-  ASSERT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnWillStart(request_->url()));
   scoped_refptr<ResourceResponse> response = new ResourceResponse();
-  ASSERT_TRUE(handler_->OnResponseStarted(response.get(), &defer));
-  ASSERT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnResponseStarted(response.get()));
 
   ASSERT_FALSE(url_loader_client_.has_received_response());
   url_loader_client_.RunUntilResponseReceived();
 
   int io_buffer_size = 0;
   scoped_refptr<net::IOBuffer> io_buffer;
   ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
   ASSERT_TRUE(io_buffer);
   ASSERT_GT(io_buffer_size, 0);
   io_buffer->data()[0] = 'A';
 
   ASSERT_FALSE(url_loader_client_.response_body().is_valid());
   url_loader_client_.RunUntilResponseBodyArrived();
   ASSERT_TRUE(url_loader_client_.response_body().is_valid());
 
-  ASSERT_TRUE(handler_->OnReadCompleted(1, &defer));
-  ASSERT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnReadCompleted(1));
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, net::OK);
-  handler_->OnResponseCompleted(status, &defer);
-  ASSERT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnResponseCompleted(status));
 
   ASSERT_FALSE(url_loader_client_.has_received_completion());
   url_loader_client_.RunUntilComplete();
   EXPECT_EQ(net::OK, url_loader_client_.completion_status().error_code);
 
   // This is needed because |*io_buffer| may keep the data producer alive.
   io_buffer = nullptr;
 
   std::string body;
   while (true) {
@@ skipping 12 matching lines @@
     }
   }
   EXPECT_EQ("A", body);
 }
 
 // MimeResourceHandler calls delegated ResourceHandler's methods in this order.
 TEST_P(
     MojoAsyncResourceHandlerWithAllocationSizeTest,
     OnWillStartThenOnWillReadThenOnResponseStartedThenOnReadCompletedThenOnResponseCompleted) {
   rdh_delegate_.set_num_on_response_started_calls_expectation(1);
-  bool defer = false;
 
-  ASSERT_TRUE(handler_->OnWillStart(request_->url(), &defer));
-  ASSERT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnWillStart(request_->url()));
 
   int io_buffer_size = 0;
   scoped_refptr<net::IOBuffer> io_buffer;
   ASSERT_TRUE(handler_->OnWillRead(&io_buffer, &io_buffer_size, -1));
   ASSERT_TRUE(io_buffer);
   ASSERT_GT(io_buffer_size, 0);
   io_buffer->data()[0] = 'B';
 
   ASSERT_FALSE(url_loader_client_.response_body().is_valid());
   url_loader_client_.RunUntilResponseBodyArrived();
   ASSERT_TRUE(url_loader_client_.response_body().is_valid());
 
   scoped_refptr<ResourceResponse> response = new ResourceResponse();
-  ASSERT_TRUE(handler_->OnResponseStarted(response.get(), &defer));
-  ASSERT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnResponseStarted(response.get()));
 
   ASSERT_FALSE(url_loader_client_.has_received_response());
   url_loader_client_.RunUntilResponseReceived();
 
-  ASSERT_TRUE(handler_->OnReadCompleted(1, &defer));
-  ASSERT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnReadCompleted(1));
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, net::OK);
-  handler_->OnResponseCompleted(status, &defer);
-  ASSERT_FALSE(defer);
+  ASSERT_EQ(TestResourceHandlerWrapper::Result::RESUME,
+            handler_wrapper_->OnResponseCompleted(status));
 
   ASSERT_FALSE(url_loader_client_.has_received_completion());
   url_loader_client_.RunUntilComplete();
   EXPECT_EQ(net::OK, url_loader_client_.completion_status().error_code);
 
   // This is needed because |*io_buffer| may keep the data producer alive.
   io_buffer = nullptr;
 
   std::string body;
   while (true) {
@@ skipping 12 matching lines @@
     }
   }
   EXPECT_EQ("B", body);
 }
 
 INSTANTIATE_TEST_CASE_P(MojoAsyncResourceHandlerWithAllocationSizeTest,
                         MojoAsyncResourceHandlerWithAllocationSizeTest,
                         ::testing::Values(8, 32 * 2014));
 }  // namespace
 }  // namespace content