Index: net/url_request/url_request_ftp_job_unittest.cc |
diff --git a/net/url_request/url_request_ftp_job_unittest.cc b/net/url_request/url_request_ftp_job_unittest.cc |
index e478e2a17515d211a7a4e2479ef9e42dac4492cb..526269c0c8cc306ff6463d24ecf92c92040d5494 100644 |
--- a/net/url_request/url_request_ftp_job_unittest.cc |
+++ b/net/url_request/url_request_ftp_job_unittest.cc |
@@ -310,7 +310,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequest) { |
// The TestDelegate will by default quit the message loop on completion. |
base::RunLoop().Run(); |
- EXPECT_TRUE(url_request->status().is_success()); |
+ EXPECT_THAT(request_delegate.request_status(), IsOk()); |
EXPECT_TRUE(url_request->proxy_server().Equals( |
HostPortPair::FromString("localhost:80"))); |
EXPECT_EQ(1, network_delegate()->completed_requests()); |
@@ -406,7 +406,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAuthNoCredentials) { |
// The TestDelegate will by default quit the message loop on completion. |
base::RunLoop().Run(); |
- EXPECT_TRUE(url_request->status().is_success()); |
+ EXPECT_THAT(request_delegate.request_status(), IsOk()); |
EXPECT_TRUE(url_request->proxy_server().Equals( |
HostPortPair::FromString("localhost:80"))); |
EXPECT_EQ(1, network_delegate()->completed_requests()); |
@@ -452,7 +452,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAuthWithCredentials) { |
// The TestDelegate will by default quit the message loop on completion. |
base::RunLoop().Run(); |
- EXPECT_TRUE(url_request->status().is_success()); |
+ EXPECT_THAT(request_delegate.request_status(), IsOk()); |
EXPECT_EQ(1, network_delegate()->completed_requests()); |
EXPECT_EQ(0, network_delegate()->error_count()); |
EXPECT_TRUE(request_delegate.auth_required_called()); |
@@ -485,7 +485,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedServerAuthNoCredentials) { |
// The TestDelegate will by default quit the message loop on completion. |
base::RunLoop().Run(); |
- EXPECT_TRUE(url_request->status().is_success()); |
+ EXPECT_THAT(request_delegate.request_status(), IsOk()); |
EXPECT_EQ(1, network_delegate()->completed_requests()); |
EXPECT_EQ(0, network_delegate()->error_count()); |
EXPECT_TRUE(request_delegate.auth_required_called()); |
@@ -529,7 +529,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedServerAuthWithCredentials) { |
// The TestDelegate will by default quit the message loop on completion. |
base::RunLoop().Run(); |
- EXPECT_TRUE(url_request->status().is_success()); |
+ EXPECT_THAT(request_delegate.request_status(), IsOk()); |
EXPECT_EQ(1, network_delegate()->completed_requests()); |
EXPECT_EQ(0, network_delegate()->error_count()); |
EXPECT_TRUE(request_delegate.auth_required_called()); |
@@ -603,7 +603,6 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAndServerAuth) { |
// Run until server auth is requested. |
base::RunLoop().Run(); |
- EXPECT_TRUE(url_request->status().is_success()); |
EXPECT_EQ(0, network_delegate()->completed_requests()); |
EXPECT_EQ(0, network_delegate()->error_count()); |
url_request->SetAuth( |
@@ -612,7 +611,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAndServerAuth) { |
// The TestDelegate will by default quit the message loop on completion. |
base::RunLoop().Run(); |
- EXPECT_TRUE(url_request->status().is_success()); |
+ EXPECT_THAT(request_delegate.request_status(), IsOk()); |
EXPECT_EQ(1, network_delegate()->completed_requests()); |
EXPECT_EQ(0, network_delegate()->error_count()); |
EXPECT_TRUE(request_delegate.auth_required_called()); |
@@ -643,7 +642,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestDoNotSaveCookies) { |
// The TestDelegate will by default quit the message loop on completion. |
base::RunLoop().Run(); |
- EXPECT_TRUE(url_request->status().is_success()); |
+ EXPECT_THAT(request_delegate.request_status(), IsOk()); |
EXPECT_EQ(1, network_delegate()->completed_requests()); |
EXPECT_EQ(0, network_delegate()->error_count()); |