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

Unified Diff: chrome/browser/chromeos/mobile_config.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
Index: chrome/browser/chromeos/mobile_config.cc
diff --git a/chrome/browser/chromeos/mobile_config.cc b/chrome/browser/chromeos/mobile_config.cc
index f231fe67cd7795fb3a370a0569e0b8970cbdfec3..d3547c85a2f41a76be6990499cf70d17a2e7cdee 100644
--- a/chrome/browser/chromeos/mobile_config.cc
+++ b/chrome/browser/chromeos/mobile_config.cc
@@ -178,7 +178,7 @@ void MobileConfig::Carrier::InitFromDictionary(
for (size_t i = 0; i < deals_list->GetSize(); ++i) {
const base::DictionaryValue* deal_dict = NULL;
if (deals_list->GetDictionary(i, &deal_dict)) {
- scoped_ptr<CarrierDeal> deal(new CarrierDeal(deal_dict));
+ std::unique_ptr<CarrierDeal> deal(new CarrierDeal(deal_dict));
// Filter out deals by initial_locale right away.
std::vector<std::string>::const_iterator iter =
std::find(deal->locales().begin(),
@@ -333,7 +333,7 @@ void MobileConfig::ProcessConfig(const std::string& global_config,
// Global config is mandatory, local config is optional.
bool global_initialized = false;
bool local_initialized = true;
- scoped_ptr<base::DictionaryValue> global_config_root;
+ std::unique_ptr<base::DictionaryValue> global_config_root;
if (!global_config.empty()) {
global_initialized = LoadManifestFromString(global_config);
« no previous file with comments | « chrome/browser/chromeos/mobile_config.h ('k') | chrome/browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698