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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 328943002: Change topSites API permission warning (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 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/common/extensions/permissions/chrome_permission_message_provider.cc ('K') | « chrome/common/extensions/permissions/chrome_permission_message_provider.cc ('k') | extensions/common/permissions/permission_message.h » ('j') | 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 ee7c6a08071f4d21827dae6ddfa7e5786e0947ea..b0330d3671bfea265699520f8bc15e0651412245 100644
--- a/chrome/common/extensions/permissions/permission_set_unittest.cc
+++ b/chrome/common/extensions/permissions/permission_set_unittest.cc
@@ -832,7 +832,7 @@ TEST(PermissionsTest, SuppressedPermissionMessages) {
PermissionMessageProvider::Get()->GetPermissionMessages(
permissions, Manifest::TYPE_EXTENSION);
EXPECT_EQ(1u, messages.size());
- EXPECT_EQ(PermissionMessage::kBrowsingHistory, messages[0].id());
+ EXPECT_EQ(PermissionMessage::kBrowsingHistoryWrite, messages[0].id());
}
{
APIPermissionSet api_permissions;
@@ -847,7 +847,7 @@ TEST(PermissionsTest, SuppressedPermissionMessages) {
PermissionMessageProvider::Get()->GetPermissionMessages(
permissions, Manifest::TYPE_EXTENSION);
EXPECT_EQ(1u, messages.size());
- EXPECT_EQ(PermissionMessage::kTabs, messages[0].id());
+ EXPECT_EQ(PermissionMessage::kBrowsingHistoryRead, messages[0].id());
}
{
APIPermissionSet api_permissions;
@@ -862,7 +862,7 @@ TEST(PermissionsTest, SuppressedPermissionMessages) {
PermissionMessageProvider::Get()->GetPermissionMessages(
permissions, Manifest::TYPE_EXTENSION);
EXPECT_EQ(1u, messages.size());
- EXPECT_EQ(PermissionMessage::kBrowsingHistory, messages[0].id());
+ EXPECT_EQ(PermissionMessage::kBrowsingHistoryWrite, messages[0].id());
}
{
APIPermissionSet api_permissions;
@@ -877,6 +877,46 @@ TEST(PermissionsTest, SuppressedPermissionMessages) {
EXPECT_EQ(1u, messages.size());
EXPECT_EQ(PermissionMessage::kHostsAll, messages[0].id());
}
+ {
+ APIPermissionSet api_permissions;
+ api_permissions.insert(APIPermission::kHistory);
+ api_permissions.insert(APIPermission::kTopSites);
+ scoped_refptr<PermissionSet> permissions(
+ new PermissionSet(api_permissions, ManifestPermissionSet(),
+ URLPatternSet(), URLPatternSet()));
+ PermissionMessages messages =
+ PermissionMessageProvider::Get()->GetPermissionMessages(
+ permissions, Manifest::TYPE_EXTENSION);
+ EXPECT_EQ(1u, messages.size());
+ EXPECT_EQ(PermissionMessage::kBrowsingHistoryWrite, messages[0].id());
+ }
+ {
+ APIPermissionSet api_permissions;
+ api_permissions.insert(APIPermission::kTab);
+ api_permissions.insert(APIPermission::kTopSites);
meacer 2014/06/13 17:28:36 Maybe you can simply check kTab and kTopSites (and
wjywbs 2014/06/13 18:02:53 Done.
+ scoped_refptr<PermissionSet> permissions(
+ new PermissionSet(api_permissions, ManifestPermissionSet(),
+ URLPatternSet(), URLPatternSet()));
+ PermissionMessages messages =
+ PermissionMessageProvider::Get()->GetPermissionMessages(
+ permissions, Manifest::TYPE_EXTENSION);
+ EXPECT_EQ(1u, messages.size());
+ EXPECT_EQ(PermissionMessage::kBrowsingHistoryRead, messages[0].id());
+ }
+ {
+ APIPermissionSet api_permissions;
+ api_permissions.insert(APIPermission::kHistory);
+ api_permissions.insert(APIPermission::kTab);
+ api_permissions.insert(APIPermission::kTopSites);
+ scoped_refptr<PermissionSet> permissions(
+ new PermissionSet(api_permissions, ManifestPermissionSet(),
+ URLPatternSet(), URLPatternSet()));
+ PermissionMessages messages =
+ PermissionMessageProvider::Get()->GetPermissionMessages(
+ permissions, Manifest::TYPE_EXTENSION);
+ EXPECT_EQ(1u, messages.size());
+ EXPECT_EQ(PermissionMessage::kBrowsingHistoryWrite, messages[0].id());
+ }
}
TEST(PermissionsTest, MergedFileSystemPermissionComparison) {
@@ -1001,11 +1041,27 @@ TEST(PermissionsTest, GetWarningMessages_CombinedSessions) {
permissions, Manifest::TYPE_EXTENSION);
EXPECT_EQ(1u, messages.size());
EXPECT_EQ(l10n_util::GetStringUTF16(
- IDS_EXTENSION_PROMPT_WARNING_TABS_AND_SESSIONS),
+ IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ_AND_SESSIONS),
+ messages[0]);
+ }
+ {
+ APIPermissionSet api_permissions;
+ api_permissions.insert(APIPermission::kHistory);
+ api_permissions.insert(APIPermission::kSessions);
+ scoped_refptr<PermissionSet> permissions(
+ new PermissionSet(api_permissions, ManifestPermissionSet(),
+ URLPatternSet(), URLPatternSet()));
+ std::vector<base::string16> messages =
+ PermissionMessageProvider::Get()->GetWarningMessages(
+ permissions, Manifest::TYPE_EXTENSION);
+ EXPECT_EQ(1u, messages.size());
+ EXPECT_EQ(l10n_util::GetStringUTF16(
+ IDS_EXTENSION_PROMPT_WARNING_HISTORY_WRITE_AND_SESSIONS),
messages[0]);
}
{
APIPermissionSet api_permissions;
+ api_permissions.insert(APIPermission::kTab);
api_permissions.insert(APIPermission::kHistory);
api_permissions.insert(APIPermission::kSessions);
scoped_refptr<PermissionSet> permissions(
@@ -1016,12 +1072,44 @@ TEST(PermissionsTest, GetWarningMessages_CombinedSessions) {
permissions, Manifest::TYPE_EXTENSION);
EXPECT_EQ(1u, messages.size());
EXPECT_EQ(l10n_util::GetStringUTF16(
- IDS_EXTENSION_PROMPT_WARNING_BROWSING_HISTORY_AND_SESSIONS),
+ IDS_EXTENSION_PROMPT_WARNING_HISTORY_WRITE_AND_SESSIONS),
+ messages[0]);
+ }
+ {
+ APIPermissionSet api_permissions;
+ api_permissions.insert(APIPermission::kTopSites);
+ api_permissions.insert(APIPermission::kSessions);
+ scoped_refptr<PermissionSet> permissions(
+ new PermissionSet(api_permissions, ManifestPermissionSet(),
meacer 2014/06/13 17:28:36 Same as above.
wjywbs 2014/06/13 18:02:53 Done.
+ URLPatternSet(), URLPatternSet()));
+ std::vector<base::string16> messages =
+ PermissionMessageProvider::Get()->GetWarningMessages(
+ permissions, Manifest::TYPE_EXTENSION);
+ EXPECT_EQ(1u, messages.size());
+ EXPECT_EQ(l10n_util::GetStringUTF16(
+ IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ_AND_SESSIONS),
+ messages[0]);
+ }
+ {
+ APIPermissionSet api_permissions;
+ api_permissions.insert(APIPermission::kTab);
+ api_permissions.insert(APIPermission::kTopSites);
+ api_permissions.insert(APIPermission::kSessions);
+ scoped_refptr<PermissionSet> permissions(
+ new PermissionSet(api_permissions, ManifestPermissionSet(),
+ URLPatternSet(), URLPatternSet()));
+ std::vector<base::string16> messages =
+ PermissionMessageProvider::Get()->GetWarningMessages(
+ permissions, Manifest::TYPE_EXTENSION);
+ EXPECT_EQ(1u, messages.size());
+ EXPECT_EQ(l10n_util::GetStringUTF16(
+ IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ_AND_SESSIONS),
messages[0]);
}
{
APIPermissionSet api_permissions;
api_permissions.insert(APIPermission::kTab);
+ api_permissions.insert(APIPermission::kTopSites);
api_permissions.insert(APIPermission::kHistory);
api_permissions.insert(APIPermission::kSessions);
scoped_refptr<PermissionSet> permissions(
@@ -1032,7 +1120,7 @@ TEST(PermissionsTest, GetWarningMessages_CombinedSessions) {
permissions, Manifest::TYPE_EXTENSION);
EXPECT_EQ(1u, messages.size());
EXPECT_EQ(l10n_util::GetStringUTF16(
- IDS_EXTENSION_PROMPT_WARNING_BROWSING_HISTORY_AND_SESSIONS),
+ IDS_EXTENSION_PROMPT_WARNING_HISTORY_WRITE_AND_SESSIONS),
messages[0]);
}
}
« chrome/common/extensions/permissions/chrome_permission_message_provider.cc ('K') | « chrome/common/extensions/permissions/chrome_permission_message_provider.cc ('k') | extensions/common/permissions/permission_message.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698