Chromium Code Reviews| Index: content/browser/loader/mojo_async_resource_handler_unittest.cc |
| diff --git a/content/browser/loader/mojo_async_resource_handler_unittest.cc b/content/browser/loader/mojo_async_resource_handler_unittest.cc |
| index 7c4208c52a268d677fb29c3526ffa8b911fdd0a3..fb64714b7c35c97c88eca15db02471d00101766c 100644 |
| --- a/content/browser/loader/mojo_async_resource_handler_unittest.cc |
| +++ b/content/browser/loader/mojo_async_resource_handler_unittest.cc |
| @@ -853,7 +853,7 @@ TEST_F(MojoAsyncResourceHandlerTest, |
| url_loader_client_.RunUntilResponseBodyArrived(); |
| ASSERT_TRUE(url_loader_client_.response_body().is_valid()); |
| handler_->ResetBeginWriteExpectation(); |
| - handler_->ResumeForTesting(); |
| + handler_->OnWritableForTesting(); |
| std::string actual; |
| while (actual.size() < written) { |
| @@ -1092,6 +1092,31 @@ TEST_P(MojoAsyncResourceHandlerWithAllocationSizeTest, CancelWhileWaiting) { |
| EXPECT_EQ(0, resource_controller_.num_resume_calls()); |
| } |
| +TEST_P(MojoAsyncResourceHandlerWithAllocationSizeTest, RedirectHandling) { |
| + bool defer = false; |
| + |
| + ASSERT_TRUE(handler_->OnWillStart(request_->url(), &defer)); |
| + ASSERT_FALSE(defer); |
| + 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_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()); |
|
mmenke
2016/11/10 21:42:41
Check that there was only one received redirect ca
yhirano
2016/11/11 09:47:04
Done in TestResourceClient.
|
| + EXPECT_EQ(301, url_loader_client_.redirect_info().status_code); |
| + |
| + EXPECT_EQ(0, resource_controller_.num_resume_calls()); |
| + handler_->FollowRedirect(); |
| + EXPECT_EQ(1, resource_controller_.num_resume_calls()); |
|
mmenke
2016/11/10 21:42:41
Let's continue this request to completion. Otherw
yhirano
2016/11/11 09:47:04
Done.
|
| +} |
| + |
| // Typically ResourceHandler methods are called in this order. |
| TEST_P( |
| MojoAsyncResourceHandlerWithAllocationSizeTest, |