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

Unified Diff: net/proxy/proxy_config_unittest.cc

Issue 3146029: Cleanup: rename ProxyRules::socks_proxy --> ProxyRules::fallback_proxy.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync and include a new chromeos file Created 10 years, 4 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_service_mac.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_config_unittest.cc
===================================================================
--- net/proxy/proxy_config_unittest.cc (revision 57274)
+++ net/proxy/proxy_config_unittest.cc (working copy)
@@ -104,7 +104,7 @@
const char* proxy_for_http;
const char* proxy_for_https;
const char* proxy_for_ftp;
- const char* socks_proxy;
+ const char* fallback_proxy;
} tests[] = {
// One HTTP proxy for all schemes.
{
@@ -246,8 +246,8 @@
config.proxy_rules().proxy_for_https);
ExpectProxyServerEquals(tests[i].proxy_for_ftp,
config.proxy_rules().proxy_for_ftp);
- ExpectProxyServerEquals(tests[i].socks_proxy,
- config.proxy_rules().socks_proxy);
+ ExpectProxyServerEquals(tests[i].fallback_proxy,
+ config.proxy_rules().fallback_proxy);
}
}
@@ -335,7 +335,7 @@
"Manual settings:\n"
" Proxy server: \n"
" HTTP: proxy-for-http:1801\n"
- " SOCKS: socks4://socks-server:6083\n"
+ " (fallback): socks4://socks-server:6083\n"
" Bypass list: [None]",
config.ToString());
}
« no previous file with comments | « net/proxy/proxy_config_service_mac.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698