summaryrefslogtreecommitdiffstats
path: root/net/build
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-19 08:11:42 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-19 08:11:42 +0000
commitf6fb2de77993bbd88931ba205b0cc1e3423111f6 (patch)
tree831dbc093048f60b7d3cfa6548d42cedc340b4d7 /net/build
parent77c846f5d8043e56543668971fff356d58380cf7 (diff)
downloadchromium_src-f6fb2de77993bbd88931ba205b0cc1e3423111f6.zip
chromium_src-f6fb2de77993bbd88931ba205b0cc1e3423111f6.tar.gz
chromium_src-f6fb2de77993bbd88931ba205b0cc1e3423111f6.tar.bz2
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
Diffstat (limited to 'net/build')
-rw-r--r--net/build/net.vcproj8
-rw-r--r--net/build/net_unittests.vcproj4
2 files changed, 12 insertions, 0 deletions
diff --git a/net/build/net.vcproj b/net/build/net.vcproj
index dac85da..4afc6a9 100644
--- a/net/build/net.vcproj
+++ b/net/build/net.vcproj
@@ -1025,6 +1025,14 @@
>
</File>
<File
+ RelativePath="..\proxy\proxy_server.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\proxy\proxy_server.h"
+ >
+ </File>
+ <File
RelativePath="..\proxy\proxy_service.cc"
>
</File>
diff --git a/net/build/net_unittests.vcproj b/net/build/net_unittests.vcproj
index 2323492e..c25c546 100644
--- a/net/build/net_unittests.vcproj
+++ b/net/build/net_unittests.vcproj
@@ -415,6 +415,10 @@
>
</File>
<File
+ RelativePath="..\proxy\proxy_server_unittest.cc"
+ >
+ </File>
+ <File
RelativePath="..\proxy\proxy_service_unittest.cc"
>
</File>