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

Unified Diff: components/user_prefs/tracked/pref_hash_filter.cc

Issue 1908143002: Convert //components/user_prefs from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Restore the rightful glory of <windows.h> 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: components/user_prefs/tracked/pref_hash_filter.cc
diff --git a/components/user_prefs/tracked/pref_hash_filter.cc b/components/user_prefs/tracked/pref_hash_filter.cc
index a9b41835f7bd2da2dd5e6f937cd03bdc5f8aaec5..2f0c6e71f5f38fb0f878f5d0c3c64fb2207efe83 100644
--- a/components/user_prefs/tracked/pref_hash_filter.cc
+++ b/components/user_prefs/tracked/pref_hash_filter.cc
@@ -50,7 +50,7 @@ void CleanupDeprecatedTrackedPreferences(
} // namespace
PrefHashFilter::PrefHashFilter(
- scoped_ptr<PrefHashStore> pref_hash_store,
+ std::unique_ptr<PrefHashStore> pref_hash_store,
const std::vector<TrackedPreferenceMetadata>& tracked_preferences,
const base::Closure& on_reset_on_load,
TrackedPreferenceValidationDelegate* delegate,
@@ -65,7 +65,7 @@ PrefHashFilter::PrefHashFilter(
for (size_t i = 0; i < tracked_preferences.size(); ++i) {
const TrackedPreferenceMetadata& metadata = tracked_preferences[i];
- scoped_ptr<TrackedPreference> tracked_preference;
+ std::unique_ptr<TrackedPreference> tracked_preference;
switch (metadata.strategy) {
case TRACKING_STRATEGY_ATOMIC:
tracked_preference.reset(
@@ -132,8 +132,8 @@ void PrefHashFilter::ClearResetTime(PrefService* user_prefs) {
}
void PrefHashFilter::Initialize(base::DictionaryValue* pref_store_contents) {
- scoped_ptr<PrefHashStoreTransaction> hash_store_transaction(
- pref_hash_store_->BeginTransaction(scoped_ptr<HashStoreContents>(
+ std::unique_ptr<PrefHashStoreTransaction> hash_store_transaction(
+ pref_hash_store_->BeginTransaction(std::unique_ptr<HashStoreContents>(
new DictionaryHashStoreContents(pref_store_contents))));
for (TrackedPreferencesMap::const_iterator it = tracked_paths_.begin();
it != tracked_paths_.end(); ++it) {
@@ -161,8 +161,8 @@ void PrefHashFilter::FilterSerializeData(
if (!changed_paths_.empty()) {
base::TimeTicks checkpoint = base::TimeTicks::Now();
{
- scoped_ptr<PrefHashStoreTransaction> hash_store_transaction(
- pref_hash_store_->BeginTransaction(scoped_ptr<HashStoreContents>(
+ std::unique_ptr<PrefHashStoreTransaction> hash_store_transaction(
+ pref_hash_store_->BeginTransaction(std::unique_ptr<HashStoreContents>(
new DictionaryHashStoreContents(pref_store_contents))));
for (ChangedPathsMap::const_iterator it = changed_paths_.begin();
it != changed_paths_.end(); ++it) {
@@ -184,15 +184,15 @@ void PrefHashFilter::FilterSerializeData(
void PrefHashFilter::FinalizeFilterOnLoad(
const PostFilterOnLoadCallback& post_filter_on_load_callback,
- scoped_ptr<base::DictionaryValue> pref_store_contents,
+ std::unique_ptr<base::DictionaryValue> pref_store_contents,
bool prefs_altered) {
DCHECK(pref_store_contents);
base::TimeTicks checkpoint = base::TimeTicks::Now();
bool did_reset = false;
{
- scoped_ptr<PrefHashStoreTransaction> hash_store_transaction(
- pref_hash_store_->BeginTransaction(scoped_ptr<HashStoreContents>(
+ std::unique_ptr<PrefHashStoreTransaction> hash_store_transaction(
+ pref_hash_store_->BeginTransaction(std::unique_ptr<HashStoreContents>(
new DictionaryHashStoreContents(pref_store_contents.get()))));
CleanupDeprecatedTrackedPreferences(
« no previous file with comments | « components/user_prefs/tracked/pref_hash_filter.h ('k') | components/user_prefs/tracked/pref_hash_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698