| 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 6ee12a943f4cdd5316e22e48ce5bfd10db53f112..b2549dbf5387ca4c371c2d1dea08fd609a74dbfe 100644
|
| --- a/net/url_request/url_request_ftp_job_unittest.cc
|
| +++ b/net/url_request/url_request_ftp_job_unittest.cc
|
| @@ -328,13 +328,13 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestOrphanJob) {
|
| // Verify PAC request is in progress.
|
| EXPECT_EQ(net::LoadState::LOAD_STATE_RESOLVING_PROXY_FOR_URL,
|
| url_request->GetLoadState().state);
|
| - EXPECT_EQ(1u, resolver_factory->resolver()->pending_requests().size());
|
| - EXPECT_EQ(0u, resolver_factory->resolver()->cancelled_requests().size());
|
| + EXPECT_EQ(1u, resolver_factory->resolver()->pending_jobs().size());
|
| + EXPECT_EQ(0u, resolver_factory->resolver()->cancelled_jobs().size());
|
|
|
| // Destroying the request should cancel the PAC request.
|
| url_request.reset();
|
| - EXPECT_EQ(0u, resolver_factory->resolver()->pending_requests().size());
|
| - EXPECT_EQ(1u, resolver_factory->resolver()->cancelled_requests().size());
|
| + EXPECT_EQ(0u, resolver_factory->resolver()->pending_jobs().size());
|
| + EXPECT_EQ(1u, resolver_factory->resolver()->cancelled_jobs().size());
|
| }
|
|
|
| // Make sure PAC requests are cancelled on request cancellation. Requests can
|
| @@ -359,14 +359,14 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestCancelRequest) {
|
| url_request->Start();
|
| EXPECT_EQ(net::LoadState::LOAD_STATE_RESOLVING_PROXY_FOR_URL,
|
| url_request->GetLoadState().state);
|
| - EXPECT_EQ(1u, resolver_factory->resolver()->pending_requests().size());
|
| - EXPECT_EQ(0u, resolver_factory->resolver()->cancelled_requests().size());
|
| + EXPECT_EQ(1u, resolver_factory->resolver()->pending_jobs().size());
|
| + EXPECT_EQ(0u, resolver_factory->resolver()->cancelled_jobs().size());
|
|
|
| // Cancelling the request should cancel the PAC request.
|
| url_request->Cancel();
|
| EXPECT_EQ(net::LoadState::LOAD_STATE_IDLE, url_request->GetLoadState().state);
|
| - EXPECT_EQ(0u, resolver_factory->resolver()->pending_requests().size());
|
| - EXPECT_EQ(1u, resolver_factory->resolver()->cancelled_requests().size());
|
| + EXPECT_EQ(0u, resolver_factory->resolver()->pending_jobs().size());
|
| + EXPECT_EQ(1u, resolver_factory->resolver()->cancelled_jobs().size());
|
| }
|
|
|
| TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAuthNoCredentials) {
|
|
|