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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/extensions/permissions/permission_set_unittest.cc

Issue 1880143002: Convert chrome/common to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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/common/extensions/permissions/media_galleries_permission_unittest.cc ('k') | chrome/common/extensions/permissions/settings_override_permission_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/permissions/permission_set_unittest.cc
diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/chrome/common/extensions/permissions/permission_set_unittest.cc
index c85eed3211b28d84ebccd1471ec086d69ed0527c..bfde13cb121b3544ac82425ca41f106d2ad1b9b5 100644
--- a/chrome/common/extensions/permissions/permission_set_unittest.cc
+++ b/chrome/common/extensions/permissions/permission_set_unittest.cc
@@ -4,6 +4,7 @@
#include <stddef.h>
+#include <memory>
#include <utility>
#include "base/command_line.h"
@@ -343,15 +344,15 @@ TEST(PermissionsTest, CreateUnion) {
URLPatternSet effective_hosts;
- scoped_ptr<const PermissionSet> set1;
- scoped_ptr<const PermissionSet> set2;
- scoped_ptr<const PermissionSet> union_set;
+ std::unique_ptr<const PermissionSet> set1;
+ std::unique_ptr<const PermissionSet> set2;
+ std::unique_ptr<const PermissionSet> union_set;
const APIPermissionInfo* permission_info =
PermissionsInfo::GetInstance()->GetByID(APIPermission::kSocket);
permission = permission_info->CreateAPIPermission();
{
- scoped_ptr<base::ListValue> value(new base::ListValue());
+ std::unique_ptr<base::ListValue> value(new base::ListValue());
value->Append(new base::StringValue("tcp-connect:*.example.com:80"));
value->Append(new base::StringValue("udp-bind::8080"));
value->Append(new base::StringValue("udp-send-to::8888"));
@@ -396,7 +397,7 @@ TEST(PermissionsTest, CreateUnion) {
permission = permission_info->CreateAPIPermission();
{
- scoped_ptr<base::ListValue> value(new base::ListValue());
+ std::unique_ptr<base::ListValue> value(new base::ListValue());
value->Append(new base::StringValue("tcp-connect:*.example.com:80"));
value->Append(new base::StringValue("udp-send-to::8899"));
ASSERT_TRUE(permission->FromValue(value.get(), NULL, NULL));
@@ -410,7 +411,7 @@ TEST(PermissionsTest, CreateUnion) {
permission = permission_info->CreateAPIPermission();
{
- scoped_ptr<base::ListValue> value(new base::ListValue());
+ std::unique_ptr<base::ListValue> value(new base::ListValue());
value->Append(new base::StringValue("tcp-connect:*.example.com:80"));
value->Append(new base::StringValue("udp-bind::8080"));
value->Append(new base::StringValue("udp-send-to::8888"));
@@ -465,9 +466,9 @@ TEST(PermissionsTest, CreateIntersection) {
URLPatternSet effective_hosts;
- scoped_ptr<const PermissionSet> set1;
- scoped_ptr<const PermissionSet> set2;
- scoped_ptr<const PermissionSet> new_set;
+ std::unique_ptr<const PermissionSet> set1;
+ std::unique_ptr<const PermissionSet> set2;
+ std::unique_ptr<const PermissionSet> new_set;
const APIPermissionInfo* permission_info =
PermissionsInfo::GetInstance()->GetByID(APIPermission::kSocket);
@@ -477,7 +478,7 @@ TEST(PermissionsTest, CreateIntersection) {
apis1.insert(APIPermission::kBackground);
permission = permission_info->CreateAPIPermission();
{
- scoped_ptr<base::ListValue> value(new base::ListValue());
+ std::unique_ptr<base::ListValue> value(new base::ListValue());
value->Append(new base::StringValue("tcp-connect:*.example.com:80"));
value->Append(new base::StringValue("udp-bind::8080"));
value->Append(new base::StringValue("udp-send-to::8888"));
@@ -514,7 +515,7 @@ TEST(PermissionsTest, CreateIntersection) {
apis2.insert(APIPermission::kPlugin);
permission = permission_info->CreateAPIPermission();
{
- scoped_ptr<base::ListValue> value(new base::ListValue());
+ std::unique_ptr<base::ListValue> value(new base::ListValue());
value->Append(new base::StringValue("udp-bind::8080"));
value->Append(new base::StringValue("udp-send-to::8888"));
value->Append(new base::StringValue("udp-send-to::8899"));
@@ -525,7 +526,7 @@ TEST(PermissionsTest, CreateIntersection) {
expected_apis.insert(APIPermission::kTab);
permission = permission_info->CreateAPIPermission();
{
- scoped_ptr<base::ListValue> value(new base::ListValue());
+ std::unique_ptr<base::ListValue> value(new base::ListValue());
value->Append(new base::StringValue("udp-bind::8080"));
value->Append(new base::StringValue("udp-send-to::8888"));
ASSERT_TRUE(permission->FromValue(value.get(), NULL, NULL));
@@ -577,9 +578,9 @@ TEST(PermissionsTest, CreateDifference) {
URLPatternSet effective_hosts;
- scoped_ptr<const PermissionSet> set1;
- scoped_ptr<const PermissionSet> set2;
- scoped_ptr<const PermissionSet> new_set;
+ std::unique_ptr<const PermissionSet> set1;
+ std::unique_ptr<const PermissionSet> set2;
+ std::unique_ptr<const PermissionSet> new_set;
const APIPermissionInfo* permission_info =
PermissionsInfo::GetInstance()->GetByID(APIPermission::kSocket);
@@ -589,7 +590,7 @@ TEST(PermissionsTest, CreateDifference) {
apis1.insert(APIPermission::kBackground);
permission = permission_info->CreateAPIPermission();
{
- scoped_ptr<base::ListValue> value(new base::ListValue());
+ std::unique_ptr<base::ListValue> value(new base::ListValue());
value->Append(new base::StringValue("tcp-connect:*.example.com:80"));
value->Append(new base::StringValue("udp-bind::8080"));
value->Append(new base::StringValue("udp-send-to::8888"));
@@ -614,7 +615,7 @@ TEST(PermissionsTest, CreateDifference) {
apis2.insert(APIPermission::kPlugin);
permission = permission_info->CreateAPIPermission();
{
- scoped_ptr<base::ListValue> value(new base::ListValue());
+ std::unique_ptr<base::ListValue> value(new base::ListValue());
value->Append(new base::StringValue("tcp-connect:*.example.com:80"));
value->Append(new base::StringValue("udp-send-to::8899"));
ASSERT_TRUE(permission->FromValue(value.get(), NULL, NULL));
@@ -624,7 +625,7 @@ TEST(PermissionsTest, CreateDifference) {
expected_apis.insert(APIPermission::kBackground);
permission = permission_info->CreateAPIPermission();
{
- scoped_ptr<base::ListValue> value(new base::ListValue());
+ std::unique_ptr<base::ListValue> value(new base::ListValue());
value->Append(new base::StringValue("udp-bind::8080"));
value->Append(new base::StringValue("udp-send-to::8888"));
ASSERT_TRUE(permission->FromValue(value.get(), NULL, NULL));
@@ -1587,8 +1588,8 @@ TEST(PermissionsTest, IsHostPrivilegeIncrease) {
URLPatternSet elist2;
URLPatternSet slist1;
URLPatternSet slist2;
- scoped_ptr<const PermissionSet> set1;
- scoped_ptr<const PermissionSet> set2;
+ std::unique_ptr<const PermissionSet> set1;
+ std::unique_ptr<const PermissionSet> set2;
APIPermissionSet empty_perms;
elist1.AddPattern(
URLPattern(URLPattern::SCHEME_HTTP, "http://www.google.com.hk/path"));
@@ -1686,9 +1687,9 @@ TEST(PermissionsTest, IsEmpty) {
APIPermissionSet empty_apis;
URLPatternSet empty_extent;
- scoped_ptr<const PermissionSet> empty(new PermissionSet());
+ std::unique_ptr<const PermissionSet> empty(new PermissionSet());
EXPECT_TRUE(empty->IsEmpty());
- scoped_ptr<const PermissionSet> perm_set;
+ std::unique_ptr<const PermissionSet> perm_set;
perm_set.reset(new PermissionSet(empty_apis, ManifestPermissionSet(),
empty_extent, empty_extent));
« no previous file with comments | « chrome/common/extensions/permissions/media_galleries_permission_unittest.cc ('k') | chrome/common/extensions/permissions/settings_override_permission_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698