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

content/browser/resolve_proxy_msg_helper_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/resolve_proxy_msg_helper.h"
 
 #include "content/browser/browser_thread_impl.h"
 #include "content/common/view_messages.h"
 #include "ipc/ipc_test_sink.h"
 #include "net/base/net_errors.h"
@@ skipping 108 matching lines @@
   // Execute each request sequentially (so there are never 2 requests
   // outstanding at the same time).
 
   helper_->OnResolveProxy(url1, msg1);
 
   // Finish ProxyService's initialization.
   ASSERT_EQ(1u, resolver_factory_->pending_requests().size());
   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);
   EXPECT_EQ("PROXY result1:80", pending_result()->proxy_list);
   clear_pending_result();
 
   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);
   EXPECT_EQ("PROXY result2:80", pending_result()->proxy_list);
   clear_pending_result();
 
   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);
   EXPECT_EQ("PROXY result3:80", pending_result()->proxy_list);
   clear_pending_result();
 }
 
 // Issue a request while one is already in progress -- should be queued.
 TEST_F(ResolveProxyMsgHelperTest, QueueRequests) {
   GURL url1("http://www.google1.com/");
@@ skipping 12 matching lines @@
   // Finish ProxyService's initialization.
   ASSERT_EQ(1u, resolver_factory_->pending_requests().size());
   resolver_factory_->pending_requests()[0]->CompleteNowWithForwarder(
       net::OK, &resolver_);
 
   helper_->OnResolveProxy(url2, msg2);
   helper_->OnResolveProxy(url3, msg3);
 
   // 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);
   EXPECT_EQ("PROXY result3:80", pending_result()->proxy_list);
   clear_pending_result();
 }
 
 // Delete the helper while a request is in progress, and others are pending.
 TEST_F(ResolveProxyMsgHelperTest, CancelPendingRequests) {
   GURL url1("http://www.google1.com/");
@@ skipping 13 matching lines @@
   // Finish ProxyService's initialization.
   ASSERT_EQ(1u, resolver_factory_->pending_requests().size());
   resolver_factory_->pending_requests()[0]->CompleteNowWithForwarder(
       net::OK, &resolver_);
 
   helper_->OnResolveProxy(url2, msg2);
   helper_->OnResolveProxy(url3, msg3);
 
   // 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.
   helper_ = NULL;
 
   // 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);
 
   // It should also be the case that msg1, msg2, msg3 were deleted by the
   // cancellation. (Else will show up as a leak in Valgrind).
 }
 
 }  // namespace content