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

Unified Diff: chrome/browser/extensions/api/permissions/permissions_api_helpers.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
Index: chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
index 22c3b41c06080ff61308bf0284dd084046fc8dde..8d6af879c89fade31af8a3a9e6b80bc89bc25a2d 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
@@ -8,6 +8,7 @@
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
+#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/common/extensions/api/permissions.h"
#include "extensions/common/error_utils.h"
@@ -37,12 +38,12 @@ const char kUnsupportedPermissionId[] =
} // namespace
-scoped_ptr<Permissions> PackPermissionSet(const PermissionSet& set) {
- scoped_ptr<Permissions> permissions(new Permissions());
+std::unique_ptr<Permissions> PackPermissionSet(const PermissionSet& set) {
+ std::unique_ptr<Permissions> permissions(new Permissions());
permissions->permissions.reset(new std::vector<std::string>());
for (const APIPermission* api : set.apis()) {
- scoped_ptr<base::Value> value(api->ToValue());
+ std::unique_ptr<base::Value> value(api->ToValue());
if (!value) {
permissions->permissions->push_back(api->name());
} else {
@@ -63,7 +64,7 @@ scoped_ptr<Permissions> PackPermissionSet(const PermissionSet& set) {
return permissions;
}
-scoped_ptr<const PermissionSet> UnpackPermissionSet(
+std::unique_ptr<const PermissionSet> UnpackPermissionSet(
const Permissions& permissions,
bool allow_file_access,
std::string* error) {
@@ -83,7 +84,7 @@ scoped_ptr<const PermissionSet> UnpackPermissionSet(
std::string permission_name = it->substr(0, delimiter);
std::string permission_arg = it->substr(delimiter + 1);
- scoped_ptr<base::Value> permission_json =
+ std::unique_ptr<base::Value> permission_json =
base::JSONReader::Read(permission_arg);
if (!permission_json.get()) {
*error = ErrorUtils::FormatErrorMessage(kInvalidParameter, *it);
@@ -145,7 +146,7 @@ scoped_ptr<const PermissionSet> UnpackPermissionSet(
}
}
- return make_scoped_ptr(
+ return base::WrapUnique(
new PermissionSet(apis, manifest_permissions, origins, URLPatternSet()));
}

Powered by Google App Engine
This is Rietveld 408576698