Change topSites API permission warning

chrome/common/extensions/permissions/permission_set_unittest.cc

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..2c109cdd7a67480c03f72fc35618a0a42027960d 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());

[meacer, 2014/06/13 19:59:20]

This case doesn't seem necessary anymore, now that you are testing for history +
tab + topsites + processes + webnavigation below.

[wjywbs, 2014/06/13 20:50:10]

Done.

   }
   {
     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,37 @@ 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::kTab);
+    api_permissions.insert(APIPermission::kTopSites);
+    api_permissions.insert(APIPermission::kProcesses);
+    api_permissions.insert(APIPermission::kWebNavigation);
+    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);
+    api_permissions.insert(APIPermission::kProcesses);
+    api_permissions.insert(APIPermission::kWebNavigation);
+    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());
+  }
 }
 
 TEST(PermissionsTest, MergedFileSystemPermissionComparison) {
@@ -992,6 +1023,9 @@ TEST(PermissionsTest, GetWarningMessages_CombinedSessions) {
   {
     APIPermissionSet api_permissions;
     api_permissions.insert(APIPermission::kTab);
+    api_permissions.insert(APIPermission::kTopSites);
+    api_permissions.insert(APIPermission::kProcesses);
+    api_permissions.insert(APIPermission::kWebNavigation);
     api_permissions.insert(APIPermission::kSessions);
     scoped_refptr<PermissionSet> permissions(
         new PermissionSet(api_permissions, ManifestPermissionSet(),
@@ -1001,27 +1035,15 @@ 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),
-              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_BROWSING_HISTORY_AND_SESSIONS),
+                  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::kProcesses);
+    api_permissions.insert(APIPermission::kWebNavigation);
     api_permissions.insert(APIPermission::kHistory);

[meacer, 2014/06/13 19:59:20]

Can you put kHistory at the top? (since it's the one that suppresses others)

[wjywbs, 2014/06/13 20:50:10]

Done.

     api_permissions.insert(APIPermission::kSessions);
     scoped_refptr<PermissionSet> permissions(
@@ -1032,7 +1054,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]);
   }
 }