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 4cb09a1333b301ac6653ee39b94ba73e56aca4a5..bd4d410607d2a2b3d82769ce2ceec75d4f75a7ff 100644 |
--- a/chrome/common/extensions/permissions/permission_set_unittest.cc |
+++ b/chrome/common/extensions/permissions/permission_set_unittest.cc |
@@ -825,6 +825,7 @@ TEST(PermissionsTest, HiddenFileSystemPermissionMessages) { |
TEST(PermissionsTest, SuppressedPermissionMessages) { |
{ |
+ // Tabs warning suppresses favicon warning. |
APIPermissionSet api_permissions; |
api_permissions.insert(APIPermission::kTab); |
URLPatternSet hosts; |
@@ -840,6 +841,7 @@ TEST(PermissionsTest, SuppressedPermissionMessages) { |
EXPECT_EQ(PermissionMessage::kTabs, messages[0].id()); |
} |
{ |
+ // History warning suppresses favicon warning. |
APIPermissionSet api_permissions; |
api_permissions.insert(APIPermission::kHistory); |
URLPatternSet hosts; |
@@ -855,6 +857,7 @@ TEST(PermissionsTest, SuppressedPermissionMessages) { |
EXPECT_EQ(PermissionMessage::kBrowsingHistory, messages[0].id()); |
} |
{ |
+ // All sites warning suppresses tabs warning. |
APIPermissionSet api_permissions; |
URLPatternSet hosts; |
hosts.AddPattern(URLPattern(URLPattern::SCHEME_CHROMEUI, "*://*/*")); |
@@ -868,6 +871,21 @@ TEST(PermissionsTest, SuppressedPermissionMessages) { |
EXPECT_EQ(PermissionMessage::kHostsAll, messages[0].id()); |
} |
{ |
+ // All sites warning suppresses topSites warning. |
+ APIPermissionSet api_permissions; |
+ URLPatternSet hosts; |
+ hosts.AddPattern(URLPattern(URLPattern::SCHEME_CHROMEUI, "*://*/*")); |
+ api_permissions.insert(APIPermission::kTopSites); |
+ scoped_refptr<PermissionSet> permissions(new PermissionSet( |
+ api_permissions, ManifestPermissionSet(), hosts, URLPatternSet())); |
+ PermissionMessages messages = |
+ PermissionMessageProvider::Get()->GetPermissionMessages( |
+ permissions, Manifest::TYPE_EXTENSION); |
+ EXPECT_EQ(1u, messages.size()); |
+ EXPECT_EQ(PermissionMessage::kHostsAll, messages[0].id()); |
+ } |
+ { |
+ // All sites warning suppresses declarativeWebRequest warning. |
APIPermissionSet api_permissions; |
URLPatternSet hosts; |
hosts.AddPattern(URLPattern(URLPattern::SCHEME_CHROMEUI, "*://*/*")); |
@@ -881,6 +899,7 @@ TEST(PermissionsTest, SuppressedPermissionMessages) { |
EXPECT_EQ(PermissionMessage::kHostsAll, messages[0].id()); |
} |
{ |
+ // BrowsingHistory warning suppresses all history read/write warnings. |
APIPermissionSet api_permissions; |
api_permissions.insert(APIPermission::kHistory); |
api_permissions.insert(APIPermission::kTab); |
@@ -897,6 +916,7 @@ TEST(PermissionsTest, SuppressedPermissionMessages) { |
EXPECT_EQ(PermissionMessage::kBrowsingHistory, messages[0].id()); |
} |
{ |
+ // Tabs warning suppresses all read-only history warnings. |
APIPermissionSet api_permissions; |
api_permissions.insert(APIPermission::kTab); |
api_permissions.insert(APIPermission::kTopSites); |