| 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 bfde13cb121b3544ac82425ca41f106d2ad1b9b5..5b7733a31b7c3412255cb5976016c8cab15cc819 100644
|
| --- a/chrome/common/extensions/permissions/permission_set_unittest.cc
|
| +++ b/chrome/common/extensions/permissions/permission_set_unittest.cc
|
| @@ -353,9 +353,9 @@ TEST(PermissionsTest, CreateUnion) {
|
| permission = permission_info->CreateAPIPermission();
|
| {
|
| 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"));
|
| + value->AppendString("tcp-connect:*.example.com:80");
|
| + value->AppendString("udp-bind::8080");
|
| + value->AppendString("udp-send-to::8888");
|
| ASSERT_TRUE(permission->FromValue(value.get(), NULL, NULL));
|
| }
|
|
|
| @@ -398,8 +398,8 @@ TEST(PermissionsTest, CreateUnion) {
|
| permission = permission_info->CreateAPIPermission();
|
| {
|
| 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"));
|
| + value->AppendString("tcp-connect:*.example.com:80");
|
| + value->AppendString("udp-send-to::8899");
|
| ASSERT_TRUE(permission->FromValue(value.get(), NULL, NULL));
|
| }
|
| apis2.insert(permission);
|
| @@ -412,10 +412,10 @@ TEST(PermissionsTest, CreateUnion) {
|
| permission = permission_info->CreateAPIPermission();
|
| {
|
| 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"));
|
| - value->Append(new base::StringValue("udp-send-to::8899"));
|
| + value->AppendString("tcp-connect:*.example.com:80");
|
| + value->AppendString("udp-bind::8080");
|
| + value->AppendString("udp-send-to::8888");
|
| + value->AppendString("udp-send-to::8899");
|
| ASSERT_TRUE(permission->FromValue(value.get(), NULL, NULL));
|
| }
|
| // Insert a new permission socket permisssion which will replace the old one.
|
| @@ -479,9 +479,9 @@ TEST(PermissionsTest, CreateIntersection) {
|
| permission = permission_info->CreateAPIPermission();
|
| {
|
| 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"));
|
| + value->AppendString("tcp-connect:*.example.com:80");
|
| + value->AppendString("udp-bind::8080");
|
| + value->AppendString("udp-send-to::8888");
|
| ASSERT_TRUE(permission->FromValue(value.get(), NULL, NULL));
|
| }
|
| apis1.insert(permission);
|
| @@ -516,9 +516,9 @@ TEST(PermissionsTest, CreateIntersection) {
|
| permission = permission_info->CreateAPIPermission();
|
| {
|
| 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"));
|
| + value->AppendString("udp-bind::8080");
|
| + value->AppendString("udp-send-to::8888");
|
| + value->AppendString("udp-send-to::8899");
|
| ASSERT_TRUE(permission->FromValue(value.get(), NULL, NULL));
|
| }
|
| apis2.insert(permission);
|
| @@ -527,8 +527,8 @@ TEST(PermissionsTest, CreateIntersection) {
|
| permission = permission_info->CreateAPIPermission();
|
| {
|
| 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->AppendString("udp-bind::8080");
|
| + value->AppendString("udp-send-to::8888");
|
| ASSERT_TRUE(permission->FromValue(value.get(), NULL, NULL));
|
| }
|
| expected_apis.insert(permission);
|
| @@ -591,9 +591,9 @@ TEST(PermissionsTest, CreateDifference) {
|
| permission = permission_info->CreateAPIPermission();
|
| {
|
| 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"));
|
| + value->AppendString("tcp-connect:*.example.com:80");
|
| + value->AppendString("udp-bind::8080");
|
| + value->AppendString("udp-send-to::8888");
|
| ASSERT_TRUE(permission->FromValue(value.get(), NULL, NULL));
|
| }
|
| apis1.insert(permission);
|
| @@ -616,8 +616,8 @@ TEST(PermissionsTest, CreateDifference) {
|
| permission = permission_info->CreateAPIPermission();
|
| {
|
| 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"));
|
| + value->AppendString("tcp-connect:*.example.com:80");
|
| + value->AppendString("udp-send-to::8899");
|
| ASSERT_TRUE(permission->FromValue(value.get(), NULL, NULL));
|
| }
|
| apis2.insert(permission);
|
| @@ -626,8 +626,8 @@ TEST(PermissionsTest, CreateDifference) {
|
| permission = permission_info->CreateAPIPermission();
|
| {
|
| 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->AppendString("udp-bind::8080");
|
| + value->AppendString("udp-send-to::8888");
|
| ASSERT_TRUE(permission->FromValue(value.get(), NULL, NULL));
|
| }
|
| expected_apis.insert(permission);
|
|
|