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

Unified Diff: chrome/browser/prefs/chrome_command_line_pref_store.cc

Issue 2785883003: Use unique_ptr<DictionaryValue> in ProxyConfigDictionary (Closed)
Patch Set: Fix compilation Created 3 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
Index: chrome/browser/prefs/chrome_command_line_pref_store.cc
diff --git a/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chrome/browser/prefs/chrome_command_line_pref_store.cc
index ebfecf62cd7c22a60e9116a50e88803dd0558f4f..51bddfe79544ce4e87555329fc5d309e44d935cc 100644
--- a/chrome/browser/prefs/chrome_command_line_pref_store.cc
+++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc
@@ -123,29 +123,27 @@ void ChromeCommandLinePrefStore::ApplySimpleSwitches() {
void ChromeCommandLinePrefStore::ApplyProxyMode() {
if (command_line()->HasSwitch(switches::kNoProxyServer)) {
- SetValue(proxy_config::prefs::kProxy,
- base::WrapUnique(ProxyConfigDictionary::CreateDirect()),
+ SetValue(proxy_config::prefs::kProxy, ProxyConfigDictionary::CreateDirect(),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
} else if (command_line()->HasSwitch(switches::kProxyPacUrl)) {
std::string pac_script_url =
command_line()->GetSwitchValueASCII(switches::kProxyPacUrl);
SetValue(proxy_config::prefs::kProxy,
- base::WrapUnique(
- ProxyConfigDictionary::CreatePacScript(pac_script_url, false)),
+ ProxyConfigDictionary::CreatePacScript(pac_script_url, false),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
} else if (command_line()->HasSwitch(switches::kProxyAutoDetect)) {
SetValue(proxy_config::prefs::kProxy,
- base::WrapUnique(ProxyConfigDictionary::CreateAutoDetect()),
+ ProxyConfigDictionary::CreateAutoDetect(),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
} else if (command_line()->HasSwitch(switches::kProxyServer)) {
std::string proxy_server =
command_line()->GetSwitchValueASCII(switches::kProxyServer);
std::string bypass_list =
command_line()->GetSwitchValueASCII(switches::kProxyBypassList);
- SetValue(proxy_config::prefs::kProxy,
- base::WrapUnique(ProxyConfigDictionary::CreateFixedServers(
- proxy_server, bypass_list)),
- WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
+ SetValue(
+ proxy_config::prefs::kProxy,
+ ProxyConfigDictionary::CreateFixedServers(proxy_server, bypass_list),
+ WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
}
}

Powered by Google App Engine
This is Rietveld 408576698