net/proxy/proxy_service_unittest.cc - Issue 2299963002: Reland "Change ProxyResolver::GetProxyForURL() to take a unique_ptr<Request>* "

Unified Diff: net/proxy/proxy_service_unittest.cc

Issue 2299963002: Reland "Change ProxyResolver::GetProxyForURL() to take a unique_ptr<Request>* " (Closed)

Patch Set: remove fields proposed by eroman Created 4 years, 2 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

Index: net/proxy/proxy_service_unittest.cc

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

index f1391c877d3db2735ad918ecac8a299c06babf27..e0472e7b3b0f237520a4634b5c734d6596d9949f 100644

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

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

@@ -292,25 +292,14 @@ class TestProxyFallbackProxyDelegate : public ProxyDelegate {

int proxy_fallback_net_error_;

};

-using RequestMap =

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

-// 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|.

-//

-// 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;

- for (const auto& it : requests)

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

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

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

+// Given a jobmap 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|.

+JobMap GetJobsForURLs(const JobMap& map, const std::vector<GURL>& urls) {

+ size_t a = urls.size();

+ size_t b = map.size();

+ if (a != b) {

ADD_FAILURE() << "map size (" << map.size() << ") != urls size ("

<< urls.size() << ")";

return map;

@@ -326,11 +315,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);

@@ -338,16 +327,23 @@ RequestMap GetPendingRequestsForURLs(const MockAsyncProxyResolver& resolver,

urls.push_back(url2);

if (!url3.is_empty())

urls.push_back(url3);

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

+ JobMap map;

+ for (MockAsyncProxyResolver::Job* it : resolver.pending_jobs()) {

+ DCHECK(it);

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

+ }

+ return GetJobsForURLs(map, 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);

@@ -355,7 +351,15 @@ RequestMap GetCancelledRequestsForURLs(const MockAsyncProxyResolver& resolver,

urls.push_back(url2);

if (!url3.is_empty())

urls.push_back(url3);

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

+ JobMap map;

+ for (const std::unique_ptr<MockAsyncProxyResolver::Job>& it :

+ resolver.cancelled_jobs()) {

+ DCHECK(it);

+ map[it->url()] = it.get();

+ }

+ return GetJobsForURLs(map, urls);

}

} // namespace

@@ -425,7 +429,7 @@ TEST_F(ProxyServiceTest, OnResolveProxyCallbackAddProxy) {

// Verify that the ProxyDelegate'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:

@@ -521,12 +525,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_THAT(callback.WaitForResult(), IsOk());

EXPECT_FALSE(info.is_direct());

@@ -576,10 +580,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.

@@ -607,12 +611,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_THAT(callback1.WaitForResult(), IsOk());

EXPECT_FALSE(info.is_direct());

@@ -661,11 +665,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_THAT(callback1.WaitForResult(), IsOk());

@@ -719,13 +723,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_THAT(callback1.WaitForResult(), IsOk());

EXPECT_TRUE(info.is_direct());

@@ -791,11 +795,11 @@ TEST_F(ProxyServiceTest, PAC_ConfigSourcePropagates) {

nullptr, nullptr, NetLogWithSource());

ASSERT_THAT(rv, IsError(ERR_IO_PENDING));

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_THAT(callback.WaitForResult(), IsOk());

EXPECT_EQ(PROXY_CONFIG_SOURCE_TEST, info.config_source());

@@ -833,11 +837,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.

@@ -856,13 +860,13 @@ TEST_F(ProxyServiceTest, ProxyResolverFails) {

nullptr, nullptr, NetLogWithSource());

EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

- 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_THAT(callback2.WaitForResult(), IsOk());

EXPECT_FALSE(info.is_direct());

@@ -896,11 +900,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.

@@ -926,12 +930,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_THAT(callback2.WaitForResult(), IsOk());

EXPECT_FALSE(info.is_direct());

@@ -972,10 +976,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.

@@ -988,7 +992,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.

@@ -997,11 +1001,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_THAT(callback2.WaitForResult(), IsOk());

EXPECT_FALSE(info.is_direct());

@@ -1131,11 +1135,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.

@@ -1150,13 +1154,13 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsInJavaScriptMandatoryPac) {

nullptr, nullptr, NetLogWithSource());

EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

- 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_THAT(callback2.WaitForResult(), IsOk());

EXPECT_FALSE(info.is_direct());

@@ -1190,13 +1194,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_THAT(callback1.WaitForResult(), IsOk());

@@ -1235,14 +1239,14 @@ TEST_F(ProxyServiceTest, ProxyFallback) {

nullptr, nullptr, NetLogWithSource());

EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

- 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_THAT(callback3.WaitForResult(), IsOk());

EXPECT_FALSE(info.is_direct());

@@ -1294,14 +1298,14 @@ TEST_F(ProxyServiceTest, ProxyFallback) {

nullptr, nullptr, NetLogWithSource());

EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

- 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_THAT(callback7.WaitForResult(), IsOk());

@@ -1340,13 +1344,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_THAT(callback1.WaitForResult(), IsOk());

@@ -1413,13 +1417,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_THAT(callback1.WaitForResult(), IsOk());

@@ -1440,12 +1444,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_THAT(callback2.WaitForResult(), IsOk());

@@ -1475,12 +1479,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_THAT(callback4.WaitForResult(), IsOk());

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

@@ -1515,12 +1519,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_THAT(callback1.WaitForResult(), IsOk());

@@ -1545,11 +1549,11 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) {

nullptr, nullptr, NetLogWithSource());

EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

- 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.

@@ -1567,12 +1571,12 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) {

callback4.callback(), nullptr, nullptr, NetLogWithSource());

EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

- 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().

@@ -1613,12 +1617,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_THAT(callback1.WaitForResult(), IsOk());

@@ -1643,11 +1647,11 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) {

nullptr, nullptr, NetLogWithSource());

EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

- 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.

@@ -1666,12 +1670,12 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) {

callback4.callback(), nullptr, nullptr, NetLogWithSource());

EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

- 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().

@@ -1951,7 +1955,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;

@@ -1960,34 +1964,33 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) {

&request2, nullptr, NetLogWithSource());

EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

- GetPendingRequestsForURLs(resolver, url1, url2);

+ GetPendingJobsForURLs(resolver, url1, url2);

ProxyInfo info3;

TestCompletionCallback callback3;

rv = service.ResolveProxy(url3, std::string(), &info3, callback3.callback(),

nullptr, nullptr, NetLogWithSource());

EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

- 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); // dsaadsasd

- 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.

- EXPECT_THAT(callback1.WaitForResult(), IsOk());

+ 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_THAT(callback3.WaitForResult(), IsOk());

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

@@ -2061,25 +2064,33 @@ 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.

- EXPECT_THAT(callback1.WaitForResult(), IsOk());

+ //<<<<<<< HEAD

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

+ // EXPECT_THAT(callback1.WaitForResult(), IsOk());

+ //=======

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

+ EXPECT_EQ(OK, callback1.WaitForResult());

+ //>>>>>>> parent of 9c8f424... Revert of Change

+ // ProxyResolver::GetProxyForURL() to take a std::unique_ptr<Request>* rather

+ // than a RequestHandle* (patchset #11 id:200001 of

+ // https://codereview.chromium.org/1439053002/ )

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

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

EXPECT_FALSE(info1.proxy_resolve_end_time().is_null());

@@ -2116,7 +2127,7 @@ TEST_F(ProxyServiceTest, ChangeScriptFetcherWhilePACDownloadInProgress) {

service.SetProxyScriptFetchers(

fetcher, base::WrapUnique(new DoNothingDhcpProxyScriptFetcher()));

- // Start 2 requests.

+ // Start 2 jobs.

ProxyInfo info1;

TestCompletionCallback callback1;

@@ -2157,7 +2168,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.

@@ -2208,7 +2219,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);

@@ -2223,17 +2234,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_THAT(callback3.WaitForResult(), IsOk());

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.

@@ -2308,19 +2319,27 @@ 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);

- // Complete the pending requests.

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

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

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

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

- // Verify that requests ran as expected.

- EXPECT_THAT(callback1.WaitForResult(), IsOk());

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

+ // Complete the pending jobs.

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

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

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

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

+ //<<<<<<< HEAD

+ // // Verify that requests ran as expected.

+ // EXPECT_THAT(callback1.WaitForResult(), IsOk());

+ //=======

+ // Verify that jobs ran as expected.

+ EXPECT_EQ(OK, callback1.WaitForResult());

+ //>>>>>>> parent of 9c8f424... Revert of Change

+ // ProxyResolver::GetProxyForURL() to take a std::unique_ptr<Request>* rather

+ // than a RequestHandle* (patchset #11 id:200001 of

+ // https://codereview.chromium.org/1439053002/ )

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

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

EXPECT_FALSE(info1.proxy_resolve_end_time().is_null());

@@ -2390,19 +2409,27 @@ 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);

- // Complete the pending requests.

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

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

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

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

- // Verify that requests ran as expected.

- EXPECT_THAT(callback1.WaitForResult(), IsOk());

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

+ // Complete the pending jobs.

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

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

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

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

+ //<<<<<<< HEAD

+ // // Verify that requests ran as expected.

+ // EXPECT_THAT(callback1.WaitForResult(), IsOk());

+ //=======

+ // Verify that jobs ran as expected.

+ EXPECT_EQ(OK, callback1.WaitForResult());

+ //>>>>>>> parent of 9c8f424... Revert of Change

+ // ProxyResolver::GetProxyForURL() to take a std::unique_ptr<Request>* rather

+ // than a RequestHandle* (patchset #11 id:200001 of

+ // https://codereview.chromium.org/1439053002/ )

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

EXPECT_THAT(callback2.WaitForResult(), IsOk());

@@ -2427,7 +2454,7 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomToManual) {

service.SetProxyScriptFetchers(

fetcher, base::WrapUnique(new DoNothingDhcpProxyScriptFetcher()));

- // Start 2 requests.

+ // Start 2 jobs.

ProxyInfo info1;

TestCompletionCallback callback1;

@@ -2461,7 +2488,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_THAT(callback1.WaitForResult(), IsOk());

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

@@ -2510,13 +2537,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_THAT(callback1.WaitForResult(), IsOk());

@@ -2530,13 +2556,12 @@ TEST_F(ProxyServiceTest, BypassDoesntApplyToPac) {

NetLogWithSource());

EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

- 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_THAT(callback2.WaitForResult(), IsOk());

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

@@ -2658,9 +2683,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_THAT(callback1.WaitForResult(), IsOk());

@@ -2670,7 +2695,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.

@@ -2732,12 +2757,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_THAT(callback1.WaitForResult(), IsOk());

@@ -2775,12 +2800,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_THAT(callback2.WaitForResult(), IsOk());

@@ -2894,12 +2919,12 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterFailure) {

EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

// 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_THAT(callback2.WaitForResult(), IsOk());

@@ -2957,12 +2982,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_THAT(callback1.WaitForResult(), IsOk());

@@ -2978,7 +3003,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

@@ -3007,12 +3032,12 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) {

EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

// 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_THAT(callback2.WaitForResult(), IsOk());

@@ -3070,12 +3095,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_THAT(callback1.WaitForResult(), IsOk());

@@ -3091,7 +3116,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

@@ -3103,7 +3128,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) {

base::RunLoop().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.

@@ -3117,12 +3142,12 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) {

EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

// 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_THAT(callback2.WaitForResult(), IsOk());

@@ -3180,12 +3205,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_THAT(callback1.WaitForResult(), IsOk());

@@ -3201,7 +3226,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

@@ -3335,12 +3360,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_THAT(callback1.WaitForResult(), IsOk());

@@ -3352,7 +3377,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;

@@ -3363,10 +3388,10 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) {

EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

// 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_THAT(callback2.WaitForResult(), IsOk());

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

@@ -3479,12 +3504,12 @@ class SanitizeUrlHelper {

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

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

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

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

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

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

// Complete the request.

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

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

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

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

EXPECT_THAT(callback.WaitForResult(), IsOk());

EXPECT_TRUE(info.is_direct());

}

@@ -3506,13 +3531,13 @@ class SanitizeUrlHelper {

NetLogWithSource());

EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

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

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

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

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

// Complete the request.

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

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

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

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

EXPECT_THAT(callback.WaitForResult(), IsOk());

EXPECT_TRUE(info.is_direct());

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