chrome/browser/extensions/scripting_permissions_modifier.cc - Issue 1871713002: Convert //chrome/browser/extensions 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/extensions/scripting_permissions_modifier.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

« no previous file with comments | « chrome/browser/extensions/scripting_permissions_modifier.h ('k') | chrome/browser/extensions/scripting_permissions_modifier_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/scripting_permissions_modifier.cc

diff --git a/chrome/browser/extensions/scripting_permissions_modifier.cc b/chrome/browser/extensions/scripting_permissions_modifier.cc

index 71e3c82bfce7cca4c2d066559f5b504a23e7df54..b52a03663b7e8b0c91ea8349ccefe78b425fd9bd 100644

--- a/chrome/browser/extensions/scripting_permissions_modifier.cc

+++ b/chrome/browser/extensions/scripting_permissions_modifier.cc

@@ -87,8 +87,8 @@ bool ScriptingPermissionsModifier::HasGrantedHostPermission(

.effective_hosts()

.MatchesURL(origin))

return false;

- scoped_ptr<const PermissionSet> granted_permissions;

- scoped_ptr<const PermissionSet> withheld_permissions;

+ std::unique_ptr<const PermissionSet> granted_permissions;

+ std::unique_ptr<const PermissionSet> withheld_permissions;

WithholdPermissions(required_permissions, &granted_permissions,

&withheld_permissions, true);

if (!granted_permissions->effective_hosts().MatchesURL(origin) &&

@@ -122,8 +122,8 @@ void ScriptingPermissionsModifier::RemoveGrantedHostPermission(

void ScriptingPermissionsModifier::WithholdPermissions(

const PermissionSet& permissions,

- scoped_ptr<const PermissionSet>* granted_permissions_out,

- scoped_ptr<const PermissionSet>* withheld_permissions_out,

+ std::unique_ptr<const PermissionSet>* granted_permissions_out,

+ std::unique_ptr<const PermissionSet>* withheld_permissions_out,

bool use_initial_state) const {

bool should_withhold = false;

if (CanAffectExtension(permissions)) {