| 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 1c3ac36914c4ffe5b5816abe60b4c642dfb6f5b8..7f09b0c1f171e9b3bdeac9da5c1e99a8afa8a253 100644
|
| --- a/chrome/common/extensions/permissions/permission_set_unittest.cc
|
| +++ b/chrome/common/extensions/permissions/permission_set_unittest.cc
|
| @@ -91,10 +91,10 @@ class PermissionsTest : public testing::Test {
|
| // Tests GetByID.
|
| TEST(PermissionsTest, GetByID) {
|
| PermissionsInfo* info = PermissionsInfo::GetInstance();
|
| - APIPermissionSet ids = info->GetAll();
|
| - for (APIPermissionSet::iterator i = ids.begin();
|
| - i != ids.end(); ++i) {
|
| - EXPECT_EQ(*i, info->GetByID(*i)->id());
|
| + APIPermissionSet apis = info->GetAll();
|
| + for (APIPermissionSet::const_iterator i = apis.begin();
|
| + i != apis.end(); ++i) {
|
| + EXPECT_EQ(i->id(), i->permission()->id());
|
| }
|
| }
|
|
|
| @@ -111,11 +111,11 @@ TEST(PermissionsTest, GetAll) {
|
| size_t count = 0;
|
| PermissionsInfo* info = PermissionsInfo::GetInstance();
|
| APIPermissionSet apis = info->GetAll();
|
| - for (APIPermissionSet::iterator api = apis.begin();
|
| + for (APIPermissionSet::const_iterator api = apis.begin();
|
| api != apis.end(); ++api) {
|
| // Make sure only the valid permission IDs get returned.
|
| - EXPECT_NE(APIPermission::kInvalid, *api);
|
| - EXPECT_NE(APIPermission::kUnknown, *api);
|
| + EXPECT_NE(APIPermission::kInvalid, api->id());
|
| + EXPECT_NE(APIPermission::kUnknown, api->id());
|
| count++;
|
| }
|
| EXPECT_EQ(count, info->get_permission_count());
|
| @@ -616,9 +616,9 @@ TEST(PermissionsTest, PermissionMessages) {
|
| APIPermissionSet permissions = info->GetAll();
|
| for (APIPermissionSet::const_iterator i = permissions.begin();
|
| i != permissions.end(); ++i) {
|
| - APIPermission* permission = info->GetByID(*i);
|
| + const APIPermission* permission = i->permission();
|
| EXPECT_TRUE(permission);
|
| - if (skip.count(*i)) {
|
| + if (skip.count(i->id())) {
|
| EXPECT_EQ(PermissionMessage::kNone, permission->message_id())
|
| << "unexpected message_id for " << permission->name();
|
| } else {
|
|
|