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

Unified Diff: extensions/common/permissions/socket_permission_unittest.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/permissions/socket_permission_unittest.cc
diff --git a/extensions/common/permissions/socket_permission_unittest.cc b/extensions/common/permissions/socket_permission_unittest.cc
index 1ed207e814cb79ede5a5317870fc9262592683da..e6ac7dfddfbddbac0f102e3f6999e402f10b3098 100644
--- a/extensions/common/permissions/socket_permission_unittest.cc
+++ b/extensions/common/permissions/socket_permission_unittest.cc
@@ -125,7 +125,7 @@ TEST(SocketPermissionTest, Parse) {
TEST(SocketPermissionTest, Match) {
SocketPermissionData data;
- scoped_ptr<SocketPermission::CheckParam> param;
+ std::unique_ptr<SocketPermission::CheckParam> param;
CHECK(data.ParseForTest("tcp-connect"));
param.reset(new SocketPermission::CheckParam(
@@ -269,9 +269,9 @@ TEST(SocketPermissionTest, IPC) {
{
IPC::Message m;
- scoped_ptr<APIPermission> permission1(
+ std::unique_ptr<APIPermission> permission1(
permission_info->CreateAPIPermission());
- scoped_ptr<APIPermission> permission2(
+ std::unique_ptr<APIPermission> permission2(
permission_info->CreateAPIPermission());
permission1->Write(&m);
@@ -284,12 +284,12 @@ TEST(SocketPermissionTest, IPC) {
{
IPC::Message m;
- scoped_ptr<APIPermission> permission1(
+ std::unique_ptr<APIPermission> permission1(
permission_info->CreateAPIPermission());
- scoped_ptr<APIPermission> permission2(
+ std::unique_ptr<APIPermission> permission2(
permission_info->CreateAPIPermission());
- scoped_ptr<base::ListValue> value(new base::ListValue());
+ std::unique_ptr<base::ListValue> value(new base::ListValue());
value->AppendString("tcp-connect:*.example.com:80");
value->AppendString("udp-bind::8080");
value->AppendString("udp-send-to::8888");
@@ -308,10 +308,12 @@ TEST(SocketPermissionTest, Value) {
const APIPermissionInfo* permission_info =
PermissionsInfo::GetInstance()->GetByID(APIPermission::kSocket);
- scoped_ptr<APIPermission> permission1(permission_info->CreateAPIPermission());
- scoped_ptr<APIPermission> permission2(permission_info->CreateAPIPermission());
+ std::unique_ptr<APIPermission> permission1(
+ permission_info->CreateAPIPermission());
+ std::unique_ptr<APIPermission> permission2(
+ permission_info->CreateAPIPermission());
- scoped_ptr<base::ListValue> value(new base::ListValue());
+ std::unique_ptr<base::ListValue> value(new base::ListValue());
value->AppendString("tcp-connect:*.example.com:80");
value->AppendString("udp-bind::8080");
value->AppendString("udp-send-to::8888");
@@ -319,7 +321,7 @@ TEST(SocketPermissionTest, Value) {
EXPECT_FALSE(permission1->Equal(permission2.get()));
- scoped_ptr<base::Value> vtmp(permission1->ToValue());
+ std::unique_ptr<base::Value> vtmp(permission1->ToValue());
ASSERT_TRUE(vtmp);
ASSERT_TRUE(permission2->FromValue(vtmp.get(), NULL, NULL));
EXPECT_TRUE(permission1->Equal(permission2.get()));
« no previous file with comments | « extensions/common/permissions/socket_permission_entry.cc ('k') | extensions/common/permissions/usb_device_permission_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698