| 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(
|
|
|