| Index: chrome/common/extensions/permissions/settings_override_permission_unittest.cc
|
| diff --git a/chrome/common/extensions/permissions/settings_override_permission_unittest.cc b/chrome/common/extensions/permissions/settings_override_permission_unittest.cc
|
| index 7f92290821428fa02935a49ef055ab030deff8e7..61f6b5be56f1481b3a3a829c226849ede9a8d0f4 100644
|
| --- a/chrome/common/extensions/permissions/settings_override_permission_unittest.cc
|
| +++ b/chrome/common/extensions/permissions/settings_override_permission_unittest.cc
|
| @@ -64,7 +64,7 @@ class SettingsOverridePermissionTest : public ExtensionManifestTest {
|
| TEST_F(SettingsOverridePermissionTest, HomePage) {
|
| scoped_refptr<Extension> extension(GetPermissionSet(kHomepage));
|
| scoped_refptr<const PermissionSet> permission_set(
|
| - extension->GetActivePermissions());
|
| + extension->permissions_data()->active_permissions());
|
|
|
| #if defined(OS_WIN)
|
| EXPECT_TRUE(permission_set->HasAPIPermission(APIPermission::kHomepage));
|
| @@ -88,7 +88,7 @@ TEST_F(SettingsOverridePermissionTest, HomePage) {
|
| TEST_F(SettingsOverridePermissionTest, StartupPages) {
|
| scoped_refptr<Extension> extension(GetPermissionSet(kStartupPages));
|
| scoped_refptr<const PermissionSet> permission_set(
|
| - extension->GetActivePermissions());
|
| + extension->permissions_data()->active_permissions());
|
|
|
| #if defined(OS_WIN)
|
| EXPECT_TRUE(permission_set->HasAPIPermission(APIPermission::kStartupPages));
|
| @@ -112,7 +112,7 @@ TEST_F(SettingsOverridePermissionTest, StartupPages) {
|
| TEST_F(SettingsOverridePermissionTest, SearchSettings) {
|
| scoped_refptr<Extension> extension(GetPermissionSet(kSearchProvider));
|
| scoped_refptr<const PermissionSet> permission_set(
|
| - extension->GetActivePermissions());
|
| + extension->permissions_data()->active_permissions());
|
|
|
| #if defined(OS_WIN)
|
| EXPECT_TRUE(permission_set->HasAPIPermission(APIPermission::kSearchProvider));
|
| @@ -136,7 +136,7 @@ TEST_F(SettingsOverridePermissionTest, All) {
|
| scoped_refptr<Extension> extension(GetPermissionSet(
|
| kSearchProvider | kStartupPages | kHomepage));
|
| scoped_refptr<const PermissionSet> permission_set(
|
| - extension->GetActivePermissions());
|
| + extension->permissions_data()->active_permissions());
|
|
|
| #if defined(OS_WIN)
|
| EXPECT_TRUE(permission_set->HasAPIPermission(APIPermission::kSearchProvider));
|
| @@ -154,7 +154,7 @@ TEST_F(SettingsOverridePermissionTest, Some) {
|
| scoped_refptr<Extension> extension(GetPermissionSet(
|
| kSearchProvider | kHomepage));
|
| scoped_refptr<const PermissionSet> permission_set(
|
| - extension->GetActivePermissions());
|
| + extension->permissions_data()->active_permissions());
|
|
|
| #if defined(OS_WIN)
|
| EXPECT_TRUE(permission_set->HasAPIPermission(APIPermission::kSearchProvider));
|
|
|