Add parsing for PAC result strings -- ProxyInfo::UsePacString().

Added the support class ProxyServer to avoid losing the proxy server's type information (http, socks) when populating the list.

The format of the configuration strings has been extended accordingly to include an optional [<scheme>"://"] prefix.
(i.e. "http://", "socks4://", "socks5://").

Review URL: http://codereview.chromium.org/20398

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10010 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 4 deletions

diff --git a/chrome/browser/net/resolve_proxy_msg_helper.cc b/chrome/browser/net/resolve_proxy_msg_helper.cc
index dca5ad6..99ecd27 100644
--- a/chrome/browser/net/resolve_proxy_msg_helper.cc
+++ b/chrome/browser/net/resolve_proxy_msg_helper.cc
@@ -34,7 +34,7 @@ void ResolveProxyMsgHelper::OnResolveProxyCompleted(int result) {
   const PendingRequest& completed_req = pending_requests_.front();
   delegate_->OnResolveProxyCompleted(completed_req.reply_msg,
                                      result,
-                                     proxy_info_.GetAnnotatedProxyList());
+                                     proxy_info_.ToPacString());
 
   // Clear the current (completed) request.
   pending_requests_.pop_front();
diff --git a/chrome/browser/net/resolve_proxy_msg_helper_unittest.cc b/chrome/browser/net/resolve_proxy_msg_helper_unittest.cc
index dd70713..2821c5e 100644
--- a/chrome/browser/net/resolve_proxy_msg_helper_unittest.cc
+++ b/chrome/browser/net/resolve_proxy_msg_helper_unittest.cc
@@ -289,15 +289,15 @@ TEST(ResolveProxyMsgHelperTest, QueueRequests) {
 
   EXPECT_EQ(msg1.get(), result1->reply_msg);
   EXPECT_EQ(net::OK, result1->error_code);
-  EXPECT_EQ("PROXY www.google1.com", result1->proxy_list);
+  EXPECT_EQ("PROXY www.google1.com:80", result1->proxy_list);
 
   EXPECT_EQ(msg2.get(), result2->reply_msg);
   EXPECT_EQ(net::OK, result2->error_code);
-  EXPECT_EQ("PROXY www.google2.com", result2->proxy_list);
+  EXPECT_EQ("PROXY www.google2.com:80", result2->proxy_list);
 
   EXPECT_EQ(msg3.get(), result3->reply_msg);
   EXPECT_EQ(net::OK, result3->error_code);
-  EXPECT_EQ("PROXY www.google3.com", result3->proxy_list);
+  EXPECT_EQ("PROXY www.google3.com:80", result3->proxy_list);
 }
 
 // Delete the helper while a request is in progress, and others are pending.