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

Unified Diff: net/proxy/proxy_config_service_win.cc

Issue 57011: Extract the parsing of proxy rules to ProxyConfig::ProxyRules, and unit-test.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: address wtc's second batch of comments -- second try, got rietveld 500 before... Created 11 years, 9 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_fixed.h ('k') | net/proxy/proxy_config_service_win_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_win.cc
===================================================================
--- net/proxy/proxy_config_service_win.cc (revision 12729)
+++ net/proxy/proxy_config_service_win.cc (working copy)
@@ -44,8 +44,11 @@
const WINHTTP_CURRENT_USER_IE_PROXY_CONFIG& ie_config) {
if (ie_config.fAutoDetect)
config->auto_detect = true;
- if (ie_config.lpszProxy)
- config->proxy_rules = WideToASCII(ie_config.lpszProxy);
+ if (ie_config.lpszProxy) {
+ // lpszProxy may be a single proxy, or a proxy per scheme. The format
+ // is compatible with ProxyConfig::ProxyRules's string format.
+ config->proxy_rules.ParseFromString(WideToASCII(ie_config.lpszProxy));
+ }
if (ie_config.lpszProxyBypass) {
std::string proxy_bypass = WideToASCII(ie_config.lpszProxyBypass);
« no previous file with comments | « net/proxy/proxy_config_service_fixed.h ('k') | net/proxy/proxy_config_service_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698