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

Unified Diff: chrome/browser/extensions/permissions_updater_unittest.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/permissions_updater.cc ('k') | chrome/browser/extensions/policy_handlers.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/permissions_updater_unittest.cc
diff --git a/chrome/browser/extensions/permissions_updater_unittest.cc b/chrome/browser/extensions/permissions_updater_unittest.cc
index 5c6b46e406c8f442ff58042c9870507ac808771b..6a9499570cc63e0999beba7d341d88c62880b7b4 100644
--- a/chrome/browser/extensions/permissions_updater_unittest.cc
+++ b/chrome/browser/extensions/permissions_updater_unittest.cc
@@ -8,6 +8,7 @@
#include "base/files/file_path.h"
#include "base/json/json_file_value_serializer.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
@@ -39,8 +40,8 @@ namespace extensions {
namespace {
scoped_refptr<const Extension> CreateExtensionWithOptionalPermissions(
- scoped_ptr<base::Value> optional_permissions,
- scoped_ptr<base::Value> permissions,
+ std::unique_ptr<base::Value> optional_permissions,
+ std::unique_ptr<base::Value> permissions,
const std::string& name) {
return ExtensionBuilder()
.SetLocation(Manifest::INTERNAL)
@@ -110,7 +111,7 @@ class PermissionsUpdaterListener : public content::NotificationObserver {
bool waiting_;
content::NotificationRegistrar registrar_;
scoped_refptr<const Extension> extension_;
- scoped_ptr<const PermissionSet> permissions_;
+ std::unique_ptr<const PermissionSet> permissions_;
UpdatedExtensionPermissionsInfo::Reason reason_;
};
@@ -159,8 +160,8 @@ TEST_F(PermissionsUpdaterTest, AddAndRemovePermissions) {
extension->permissions_data()->active_permissions());
ExtensionPrefs* prefs = ExtensionPrefs::Get(profile_.get());
- scoped_ptr<const PermissionSet> active_permissions;
- scoped_ptr<const PermissionSet> granted_permissions;
+ std::unique_ptr<const PermissionSet> active_permissions;
+ std::unique_ptr<const PermissionSet> granted_permissions;
// Add a few permissions.
APIPermissionSet apis;
@@ -239,15 +240,15 @@ TEST_F(PermissionsUpdaterTest, RevokingPermissions) {
auto api_permission_set = [](APIPermission::ID id) {
APIPermissionSet apis;
apis.insert(id);
- return make_scoped_ptr(new PermissionSet(apis, ManifestPermissionSet(),
- URLPatternSet(), URLPatternSet()));
+ return base::WrapUnique(new PermissionSet(
+ apis, ManifestPermissionSet(), URLPatternSet(), URLPatternSet()));
};
auto url_permission_set = [](const GURL& url) {
URLPatternSet set;
URLPattern pattern(URLPattern::SCHEME_ALL, url.spec());
set.AddPattern(pattern);
- return make_scoped_ptr(new PermissionSet(
+ return base::WrapUnique(new PermissionSet(
APIPermissionSet(), ManifestPermissionSet(), set, URLPatternSet()));
};
@@ -273,7 +274,7 @@ TEST_F(PermissionsUpdaterTest, RevokingPermissions) {
// its granted permissions (stored in prefs). And, the permission should
// be revokable.
EXPECT_TRUE(permissions->HasAPIPermission(APIPermission::kCookie));
- scoped_ptr<const PermissionSet> granted_permissions =
+ std::unique_ptr<const PermissionSet> granted_permissions =
prefs->GetGrantedPermissions(extension->id());
EXPECT_TRUE(granted_permissions->HasAPIPermission(APIPermission::kCookie));
EXPECT_TRUE(updater.GetRevokablePermissions(extension.get())
« no previous file with comments | « chrome/browser/extensions/permissions_updater.cc ('k') | chrome/browser/extensions/policy_handlers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698