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

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 5e3dd0de58435ff2f1cef8468d99216182951034..7ecd78408fb252b689a4967713350b2311a29e0e 100644
--- a/content/browser/resolve_proxy_msg_helper_unittest.cc
+++ b/content/browser/resolve_proxy_msg_helper_unittest.cc
@@ -126,10 +126,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);
@@ -138,10 +138,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);
@@ -150,10 +150,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);
@@ -186,33 +186,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);
@@ -246,8 +246,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.
@@ -255,7 +255,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);