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

Unified Diff: chromeos/network/proxy/ui_proxy_config.cc

Issue 2785883003: Use unique_ptr<DictionaryValue> in ProxyConfigDictionary (Closed)
Patch Set: one constructor 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: chromeos/network/proxy/ui_proxy_config.cc
diff --git a/chromeos/network/proxy/ui_proxy_config.cc b/chromeos/network/proxy/ui_proxy_config.cc
index 371fca3a6dbdcd378cda07ee9d009575b17c268b..cae782df8ac6b777ac878115f988fe7c1268e241 100644
--- a/chromeos/network/proxy/ui_proxy_config.cc
+++ b/chromeos/network/proxy/ui_proxy_config.cc
@@ -101,7 +101,8 @@ bool UIProxyConfig::FromNetProxyConfig(const net::ProxyConfig& net_config) {
return false;
}
-base::DictionaryValue* UIProxyConfig::ToPrefProxyConfig() const {
+std::unique_ptr<base::DictionaryValue> UIProxyConfig::ToPrefProxyConfig()
+ const {
switch (mode) {
case MODE_DIRECT: {
return ProxyConfigDictionary::CreateDirect();
@@ -137,7 +138,7 @@ base::DictionaryValue* UIProxyConfig::ToPrefProxyConfig() const {
break;
}
NOTREACHED() << "Unrecognized proxy config mode for preference";
- return NULL;
+ return nullptr;
}
UIProxyConfig::ManualProxy* UIProxyConfig::MapSchemeToProxy(

Powered by Google App Engine
This is Rietveld 408576698