chrome/browser/safe_browsing/incident_reporting/state_store.cc - Issue 1870003002: Convert //chrome/browser/safe_browsing 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: chrome/browser/safe_browsing/incident_reporting/state_store.cc

Issue 1870003002: Convert //chrome/browser/safe_browsing from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase and address comments 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/safe_browsing/incident_reporting/state_store.h ('k') | chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/incident_reporting/state_store.cc

diff --git a/chrome/browser/safe_browsing/incident_reporting/state_store.cc b/chrome/browser/safe_browsing/incident_reporting/state_store.cc

index 856daef8521cdf45d244a759f4007643439ce74e..52f1c15c919adf6d982fcadb6d14fbc5f397ccb7 100644

--- a/chrome/browser/safe_browsing/incident_reporting/state_store.cc

+++ b/chrome/browser/safe_browsing/incident_reporting/state_store.cc

@@ -104,7 +104,7 @@ base::DictionaryValue* StateStore::Transaction::GetPrefDict() {

}

void StateStore::Transaction::ReplacePrefDict(

- scoped_ptr<base::DictionaryValue> pref_dict) {

+ std::unique_ptr<base::DictionaryValue> pref_dict) {

GetPrefDict()->Swap(pref_dict.get());

}

@@ -127,7 +127,7 @@ StateStore::StateStore(Profile* profile)

// Apply the platform data.

Transaction transaction(this);

- scoped_ptr<base::DictionaryValue> value_dict(

+ std::unique_ptr<base::DictionaryValue> value_dict(

platform_state_store::Load(profile_));

InitializationResult state_store_init_result = PSS_MATCHES;