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

Unified Diff: chrome/browser/chromeos/proxy_config_service_impl.cc

Issue 10578017: Test GURL::spec() usage changes with DEPS rolled to the new version. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More fixes Created 8 years, 6 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: chrome/browser/chromeos/proxy_config_service_impl.cc
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc
index 72e3416f3079a965c4795f9c40a1472698c8d720..8681252acb6bc03e90cd7f3a16a286b82ae847ab 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl.cc
+++ b/chrome/browser/chromeos/proxy_config_service_impl.cc
@@ -295,8 +295,10 @@ bool ProxyConfigServiceImpl::ProxyConfig::DeserializeForDevice(
mode = MODE_AUTO_DETECT;
} else if (mode_string == ProxyPrefs::kPacScriptProxyModeName) {
mode = MODE_PAC_SCRIPT;
- if (proxy_proto.has_proxy_pac_url())
- automatic_proxy.pac_url = GURL(proxy_proto.proxy_pac_url());
+ if (proxy_proto.has_proxy_pac_url()) {
+ GURL pac_url = GURL(proxy_proto.proxy_pac_url());
+ automatic_proxy.pac_url = pac_url.is_valid() ? pac_url : GURL();
+ }
} else if (mode_string == ProxyPrefs::kFixedServersProxyModeName) {
net::ProxyConfig::ProxyRules rules;
rules.ParseFromString(proxy_proto.proxy_server());
« no previous file with comments | « chrome/browser/chromeos/extensions/file_browser_private_api.cc ('k') | chrome/browser/extensions/apps_promo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698