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

Unified Diff: chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc

Issue 1296663003: Componentize proxy code from chrome/browser/net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
Index: chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc
diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc
index b8471ea56909617de6df5e46651da67aeeb41878..023b5aa94b2fcee9b1c74d451bfdde62b18fe678 100644
--- a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc
+++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc
@@ -95,13 +95,13 @@ DataReductionProxyChromeSettings::ProxyPrefMigrationResult
DataReductionProxyChromeSettings::MigrateDataReductionProxyOffProxyPrefsHelper(
PrefService* prefs) {
base::DictionaryValue* dict =
- (base::DictionaryValue*)prefs->GetUserPrefValue(prefs::kProxy);
+ (base::DictionaryValue*)prefs->GetUserPrefValue(ProxyPrefs::kProxy);
if (!dict)
return PROXY_PREF_NOT_CLEARED;
// Clear empty "proxy" dictionary created by a bug. See http://crbug/448172.
if (dict->empty()) {
- prefs->ClearPref(prefs::kProxy);
+ prefs->ClearPref(ProxyPrefs::kProxy);
return PROXY_PREF_CLEARED_EMPTY;
}
@@ -111,7 +111,7 @@ DataReductionProxyChromeSettings::MigrateDataReductionProxyOffProxyPrefsHelper(
// Clear "system" proxy entry since this is the default. This entry was
// created by bug (http://crbug/448172).
if (ProxyModeToString(ProxyPrefs::MODE_SYSTEM) == mode) {
- prefs->ClearPref(prefs::kProxy);
+ prefs->ClearPref(ProxyPrefs::kProxy);
return PROXY_PREF_CLEARED_MODE_SYSTEM;
}
@@ -135,7 +135,7 @@ DataReductionProxyChromeSettings::MigrateDataReductionProxyOffProxyPrefsHelper(
else
return PROXY_PREF_NOT_CLEARED;
- prefs->ClearPref(prefs::kProxy);
+ prefs->ClearPref(ProxyPrefs::kProxy);
return rv;
}
@@ -157,7 +157,7 @@ DataReductionProxyChromeSettings::MigrateDataReductionProxyOffProxyPrefsHelper(
if (pac_script.find(".googlezip.net:") == std::string::npos)
return PROXY_PREF_NOT_CLEARED;
- prefs->ClearPref(prefs::kProxy);
+ prefs->ClearPref(ProxyPrefs::kProxy);
return PROXY_PREF_CLEARED_PAC_GOOGLEZIP;
}

Powered by Google App Engine
This is Rietveld 408576698