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

Unified Diff: chrome/browser/chromeos/net/onc_utils.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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
« no previous file with comments | « chrome/browser/chromeos/net/onc_utils.h ('k') | chrome/browser/chromeos/net/proxy_config_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/net/onc_utils.cc
diff --git a/chrome/browser/chromeos/net/onc_utils.cc b/chrome/browser/chromeos/net/onc_utils.cc
index 22bec7033826470fa8e582a25c969db7bd1c9d40..cd5ca390aaceb18e70e2101f1d35775b1159455a 100644
--- a/chrome/browser/chromeos/net/onc_utils.cc
+++ b/chrome/browser/chromeos/net/onc_utils.cc
@@ -77,7 +77,8 @@ void ImportNetworksForUser(const user_manager::User* user,
std::string* error) {
error->clear();
- scoped_ptr<base::ListValue> expanded_networks(network_configs.DeepCopy());
+ std::unique_ptr<base::ListValue> expanded_networks(
+ network_configs.DeepCopy());
ExpandStringPlaceholdersInNetworksForUser(user, expanded_networks.get());
const NetworkProfile* profile =
@@ -98,17 +99,17 @@ void ImportNetworksForUser(const user_manager::User* user,
// Remove irrelevant fields.
onc::Normalizer normalizer(true /* remove recommended fields */);
- scoped_ptr<base::DictionaryValue> normalized_network =
+ std::unique_ptr<base::DictionaryValue> normalized_network =
normalizer.NormalizeObject(&onc::kNetworkConfigurationSignature,
*network);
// TODO(pneubeck): Use ONC and ManagedNetworkConfigurationHandler instead.
// crbug.com/457936
- scoped_ptr<base::DictionaryValue> shill_dict =
+ std::unique_ptr<base::DictionaryValue> shill_dict =
onc::TranslateONCObjectToShill(&onc::kNetworkConfigurationSignature,
*normalized_network);
- scoped_ptr<NetworkUIData> ui_data(
+ std::unique_ptr<NetworkUIData> ui_data(
NetworkUIData::CreateFromONC(::onc::ONC_SOURCE_USER_IMPORT));
base::DictionaryValue ui_data_dict;
ui_data->FillDictionary(&ui_data_dict);
« no previous file with comments | « chrome/browser/chromeos/net/onc_utils.h ('k') | chrome/browser/chromeos/net/proxy_config_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698