chrome/common/extensions/permissions/settings_override_permission_unittest.cc - Issue 1349613003: [Extensions] Un-refcount PermissionSet

Unified Diff: chrome/common/extensions/permissions/settings_override_permission_unittest.cc

Issue 1349613003: [Extensions] Un-refcount PermissionSet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/extensions/api/permissions/permissions_api_helpers.h ('K') | « chrome/common/extensions/permissions/permissions_data_unittest.cc ('k') | extensions/browser/extension_prefs.h » ('j') | extensions/browser/extension_prefs.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 b2cbb4f36fecdf51e07d1742dcb264a91d44e846..8f1fb015238bdcbfe5b64814c285eaa6d0ac7856 100644

--- a/chrome/common/extensions/permissions/settings_override_permission_unittest.cc

+++ b/chrome/common/extensions/permissions/settings_override_permission_unittest.cc

@@ -64,8 +64,8 @@ class SettingsOverridePermissionTest : public ChromeManifestTest {

TEST_F(SettingsOverridePermissionTest, HomePage) {

scoped_refptr<Extension> extension(GetPermissionSet(kHomepage));

- scoped_refptr<const PermissionSet> permission_set(

- extension->permissions_data()->active_permissions());

+ const PermissionSet* permission_set =

+ extension->permissions_data()->active_permissions();

#if defined(OS_WIN)

EXPECT_TRUE(permission_set->HasAPIPermission(APIPermission::kHomepage));

@@ -82,8 +82,8 @@ TEST_F(SettingsOverridePermissionTest, HomePage) {

TEST_F(SettingsOverridePermissionTest, StartupPages) {

scoped_refptr<Extension> extension(GetPermissionSet(kStartupPages));

- scoped_refptr<const PermissionSet> permission_set(

- extension->permissions_data()->active_permissions());

+ const PermissionSet* permission_set =

+ extension->permissions_data()->active_permissions();

#if defined(OS_WIN)

EXPECT_TRUE(permission_set->HasAPIPermission(APIPermission::kStartupPages));

@@ -101,8 +101,8 @@ TEST_F(SettingsOverridePermissionTest, StartupPages) {

TEST_F(SettingsOverridePermissionTest, SearchSettings) {

scoped_refptr<Extension> extension(GetPermissionSet(kSearchProvider));

- scoped_refptr<const PermissionSet> permission_set(

- extension->permissions_data()->active_permissions());

+ const PermissionSet* permission_set =

+ extension->permissions_data()->active_permissions();

#if defined(OS_WIN)

EXPECT_TRUE(permission_set->HasAPIPermission(APIPermission::kSearchProvider));

@@ -120,8 +120,8 @@ TEST_F(SettingsOverridePermissionTest, SearchSettings) {

TEST_F(SettingsOverridePermissionTest, All) {

scoped_refptr<Extension> extension(GetPermissionSet(

kSearchProvider | kStartupPages | kHomepage));

- scoped_refptr<const PermissionSet> permission_set(

- extension->permissions_data()->active_permissions());

+ const PermissionSet* permission_set =

+ extension->permissions_data()->active_permissions();

#if defined(OS_WIN)

EXPECT_TRUE(permission_set->HasAPIPermission(APIPermission::kHomepage));

@@ -138,8 +138,8 @@ TEST_F(SettingsOverridePermissionTest, All) {

TEST_F(SettingsOverridePermissionTest, Some) {

scoped_refptr<Extension> extension(GetPermissionSet(

kSearchProvider | kHomepage));

- scoped_refptr<const PermissionSet> permission_set(

- extension->permissions_data()->active_permissions());

+ const PermissionSet* permission_set =

+ extension->permissions_data()->active_permissions();

#if defined(OS_WIN)

EXPECT_TRUE(permission_set->HasAPIPermission(APIPermission::kHomepage));