| Index: chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
|
| diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
|
| index 22e2015fa19520148a990342fcb7e9a49efb4fe2..b327840c99bcacfc7396fe58366d8388f02e3c37 100644
|
| --- a/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
|
| +++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
|
| @@ -52,13 +52,13 @@ TEST(ExtensionPermissionsAPIHelpers, Pack) {
|
|
|
| std::string expected_apis[] = { "tabs", "webRequest" };
|
| for (size_t i = 0; i < ARRAYSIZE_UNSAFE(expected_apis); ++i) {
|
| - scoped_ptr<Value> value(Value::CreateStringValue(expected_apis[i]));
|
| + scoped_ptr<Value> value(new base::StringValue(expected_apis[i]));
|
| EXPECT_NE(api_list->end(), api_list->Find(*value));
|
| }
|
|
|
| std::string expected_origins[] = { "http://a.com/*", "http://b.com/*" };
|
| for (size_t i = 0; i < ARRAYSIZE_UNSAFE(expected_origins); ++i) {
|
| - scoped_ptr<Value> value(Value::CreateStringValue(expected_origins[i]));
|
| + scoped_ptr<Value> value(new base::StringValue(expected_origins[i]));
|
| EXPECT_NE(origin_list->end(), origin_list->Find(*value));
|
| }
|
|
|
| @@ -78,9 +78,9 @@ TEST(ExtensionPermissionsAPIHelpers, Pack) {
|
| // into PermissionSets.
|
| TEST(ExtensionPermissionsAPIHelpers, Unpack) {
|
| scoped_ptr<base::ListValue> apis(new base::ListValue());
|
| - apis->Append(Value::CreateStringValue("tabs"));
|
| + apis->Append(new base::StringValue("tabs"));
|
| scoped_ptr<base::ListValue> origins(new base::ListValue());
|
| - origins->Append(Value::CreateStringValue("http://a.com/*"));
|
| + origins->Append(new base::StringValue("http://a.com/*"));
|
|
|
| scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
|
| scoped_refptr<PermissionSet> permissions;
|
| @@ -114,7 +114,7 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
|
| Permissions permissions_object;
|
| value->Clear();
|
| scoped_ptr<base::ListValue> invalid_apis(apis->DeepCopy());
|
| - invalid_apis->Append(Value::CreateIntegerValue(3));
|
| + invalid_apis->Append(new base::FundamentalValue(3));
|
| value->Set("permissions", invalid_apis->DeepCopy());
|
| EXPECT_FALSE(Permissions::Populate(*value, &permissions_object));
|
| }
|
| @@ -124,7 +124,7 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
|
| Permissions permissions_object;
|
| value->Clear();
|
| scoped_ptr<base::ListValue> invalid_origins(origins->DeepCopy());
|
| - invalid_origins->Append(Value::CreateIntegerValue(3));
|
| + invalid_origins->Append(new base::FundamentalValue(3));
|
| value->Set("origins", invalid_origins->DeepCopy());
|
| EXPECT_FALSE(Permissions::Populate(*value, &permissions_object));
|
| }
|
| @@ -133,14 +133,14 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
|
| {
|
| Permissions permissions_object;
|
| value->Clear();
|
| - value->Set("origins", Value::CreateIntegerValue(2));
|
| + value->Set("origins", new base::FundamentalValue(2));
|
| EXPECT_FALSE(Permissions::Populate(*value, &permissions_object));
|
| }
|
|
|
| {
|
| Permissions permissions_object;
|
| value->Clear();
|
| - value->Set("permissions", Value::CreateIntegerValue(2));
|
| + value->Set("permissions", new base::FundamentalValue(2));
|
| EXPECT_FALSE(Permissions::Populate(*value, &permissions_object));
|
| }
|
|
|
| @@ -149,7 +149,7 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
|
| Permissions permissions_object;
|
| value->Clear();
|
| value->Set("origins", origins->DeepCopy());
|
| - value->Set("random", Value::CreateIntegerValue(3));
|
| + value->Set("random", new base::FundamentalValue(3));
|
| EXPECT_TRUE(Permissions::Populate(*value, &permissions_object));
|
| permissions = UnpackPermissionSet(permissions_object, true, &error);
|
| EXPECT_TRUE(permissions.get());
|
| @@ -162,7 +162,7 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
|
| Permissions permissions_object;
|
| value->Clear();
|
| scoped_ptr<base::ListValue> invalid_apis(apis->DeepCopy());
|
| - invalid_apis->Append(Value::CreateStringValue("unknown_permission"));
|
| + invalid_apis->Append(new base::StringValue("unknown_permission"));
|
| value->Set("permissions", invalid_apis->DeepCopy());
|
| EXPECT_TRUE(Permissions::Populate(*value, &permissions_object));
|
| permissions = UnpackPermissionSet(permissions_object, true, &error);
|
|
|