net/proxy/proxy_service_unittest.cc - Issue 1439053002: Change ProxyResolver::GetProxyForURL() to take a scoped_ptr<Request>* rather than a RequestHandle*

Unified Diff: net/proxy/proxy_service_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: Created 5 years, 1 month 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

Index: net/proxy/proxy_service_unittest.cc

diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc

index 6e8dcdb7db37579a08e8d5d736e024fea941774c..a48e2cd6297b361182c3d887ecde6f7c766212aa 100644

--- a/net/proxy/proxy_service_unittest.cc

+++ b/net/proxy/proxy_service_unittest.cc

@@ -240,22 +240,20 @@ class TestProxyFallbackNetworkDelegate : public NetworkDelegateImpl {

int proxy_fallback_net_error_;

};

-using RequestMap =

- std::map<GURL, scoped_refptr<MockAsyncProxyResolver::Request>>;

+using JobMap = std::map<GURL, scoped_refptr<MockAsyncProxyResolver::Job>>;

-// Given a list of requests |list| from a MockAsyncProxyResolver and a list of

-// target URLs |_urls|, asserts that the set of URLs of the requests appearing

-// in |list| is exactly the set of URLs in |_urls|, and produces a RequestMap in

-// |*map| containing the requests corresponding to those target |_urls|.

+// Given a list of jobs |list| from a MockAsyncProxyResolver and a list of

+// target URLs |_urls|, asserts that the set of URLs of the jobs appearing

+// in |list| is exactly the set of URLs in |_urls|, and produces a JobMap in

+// |*map| containing the jobs corresponding to those target |_urls|.

// Note that this function must return void to allow use of gtest's ASSERT_*

// macros inside it.

-RequestMap GetRequestsForURLs(

- const MockAsyncProxyResolver::RequestsList& requests,

- const std::vector<GURL>& urls) {

- RequestMap map;

+JobMap GetJobsForURLs(const MockAsyncProxyResolver::JobsList& jobs,

+ const std::vector<GURL>& urls) {

+ JobMap map;

- for (const auto& it : requests)

+ for (const auto& it : jobs)

map[it->url()] = it;

if (urls.size() != map.size()) {

@@ -274,11 +272,11 @@ RequestMap GetRequestsForURLs(

// Given a MockAsyncProxyResolver |resolver| and some GURLs, validates that the

// set of pending request URLs for |resolver| is exactly the supplied list of

-// URLs and returns a map from URLs to the corresponding pending requests.

-RequestMap GetPendingRequestsForURLs(const MockAsyncProxyResolver& resolver,

- const GURL& url1 = GURL(),

- const GURL& url2 = GURL(),

- const GURL& url3 = GURL()) {

+// URLs and returns a map from URLs to the corresponding pending jobs.

+JobMap GetPendingJobsForURLs(const MockAsyncProxyResolver& resolver,

+ const GURL& url1 = GURL(),

+ const GURL& url2 = GURL(),

+ const GURL& url3 = GURL()) {

std::vector<GURL> urls;

if (!url1.is_empty())

urls.push_back(url1);

@@ -286,16 +284,16 @@ RequestMap GetPendingRequestsForURLs(const MockAsyncProxyResolver& resolver,

urls.push_back(url2);

if (!url3.is_empty())

urls.push_back(url3);

- return GetRequestsForURLs(resolver.pending_requests(), urls);

+ return GetJobsForURLs(resolver.pending_jobs(), urls);

}

// Given a MockAsyncProxyResolver |resolver| and some GURLs, validates that the

// set of cancelled request URLs for |resolver| is exactly the supplied list of

-// URLs and returns a map from URLs to the corresponding cancelled requests.

-RequestMap GetCancelledRequestsForURLs(const MockAsyncProxyResolver& resolver,

- const GURL& url1 = GURL(),

- const GURL& url2 = GURL(),

- const GURL& url3 = GURL()) {

+// URLs and returns a map from URLs to the corresponding cancelled jobs.

+JobMap GetCancelledJobsForURLs(const MockAsyncProxyResolver& resolver,

+ const GURL& url1 = GURL(),

+ const GURL& url2 = GURL(),

+ const GURL& url3 = GURL()) {

std::vector<GURL> urls;

if (!url1.is_empty())

urls.push_back(url1);

@@ -303,7 +301,7 @@ RequestMap GetCancelledRequestsForURLs(const MockAsyncProxyResolver& resolver,

urls.push_back(url2);

if (!url3.is_empty())

urls.push_back(url3);

- return GetRequestsForURLs(resolver.cancelled_requests(), urls);

+ return GetJobsForURLs(resolver.cancelled_jobs(), urls);

}

} // namespace

@@ -373,7 +371,7 @@ TEST_F(ProxyServiceTest, OnResolveProxyCallbackAddProxy) {

// Verify that the NetworkDelegate's behavior is stateless across

// invocations of ResolveProxy. Start by having the callback add a proxy

- // and checking that subsequent requests are not affected.

+ // and checking that subsequent jobs are not affected.

delegate.set_add_proxy(true);

// Callback should interpose:

@@ -469,12 +467,12 @@ TEST_F(ProxyServiceTest, PAC) {

factory->pending_requests()[0]->script_data()->url());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

// Set the result in proxy resolver.

- resolver.pending_requests()[0]->results()->UseNamedProxy("foopy");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("foopy");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

EXPECT_EQ(OK, callback.WaitForResult());

EXPECT_FALSE(info.is_direct());

@@ -525,10 +523,10 @@ TEST_F(ProxyServiceTest, PAC_NoIdentityOrHash) {

factory->pending_requests()[0]->script_data()->url());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

// The URL should have been simplified, stripping the username/password/hash.

EXPECT_EQ(GURL("http://www.google.com/?ref"),

- resolver.pending_requests()[0]->url());

+ resolver.pending_jobs()[0]->url());

// We end here without ever completing the request -- destruction of

// ProxyService will cancel the outstanding request.

@@ -556,12 +554,12 @@ TEST_F(ProxyServiceTest, PAC_FailoverWithoutDirect) {

factory->pending_requests()[0]->script_data()->url());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

// Set the result in proxy resolver.

- resolver.pending_requests()[0]->results()->UseNamedProxy("foopy:8080");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("foopy:8080");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

EXPECT_EQ(OK, callback1.WaitForResult());

EXPECT_FALSE(info.is_direct());

@@ -610,11 +608,11 @@ TEST_F(ProxyServiceTest, PAC_RuntimeError) {

factory->pending_requests()[0]->script_data()->url());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

// Simulate a failure in the PAC executor.

- resolver.pending_requests()[0]->CompleteNow(ERR_PAC_SCRIPT_FAILED);

+ resolver.pending_jobs()[0]->CompleteNow(ERR_PAC_SCRIPT_FAILED);

EXPECT_EQ(OK, callback1.WaitForResult());

@@ -668,13 +666,13 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) {

factory->pending_requests()[0]->script_data()->url());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

// Set the result in proxy resolver.

- resolver.pending_requests()[0]->results()->UsePacString(

+ resolver.pending_jobs()[0]->results()->UsePacString(

"DIRECT ; PROXY foobar:10 ; DIRECT ; PROXY foobar:20");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->CompleteNow(OK);

EXPECT_EQ(OK, callback1.WaitForResult());

EXPECT_TRUE(info.is_direct());

@@ -740,11 +738,11 @@ TEST_F(ProxyServiceTest, PAC_ConfigSourcePropagates) {

NULL, NULL, BoundNetLog());

ASSERT_EQ(ERR_IO_PENDING, rv);

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

// Set the result in proxy resolver.

- resolver.pending_requests()[0]->results()->UseNamedProxy("foopy");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("foopy");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

EXPECT_EQ(OK, callback.WaitForResult());

EXPECT_EQ(PROXY_CONFIG_SOURCE_TEST, info.config_source());

@@ -782,11 +780,11 @@ TEST_F(ProxyServiceTest, ProxyResolverFails) {

factory->pending_requests()[0]->script_data()->url());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

// Fail the first resolve request in MockAsyncProxyResolver.

- resolver.pending_requests()[0]->CompleteNow(ERR_FAILED);

+ resolver.pending_jobs()[0]->CompleteNow(ERR_FAILED);

// Although the proxy resolver failed the request, ProxyService implicitly

// falls-back to DIRECT.

@@ -805,13 +803,13 @@ TEST_F(ProxyServiceTest, ProxyResolverFails) {

NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

// This time we will have the resolver succeed (perhaps the PAC script has

// a dependency on the current time).

- resolver.pending_requests()[0]->results()->UseNamedProxy("foopy_valid:8080");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("foopy_valid:8080");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

EXPECT_EQ(OK, callback2.WaitForResult());

EXPECT_FALSE(info.is_direct());

@@ -846,11 +844,11 @@ TEST_F(ProxyServiceTest, ProxyResolverTerminatedDuringRequest) {

factory->pending_requests()[0]->script_data()->url());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

// Fail the first resolve request in MockAsyncProxyResolver.

- resolver.pending_requests()[0]->CompleteNow(ERR_PAC_SCRIPT_TERMINATED);

+ resolver.pending_jobs()[0]->CompleteNow(ERR_PAC_SCRIPT_TERMINATED);

// Although the proxy resolver failed the request, ProxyService implicitly

// falls-back to DIRECT.

@@ -876,12 +874,12 @@ TEST_F(ProxyServiceTest, ProxyResolverTerminatedDuringRequest) {

factory->pending_requests()[0]->script_data()->url());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

// This time we will have the resolver succeed.

- resolver.pending_requests()[0]->results()->UseNamedProxy("foopy_valid:8080");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("foopy_valid:8080");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

EXPECT_EQ(OK, callback2.WaitForResult());

EXPECT_FALSE(info.is_direct());

@@ -922,10 +920,10 @@ TEST_F(ProxyServiceTest,

factory->pending_requests()[0]->script_data()->url());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- RequestMap requests = GetPendingRequestsForURLs(resolver, url1, url2);

+ JobMap jobs = GetPendingJobsForURLs(resolver, url1, url2);

// Fail the first resolve request in MockAsyncProxyResolver.

- requests[url1]->CompleteNow(ERR_PAC_SCRIPT_TERMINATED);

+ jobs[url1]->CompleteNow(ERR_PAC_SCRIPT_TERMINATED);

// Although the proxy resolver failed the request, ProxyService implicitly

// falls-back to DIRECT.

@@ -938,7 +936,7 @@ TEST_F(ProxyServiceTest,

EXPECT_LE(info.proxy_resolve_start_time(), info.proxy_resolve_end_time());

// The second request is cancelled when the proxy resolver terminates.

- requests = GetCancelledRequestsForURLs(resolver, url2);

+ jobs = GetCancelledJobsForURLs(resolver, url2);

// Since a second request was in progress, the ProxyService starts

// initializating a new ProxyResolver.

@@ -947,11 +945,11 @@ TEST_F(ProxyServiceTest,

factory->pending_requests()[0]->script_data()->url());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- requests = GetPendingRequestsForURLs(resolver, url2);

+ jobs = GetPendingJobsForURLs(resolver, url2);

// This request succeeds.

- requests[url2]->results()->UseNamedProxy("foopy_valid:8080");

- requests[url2]->CompleteNow(OK);

+ jobs[url2]->results()->UseNamedProxy("foopy_valid:8080");

+ jobs[url2]->CompleteNow(OK);

EXPECT_EQ(OK, callback2.WaitForResult());

EXPECT_FALSE(info.is_direct());

@@ -1081,11 +1079,11 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsInJavaScriptMandatoryPac) {

factory->pending_requests()[0]->script_data()->url());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

// Fail the first resolve request in MockAsyncProxyResolver.

- resolver.pending_requests()[0]->CompleteNow(ERR_FAILED);

+ resolver.pending_jobs()[0]->CompleteNow(ERR_FAILED);

// As the proxy resolver failed the request and is configured for a mandatory

// PAC script, ProxyService must not implicitly fall-back to DIRECT.

@@ -1100,13 +1098,13 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsInJavaScriptMandatoryPac) {

NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

// This time we will have the resolver succeed (perhaps the PAC script has

// a dependency on the current time).

- resolver.pending_requests()[0]->results()->UseNamedProxy("foopy_valid:8080");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("foopy_valid:8080");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

EXPECT_EQ(OK, callback2.WaitForResult());

EXPECT_FALSE(info.is_direct());

@@ -1140,13 +1138,13 @@ TEST_F(ProxyServiceTest, ProxyFallback) {

factory->pending_requests()[0]->script_data()->url());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

// Set the result in proxy resolver.

- resolver.pending_requests()[0]->results()->UseNamedProxy(

+ resolver.pending_jobs()[0]->results()->UseNamedProxy(

"foopy1:8080;foopy2:9090");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// The first item is valid.

EXPECT_EQ(OK, callback1.WaitForResult());

@@ -1185,14 +1183,14 @@ TEST_F(ProxyServiceTest, ProxyFallback) {

NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

// Set the result in proxy resolver -- the second result is already known

// to be bad, so we will not try to use it initially.

- resolver.pending_requests()[0]->results()->UseNamedProxy(

+ resolver.pending_jobs()[0]->results()->UseNamedProxy(

"foopy3:7070;foopy1:8080;foopy2:9090");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->CompleteNow(OK);

EXPECT_EQ(OK, callback3.WaitForResult());

EXPECT_FALSE(info.is_direct());

@@ -1244,14 +1242,14 @@ TEST_F(ProxyServiceTest, ProxyFallback) {

NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

// This time, the first 3 results have been found to be bad, but only the

// first proxy has been confirmed ...

- resolver.pending_requests()[0]->results()->UseNamedProxy(

+ resolver.pending_jobs()[0]->results()->UseNamedProxy(

"foopy1:8080;foopy3:7070;foopy2:9090;foopy4:9091");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// ... therefore, we should see the second proxy first.

EXPECT_EQ(OK, callback7.WaitForResult());

@@ -1290,13 +1288,13 @@ TEST_F(ProxyServiceTest, ProxyFallbackToDirect) {

factory->pending_requests()[0]->script_data()->url());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

// Set the result in proxy resolver.

- resolver.pending_requests()[0]->results()->UsePacString(

+ resolver.pending_jobs()[0]->results()->UsePacString(

"PROXY foopy1:8080; PROXY foopy2:9090; DIRECT");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// Get the first result.

EXPECT_EQ(OK, callback1.WaitForResult());

@@ -1363,13 +1361,13 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) {

factory->pending_requests()[0]->script_data()->url());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

// Set the result in proxy resolver.

- resolver.pending_requests()[0]->results()->UseNamedProxy(

+ resolver.pending_jobs()[0]->results()->UseNamedProxy(

"foopy1:8080;foopy2:9090");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// The first item is valid.

EXPECT_EQ(OK, callback1.WaitForResult());

@@ -1390,12 +1388,12 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) {

factory->pending_requests()[0]->script_data()->url());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

- resolver.pending_requests()[0]->results()->UseNamedProxy(

+ resolver.pending_jobs()[0]->results()->UseNamedProxy(

"foopy1:8080;foopy2:9090");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// The first proxy is still there since the configuration changed.

EXPECT_EQ(OK, callback2.WaitForResult());

@@ -1425,12 +1423,12 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) {

factory->pending_requests()[0]->script_data()->url());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

- resolver.pending_requests()[0]->results()->UseNamedProxy(

+ resolver.pending_jobs()[0]->results()->UseNamedProxy(

"foopy1:8080;foopy2:9090");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->CompleteNow(OK);

EXPECT_EQ(OK, callback4.WaitForResult());

EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());

@@ -1465,12 +1463,12 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) {

EXPECT_EQ(GURL("http://foopy/proxy.pac"),

factory->pending_requests()[0]->script_data()->url());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

- resolver.pending_requests()[0]->results()->UseNamedProxy(

+ resolver.pending_jobs()[0]->results()->UseNamedProxy(

"foopy1:8080;foopy2:9090");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// The first item is valid.

EXPECT_EQ(OK, callback1.WaitForResult());

@@ -1495,11 +1493,11 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) {

NULL, NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

// This simulates a javascript runtime error in the PAC script.

- resolver.pending_requests()[0]->CompleteNow(ERR_FAILED);

+ resolver.pending_jobs()[0]->CompleteNow(ERR_FAILED);

// Although the resolver failed, the ProxyService will implicitly fall-back

// to a DIRECT connection.

@@ -1517,12 +1515,12 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) {

callback4.callback(), NULL, NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

- resolver.pending_requests()[0]->results()->UseNamedProxy(

+ resolver.pending_jobs()[0]->results()->UseNamedProxy(

"foopy1:8080;foopy2:9090");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// The first proxy is not there since the it was added to the bad proxies

// list by the earlier ReconsiderProxyAfterError().

@@ -1563,12 +1561,12 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) {

EXPECT_EQ(GURL("http://foopy/proxy.pac"),

factory->pending_requests()[0]->script_data()->url());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

- resolver.pending_requests()[0]->results()->UseNamedProxy(

+ resolver.pending_jobs()[0]->results()->UseNamedProxy(

"foopy1:8080;foopy2:9090");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// The first item is valid.

EXPECT_EQ(OK, callback1.WaitForResult());

@@ -1593,11 +1591,11 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) {

NULL, NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

// This simulates a javascript runtime error in the PAC script.

- resolver.pending_requests()[0]->CompleteNow(ERR_FAILED);

+ resolver.pending_jobs()[0]->CompleteNow(ERR_FAILED);

// Although the resolver failed, the ProxyService will NOT fall-back

// to a DIRECT connection as it is configured as mandatory.

@@ -1616,12 +1614,12 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) {

callback4.callback(), NULL, NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(url, resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(url, resolver.pending_jobs()[0]->url());

- resolver.pending_requests()[0]->results()->UseNamedProxy(

+ resolver.pending_jobs()[0]->results()->UseNamedProxy(

"foopy1:8080;foopy2:9090");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// The first proxy is not there since the it was added to the bad proxies

// list by the earlier ReconsiderProxyAfterError().

@@ -1898,7 +1896,7 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) {

factory->pending_requests()[0]->script_data()->url());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- GetPendingRequestsForURLs(resolver, url1);

+ GetPendingJobsForURLs(resolver, url1);

ProxyInfo info2;

TestCompletionCallback callback2;

@@ -1907,34 +1905,34 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) {

&request2, NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

- GetPendingRequestsForURLs(resolver, url1, url2);

+ GetPendingJobsForURLs(resolver, url1, url2);

ProxyInfo info3;

TestCompletionCallback callback3;

rv = service.ResolveProxy(url3, LOAD_NORMAL, &info3, callback3.callback(),

NULL, NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

- GetPendingRequestsForURLs(resolver, url1, url2, url3);

+ GetPendingJobsForURLs(resolver, url1, url2, url3);

// Cancel the second request

service.CancelPacRequest(request2);

- RequestMap requests = GetPendingRequestsForURLs(resolver, url1, url3);

+ JobMap jobs = GetPendingJobsForURLs(resolver, url1, url3);

- // Complete the two un-cancelled requests.

+ // Complete the two un-cancelled jobs.

// We complete the last one first, just to mix it up a bit.

- requests[url3]->results()->UseNamedProxy("request3:80");

- requests[url3]->CompleteNow(OK);

+ jobs[url3]->results()->UseNamedProxy("request3:80");

+ jobs[url3]->CompleteNow(OK);

- requests[url1]->results()->UseNamedProxy("request1:80");

- requests[url1]->CompleteNow(OK);

+ jobs[url1]->results()->UseNamedProxy("request1:80");

+ jobs[url1]->CompleteNow(OK);

- // Complete and verify that requests ran as expected.

+ // Complete and verify that jobs ran as expected.

EXPECT_EQ(OK, callback1.WaitForResult());

EXPECT_EQ("request1:80", info1.proxy_server().ToURI());

EXPECT_FALSE(callback2.have_result()); // Cancelled.

- GetCancelledRequestsForURLs(resolver, url2);

+ GetCancelledJobsForURLs(resolver, url2);

EXPECT_EQ(OK, callback3.WaitForResult());

EXPECT_EQ("request3:80", info3.proxy_server().ToURI());

@@ -2007,24 +2005,24 @@ TEST_F(ProxyServiceTest, InitialPACScriptDownload) {

factory->pending_requests()[0]->script_data()->utf16());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- RequestMap requests = GetPendingRequestsForURLs(resolver, url1, url2, url3);

+ JobMap jobs = GetPendingJobsForURLs(resolver, url1, url2, url3);

EXPECT_EQ(LOAD_STATE_RESOLVING_PROXY_FOR_URL, service.GetLoadState(request1));

EXPECT_EQ(LOAD_STATE_RESOLVING_PROXY_FOR_URL, service.GetLoadState(request2));

EXPECT_EQ(LOAD_STATE_RESOLVING_PROXY_FOR_URL, service.GetLoadState(request3));

- // Complete all the requests (in some order).

+ // Complete all the jobs (in some order).

- requests[url3]->results()->UseNamedProxy("request3:80");

- requests[url3]->CompleteNow(OK);

+ jobs[url3]->results()->UseNamedProxy("request3:80");

+ jobs[url3]->CompleteNow(OK);

- requests[url1]->results()->UseNamedProxy("request1:80");

- requests[url1]->CompleteNow(OK);

+ jobs[url1]->results()->UseNamedProxy("request1:80");

+ jobs[url1]->CompleteNow(OK);

- requests[url2]->results()->UseNamedProxy("request2:80");

- requests[url2]->CompleteNow(OK);

+ jobs[url2]->results()->UseNamedProxy("request2:80");

+ jobs[url2]->CompleteNow(OK);

- // Complete and verify that requests ran as expected.

+ // Complete and verify that jobs ran as expected.

EXPECT_EQ(OK, callback1.WaitForResult());

EXPECT_EQ("request1:80", info1.proxy_server().ToURI());

EXPECT_FALSE(info1.proxy_resolve_start_time().is_null());

@@ -2062,7 +2060,7 @@ TEST_F(ProxyServiceTest, ChangeScriptFetcherWhilePACDownloadInProgress) {

service.SetProxyScriptFetchers(

fetcher, make_scoped_ptr(new DoNothingDhcpProxyScriptFetcher()));

- // Start 2 requests.

+ // Start 2 jobs.

ProxyInfo info1;

TestCompletionCallback callback1;

@@ -2102,7 +2100,7 @@ TEST_F(ProxyServiceTest, ChangeScriptFetcherWhilePACDownloadInProgress) {

factory->pending_requests()[0]->script_data()->utf16());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- GetPendingRequestsForURLs(resolver, url1, url2);

+ GetPendingJobsForURLs(resolver, url1, url2);

}

// Test cancellation of a request, while the PAC script is being fetched.

@@ -2152,7 +2150,7 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) {

// Nothing has been sent to the factory yet.

EXPECT_TRUE(factory->pending_requests().empty());

- // Cancel the first 2 requests.

+ // Cancel the first 2 jobs.

service.CancelPacRequest(request1);

service.CancelPacRequest(request2);

@@ -2167,17 +2165,17 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) {

factory->pending_requests()[0]->script_data()->utf16());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(GURL("http://request3"), resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(GURL("http://request3"), resolver.pending_jobs()[0]->url());

- // Complete all the requests.

- resolver.pending_requests()[0]->results()->UseNamedProxy("request3:80");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ // Complete all the jobs.

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("request3:80");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

EXPECT_EQ(OK, callback3.WaitForResult());

EXPECT_EQ("request3:80", info3.proxy_server().ToURI());

- EXPECT_TRUE(resolver.cancelled_requests().empty());

+ EXPECT_TRUE(resolver.cancelled_jobs().empty());

EXPECT_FALSE(callback1.have_result()); // Cancelled.

EXPECT_FALSE(callback2.have_result()); // Cancelled.

@@ -2252,18 +2250,18 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac) {

factory->pending_requests()[0]->script_data()->utf16());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- // Now finally, the pending requests should have been sent to the resolver

+ // Now finally, the pending jobs should have been sent to the resolver

// (which was initialized with custom PAC script).

- RequestMap requests = GetPendingRequestsForURLs(resolver, url1, url2);

+ JobMap jobs = GetPendingJobsForURLs(resolver, url1, url2);

- // Complete the pending requests.

- requests[url2]->results()->UseNamedProxy("request2:80");

- requests[url2]->CompleteNow(OK);

- requests[url1]->results()->UseNamedProxy("request1:80");

- requests[url1]->CompleteNow(OK);

+ // Complete the pending jobs.

+ jobs[url2]->results()->UseNamedProxy("request2:80");

+ jobs[url2]->CompleteNow(OK);

+ jobs[url1]->results()->UseNamedProxy("request1:80");

+ jobs[url1]->CompleteNow(OK);

- // Verify that requests ran as expected.

+ // Verify that jobs ran as expected.

EXPECT_EQ(OK, callback1.WaitForResult());

EXPECT_EQ("request1:80", info1.proxy_server().ToURI());

EXPECT_FALSE(info1.proxy_resolve_start_time().is_null());

@@ -2333,18 +2331,18 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac2) {

factory->pending_requests()[0]->script_data()->utf16());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- // Now finally, the pending requests should have been sent to the resolver

+ // Now finally, the pending jobs should have been sent to the resolver

// (which was initialized with custom PAC script).

- RequestMap requests = GetPendingRequestsForURLs(resolver, url1, url2);

+ JobMap jobs = GetPendingJobsForURLs(resolver, url1, url2);

- // Complete the pending requests.

- requests[url2]->results()->UseNamedProxy("request2:80");

- requests[url2]->CompleteNow(OK);

- requests[url1]->results()->UseNamedProxy("request1:80");

- requests[url1]->CompleteNow(OK);

+ // Complete the pending jobs.

+ jobs[url2]->results()->UseNamedProxy("request2:80");

+ jobs[url2]->CompleteNow(OK);

+ jobs[url1]->results()->UseNamedProxy("request1:80");

+ jobs[url1]->CompleteNow(OK);

- // Verify that requests ran as expected.

+ // Verify that jobs ran as expected.

EXPECT_EQ(OK, callback1.WaitForResult());

EXPECT_EQ("request1:80", info1.proxy_server().ToURI());

@@ -2370,7 +2368,7 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomToManual) {

service.SetProxyScriptFetchers(

fetcher, make_scoped_ptr(new DoNothingDhcpProxyScriptFetcher()));

- // Start 2 requests.

+ // Start 2 jobs.

ProxyInfo info1;

TestCompletionCallback callback1;

@@ -2404,7 +2402,7 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomToManual) {

// sent to it.

ASSERT_EQ(0u, factory->pending_requests().size());

- // Verify that requests ran as expected -- they should have fallen back to

+ // Verify that jobs ran as expected -- they should have fallen back to

// the manual proxy configuration for HTTP urls.

EXPECT_EQ(OK, callback1.WaitForResult());

EXPECT_EQ("foopy:80", info1.proxy_server().ToURI());

@@ -2453,13 +2451,12 @@ TEST_F(ProxyServiceTest, BypassDoesntApplyToPac) {

factory->pending_requests()[0]->script_data()->utf16());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(GURL("http://www.google.com"),

- resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(GURL("http://www.google.com"), resolver.pending_jobs()[0]->url());

// Complete the pending request.

- resolver.pending_requests()[0]->results()->UseNamedProxy("request1:80");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("request1:80");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// Verify that request ran as expected.

EXPECT_EQ(OK, callback1.WaitForResult());

@@ -2472,13 +2469,12 @@ TEST_F(ProxyServiceTest, BypassDoesntApplyToPac) {

callback2.callback(), NULL, NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(GURL("http://www.google.com"),

- resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(GURL("http://www.google.com"), resolver.pending_jobs()[0]->url());

// Complete the pending request.

- resolver.pending_requests()[0]->results()->UseNamedProxy("request2:80");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("request2:80");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

EXPECT_EQ(OK, callback2.WaitForResult());

EXPECT_EQ("request2:80", info2.proxy_server().ToURI());

@@ -2600,9 +2596,9 @@ TEST_F(ProxyServiceTest, UpdateConfigFromPACToDirect) {

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

// Complete the pending request.

- ASSERT_EQ(1u, resolver.pending_requests().size());

- resolver.pending_requests()[0]->results()->UseNamedProxy("request1:80");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("request1:80");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// Verify that request ran as expected.

EXPECT_EQ(OK, callback1.WaitForResult());

@@ -2612,7 +2608,7 @@ TEST_F(ProxyServiceTest, UpdateConfigFromPACToDirect) {

// (Even though the configuration isn't old/bad).

// This new configuration no longer has auto_detect set, so

- // requests should complete synchronously now as direct-connect.

+ // jobs should complete synchronously now as direct-connect.

config_service->SetConfig(ProxyConfig::CreateDirect());

// Start another request -- the effective configuration has changed.

@@ -2673,12 +2669,12 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) {

factory->pending_requests()[0]->script_data()->utf16());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(GURL("http://request1"), resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(GURL("http://request1"), resolver.pending_jobs()[0]->url());

// Complete the pending request.

- resolver.pending_requests()[0]->results()->UseNamedProxy("request1:80");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("request1:80");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// Wait for completion callback, and verify that the request ran as expected.

EXPECT_EQ(OK, callback1.WaitForResult());

@@ -2715,12 +2711,12 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) {

factory->pending_requests()[0]->script_data()->utf16());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(GURL("http://request2"), resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(GURL("http://request2"), resolver.pending_jobs()[0]->url());

// Complete the pending second request.

- resolver.pending_requests()[0]->results()->UseNamedProxy("request2:80");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("request2:80");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// Wait for completion callback, and verify that the request ran as expected.

EXPECT_EQ(OK, callback2.WaitForResult());

@@ -2833,12 +2829,12 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterFailure) {

EXPECT_EQ(ERR_IO_PENDING, rv);

// Check that it was sent to the resolver.

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(GURL("http://request2"), resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(GURL("http://request2"), resolver.pending_jobs()[0]->url());

// Complete the pending second request.

- resolver.pending_requests()[0]->results()->UseNamedProxy("request2:80");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("request2:80");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// Wait for completion callback, and verify that the request ran as expected.

EXPECT_EQ(OK, callback2.WaitForResult());

@@ -2896,12 +2892,12 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) {

factory->pending_requests()[0]->script_data()->utf16());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(GURL("http://request1"), resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(GURL("http://request1"), resolver.pending_jobs()[0]->url());

// Complete the pending request.

- resolver.pending_requests()[0]->results()->UseNamedProxy("request1:80");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("request1:80");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// Wait for completion callback, and verify that the request ran as expected.

EXPECT_EQ(OK, callback1.WaitForResult());

@@ -2917,7 +2913,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) {

fetcher->WaitUntilFetch();

ASSERT_TRUE(factory->pending_requests().empty());

- ASSERT_TRUE(resolver.pending_requests().empty());

+ ASSERT_TRUE(resolver.pending_jobs().empty());

// Make sure that our background checker is trying to download the expected

// PAC script (same one as before). This time we will simulate a successful

@@ -2945,12 +2941,12 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) {

EXPECT_EQ(ERR_IO_PENDING, rv);

// Check that it was sent to the resolver.

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(GURL("http://request2"), resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(GURL("http://request2"), resolver.pending_jobs()[0]->url());

// Complete the pending second request.

- resolver.pending_requests()[0]->results()->UseNamedProxy("request2:80");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("request2:80");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// Wait for completion callback, and verify that the request ran as expected.

EXPECT_EQ(OK, callback2.WaitForResult());

@@ -3008,12 +3004,12 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) {

factory->pending_requests()[0]->script_data()->utf16());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(GURL("http://request1"), resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(GURL("http://request1"), resolver.pending_jobs()[0]->url());

// Complete the pending request.

- resolver.pending_requests()[0]->results()->UseNamedProxy("request1:80");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("request1:80");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// Wait for completion callback, and verify that the request ran as expected.

EXPECT_EQ(OK, callback1.WaitForResult());

@@ -3029,7 +3025,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) {

fetcher->WaitUntilFetch();

ASSERT_TRUE(factory->pending_requests().empty());

- ASSERT_TRUE(resolver.pending_requests().empty());

+ ASSERT_TRUE(resolver.pending_jobs().empty());

// Make sure that our background checker is trying to download the expected

// PAC script (same one as before). We will simulate the same response as

@@ -3041,7 +3037,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) {

base::MessageLoop::current()->RunUntilIdle();

ASSERT_TRUE(factory->pending_requests().empty());

- ASSERT_TRUE(resolver.pending_requests().empty());

+ ASSERT_TRUE(resolver.pending_jobs().empty());

// At this point the ProxyService is still running the same PAC script as

// before.

@@ -3054,12 +3050,12 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) {

EXPECT_EQ(ERR_IO_PENDING, rv);

// Check that it was sent to the resolver.

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(GURL("http://request2"), resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(GURL("http://request2"), resolver.pending_jobs()[0]->url());

// Complete the pending second request.

- resolver.pending_requests()[0]->results()->UseNamedProxy("request2:80");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("request2:80");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// Wait for completion callback, and verify that the request ran as expected.

EXPECT_EQ(OK, callback2.WaitForResult());

@@ -3117,12 +3113,12 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterSuccess) {

factory->pending_requests()[0]->script_data()->utf16());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(GURL("http://request1"), resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(GURL("http://request1"), resolver.pending_jobs()[0]->url());

// Complete the pending request.

- resolver.pending_requests()[0]->results()->UseNamedProxy("request1:80");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("request1:80");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// Wait for completion callback, and verify that the request ran as expected.

EXPECT_EQ(OK, callback1.WaitForResult());

@@ -3138,7 +3134,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterSuccess) {

fetcher->WaitUntilFetch();

ASSERT_TRUE(factory->pending_requests().empty());

- ASSERT_TRUE(resolver.pending_requests().empty());

+ ASSERT_TRUE(resolver.pending_jobs().empty());

// Make sure that our background checker is trying to download the expected

// PAC script (same one as before). This time we will simulate a failure

@@ -3271,12 +3267,12 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) {

factory->pending_requests()[0]->script_data()->utf16());

factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(GURL("http://request1"), resolver.pending_requests()[0]->url());

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(GURL("http://request1"), resolver.pending_jobs()[0]->url());

// Complete the pending request.

- resolver.pending_requests()[0]->results()->UseNamedProxy("request1:80");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("request1:80");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

// Wait for completion callback, and verify that the request ran as expected.

EXPECT_EQ(OK, callback1.WaitForResult());

@@ -3288,7 +3284,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) {

ASSERT_FALSE(fetcher->has_pending_request());

ASSERT_TRUE(factory->pending_requests().empty());

- ASSERT_TRUE(resolver.pending_requests().empty());

+ ASSERT_TRUE(resolver.pending_jobs().empty());

// Start a second request.

ProxyInfo info2;

@@ -3298,10 +3294,10 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) {

EXPECT_EQ(ERR_IO_PENDING, rv);

// This request should have sent work to the resolver; complete it.

- ASSERT_EQ(1u, resolver.pending_requests().size());

- EXPECT_EQ(GURL("http://request2"), resolver.pending_requests()[0]->url());

- resolver.pending_requests()[0]->results()->UseNamedProxy("request2:80");

- resolver.pending_requests()[0]->CompleteNow(OK);

+ ASSERT_EQ(1u, resolver.pending_jobs().size());

+ EXPECT_EQ(GURL("http://request2"), resolver.pending_jobs()[0]->url());

+ resolver.pending_jobs()[0]->results()->UseNamedProxy("request2:80");

+ resolver.pending_jobs()[0]->CompleteNow(OK);

EXPECT_EQ(OK, callback2.WaitForResult());

EXPECT_EQ("request2:80", info2.proxy_server().ToURI());

« net/proxy/proxy_resolver_factory_mojo.cc ('K') | « net/proxy/proxy_service.cc ('k') | net/url_request/url_request_ftp_job_unittest.cc » ('j') | no next file with comments »