| Index: chrome/common/extensions/extension_manifests_unittest.cc
|
| diff --git a/chrome/common/extensions/extension_manifests_unittest.cc b/chrome/common/extensions/extension_manifests_unittest.cc
|
| index e2a2d76f83117412d995d6d9992e81ced223d7a6..350130b05878a5059d24648294a730ab85b51c47 100644
|
| --- a/chrome/common/extensions/extension_manifests_unittest.cc
|
| +++ b/chrome/common/extensions/extension_manifests_unittest.cc
|
| @@ -297,7 +297,7 @@ TEST_F(ExtensionManifestTest, OldUnlimitedStoragePermission) {
|
| scoped_refptr<Extension> extension = LoadStrictAndExpectSuccess(
|
| "old_unlimited_storage.json");
|
| EXPECT_TRUE(extension->HasApiPermission(
|
| - Extension::kUnlimitedStoragePermission));
|
| + ExtensionAPIPermission::UnlimitedStorage()));
|
| }
|
|
|
| TEST_F(ExtensionManifestTest, ValidApp) {
|
| @@ -620,14 +620,16 @@ TEST_F(ExtensionManifestTest, AllowUnrecognizedPermissions) {
|
|
|
| ListValue *permissions = new ListValue();
|
| manifest->Set(keys::kPermissions, permissions);
|
| - for (size_t i = 0; i < Extension::kNumPermissions; i++) {
|
| - const char* name = Extension::kPermissions[i].name;
|
| + std::set<ExtensionAPIPermission> api_perms = ExtensionAPIPermission::GetAll();
|
| + for (std::set<ExtensionAPIPermission>::iterator i = api_perms.begin();
|
| + i != api_perms.end(); ++i) {
|
| + const char* name = i->name();
|
| StringValue* p = new StringValue(name);
|
| permissions->Clear();
|
| permissions->Append(p);
|
| std::string message_name = base::StringPrintf("permission-%s", name);
|
|
|
| - if (name == Extension::kExperimentalPermission) {
|
| + if (*i == ExtensionAPIPermission::Experimental()) {
|
| // Experimental permission is allowed, but requires this switch.
|
| CommandLine::ForCurrentProcess()->AppendSwitch(
|
| switches::kEnableExperimentalExtensionApis);
|
|
|