Suppress tabs permission warning if there is already a browsingHistory warning.

chrome/common/extensions/permissions/chrome_permission_message_provider.cc

Index: chrome/common/extensions/permissions/chrome_permission_message_provider.cc
diff --git a/chrome/common/extensions/permissions/chrome_permission_message_provider.cc b/chrome/common/extensions/permissions/chrome_permission_message_provider.cc
index f0c415d5f79b70d1c8f4d86d16a28c3d99da7408..e3c007023f3197c72f7e8e9393d94ae7f71593ab 100644
--- a/chrome/common/extensions/permissions/chrome_permission_message_provider.cc
+++ b/chrome/common/extensions/permissions/chrome_permission_message_provider.cc
@@ -73,6 +73,19 @@ PermissionMessages::iterator FindMessageByID(PermissionMessages& messages,
   return messages.end();
 }
 
+void SuppressMessage(PermissionMessages& messages,
+                     int suppressing_message,
+                     int suppressed_message) {
+  // If there is a warning for browsing history, don't show the warning for tabs
+  // permission because the texts are very similar.
+  PermissionMessages::iterator suppressed =
+      FindMessageByID(messages, suppressed_message);
+  if (suppressed != messages.end() &&
+      FindMessageByID(messages, suppressing_message) != messages.end()) {
+    messages.erase(suppressed);
+  }
+}
+
 }  // namespace
 
 ChromePermissionMessageProvider::ChromePermissionMessageProvider() {
@@ -114,6 +127,12 @@ PermissionMessages ChromePermissionMessageProvider::GetPermissionMessages(
     messages.erase(override_bookmarks_ui);
   }
 
+  SuppressMessage(messages,
+                  PermissionMessage::kBookmarks,
+                  PermissionMessage::kOverrideBookmarksUI);
+  SuppressMessage(messages,
+                  PermissionMessage::kBrowsingHistory,

[Devlin, 2014/04/11 23:18:56]

I think I'd rather have BrowsingHistory suppressed.  I think "Access your tabs
and browsing activity" is scarier than "Read and modify your browsing history",
and we should always show the scariest. :)

[meacer, 2014/04/11 23:49:53]

I actually think the scary one is browsing history because it encapsulates
current browsing activity. "History" is also more familiar to users than
"activity", so I'd like to keep the word history.

+                  PermissionMessage::kTabs);
   return messages;
 }