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

content/browser/resolve_proxy_msg_helper_unittest.cc

Index: content/browser/resolve_proxy_msg_helper_unittest.cc
diff --git a/content/browser/resolve_proxy_msg_helper_unittest.cc b/content/browser/resolve_proxy_msg_helper_unittest.cc
index 1a196086837188e14007b1f34534df46f4a5228e..0281386e594da35fd28c35c8726c2386070f8798 100644
--- a/content/browser/resolve_proxy_msg_helper_unittest.cc
+++ b/content/browser/resolve_proxy_msg_helper_unittest.cc
@@ -128,10 +128,10 @@ TEST_F(ResolveProxyMsgHelperTest, Sequential) {
   resolver_factory_->pending_requests()[0]->CompleteNowWithForwarder(
       net::OK, &resolver_);
 
-  ASSERT_EQ(1u, resolver_.pending_requests().size());
-  EXPECT_EQ(url1, resolver_.pending_requests()[0]->url());
-  resolver_.pending_requests()[0]->results()->UseNamedProxy("result1:80");
-  resolver_.pending_requests()[0]->CompleteNow(net::OK);
+  ASSERT_EQ(1u, resolver_.pending_jobs().size());
+  EXPECT_EQ(url1, resolver_.pending_jobs()[0]->url());
+  resolver_.pending_jobs()[0]->results()->UseNamedProxy("result1:80");
+  resolver_.pending_jobs()[0]->CompleteNow(net::OK);
 
   // Check result.
   EXPECT_EQ(true, pending_result()->result);
@@ -140,10 +140,10 @@ TEST_F(ResolveProxyMsgHelperTest, Sequential) {
 
   helper_->OnResolveProxy(url2, msg2);
 
-  ASSERT_EQ(1u, resolver_.pending_requests().size());
-  EXPECT_EQ(url2, resolver_.pending_requests()[0]->url());
-  resolver_.pending_requests()[0]->results()->UseNamedProxy("result2:80");
-  resolver_.pending_requests()[0]->CompleteNow(net::OK);
+  ASSERT_EQ(1u, resolver_.pending_jobs().size());
+  EXPECT_EQ(url2, resolver_.pending_jobs()[0]->url());
+  resolver_.pending_jobs()[0]->results()->UseNamedProxy("result2:80");
+  resolver_.pending_jobs()[0]->CompleteNow(net::OK);
 
   // Check result.
   EXPECT_EQ(true, pending_result()->result);
@@ -152,10 +152,10 @@ TEST_F(ResolveProxyMsgHelperTest, Sequential) {
 
   helper_->OnResolveProxy(url3, msg3);
 
-  ASSERT_EQ(1u, resolver_.pending_requests().size());
-  EXPECT_EQ(url3, resolver_.pending_requests()[0]->url());
-  resolver_.pending_requests()[0]->results()->UseNamedProxy("result3:80");
-  resolver_.pending_requests()[0]->CompleteNow(net::OK);
+  ASSERT_EQ(1u, resolver_.pending_jobs().size());
+  EXPECT_EQ(url3, resolver_.pending_jobs()[0]->url());
+  resolver_.pending_jobs()[0]->results()->UseNamedProxy("result3:80");
+  resolver_.pending_jobs()[0]->CompleteNow(net::OK);
 
   // Check result.
   EXPECT_EQ(true, pending_result()->result);
@@ -188,33 +188,33 @@ TEST_F(ResolveProxyMsgHelperTest, QueueRequests) {
 
   // ResolveProxyHelper only keeps 1 request outstanding in ProxyService
   // at a time.
-  ASSERT_EQ(1u, resolver_.pending_requests().size());
-  EXPECT_EQ(url1, resolver_.pending_requests()[0]->url());
+  ASSERT_EQ(1u, resolver_.pending_jobs().size());
+  EXPECT_EQ(url1, resolver_.pending_jobs()[0]->url());
 
-  resolver_.pending_requests()[0]->results()->UseNamedProxy("result1:80");
-  resolver_.pending_requests()[0]->CompleteNow(net::OK);
+  resolver_.pending_jobs()[0]->results()->UseNamedProxy("result1:80");
+  resolver_.pending_jobs()[0]->CompleteNow(net::OK);
 
   // Check result.
   EXPECT_EQ(true, pending_result()->result);
   EXPECT_EQ("PROXY result1:80", pending_result()->proxy_list);
   clear_pending_result();
 
-  ASSERT_EQ(1u, resolver_.pending_requests().size());
-  EXPECT_EQ(url2, resolver_.pending_requests()[0]->url());
+  ASSERT_EQ(1u, resolver_.pending_jobs().size());
+  EXPECT_EQ(url2, resolver_.pending_jobs()[0]->url());
 
-  resolver_.pending_requests()[0]->results()->UseNamedProxy("result2:80");
-  resolver_.pending_requests()[0]->CompleteNow(net::OK);
+  resolver_.pending_jobs()[0]->results()->UseNamedProxy("result2:80");
+  resolver_.pending_jobs()[0]->CompleteNow(net::OK);
 
   // Check result.
   EXPECT_EQ(true, pending_result()->result);
   EXPECT_EQ("PROXY result2:80", pending_result()->proxy_list);
   clear_pending_result();
 
-  ASSERT_EQ(1u, resolver_.pending_requests().size());
-  EXPECT_EQ(url3, resolver_.pending_requests()[0]->url());
+  ASSERT_EQ(1u, resolver_.pending_jobs().size());
+  EXPECT_EQ(url3, resolver_.pending_jobs()[0]->url());
 
-  resolver_.pending_requests()[0]->results()->UseNamedProxy("result3:80");
-  resolver_.pending_requests()[0]->CompleteNow(net::OK);
+  resolver_.pending_jobs()[0]->results()->UseNamedProxy("result3:80");
+  resolver_.pending_jobs()[0]->CompleteNow(net::OK);
 
   // Check result.
   EXPECT_EQ(true, pending_result()->result);
@@ -248,8 +248,8 @@ TEST_F(ResolveProxyMsgHelperTest, CancelPendingRequests) {
 
   // ResolveProxyHelper only keeps 1 request outstanding in ProxyService
   // at a time.
-  ASSERT_EQ(1u, resolver_.pending_requests().size());
-  EXPECT_EQ(url1, resolver_.pending_requests()[0]->url());
+  ASSERT_EQ(1u, resolver_.pending_jobs().size());
+  EXPECT_EQ(url1, resolver_.pending_jobs()[0]->url());
 
   // Delete the underlying ResolveProxyMsgHelper -- this should cancel all
   // the requests which are outstanding.
@@ -257,7 +257,7 @@ TEST_F(ResolveProxyMsgHelperTest, CancelPendingRequests) {
 
   // The pending requests sent to the proxy resolver should have been cancelled.
 
-  EXPECT_EQ(0u, resolver_.pending_requests().size());
+  EXPECT_EQ(0u, resolver_.pending_jobs().size());
 
   EXPECT_TRUE(pending_result() == NULL);