chrome/browser/safe_browsing/incident_reporting/extension_data_collection.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/extension_data_collection.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/environment_data_collection_win.cc ('k') | chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 22a112c8f39906a4fd51a5dfcb2d86f157919182..2fc10dd4816572e20fa68de2589e3528a33d1cf9 100644

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

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

@@ -71,7 +71,7 @@ void PopulateExtensionInfo(

const base::DictionaryValue* signature =

extension_prefs.GetInstallSignature();

if (signature) {

- scoped_ptr<extensions::InstallSignature> signature_from_prefs =

+ std::unique_ptr<extensions::InstallSignature> signature_from_prefs =

extensions::InstallSignature::FromValue(*signature);

if (signature_from_prefs) {

if (ContainsKey(signature_from_prefs->ids, extension_id)) {

@@ -108,7 +108,7 @@ void CollectExtensionData(ClientIncidentReport_ExtensionData* data) {

if (!IncidentReportingService::IsEnabledForProfile(profile))

continue;

- scoped_ptr<const extensions::ExtensionSet> extensions(

+ std::unique_ptr<const extensions::ExtensionSet> extensions(

extensions::ExtensionRegistryFactory::GetForBrowserContext(profile)

->GenerateInstalledExtensionsSet());

extensions::ExtensionPrefs* extension_prefs =