| Index: chromeos/network/onc/onc_utils.cc
|
| diff --git a/chromeos/network/onc/onc_utils.cc b/chromeos/network/onc/onc_utils.cc
|
| index 55f509135bcc78763711c57cf05bc21a8028cc3e..cb2ea8b457ad7380cda3ccd72c506c180b0fd317 100644
|
| --- a/chromeos/network/onc/onc_utils.cc
|
| +++ b/chromeos/network/onc/onc_utils.cc
|
| @@ -163,7 +163,7 @@ scoped_ptr<base::DictionaryValue> Decrypt(const std::string& passphrase,
|
| return nullptr;
|
| }
|
|
|
| - return new_root.Pass();
|
| + return new_root;
|
| }
|
|
|
| std::string GetSourceAsString(ONCSource source) {
|
| @@ -912,7 +912,7 @@ scoped_ptr<base::DictionaryValue> ConvertOncProxySettingsToProxyConfig(
|
| } else {
|
| NOTREACHED();
|
| }
|
| - return proxy_dict.Pass();
|
| + return proxy_dict;
|
| }
|
|
|
| scoped_ptr<base::DictionaryValue> ConvertProxyConfigToOncProxySettings(
|
| @@ -985,7 +985,7 @@ scoped_ptr<base::DictionaryValue> ConvertProxyConfigToOncProxySettings(
|
| return nullptr;
|
| }
|
| }
|
| - return proxy_settings.Pass();
|
| + return proxy_settings;
|
| }
|
|
|
| } // namespace onc
|
|
|