Change ProxyResolver::GetProxyForURL() to take a scoped_ptr<Request>* rather than a RequestHandle*

net/proxy/proxy_service_unittest.cc

Index: net/proxy/proxy_service_unittest.cc
diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc
index 3d23b583345cf2d533307e9b410d4acf2597ee3a..680b6d7c917964b40d5029e797bc2f9dd33916f0 100644
--- a/net/proxy/proxy_service_unittest.cc
+++ b/net/proxy/proxy_service_unittest.cc
@@ -241,25 +241,15 @@ class TestProxyFallbackNetworkDelegate : public NetworkDelegateImpl {
   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

[eroman, 2016/02/24 03:08:07]

nit: Can you re-wrap this comment, and remove the extra space after jobmap?

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

[eroman, 2016/02/24 03:08:07]

_urls --> urls (looks like the previous comment was wrong).

+// in |list| is exactly the set of URLs in |_urls|.

[eroman, 2016/02/24 03:08:07]

_urls --> urls (looks like the previous comment was wrong)

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

[eroman, 2016/02/24 03:08:07]

const JobMap map --> const JobMap& map

+  int a = urls.size();

[eroman, 2016/02/24 03:08:07]

write this as either:
   size_t a = urls.size();
or
   auto a = urls.size();

(size_t --> int can be a truncating operation otherwise and may trigger compiler
warnings)

+  int b = map.size();
+  if (a != b) {
     ADD_FAILURE() << "map size (" << map.size() << ") != urls size ("
                   << urls.size() << ")";
     return map;
@@ -275,11 +265,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);
@@ -287,16 +277,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);
@@ -304,7 +301,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 scoped_refptr<MockAsyncProxyResolver::Job>& it :
+       resolver.cancelled_jobs()) {
+    DCHECK(it);
+    map[it->url()] = it.get();
+  }
+
+  return GetJobsForURLs(map, urls);
 }
 
 }  // namespace
@@ -374,7 +379,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:
@@ -470,12 +475,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());
@@ -526,10 +531,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.
@@ -557,12 +562,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());
@@ -611,11 +616,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());
 
@@ -669,13 +674,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());
@@ -741,11 +746,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());
@@ -783,11 +788,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.
@@ -806,13 +811,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());
@@ -847,11 +852,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.
@@ -877,12 +882,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());
@@ -923,10 +928,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.
@@ -939,7 +944,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.
@@ -948,11 +953,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());
@@ -1082,11 +1087,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.
@@ -1101,13 +1106,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());
@@ -1141,13 +1146,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());
@@ -1186,14 +1191,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());
@@ -1245,14 +1250,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());
@@ -1291,13 +1296,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());
@@ -1364,13 +1369,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());
@@ -1391,12 +1396,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());
@@ -1426,12 +1431,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());
@@ -1466,12 +1471,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());
@@ -1496,11 +1501,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.
@@ -1518,12 +1523,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().
@@ -1564,12 +1569,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());
@@ -1594,11 +1599,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.
@@ -1617,12 +1622,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().
@@ -1899,7 +1904,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;
@@ -1908,34 +1913,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);  // 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.
+  // 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());
@@ -2008,24 +2013,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());
@@ -2063,7 +2068,7 @@ TEST_F(ProxyServiceTest, ChangeScriptFetcherWhilePACDownloadInProgress) {
   service.SetProxyScriptFetchers(
       fetcher, make_scoped_ptr(new DoNothingDhcpProxyScriptFetcher()));
 
-  // Start 2 requests.
+  // Start 2 jobs.
 
   ProxyInfo info1;
   TestCompletionCallback callback1;
@@ -2103,7 +2108,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.
@@ -2153,7 +2158,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);
 
@@ -2168,17 +2173,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.
@@ -2253,18 +2258,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());
@@ -2334,18 +2339,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());
 
@@ -2371,7 +2376,7 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomToManual) {
   service.SetProxyScriptFetchers(
       fetcher, make_scoped_ptr(new DoNothingDhcpProxyScriptFetcher()));
 
-  // Start 2 requests.
+  // Start 2 jobs.
 
   ProxyInfo info1;
   TestCompletionCallback callback1;
@@ -2405,7 +2410,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());
@@ -2454,13 +2459,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());
@@ -2473,13 +2477,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());
@@ -2601,9 +2604,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());
@@ -2613,7 +2616,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.
@@ -2674,12 +2677,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());
@@ -2716,12 +2719,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());
@@ -2834,12 +2837,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());
@@ -2897,12 +2900,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());
@@ -2918,7 +2921,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
@@ -2946,12 +2949,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());
@@ -3009,12 +3012,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());
@@ -3030,7 +3033,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
@@ -3042,7 +3045,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.
@@ -3055,12 +3058,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());
@@ -3118,12 +3121,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());
@@ -3139,7 +3142,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
@@ -3272,12 +3275,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());
@@ -3289,7 +3292,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;
@@ -3299,10 +3302,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());