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

Unified Diff: extensions/common/api/sockets/sockets_manifest_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/api/sockets/sockets_manifest_permission_unittest.cc
diff --git a/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc b/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc
index d0dc6099e8d3d57ccdd0ff4a5bc25a7459f84e35..fa970cecafc5401305c35ff627931b2b7838502a 100644
--- a/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc
+++ b/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc
@@ -40,24 +40,25 @@ static void AssertEmptyPermission(const SocketsManifestPermission* permission) {
EXPECT_EQ(0u, permission->entries().size());
}
-static scoped_ptr<base::Value> ParsePermissionJSON(const std::string& json) {
- scoped_ptr<base::Value> result(base::JSONReader::Read(json));
+static std::unique_ptr<base::Value> ParsePermissionJSON(
+ const std::string& json) {
+ std::unique_ptr<base::Value> result(base::JSONReader::Read(json));
EXPECT_TRUE(result) << "Invalid JSON string: " << json;
return result;
}
-static scoped_ptr<SocketsManifestPermission> PermissionFromValue(
+static std::unique_ptr<SocketsManifestPermission> PermissionFromValue(
const base::Value& value) {
base::string16 error16;
- scoped_ptr<SocketsManifestPermission> permission(
+ std::unique_ptr<SocketsManifestPermission> permission(
SocketsManifestPermission::FromValue(value, &error16));
EXPECT_TRUE(permission) << "Error parsing Value into permission: " << error16;
return permission;
}
-static scoped_ptr<SocketsManifestPermission> PermissionFromJSON(
+static std::unique_ptr<SocketsManifestPermission> PermissionFromJSON(
const std::string& json) {
- scoped_ptr<base::Value> value(ParsePermissionJSON(json));
+ std::unique_ptr<base::Value> value(ParsePermissionJSON(json));
return PermissionFromValue(*value);
}
@@ -85,7 +86,8 @@ struct CheckFormatEntry {
static testing::AssertionResult CheckFormat(
std::multiset<CheckFormatEntry> permissions,
const std::string& json) {
- scoped_ptr<SocketsManifestPermission> permission(PermissionFromJSON(json));
+ std::unique_ptr<SocketsManifestPermission> permission(
+ PermissionFromJSON(json));
if (!permission)
return testing::AssertionFailure() << "Invalid permission " << json;
@@ -152,44 +154,44 @@ static testing::AssertionResult CheckFormat(const std::string& json,
TEST(SocketsManifestPermissionTest, Empty) {
// Construction
- scoped_ptr<SocketsManifestPermission> permission(
+ std::unique_ptr<SocketsManifestPermission> permission(
new SocketsManifestPermission());
AssertEmptyPermission(permission.get());
// Clone()/Equal()
- scoped_ptr<SocketsManifestPermission> clone(
+ std::unique_ptr<SocketsManifestPermission> clone(
static_cast<SocketsManifestPermission*>(permission->Clone()));
AssertEmptyPermission(clone.get());
EXPECT_TRUE(permission->Equal(clone.get()));
// ToValue()/FromValue()
- scoped_ptr<const base::Value> value(permission->ToValue());
+ std::unique_ptr<const base::Value> value(permission->ToValue());
EXPECT_TRUE(value.get());
- scoped_ptr<SocketsManifestPermission> permission2(
+ std::unique_ptr<SocketsManifestPermission> permission2(
new SocketsManifestPermission());
EXPECT_TRUE(permission2->FromValue(value.get()));
AssertEmptyPermission(permission2.get());
// Union/Diff/Intersection
- scoped_ptr<SocketsManifestPermission> diff_perm(
+ std::unique_ptr<SocketsManifestPermission> diff_perm(
static_cast<SocketsManifestPermission*>(permission->Diff(clone.get())));
AssertEmptyPermission(diff_perm.get());
- scoped_ptr<SocketsManifestPermission> union_perm(
+ std::unique_ptr<SocketsManifestPermission> union_perm(
static_cast<SocketsManifestPermission*>(permission->Union(clone.get())));
AssertEmptyPermission(union_perm.get());
- scoped_ptr<SocketsManifestPermission> intersect_perm(
+ std::unique_ptr<SocketsManifestPermission> intersect_perm(
static_cast<SocketsManifestPermission*>(
permission->Intersect(clone.get())));
AssertEmptyPermission(intersect_perm.get());
// IPC
- scoped_ptr<SocketsManifestPermission> ipc_perm(
+ std::unique_ptr<SocketsManifestPermission> ipc_perm(
new SocketsManifestPermission());
- scoped_ptr<SocketsManifestPermission> ipc_perm2(
+ std::unique_ptr<SocketsManifestPermission> ipc_perm2(
new SocketsManifestPermission());
IPC::Message m;
@@ -281,76 +283,78 @@ TEST(SocketsManifestPermissionTest, JSONFormats) {
}
TEST(SocketsManifestPermissionTest, FromToValue) {
- scoped_ptr<base::Value> udp_send(ParsePermissionJSON(kUdpBindPermission));
- scoped_ptr<base::Value> udp_bind(ParsePermissionJSON(kUdpSendPermission));
- scoped_ptr<base::Value> tcp_connect(
+ std::unique_ptr<base::Value> udp_send(
+ ParsePermissionJSON(kUdpBindPermission));
+ std::unique_ptr<base::Value> udp_bind(
+ ParsePermissionJSON(kUdpSendPermission));
+ std::unique_ptr<base::Value> tcp_connect(
ParsePermissionJSON(kTcpConnectPermission));
- scoped_ptr<base::Value> tcp_server_listen(
+ std::unique_ptr<base::Value> tcp_server_listen(
ParsePermissionJSON(kTcpServerListenPermission));
// FromValue()
- scoped_ptr<SocketsManifestPermission> permission1(
+ std::unique_ptr<SocketsManifestPermission> permission1(
new SocketsManifestPermission());
EXPECT_TRUE(permission1->FromValue(udp_send.get()));
EXPECT_EQ(2u, permission1->entries().size());
- scoped_ptr<SocketsManifestPermission> permission2(
+ std::unique_ptr<SocketsManifestPermission> permission2(
new SocketsManifestPermission());
EXPECT_TRUE(permission2->FromValue(udp_bind.get()));
EXPECT_EQ(2u, permission2->entries().size());
- scoped_ptr<SocketsManifestPermission> permission3(
+ std::unique_ptr<SocketsManifestPermission> permission3(
new SocketsManifestPermission());
EXPECT_TRUE(permission3->FromValue(tcp_connect.get()));
EXPECT_EQ(2u, permission3->entries().size());
- scoped_ptr<SocketsManifestPermission> permission4(
+ std::unique_ptr<SocketsManifestPermission> permission4(
new SocketsManifestPermission());
EXPECT_TRUE(permission4->FromValue(tcp_server_listen.get()));
EXPECT_EQ(2u, permission4->entries().size());
// ToValue()
- scoped_ptr<base::Value> value1 = permission1->ToValue();
+ std::unique_ptr<base::Value> value1 = permission1->ToValue();
EXPECT_TRUE(value1);
- scoped_ptr<SocketsManifestPermission> permission1_1(
+ std::unique_ptr<SocketsManifestPermission> permission1_1(
new SocketsManifestPermission());
EXPECT_TRUE(permission1_1->FromValue(value1.get()));
EXPECT_TRUE(permission1->Equal(permission1_1.get()));
- scoped_ptr<base::Value> value2 = permission2->ToValue();
+ std::unique_ptr<base::Value> value2 = permission2->ToValue();
EXPECT_TRUE(value2);
- scoped_ptr<SocketsManifestPermission> permission2_1(
+ std::unique_ptr<SocketsManifestPermission> permission2_1(
new SocketsManifestPermission());
EXPECT_TRUE(permission2_1->FromValue(value2.get()));
EXPECT_TRUE(permission2->Equal(permission2_1.get()));
- scoped_ptr<base::Value> value3 = permission3->ToValue();
+ std::unique_ptr<base::Value> value3 = permission3->ToValue();
EXPECT_TRUE(value3);
- scoped_ptr<SocketsManifestPermission> permission3_1(
+ std::unique_ptr<SocketsManifestPermission> permission3_1(
new SocketsManifestPermission());
EXPECT_TRUE(permission3_1->FromValue(value3.get()));
EXPECT_TRUE(permission3->Equal(permission3_1.get()));
- scoped_ptr<base::Value> value4 = permission4->ToValue();
+ std::unique_ptr<base::Value> value4 = permission4->ToValue();
EXPECT_TRUE(value4);
- scoped_ptr<SocketsManifestPermission> permission4_1(
+ std::unique_ptr<SocketsManifestPermission> permission4_1(
new SocketsManifestPermission());
EXPECT_TRUE(permission4_1->FromValue(value4.get()));
EXPECT_TRUE(permission4->Equal(permission4_1.get()));
}
TEST(SocketsManifestPermissionTest, SetOperations) {
- scoped_ptr<SocketsManifestPermission> permission1(
+ std::unique_ptr<SocketsManifestPermission> permission1(
PermissionFromJSON(kUdpBindPermission));
- scoped_ptr<SocketsManifestPermission> permission2(
+ std::unique_ptr<SocketsManifestPermission> permission2(
PermissionFromJSON(kUdpSendPermission));
- scoped_ptr<SocketsManifestPermission> permission3(
+ std::unique_ptr<SocketsManifestPermission> permission3(
PermissionFromJSON(kTcpConnectPermission));
- scoped_ptr<SocketsManifestPermission> permission4(
+ std::unique_ptr<SocketsManifestPermission> permission4(
PermissionFromJSON(kTcpServerListenPermission));
// Union
- scoped_ptr<SocketsManifestPermission> union_perm(
+ std::unique_ptr<SocketsManifestPermission> union_perm(
static_cast<SocketsManifestPermission*>(
permission1->Union(permission2.get())));
EXPECT_TRUE(union_perm);
@@ -362,7 +366,7 @@ TEST(SocketsManifestPermissionTest, SetOperations) {
EXPECT_FALSE(union_perm->Contains(permission4.get()));
// Diff
- scoped_ptr<SocketsManifestPermission> diff_perm1(
+ std::unique_ptr<SocketsManifestPermission> diff_perm1(
static_cast<SocketsManifestPermission*>(
permission1->Diff(permission2.get())));
EXPECT_TRUE(diff_perm1);
@@ -371,14 +375,14 @@ TEST(SocketsManifestPermissionTest, SetOperations) {
EXPECT_TRUE(permission1->Equal(diff_perm1.get()));
EXPECT_TRUE(diff_perm1->Equal(permission1.get()));
- scoped_ptr<SocketsManifestPermission> diff_perm2(
+ std::unique_ptr<SocketsManifestPermission> diff_perm2(
static_cast<SocketsManifestPermission*>(
permission1->Diff(union_perm.get())));
EXPECT_TRUE(diff_perm2);
AssertEmptyPermission(diff_perm2.get());
// Intersection
- scoped_ptr<SocketsManifestPermission> intersect_perm1(
+ std::unique_ptr<SocketsManifestPermission> intersect_perm1(
static_cast<SocketsManifestPermission*>(
union_perm->Intersect(permission1.get())));
EXPECT_TRUE(intersect_perm1);
@@ -389,12 +393,12 @@ TEST(SocketsManifestPermissionTest, SetOperations) {
}
TEST(SocketsManifestPermissionTest, IPC) {
- scoped_ptr<SocketsManifestPermission> permission(
+ std::unique_ptr<SocketsManifestPermission> permission(
PermissionFromJSON(kUdpBindPermission));
- scoped_ptr<SocketsManifestPermission> ipc_perm(
+ std::unique_ptr<SocketsManifestPermission> ipc_perm(
static_cast<SocketsManifestPermission*>(permission->Clone()));
- scoped_ptr<SocketsManifestPermission> ipc_perm2(
+ std::unique_ptr<SocketsManifestPermission> ipc_perm2(
new SocketsManifestPermission());
IPC::Message m;
« no previous file with comments | « extensions/common/api/sockets/sockets_manifest_permission.cc ('k') | extensions/common/cast/cast_cert_validator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698