components/user_prefs/tracked/segregated_pref_store.cc - Issue 1908143002: Convert //components/user_prefs from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/user_prefs/tracked/segregated_pref_store.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

« no previous file with comments | « components/user_prefs/tracked/segregated_pref_store.h ('k') | components/user_prefs/tracked/segregated_pref_store_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/user_prefs/tracked/segregated_pref_store.cc

diff --git a/components/user_prefs/tracked/segregated_pref_store.cc b/components/user_prefs/tracked/segregated_pref_store.cc

index 7f5453fe4a5eff119604e842f1b150768f82eee4..c5a6e25c2f3715bc410a049652401cb633ec7a7d 100644

--- a/components/user_prefs/tracked/segregated_pref_store.cc

+++ b/components/user_prefs/tracked/segregated_pref_store.cc

@@ -85,7 +85,7 @@ bool SegregatedPrefStore::GetValue(const std::string& key,

}

void SegregatedPrefStore::SetValue(const std::string& key,

- scoped_ptr<base::Value> value,

+ std::unique_ptr<base::Value> value,

uint32_t flags) {

StoreForKey(key)->SetValue(key, std::move(value), flags);

}

@@ -105,7 +105,7 @@ void SegregatedPrefStore::ReportValueChanged(const std::string& key,

}

void SegregatedPrefStore::SetValueSilently(const std::string& key,

- scoped_ptr<base::Value> value,

+ std::unique_ptr<base::Value> value,

uint32_t flags) {

StoreForKey(key)->SetValueSilently(key, std::move(value), flags);

}