Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(280)

Unified Diff: net/proxy/proxy_config_service_common_unittest.h

Issue 149191: Whenever proxy configurations contain socks and http/https/ftp proxies, socks... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/proxy/proxy_config.cc ('k') | net/proxy/proxy_config_service_common_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_config_service_common_unittest.h
===================================================================
--- net/proxy/proxy_config_service_common_unittest.h (revision 20472)
+++ net/proxy/proxy_config_service_common_unittest.h (working copy)
@@ -19,7 +19,8 @@
const char* single_proxy,
const char* proxy_for_http,
const char* proxy_for_https,
- const char* proxy_for_ftp);
+ const char* proxy_for_ftp,
+ const char* socks_proxy);
ProxyConfig::ProxyRules MakeSingleProxyRules(const char* single_proxy);
@@ -28,6 +29,12 @@
const char* proxy_https,
const char* proxy_ftp);
+ProxyConfig::ProxyRules MakeProxyPerSchemeRules(
+ const char* proxy_http,
+ const char* proxy_https,
+ const char* proxy_ftp,
+ const char* socks_proxy);
+
typedef std::vector<std::string> BypassList;
// Joins the proxy bypass list using "\n" to make it into a single string.
« no previous file with comments | « net/proxy/proxy_config.cc ('k') | net/proxy/proxy_config_service_common_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698