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

Unified Diff: chrome/browser/extensions/external_registry_loader_win.cc

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header 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/extensions/external_registry_loader_win.cc
diff --git a/chrome/browser/extensions/external_registry_loader_win.cc b/chrome/browser/extensions/external_registry_loader_win.cc
index 89e969c5acf664461e492da4e37805a7d002197b..9b660b2e3701e58cc3ccc869eabe2cb3320a6664 100644
--- a/chrome/browser/extensions/external_registry_loader_win.cc
+++ b/chrome/browser/extensions/external_registry_loader_win.cc
@@ -61,10 +61,10 @@ void ExternalRegistryLoader::StartLoading() {
base::Bind(&ExternalRegistryLoader::LoadOnFileThread, this));
}
-scoped_ptr<base::DictionaryValue>
+std::unique_ptr<base::DictionaryValue>
ExternalRegistryLoader::LoadPrefsOnFileThread() {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
- scoped_ptr<base::DictionaryValue> prefs(new base::DictionaryValue);
+ std::unique_ptr<base::DictionaryValue> prefs(new base::DictionaryValue);
// A map of IDs, to weed out duplicates between HKCU and HKLM.
std::set<base::string16> keys;
@@ -187,7 +187,8 @@ ExternalRegistryLoader::LoadPrefsOnFileThread() {
void ExternalRegistryLoader::LoadOnFileThread() {
base::TimeTicks start_time = base::TimeTicks::Now();
- scoped_ptr<base::DictionaryValue> initial_prefs = LoadPrefsOnFileThread();
+ std::unique_ptr<base::DictionaryValue> initial_prefs =
+ LoadPrefsOnFileThread();
prefs_.reset(initial_prefs.release());
LOCAL_HISTOGRAM_TIMES("Extensions.ExternalRegistryLoaderWin",
base::TimeTicks::Now() - start_time);
@@ -237,7 +238,7 @@ void ExternalRegistryLoader::OnRegistryKeyChanged(base::win::RegKey* key) {
void ExternalRegistryLoader::UpdatePrefsOnFileThread() {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
base::TimeTicks start_time = base::TimeTicks::Now();
- scoped_ptr<base::DictionaryValue> prefs = LoadPrefsOnFileThread();
+ std::unique_ptr<base::DictionaryValue> prefs = LoadPrefsOnFileThread();
LOCAL_HISTOGRAM_TIMES("Extensions.ExternalRegistryLoaderWinUpdate",
base::TimeTicks::Now() - start_time);
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,

Powered by Google App Engine
This is Rietveld 408576698