Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(510)

Unified Diff: net/url_request/url_request_ftp_job_unittest.cc

Issue 1439053002: Change ProxyResolver::GetProxyForURL() to take a scoped_ptr<Request>* rather than a RequestHandle* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Restore scoped_ptr to mock and nits Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/proxy/proxy_service_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 cb31ecf5e1b23d05413f4ffdb734ea809695ea1e..7ca6754972d3357988cc96cbfe7487113072ea13 100644
--- a/net/url_request/url_request_ftp_job_unittest.cc
+++ b/net/url_request/url_request_ftp_job_unittest.cc
@@ -332,13 +332,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
@@ -363,14 +363,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) {
« no previous file with comments | « net/proxy/proxy_service_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698