Use modifed URLRequest API in net/url_request/url_request
unittests
This cl splits the big CL with changes to net/ folder and
has changes only to net/cert_net according to the
changes to URLRequest API.
What the big cl does:
It modifies net/ clients that use URLRequest API as long as
URLRequest::Read returns int net errors and
URLRequest::Delegate and NetworkDelegate methods
(for example, OnResponseStarted or OnCompleted) have int
net_error in the arguments now.
The reason behind splitting the CL into small one is that
an android bot started to be unstable and unittests became
flaky. It was not possible to locate the problem and the
decision was to split the CL and upload small parts with a
6+ hours interval in order to make it possible to locate
the problematic code.
The big CL is located here -
https://codereview.chromium.org/2265873002/
BUG=423484
Committed: https://crrev.com/a74d3cbc572fa1c85cc2c0434a9f8e2f9cba0cd9
Review-Url: https://codereview.chromium.org/2334563002
Cr-Original-Commit-Position: refs/heads/master@{#418014}
Cr-Commit-Position: refs/heads/master@{#419106}
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 31657cb3..35995a6 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -1117,7 +1117,7 @@
ASSERT_LT(0, d.bytes_received());
ASSERT_FALSE(d.request_failed());
- ASSERT_TRUE(req->status().is_success());
+ EXPECT_EQ(OK, d.request_status());
// Check for the entry generated for the "sentinel" file.
const std::string& data = d.data_received();
ASSERT_NE(data.find(sentinel_output), std::string::npos);
@@ -1141,7 +1141,7 @@
ASSERT_EQ(1, d.received_redirect_count());
ASSERT_LT(0, d.bytes_received());
ASSERT_FALSE(d.request_failed());
- ASSERT_TRUE(req->status().is_success());
+ EXPECT_EQ(OK, d.request_status());
}
#if defined(OS_WIN)
@@ -1154,7 +1154,7 @@
base::RunLoop().Run();
ASSERT_EQ(1, d.received_redirect_count());
- ASSERT_FALSE(req->status().is_success());
+ EXPECT_NE(OK, d.request_status());
}
#endif // defined(OS_WIN)
@@ -1616,7 +1616,7 @@
EXPECT_EQ(user_data2, req->GetUserData(&user_data2));
// Check that we got one good response.
- EXPECT_TRUE(req->status().is_success());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(200, req->response_headers()->response_code());
EXPECT_EQ(MockURLRequestInterceptor::ok_data(), d.data_received());
EXPECT_EQ(1, d.response_started_count());
@@ -1647,8 +1647,9 @@
EXPECT_TRUE(interceptor()->did_intercept_redirect());
// Check that we got one good response.
- EXPECT_TRUE(req->status().is_success());
- if (req->status().is_success())
+ int status = d.request_status();
+ EXPECT_EQ(OK, status);
+ if (status == OK)
EXPECT_EQ(200, req->response_headers()->response_code());
EXPECT_EQ(MockURLRequestInterceptor::ok_data(), d.data_received());
@@ -1679,7 +1680,7 @@
EXPECT_TRUE(interceptor()->did_intercept_final());
// Check that we got one good response.
- EXPECT_TRUE(req->status().is_success());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(200, req->response_headers()->response_code());
EXPECT_EQ(MockURLRequestInterceptor::ok_data(), d.data_received());
EXPECT_EQ(1, d.response_started_count());
@@ -1707,7 +1708,7 @@
EXPECT_TRUE(interceptor()->did_intercept_final());
// Check that we received one good response.
- EXPECT_TRUE(req->status().is_success());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(200, req->response_headers()->response_code());
EXPECT_EQ(MockURLRequestInterceptor::ok_data(), d.data_received());
EXPECT_EQ(1, d.response_started_count());
@@ -1735,8 +1736,9 @@
EXPECT_TRUE(interceptor()->did_intercept_main());
// Check that we received one good response.
- EXPECT_TRUE(req->status().is_success());
- if (req->status().is_success())
+ int status = d.request_status();
+ EXPECT_EQ(OK, status);
+ if (status == OK)
EXPECT_EQ(200, req->response_headers()->response_code());
EXPECT_EQ(MockURLRequestInterceptor::ok_data(), d.data_received());
@@ -1765,8 +1767,7 @@
EXPECT_FALSE(interceptor()->did_intercept_final());
// Check that we see a canceled request.
- EXPECT_FALSE(req->status().is_success());
- EXPECT_EQ(URLRequestStatus::CANCELED, req->status().status());
+ EXPECT_EQ(ERR_ABORTED, d.request_status());
}
TEST_F(URLRequestInterceptorTest, InterceptRespectsCancelRedirect) {
@@ -1797,8 +1798,7 @@
EXPECT_FALSE(interceptor()->did_intercept_final());
// Check that we see a canceled request.
- EXPECT_FALSE(req->status().is_success());
- EXPECT_EQ(URLRequestStatus::CANCELED, req->status().status());
+ EXPECT_EQ(ERR_ABORTED, d.request_status());
}
TEST_F(URLRequestInterceptorTest, InterceptRespectsCancelFinal) {
@@ -1820,8 +1820,7 @@
EXPECT_TRUE(interceptor()->did_cancel_final());
// Check that we see a canceled request.
- EXPECT_FALSE(req->status().is_success());
- EXPECT_EQ(URLRequestStatus::CANCELED, req->status().status());
+ EXPECT_EQ(ERR_ABORTED, d.request_status());
}
TEST_F(URLRequestInterceptorTest, InterceptRespectsCancelInRestart) {
@@ -1845,8 +1844,7 @@
EXPECT_FALSE(interceptor()->did_intercept_final());
// Check that we see a canceled request.
- EXPECT_FALSE(req->status().is_success());
- EXPECT_EQ(URLRequestStatus::CANCELED, req->status().status());
+ EXPECT_EQ(ERR_ABORTED, d.request_status());
}
// "Normal" LoadTimingInfo as returned by a job. Everything is in order, not
@@ -2156,11 +2154,9 @@
base::RunLoop().Run();
// Check we see a failed request.
- EXPECT_FALSE(req->status().is_success());
// The proxy server is not set before failure.
EXPECT_TRUE(req->proxy_server().IsEmpty());
- EXPECT_EQ(URLRequestStatus::FAILED, req->status().status());
- EXPECT_THAT(req->status().error(), IsError(ERR_PROXY_CONNECTION_FAILED));
+ EXPECT_EQ(ERR_PROXY_CONNECTION_FAILED, d.request_status());
EXPECT_EQ(1, network_delegate.error_count());
EXPECT_THAT(network_delegate.last_error(),
@@ -3013,7 +3009,7 @@
power_monitor_source->Suspend();
// Wait for the suspend notification to cause the request to fail.
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::CANCELED, r->status().status());
+ EXPECT_EQ(ERR_ABORTED, d.request_status());
EXPECT_TRUE(d.request_failed());
EXPECT_EQ(1, default_network_delegate_.completed_requests());
@@ -3198,8 +3194,7 @@
req->Start();
base::RunLoop().Run();
EXPECT_EQ(redirect_method, req->method());
- EXPECT_EQ(URLRequestStatus::SUCCESS, req->status().status());
- EXPECT_THAT(req->status().error(), IsOk());
+ EXPECT_EQ(OK, d.request_status());
if (include_data) {
if (request_method == redirect_method) {
EXPECT_TRUE(req->extra_request_headers().HasHeader(
@@ -3288,9 +3283,8 @@
base::RunLoop().Run();
- ASSERT_EQ(1, d.response_started_count())
- << "request failed: " << r->status().status()
- << ", os error: " << r->status().error();
+ ASSERT_EQ(1, d.response_started_count()) << "request failed. Error: "
+ << d.request_status();
EXPECT_FALSE(d.received_data_before_response());
EXPECT_EQ(uploadBytes, d.data_received());
@@ -3310,12 +3304,12 @@
base::RunLoop().Run();
- bool is_success = r->status().is_success();
+ if (d.request_status() != OK) {
+ EXPECT_EQ(ERR_RESPONSE_HEADERS_TOO_BIG, d.request_status());
+ return false;
+ }
- if (!is_success)
- EXPECT_TRUE(r->status().error() == ERR_RESPONSE_HEADERS_TOO_BIG);
-
- return is_success;
+ return true;
}
LocalHttpTestServer* http_test_server() { return &test_server_; }
@@ -3419,7 +3413,7 @@
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
+ EXPECT_EQ(OK, d.request_status());
HttpRequestHeaders headers;
std::string token_binding_header, token_binding_message;
@@ -3462,7 +3456,7 @@
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
+ EXPECT_EQ(OK, d.request_status());
HttpRequestHeaders headers;
std::string token_binding_header, token_binding_message;
@@ -3515,7 +3509,7 @@
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
+ EXPECT_EQ(OK, d.request_status());
HttpRequestHeaders headers;
std::string token_binding_header, token_binding_message;
@@ -3566,7 +3560,7 @@
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
+ EXPECT_EQ(OK, d.request_status());
HttpRequestHeaders headers;
std::string token_binding_header, token_binding_message;
@@ -3600,10 +3594,9 @@
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::FAILED, r->status().status());
// The proxy server is not set before failure.
EXPECT_TRUE(r->proxy_server().IsEmpty());
- EXPECT_THAT(r->status().error(), IsError(ERR_TUNNEL_CONNECTION_FAILED));
+ EXPECT_EQ(ERR_TUNNEL_CONNECTION_FAILED, d.request_status());
EXPECT_EQ(1, d.response_started_count());
// We should not have followed the redirect.
EXPECT_EQ(0, d.received_redirect_count());
@@ -3628,11 +3621,10 @@
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::FAILED, r->status().status());
// The proxy server is not set before failure.
EXPECT_TRUE(r->proxy_server().IsEmpty());
- EXPECT_THAT(r->status().error(), IsError(ERR_TUNNEL_CONNECTION_FAILED));
EXPECT_EQ(1, d.response_started_count());
+ EXPECT_EQ(ERR_TUNNEL_CONNECTION_FAILED, d.request_status());
// We should not have followed the redirect.
EXPECT_EQ(0, d.received_redirect_count());
@@ -3678,7 +3670,7 @@
}
base::RunLoop().Run();
EXPECT_EQ(200, r->GetResponseCode());
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(1, network_delegate.created_requests());
EXPECT_EQ(0, network_delegate.destroyed_requests());
}
@@ -3705,10 +3697,9 @@
r->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::FAILED, r->status().status());
// The proxy server is not set before cancellation.
EXPECT_TRUE(r->proxy_server().IsEmpty());
- EXPECT_THAT(r->status().error(), IsError(ERR_EMPTY_RESPONSE));
+ EXPECT_EQ(ERR_EMPTY_RESPONSE, d.request_status());
EXPECT_EQ(1, network_delegate.created_requests());
EXPECT_EQ(0, network_delegate.destroyed_requests());
}
@@ -3738,10 +3729,9 @@
r->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::FAILED, r->status().status());
// The proxy server is not set before cancellation.
EXPECT_TRUE(r->proxy_server().IsEmpty());
- EXPECT_THAT(r->status().error(), IsError(ERR_BLOCKED_BY_CLIENT));
+ EXPECT_EQ(ERR_BLOCKED_BY_CLIENT, d.request_status());
EXPECT_EQ(1, network_delegate.created_requests());
EXPECT_EQ(0, network_delegate.destroyed_requests());
}
@@ -3820,7 +3810,6 @@
base::RunLoop().Run();
// Check headers from URLRequestJob.
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
EXPECT_EQ(307, r->GetResponseCode());
EXPECT_EQ(307, r->response_headers()->response_code());
std::string location;
@@ -3831,7 +3820,7 @@
// Let the request finish.
r->FollowDeferredRedirect();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_TRUE(r->proxy_server().Equals(http_test_server()->host_port_pair()));
// before_send_headers_with_proxy_count only increments for headers sent
// through an untunneled proxy.
@@ -3839,7 +3828,7 @@
EXPECT_TRUE(network_delegate.last_observed_proxy().Equals(
http_test_server()->host_port_pair()));
- EXPECT_EQ(0, r->status().error());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(redirect_url, r->url());
EXPECT_EQ(original_url, r->original_url());
EXPECT_EQ(2U, r->url_chain().size());
@@ -3874,7 +3863,6 @@
base::RunLoop().Run();
// Check headers from URLRequestJob.
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
EXPECT_EQ(307, r->GetResponseCode());
EXPECT_EQ(307, r->response_headers()->response_code());
std::string location;
@@ -3886,14 +3874,14 @@
r->FollowDeferredRedirect();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_TRUE(r->proxy_server().Equals(http_test_server()->host_port_pair()));
// before_send_headers_with_proxy_count only increments for headers sent
// through an untunneled proxy.
EXPECT_EQ(1, network_delegate.before_send_headers_with_proxy_count());
EXPECT_TRUE(network_delegate.last_observed_proxy().Equals(
http_test_server()->host_port_pair()));
- EXPECT_EQ(0, r->status().error());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(redirect_url, r->url());
EXPECT_EQ(original_url, r->original_url());
EXPECT_EQ(2U, r->url_chain().size());
@@ -3937,7 +3925,6 @@
base::RunLoop().Run();
// Check headers from URLRequestJob.
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
EXPECT_EQ(307, r->GetResponseCode());
EXPECT_EQ(307, r->response_headers()->response_code());
std::string location;
@@ -3949,8 +3936,7 @@
r->FollowDeferredRedirect();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
- EXPECT_EQ(0, r->status().error());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(redirect_url, r->url());
EXPECT_EQ(original_url, r->original_url());
EXPECT_EQ(2U, r->url_chain().size());
@@ -3985,7 +3971,7 @@
r->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_TRUE(r->proxy_server().Equals(http_test_server()->host_port_pair()));
// before_send_headers_with_proxy_count only increments for headers sent
// through an untunneled proxy.
@@ -3993,7 +3979,7 @@
EXPECT_TRUE(network_delegate.last_observed_proxy().Equals(
http_test_server()->host_port_pair()));
- EXPECT_THAT(r->status().error(), IsOk());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(redirect_url, r->url());
EXPECT_EQ(original_url, r->original_url());
EXPECT_EQ(2U, r->url_chain().size());
@@ -4028,8 +4014,7 @@
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
- EXPECT_EQ(0, r->status().error());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(200, r->GetResponseCode());
EXPECT_TRUE(d.auth_required_called());
EXPECT_EQ(1, network_delegate.created_requests());
@@ -4066,8 +4051,7 @@
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
- EXPECT_EQ(0, r->status().error());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(200, r->GetResponseCode());
EXPECT_TRUE(d.auth_required_called());
EXPECT_EQ(1, network_delegate.created_requests());
@@ -4101,8 +4085,7 @@
r->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
- EXPECT_EQ(0, r->status().error());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(200, r->GetResponseCode());
EXPECT_FALSE(d.auth_required_called());
EXPECT_EQ(1, network_delegate.created_requests());
@@ -4137,8 +4120,7 @@
r->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
- EXPECT_EQ(0, r->status().error());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(200, r->GetResponseCode());
EXPECT_FALSE(d.auth_required_called());
EXPECT_EQ(1, network_delegate.created_requests());
@@ -4176,8 +4158,7 @@
r->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
- EXPECT_THAT(r->status().error(), IsOk());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(401, r->GetResponseCode());
EXPECT_FALSE(d.auth_required_called());
EXPECT_EQ(1, network_delegate.created_requests());
@@ -4211,8 +4192,7 @@
r->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
- EXPECT_EQ(0, r->status().error());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(200, r->GetResponseCode());
EXPECT_TRUE(d.auth_required_called());
EXPECT_EQ(1, network_delegate.created_requests());
@@ -4247,9 +4227,7 @@
r->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
- EXPECT_EQ(0, r->status().error());
-
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(200, r->GetResponseCode());
EXPECT_FALSE(d.auth_required_called());
EXPECT_EQ(1, network_delegate.created_requests());
@@ -4281,8 +4259,7 @@
r->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
- EXPECT_THAT(r->status().error(), IsOk());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(401, r->GetResponseCode());
EXPECT_FALSE(d.auth_required_called());
EXPECT_EQ(1, network_delegate.created_requests());
@@ -4319,8 +4296,7 @@
r->Cancel();
// Ensure that network delegate is notified.
EXPECT_EQ(1, network_delegate.completed_requests());
- EXPECT_EQ(URLRequestStatus::CANCELED, r->status().status());
- EXPECT_THAT(r->status().error(), IsError(ERR_ABORTED));
+ EXPECT_EQ(1, network_delegate.canceled_requests());
EXPECT_EQ(1, network_delegate.created_requests());
EXPECT_EQ(0, network_delegate.destroyed_requests());
}
@@ -4357,8 +4333,7 @@
r->Cancel();
// Ensure that network delegate is notified.
EXPECT_EQ(1, network_delegate.completed_requests());
- EXPECT_EQ(URLRequestStatus::CANCELED, r->status().status());
- EXPECT_THAT(r->status().error(), IsError(ERR_ABORTED));
+ EXPECT_EQ(1, network_delegate.canceled_requests());
EXPECT_EQ(1, network_delegate.created_requests());
EXPECT_EQ(0, network_delegate.destroyed_requests());
}
@@ -4393,8 +4368,7 @@
r->Cancel();
// Ensure that network delegate is notified.
EXPECT_EQ(1, network_delegate.completed_requests());
- EXPECT_EQ(URLRequestStatus::CANCELED, r->status().status());
- EXPECT_THAT(r->status().error(), IsError(ERR_ABORTED));
+ EXPECT_EQ(1, network_delegate.canceled_requests());
EXPECT_EQ(1, network_delegate.created_requests());
EXPECT_EQ(0, network_delegate.destroyed_requests());
}
@@ -4429,8 +4403,7 @@
r->Cancel();
// Ensure that network delegate is notified.
EXPECT_EQ(1, network_delegate.completed_requests());
- EXPECT_EQ(URLRequestStatus::CANCELED, r->status().status());
- EXPECT_THAT(r->status().error(), IsError(ERR_ABORTED));
+ EXPECT_EQ(1, network_delegate.canceled_requests());
EXPECT_EQ(1, network_delegate.created_requests());
EXPECT_EQ(0, network_delegate.destroyed_requests());
}
@@ -4479,10 +4452,9 @@
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::FAILED, r->status().status());
// The proxy server is not set before failure.
EXPECT_TRUE(r->proxy_server().IsEmpty());
- EXPECT_THAT(r->status().error(), IsError(ERR_TUNNEL_CONNECTION_FAILED));
+ EXPECT_EQ(ERR_TUNNEL_CONNECTION_FAILED, d.request_status());
}
}
@@ -4684,11 +4656,10 @@
EXPECT_EQ(1, d.response_started_count());
EXPECT_FALSE(d.received_data_before_response());
VLOG(1) << " Received " << d.bytes_received() << " bytes"
- << " status = " << r->status().status()
- << " error = " << r->status().error();
+ << " error = " << d.request_status();
if (test_expect_success[i]) {
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status())
- << " Parameter = \"" << test_file << "\"";
+ EXPECT_EQ(OK, d.request_status()) << " Parameter = \"" << test_file
+ << "\"";
if (test_parameters[i] == 'S') {
// When content length is smaller than both compressed length and
// uncompressed length, HttpStreamParser might not read the full
@@ -4697,8 +4668,7 @@
}
EXPECT_EQ(expected_content, d.data_received());
} else {
- EXPECT_EQ(URLRequestStatus::FAILED, r->status().status());
- EXPECT_EQ(ERR_CONTENT_LENGTH_MISMATCH, r->status().error())
+ EXPECT_EQ(ERR_CONTENT_LENGTH_MISMATCH, d.request_status())
<< " Parameter = \"" << test_file << "\"";
}
}
@@ -5082,7 +5052,7 @@
base::RunLoop().Run();
EXPECT_EQ(200, r->GetResponseCode());
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
+ EXPECT_EQ(OK, request_delegate.request_status());
}
TestNetLogEntry::List entries;
@@ -5120,7 +5090,7 @@
base::RunLoop().Run();
EXPECT_EQ(200, r->GetResponseCode());
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
+ EXPECT_EQ(OK, request_delegate.request_status());
EXPECT_EQ(1, network_delegate.created_requests());
EXPECT_EQ(0, network_delegate.destroyed_requests());
}
@@ -5171,7 +5141,7 @@
base::RunLoop().Run();
EXPECT_EQ(200, r->GetResponseCode());
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
+ EXPECT_EQ(OK, request_delegate.request_status());
EXPECT_EQ(2, network_delegate.created_requests());
EXPECT_EQ(0, network_delegate.destroyed_requests());
}
@@ -5244,7 +5214,7 @@
base::RunLoop().Run();
EXPECT_EQ(200, r->GetResponseCode());
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
+ EXPECT_EQ(OK, request_delegate.request_status());
EXPECT_EQ(1, network_delegate.created_requests());
EXPECT_EQ(0, network_delegate.destroyed_requests());
}
@@ -5306,7 +5276,7 @@
base::RunLoop().Run();
EXPECT_EQ(200, r->GetResponseCode());
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
+ EXPECT_EQ(OK, request_delegate.request_status());
}
TestNetLogEntry::List entries;
@@ -5355,7 +5325,7 @@
base::RunLoop().Run();
EXPECT_EQ(200, r->GetResponseCode());
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
+ EXPECT_EQ(OK, request_delegate.request_status());
}
TestNetLogEntry::List entries;
@@ -5411,7 +5381,7 @@
LoadStateWithParam load_state = r->GetLoadState();
r->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::CANCELED, r->status().status());
+ EXPECT_EQ(ERR_ABORTED, request_delegate.request_status());
}
TestNetLogEntry::List entries;
@@ -5557,7 +5527,7 @@
EXPECT_EQ(1, d.response_started_count());
EXPECT_EQ(0, d.bytes_received());
EXPECT_FALSE(d.received_data_before_response());
- EXPECT_EQ(URLRequestStatus::CANCELED, r->status().status());
+ EXPECT_EQ(ERR_ABORTED, d.request_status());
}
}
@@ -5582,7 +5552,7 @@
// or it could have been all the bytes.
// EXPECT_EQ(0, d.bytes_received());
EXPECT_FALSE(d.received_data_before_response());
- EXPECT_EQ(URLRequestStatus::CANCELED, r->status().status());
+ EXPECT_EQ(ERR_ABORTED, d.request_status());
}
}
@@ -5622,7 +5592,7 @@
http_test_server()->GetURL("/cachetime"), DEFAULT_PRIORITY, &d));
r->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
+ EXPECT_EQ(OK, d.request_status());
}
// cancel read from cache (see bug 990242)
@@ -5634,7 +5604,7 @@
r->Cancel();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::CANCELED, r->status().status());
+ EXPECT_EQ(ERR_ABORTED, d.request_status());
EXPECT_EQ(1, d.response_started_count());
EXPECT_EQ(0, d.bytes_received());
EXPECT_FALSE(d.received_data_before_response());
@@ -5665,9 +5635,8 @@
base::RunLoop().Run();
- ASSERT_EQ(1, d.response_started_count())
- << "request failed: " << r->status().status()
- << ", error: " << r->status().error();
+ ASSERT_EQ(1, d.response_started_count()) << "request failed. Error: "
+ << d.request_status();
EXPECT_FALSE(d.received_data_before_response());
EXPECT_TRUE(d.data_received().empty());
@@ -5712,9 +5681,8 @@
ASSERT_EQ(size, base::ReadFile(path, buf.get(), size));
- ASSERT_EQ(1, d.response_started_count())
- << "request failed: " << r->status().status()
- << ", error: " << r->status().error();
+ ASSERT_EQ(1, d.response_started_count()) << "request failed. Error: "
+ << d.request_status();
EXPECT_FALSE(d.received_data_before_response());
@@ -5750,8 +5718,7 @@
EXPECT_TRUE(d.request_failed());
EXPECT_FALSE(d.received_data_before_response());
EXPECT_EQ(0, d.bytes_received());
- EXPECT_EQ(URLRequestStatus::FAILED, r->status().status());
- EXPECT_THAT(r->status().error(), IsError(ERR_FILE_NOT_FOUND));
+ EXPECT_EQ(ERR_FILE_NOT_FOUND, d.request_status());
}
}
@@ -5775,9 +5742,8 @@
const std::string expected_data =
"abcdthis is a longer chunk than before.\r\n\r\n02323";
- ASSERT_EQ(1, d->response_started_count())
- << "request failed: " << r->status().status()
- << ", os error: " << r->status().error();
+ ASSERT_EQ(1, d->response_started_count()) << "request failed. Error: "
+ << d->request_status();
EXPECT_FALSE(d->received_data_before_response());
@@ -6529,8 +6495,7 @@
req->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::FAILED, req->status().status());
- EXPECT_THAT(req->status().error(), IsError(ERR_UNSAFE_REDIRECT));
+ EXPECT_EQ(ERR_UNSAFE_REDIRECT, d.request_status());
}
#endif // !defined(DISABLE_FILE_SUPPORT)
@@ -6544,8 +6509,7 @@
req->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::FAILED, req->status().status());
- EXPECT_THAT(req->status().error(), IsError(ERR_UNSAFE_REDIRECT));
+ EXPECT_EQ(ERR_UNSAFE_REDIRECT, d.request_status());
}
TEST_F(URLRequestTestHTTP, RedirectToInvalidURL) {
@@ -6558,8 +6522,7 @@
req->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::FAILED, req->status().status());
- EXPECT_THAT(req->status().error(), IsError(ERR_INVALID_URL));
+ EXPECT_EQ(ERR_INVALID_URL, d.request_status());
}
// Make sure redirects are cached, despite not reading their bodies.
@@ -6574,7 +6537,7 @@
default_context_.CreateRequest(redirect_url, DEFAULT_PRIORITY, &d));
req->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, req->status().status());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(1, d.received_redirect_count());
EXPECT_EQ(http_test_server()->GetURL("/echo"), req->url());
}
@@ -6595,7 +6558,7 @@
base::RunLoop().Run();
EXPECT_EQ(1, d.received_redirect_count());
EXPECT_EQ(1, d.response_started_count());
- EXPECT_EQ(URLRequestStatus::SUCCESS, req->status().status());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(http_test_server()->GetURL("/echo"), req->url());
}
}
@@ -6618,7 +6581,7 @@
default_context_.CreateRequest(initial_url, DEFAULT_PRIORITY, &d));
req->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, req->status().status());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(1, d.received_redirect_count());
EXPECT_EQ(redirect_to_url, req->url());
}
@@ -6630,7 +6593,7 @@
req->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, req->status().status());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_FALSE(req->was_cached());
EXPECT_EQ(0, d.received_redirect_count());
EXPECT_EQ(initial_url, req->url());
@@ -6654,10 +6617,8 @@
r->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
-
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(2U, r->url_chain().size());
- EXPECT_THAT(r->status().error(), IsOk());
EXPECT_EQ(unsafe_url, r->url());
EXPECT_EQ("this-is-considered-an-unsafe-url", d.data_received());
}
@@ -6682,8 +6643,7 @@
r->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::FAILED, r->status().status());
- EXPECT_THAT(r->status().error(), IsError(ERR_UNSAFE_REDIRECT));
+ EXPECT_EQ(ERR_UNSAFE_REDIRECT, d.request_status());
}
}
@@ -6708,8 +6668,7 @@
base::RunLoop().Run();
EXPECT_EQ(2U, r->url_chain().size());
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
- EXPECT_THAT(r->status().error(), IsOk());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(original_url, r->original_url());
EXPECT_EQ(expected_url, r->url());
}
@@ -6738,8 +6697,7 @@
base::RunLoop().Run();
EXPECT_EQ(2U, r->url_chain().size());
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
- EXPECT_THAT(r->status().error(), IsOk());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(original_url, r->original_url());
EXPECT_EQ(expected_redirect_url, r->url());
}
@@ -6767,8 +6725,7 @@
base::RunLoop().Run();
EXPECT_EQ(2U, r->url_chain().size());
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
- EXPECT_THAT(r->status().error(), IsOk());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(original_url, r->original_url());
EXPECT_EQ(redirect_url, r->url());
}
@@ -6795,8 +6752,7 @@
r->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
- EXPECT_THAT(r->status().error(), IsOk());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(original_url, r->original_url());
EXPECT_EQ(redirect_url, r->url());
}
@@ -6870,7 +6826,7 @@
EXPECT_EQ(1, d.response_started_count());
EXPECT_EQ(0, d.bytes_received());
EXPECT_FALSE(d.received_data_before_response());
- EXPECT_EQ(URLRequestStatus::CANCELED, req->status().status());
+ EXPECT_EQ(ERR_ABORTED, d.request_status());
}
}
@@ -6894,7 +6850,7 @@
EXPECT_EQ(1, d.response_started_count());
EXPECT_FALSE(d.received_data_before_response());
- EXPECT_EQ(URLRequestStatus::SUCCESS, req->status().status());
+ EXPECT_EQ(OK, d.request_status());
base::FilePath path;
PathService::Get(base::DIR_SOURCE_ROOT, &path);
@@ -6935,7 +6891,7 @@
EXPECT_TRUE(d.have_full_request_headers());
CheckFullRequestHeaders(d.full_request_headers(), target_url);
EXPECT_FALSE(d.received_data_before_response());
- EXPECT_EQ(URLRequestStatus::SUCCESS, req->status().status());
+ EXPECT_EQ(OK, d.request_status());
base::FilePath path;
PathService::Get(base::DIR_SOURCE_ROOT, &path);
@@ -6968,7 +6924,7 @@
EXPECT_EQ(1, d.response_started_count());
EXPECT_EQ(0, d.bytes_received());
EXPECT_FALSE(d.received_data_before_response());
- EXPECT_EQ(URLRequestStatus::CANCELED, req->status().status());
+ EXPECT_EQ(ERR_ABORTED, d.request_status());
}
}
@@ -7346,8 +7302,7 @@
request->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, request->status().status());
- EXPECT_THAT(request->status().error(), IsOk());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(0, d.received_redirect_count());
EXPECT_EQ(308, request->response_headers()->response_code());
EXPECT_EQ("This is not a redirect.", d.data_received());
@@ -7369,8 +7324,7 @@
base::RunLoop().Run();
EXPECT_EQ(2U, r->url_chain().size());
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
- EXPECT_THAT(r->status().error(), IsOk());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(original_url, r->original_url());
EXPECT_EQ(expected_url, r->url());
}
@@ -7392,8 +7346,7 @@
base::RunLoop().Run();
EXPECT_EQ(2U, r->url_chain().size());
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
- EXPECT_THAT(r->status().error(), IsOk());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(first_party_url, r->first_party_for_cookies());
}
}
@@ -7417,8 +7370,7 @@
base::RunLoop().Run();
EXPECT_EQ(2U, r->url_chain().size());
- EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
- EXPECT_THAT(r->status().error(), IsOk());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(expected_first_party_url, r->first_party_for_cookies());
}
}
@@ -7708,8 +7660,7 @@
base::RunLoop().Run();
EXPECT_TRUE(d.request_failed());
- EXPECT_EQ(URLRequestStatus::FAILED, req->status().status());
- EXPECT_THAT(req->status().error(), IsError(ERR_NETWORK_IO_SUSPENDED));
+ EXPECT_EQ(ERR_NETWORK_IO_SUSPENDED, d.request_status());
}
namespace {
@@ -7769,7 +7720,7 @@
EXPECT_TRUE(d.request_failed());
EXPECT_EQ(1, d.response_started_count());
- EXPECT_EQ(URLRequestStatus::CANCELED, req->status().status());
+ EXPECT_EQ(ERR_ABORTED, d.request_status());
// NetworkDelegate should see the cancellation, but not the error.
EXPECT_EQ(1, default_network_delegate()->canceled_requests());
@@ -7800,7 +7751,7 @@
req->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, req->status().status());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_TRUE(req->response_info().network_accessed);
EXPECT_FALSE(req->response_info().was_cached);
@@ -7809,7 +7760,7 @@
req->Start();
base::RunLoop().Run();
- EXPECT_EQ(URLRequestStatus::SUCCESS, req->status().status());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_FALSE(req->response_info().network_accessed);
EXPECT_TRUE(req->response_info().was_cached);
}
@@ -7891,8 +7842,9 @@
EXPECT_TRUE(interceptor()->did_intercept_redirect());
// Check we got one good response
- EXPECT_TRUE(req->status().is_success());
- if (req->status().is_success())
+ int status = d.request_status();
+ EXPECT_EQ(OK, status);
+ if (status == OK)
EXPECT_EQ(200, req->response_headers()->response_code());
EXPECT_EQ(MockURLRequestInterceptor::ok_data(), d.data_received());
@@ -7925,8 +7877,9 @@
EXPECT_TRUE(interceptor()->did_intercept_final());
// Check we received one good response.
- EXPECT_TRUE(req->status().is_success());
- if (req->status().is_success())
+ int status = d.request_status();
+ EXPECT_EQ(OK, status);
+ if (status == OK)
EXPECT_EQ(200, req->response_headers()->response_code());
EXPECT_EQ(MockURLRequestInterceptor::ok_data(), d.data_received());
EXPECT_EQ(1, d.response_started_count());
@@ -7957,8 +7910,9 @@
EXPECT_TRUE(interceptor()->did_intercept_final());
// Check we received one good response.
- EXPECT_TRUE(req->status().is_success());
- if (req->status().is_success())
+ int status = d.request_status();
+ EXPECT_EQ(OK, status);
+ if (status == OK)
EXPECT_EQ(200, req->response_headers()->response_code());
EXPECT_EQ("hello", d.data_received());
EXPECT_EQ(1, d.response_started_count());
@@ -8028,7 +7982,7 @@
EXPECT_EQ(1, d.response_started_count());
EXPECT_EQ(1, d.received_redirect_count());
EXPECT_EQ(destination_url, req->url());
- EXPECT_TRUE(req->status().is_success());
+ EXPECT_EQ(OK, d.request_status());
EXPECT_EQ(200, req->response_headers()->response_code());
EXPECT_EQ(expected.spec(), req->referrer());
@@ -8551,9 +8505,7 @@
base::RunLoop().Run();
EXPECT_EQ(1, d.response_started_count());
- EXPECT_FALSE(r->status().is_success());
- EXPECT_EQ(URLRequestStatus::FAILED, r->status().status());
- EXPECT_THAT(r->status().error(), IsError(ERR_SSL_OBSOLETE_CIPHER));
+ EXPECT_EQ(ERR_SSL_OBSOLETE_CIPHER, d.request_status());
}
}
@@ -8813,9 +8765,7 @@
void ExpectFailure(int error) {
EXPECT_EQ(1, delegate_.response_started_count());
- EXPECT_FALSE(request_->status().is_success());
- EXPECT_EQ(URLRequestStatus::FAILED, request_->status().status());
- EXPECT_EQ(error, request_->status().error());
+ EXPECT_EQ(error, delegate_.request_status());
}
private:
@@ -9936,8 +9886,7 @@
base::RunLoop().Run();
EXPECT_FALSE(r->is_pending());
- EXPECT_EQ(URLRequestStatus::FAILED, r->status().status());
- EXPECT_THAT(r->status().error(), IsError(ERR_UNSAFE_PORT));
+ EXPECT_EQ(ERR_UNSAFE_PORT, d.request_status());
}
}
@@ -10251,7 +10200,7 @@
req->Start();
req->Cancel();
base::RunLoop().RunUntilIdle();
- EXPECT_EQ(URLRequestStatus::CANCELED, req->status().status());
+ EXPECT_EQ(ERR_ABORTED, d.request_status());
EXPECT_EQ(0, d.received_redirect_count());
}
