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

Unified Diff: extensions/common/manifest_handlers/permissions_parser.cc

Issue 1908953003: Convert //extensions/{common,shell} from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? 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: extensions/common/manifest_handlers/permissions_parser.cc
diff --git a/extensions/common/manifest_handlers/permissions_parser.cc b/extensions/common/manifest_handlers/permissions_parser.cc
index 2afdf722fdc9737a45657e88bb899a1551045ea7..14a2e19490c6f0c61d52ef8c944d3f3d78efc3c4 100644
--- a/extensions/common/manifest_handlers/permissions_parser.cc
+++ b/extensions/common/manifest_handlers/permissions_parser.cc
@@ -34,14 +34,14 @@ namespace keys = manifest_keys;
namespace errors = manifest_errors;
struct ManifestPermissions : public Extension::ManifestData {
- ManifestPermissions(scoped_ptr<const PermissionSet> permissions);
+ ManifestPermissions(std::unique_ptr<const PermissionSet> permissions);
~ManifestPermissions() override;
- scoped_ptr<const PermissionSet> permissions;
+ std::unique_ptr<const PermissionSet> permissions;
};
ManifestPermissions::ManifestPermissions(
- scoped_ptr<const PermissionSet> permissions)
+ std::unique_ptr<const PermissionSet> permissions)
: permissions(std::move(permissions)) {}
ManifestPermissions::~ManifestPermissions() {
@@ -268,7 +268,7 @@ void PermissionsParser::Finalize(Extension* extension) {
ManifestHandler::AddExtensionInitialRequiredPermissions(
extension, &initial_required_permissions_->manifest_permissions);
- scoped_ptr<const PermissionSet> required_permissions(
+ std::unique_ptr<const PermissionSet> required_permissions(
new PermissionSet(initial_required_permissions_->api_permissions,
initial_required_permissions_->manifest_permissions,
initial_required_permissions_->host_permissions,
@@ -277,7 +277,7 @@ void PermissionsParser::Finalize(Extension* extension) {
keys::kPermissions,
new ManifestPermissions(std::move(required_permissions)));
- scoped_ptr<const PermissionSet> optional_permissions(new PermissionSet(
+ std::unique_ptr<const PermissionSet> optional_permissions(new PermissionSet(
initial_optional_permissions_->api_permissions,
initial_optional_permissions_->manifest_permissions,
initial_optional_permissions_->host_permissions, URLPatternSet()));
« no previous file with comments | « extensions/common/manifest_handlers/permissions_parser.h ('k') | extensions/common/manifest_handlers/requirements_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698