Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(686)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 506883003: Remove implicit conversions from scoped_refptr to T* in chrome/*/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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
« no previous file with comments | « chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f72b3dac4fff8625773e1b4adc668b8356e3f1c2..4cb09a1333b301ac6653ee39b94ba73e56aca4a5 100644
--- a/chrome/common/extensions/permissions/permission_set_unittest.cc
+++ b/chrome/common/extensions/permissions/permission_set_unittest.cc
@@ -797,7 +797,7 @@ TEST(PermissionsTest, FileSystemPermissionMessages) {
URLPatternSet(), URLPatternSet()));
PermissionMessages messages =
PermissionMessageProvider::Get()->GetPermissionMessages(
- permissions, Manifest::TYPE_PLATFORM_APP);
+ permissions.get(), Manifest::TYPE_PLATFORM_APP);
ASSERT_EQ(1u, messages.size());
std::sort(messages.begin(), messages.end());
std::set<PermissionMessage::ID> ids;
@@ -818,7 +818,7 @@ TEST(PermissionsTest, HiddenFileSystemPermissionMessages) {
URLPatternSet(), URLPatternSet()));
PermissionMessages messages =
PermissionMessageProvider::Get()->GetPermissionMessages(
- permissions, Manifest::TYPE_PLATFORM_APP);
+ permissions.get(), Manifest::TYPE_PLATFORM_APP);
ASSERT_EQ(1u, messages.size());
EXPECT_EQ(PermissionMessage::kFileSystemWriteDirectory, messages[0].id());
}
@@ -835,7 +835,7 @@ TEST(PermissionsTest, SuppressedPermissionMessages) {
hosts, URLPatternSet()));
PermissionMessages messages =
PermissionMessageProvider::Get()->GetPermissionMessages(
- permissions, Manifest::TYPE_EXTENSION);
+ permissions.get(), Manifest::TYPE_EXTENSION);
EXPECT_EQ(1u, messages.size());
EXPECT_EQ(PermissionMessage::kTabs, messages[0].id());
}
@@ -850,7 +850,7 @@ TEST(PermissionsTest, SuppressedPermissionMessages) {
hosts, URLPatternSet()));
PermissionMessages messages =
PermissionMessageProvider::Get()->GetPermissionMessages(
- permissions, Manifest::TYPE_EXTENSION);
+ permissions.get(), Manifest::TYPE_EXTENSION);
EXPECT_EQ(1u, messages.size());
EXPECT_EQ(PermissionMessage::kBrowsingHistory, messages[0].id());
}
@@ -863,7 +863,7 @@ TEST(PermissionsTest, SuppressedPermissionMessages) {
api_permissions, ManifestPermissionSet(), hosts, URLPatternSet()));
PermissionMessages messages =
PermissionMessageProvider::Get()->GetPermissionMessages(
- permissions, Manifest::TYPE_EXTENSION);
+ permissions.get(), Manifest::TYPE_EXTENSION);
EXPECT_EQ(1u, messages.size());
EXPECT_EQ(PermissionMessage::kHostsAll, messages[0].id());
}
@@ -876,7 +876,7 @@ TEST(PermissionsTest, SuppressedPermissionMessages) {
api_permissions, ManifestPermissionSet(), hosts, URLPatternSet()));
PermissionMessages messages =
PermissionMessageProvider::Get()->GetPermissionMessages(
- permissions, Manifest::TYPE_EXTENSION);
+ permissions.get(), Manifest::TYPE_EXTENSION);
EXPECT_EQ(1u, messages.size());
EXPECT_EQ(PermissionMessage::kHostsAll, messages[0].id());
}
@@ -892,7 +892,7 @@ TEST(PermissionsTest, SuppressedPermissionMessages) {
URLPatternSet(), URLPatternSet()));
PermissionMessages messages =
PermissionMessageProvider::Get()->GetPermissionMessages(
- permissions, Manifest::TYPE_EXTENSION);
+ permissions.get(), Manifest::TYPE_EXTENSION);
EXPECT_EQ(1u, messages.size());
EXPECT_EQ(PermissionMessage::kBrowsingHistory, messages[0].id());
}
@@ -907,7 +907,7 @@ TEST(PermissionsTest, SuppressedPermissionMessages) {
URLPatternSet(), URLPatternSet()));
PermissionMessages messages =
PermissionMessageProvider::Get()->GetPermissionMessages(
- permissions, Manifest::TYPE_EXTENSION);
+ permissions.get(), Manifest::TYPE_EXTENSION);
EXPECT_EQ(1u, messages.size());
EXPECT_EQ(PermissionMessage::kTabs, messages[0].id());
}
@@ -924,7 +924,7 @@ TEST(PermissionsTest, AccessToDevicesMessages) {
URLPatternSet()));
std::vector<base::string16> messages =
PermissionMessageProvider::Get()->GetWarningMessages(
- permissions, Manifest::TYPE_EXTENSION);
+ permissions.get(), Manifest::TYPE_EXTENSION);
EXPECT_EQ(1u, messages.size());
EXPECT_EQ(l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_USB),
messages[0]);
@@ -941,7 +941,7 @@ TEST(PermissionsTest, AccessToDevicesMessages) {
URLPatternSet()));
std::vector<base::string16> messages =
PermissionMessageProvider::Get()->GetWarningMessages(
- permissions, Manifest::TYPE_EXTENSION);
+ permissions.get(), Manifest::TYPE_EXTENSION);
EXPECT_EQ(1u, messages.size());
EXPECT_EQ(l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_USB),
messages[0]);
@@ -956,7 +956,7 @@ TEST(PermissionsTest, AccessToDevicesMessages) {
URLPatternSet()));
std::vector<base::string16> messages =
PermissionMessageProvider::Get()->GetWarningMessages(
- permissions, Manifest::TYPE_EXTENSION);
+ permissions.get(), Manifest::TYPE_EXTENSION);
EXPECT_EQ(1u, messages.size());
EXPECT_EQ(l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_SERIAL),
messages[0]);
@@ -972,7 +972,7 @@ TEST(PermissionsTest, AccessToDevicesMessages) {
URLPatternSet()));
std::vector<base::string16> messages =
PermissionMessageProvider::Get()->GetWarningMessages(
- permissions, Manifest::TYPE_EXTENSION);
+ permissions.get(), Manifest::TYPE_EXTENSION);
EXPECT_EQ(1u, messages.size());
EXPECT_EQ(
l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_USB_SERIAL),
@@ -991,7 +991,7 @@ TEST(PermissionsTest, AccessToDevicesMessages) {
URLPatternSet()));
std::vector<base::string16> messages =
PermissionMessageProvider::Get()->GetWarningMessages(
- permissions, Manifest::TYPE_EXTENSION);
+ permissions.get(), Manifest::TYPE_EXTENSION);
EXPECT_EQ(1u, messages.size());
EXPECT_EQ(
l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_USB_SERIAL),
@@ -1060,23 +1060,23 @@ TEST(PermissionsTest, MergedFileSystemPermissionComparison) {
URLPatternSet()));
const PermissionMessageProvider* provider = PermissionMessageProvider::Get();
- EXPECT_FALSE(provider->IsPrivilegeIncrease(write_directory_permissions,
- write_permissions,
+ EXPECT_FALSE(provider->IsPrivilegeIncrease(write_directory_permissions.get(),
+ write_permissions.get(),
Manifest::TYPE_PLATFORM_APP));
- EXPECT_FALSE(provider->IsPrivilegeIncrease(write_directory_permissions,
- directory_permissions,
+ EXPECT_FALSE(provider->IsPrivilegeIncrease(write_directory_permissions.get(),
+ directory_permissions.get(),
Manifest::TYPE_PLATFORM_APP));
- EXPECT_TRUE(provider->IsPrivilegeIncrease(write_permissions,
- directory_permissions,
+ EXPECT_TRUE(provider->IsPrivilegeIncrease(write_permissions.get(),
+ directory_permissions.get(),
Manifest::TYPE_PLATFORM_APP));
- EXPECT_TRUE(provider->IsPrivilegeIncrease(write_permissions,
- write_directory_permissions,
+ EXPECT_TRUE(provider->IsPrivilegeIncrease(write_permissions.get(),
+ write_directory_permissions.get(),
Manifest::TYPE_PLATFORM_APP));
- EXPECT_FALSE(provider->IsPrivilegeIncrease(directory_permissions,
- write_permissions,
+ EXPECT_FALSE(provider->IsPrivilegeIncrease(directory_permissions.get(),
+ write_permissions.get(),
Manifest::TYPE_PLATFORM_APP));
- EXPECT_TRUE(provider->IsPrivilegeIncrease(directory_permissions,
- write_directory_permissions,
+ EXPECT_TRUE(provider->IsPrivilegeIncrease(directory_permissions.get(),
+ write_directory_permissions.get(),
Manifest::TYPE_PLATFORM_APP));
}
@@ -1159,7 +1159,7 @@ TEST(PermissionsTest, GetWarningMessages_CombinedSessions) {
URLPatternSet(), URLPatternSet()));
std::vector<base::string16> messages =
PermissionMessageProvider::Get()->GetWarningMessages(
- permissions, Manifest::TYPE_EXTENSION);
+ permissions.get(), Manifest::TYPE_EXTENSION);
EXPECT_EQ(1u, messages.size());
EXPECT_EQ(l10n_util::GetStringUTF16(
IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ_AND_SESSIONS),
@@ -1178,7 +1178,7 @@ TEST(PermissionsTest, GetWarningMessages_CombinedSessions) {
URLPatternSet(), URLPatternSet()));
std::vector<base::string16> messages =
PermissionMessageProvider::Get()->GetWarningMessages(
- permissions, Manifest::TYPE_EXTENSION);
+ permissions.get(), Manifest::TYPE_EXTENSION);
EXPECT_EQ(1u, messages.size());
EXPECT_EQ(l10n_util::GetStringUTF16(
IDS_EXTENSION_PROMPT_WARNING_HISTORY_WRITE_AND_SESSIONS),
@@ -1631,8 +1631,8 @@ TEST(PermissionsTest, IsHostPrivilegeIncrease) {
set2 = new PermissionSet(empty_perms, empty_manifest_permissions,
elist2, slist2);
- EXPECT_FALSE(provider->IsPrivilegeIncrease(set1, set2, type));
- EXPECT_FALSE(provider->IsPrivilegeIncrease(set2, set1, type));
+ EXPECT_FALSE(provider->IsPrivilegeIncrease(set1.get(), set2.get(), type));
+ EXPECT_FALSE(provider->IsPrivilegeIncrease(set2.get(), set1.get(), type));
// Test that paths are ignored.
elist2.ClearPatterns();
@@ -1640,8 +1640,8 @@ TEST(PermissionsTest, IsHostPrivilegeIncrease) {
URLPattern(URLPattern::SCHEME_HTTP, "http://www.google.com/*"));
set2 = new PermissionSet(empty_perms, empty_manifest_permissions,
elist2, slist2);
- EXPECT_FALSE(provider->IsPrivilegeIncrease(set1, set2, type));
- EXPECT_FALSE(provider->IsPrivilegeIncrease(set2, set1, type));
+ EXPECT_FALSE(provider->IsPrivilegeIncrease(set1.get(), set2.get(), type));
+ EXPECT_FALSE(provider->IsPrivilegeIncrease(set2.get(), set1.get(), type));
// Test that RCDs are ignored.
elist2.ClearPatterns();
@@ -1649,8 +1649,8 @@ TEST(PermissionsTest, IsHostPrivilegeIncrease) {
URLPattern(URLPattern::SCHEME_HTTP, "http://www.google.com.hk/*"));
set2 = new PermissionSet(empty_perms, empty_manifest_permissions,
elist2, slist2);
- EXPECT_FALSE(provider->IsPrivilegeIncrease(set1, set2, type));
- EXPECT_FALSE(provider->IsPrivilegeIncrease(set2, set1, type));
+ EXPECT_FALSE(provider->IsPrivilegeIncrease(set1.get(), set2.get(), type));
+ EXPECT_FALSE(provider->IsPrivilegeIncrease(set2.get(), set1.get(), type));
// Test that subdomain wildcards are handled properly.
elist2.ClearPatterns();
@@ -1658,7 +1658,7 @@ TEST(PermissionsTest, IsHostPrivilegeIncrease) {
URLPattern(URLPattern::SCHEME_HTTP, "http://*.google.com.hk/*"));
set2 = new PermissionSet(empty_perms, empty_manifest_permissions,
elist2, slist2);
- EXPECT_TRUE(provider->IsPrivilegeIncrease(set1, set2, type));
+ EXPECT_TRUE(provider->IsPrivilegeIncrease(set1.get(), set2.get(), type));
// TODO(jstritar): Does not match subdomains properly. http://crbug.com/65337
// EXPECT_FALSE(provider->IsPrivilegeIncrease(set2, set1, type));
@@ -1670,8 +1670,8 @@ TEST(PermissionsTest, IsHostPrivilegeIncrease) {
URLPattern(URLPattern::SCHEME_HTTP, "http://www.example.org/path"));
set2 = new PermissionSet(empty_perms, empty_manifest_permissions,
elist2, slist2);
- EXPECT_TRUE(provider->IsPrivilegeIncrease(set1, set2, type));
- EXPECT_FALSE(provider->IsPrivilegeIncrease(set2, set1, type));
+ EXPECT_TRUE(provider->IsPrivilegeIncrease(set1.get(), set2.get(), type));
+ EXPECT_FALSE(provider->IsPrivilegeIncrease(set2.get(), set1.get(), type));
// Test that different subdomains count as different hosts.
elist2.ClearPatterns();
@@ -1679,13 +1679,13 @@ TEST(PermissionsTest, IsHostPrivilegeIncrease) {
URLPattern(URLPattern::SCHEME_HTTP, "http://mail.google.com/*"));
set2 = new PermissionSet(empty_perms, empty_manifest_permissions,
elist2, slist2);
- EXPECT_TRUE(provider->IsPrivilegeIncrease(set1, set2, type));
- EXPECT_TRUE(provider->IsPrivilegeIncrease(set2, set1, type));
+ EXPECT_TRUE(provider->IsPrivilegeIncrease(set1.get(), set2.get(), type));
+ EXPECT_TRUE(provider->IsPrivilegeIncrease(set2.get(), set1.get(), type));
// Test that platform apps do not have host permissions increases.
type = Manifest::TYPE_PLATFORM_APP;
- EXPECT_FALSE(provider->IsPrivilegeIncrease(set1, set2, type));
- EXPECT_FALSE(provider->IsPrivilegeIncrease(set2, set1, type));
+ EXPECT_FALSE(provider->IsPrivilegeIncrease(set1.get(), set2.get(), type));
+ EXPECT_FALSE(provider->IsPrivilegeIncrease(set2.get(), set1.get(), type));
}
TEST(PermissionsTest, GetAPIsAsStrings) {
@@ -1780,8 +1780,8 @@ TEST(PermissionsTest, ChromeURLs) {
scoped_refptr<PermissionSet> permissions(
new PermissionSet(APIPermissionSet(), ManifestPermissionSet(),
allowed_hosts, URLPatternSet()));
- PermissionMessageProvider::Get()->
- GetPermissionMessages(permissions, Manifest::TYPE_EXTENSION);
+ PermissionMessageProvider::Get()->GetPermissionMessages(
+ permissions.get(), Manifest::TYPE_EXTENSION);
}
TEST(PermissionsTest, IsPrivilegeIncrease_DeclarativeWebRequest) {
« no previous file with comments | « chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698