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

Unified Diff: net/proxy/proxy_config_service_ios.cc

Issue 12315019: Change ProxyRules to handle ProxyLists rather than just single ProxyServer instances. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 10 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
Index: net/proxy/proxy_config_service_ios.cc
diff --git a/net/proxy/proxy_config_service_ios.cc b/net/proxy/proxy_config_service_ios.cc
index fdeb1bb4f30aec95f20a53557dd3a1f39bbe6c5a..6a9d2d35e0c097cdb5fb8dfba75355bb0272dc18 100644
--- a/net/proxy/proxy_config_service_ios.cc
+++ b/net/proxy/proxy_config_service_ios.cc
@@ -78,10 +78,11 @@ void GetCurrentProxyConfig(ProxyConfig* config) {
if (proxy_server.is_valid()) {
config->proxy_rules().type =
ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME;
- config->proxy_rules().proxy_for_http = proxy_server;
+ config->proxy_rules().proxies_for_http.SetSingleProxyServer(proxy_server);
// Desktop Safari applies the HTTP proxy to http:// URLs only, but
// Mobile Safari applies the HTTP proxy to https:// URLs as well.
- config->proxy_rules().proxy_for_https = proxy_server;
+ config->proxy_rules().proxies_for_https.SetSingleProxyServer(
+ proxy_server);
}
}

Powered by Google App Engine
This is Rietveld 408576698