Suppress tabs permission warning if there is already a browsingHistory 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 460ef034a3500cf745e4a5e7d9e29dd2fc873c1c..86eb86513184de2b2d9e9c2a01bc5994cb06be48 100644
--- a/chrome/common/extensions/permissions/permission_set_unittest.cc
+++ b/chrome/common/extensions/permissions/permission_set_unittest.cc
@@ -811,6 +811,20 @@ TEST(PermissionsTest, HiddenFileSystemPermissionMessages) {
   EXPECT_EQ(PermissionMessage::kFileSystemWriteDirectory, messages[0].id());
 }
 
+TEST(PermissionsTest, SuppressedPermissionMessages) {
+  APIPermissionSet api_permissions;
+  api_permissions.insert(APIPermission::kTab);
+  api_permissions.insert(APIPermission::kHistory);
+  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::kBrowsingHistory, messages[0].id());
+}
+
 TEST(PermissionsTest, MergedFileSystemPermissionComparison) {
   APIPermissionSet write_api_permissions;
   write_api_permissions.insert(APIPermission::kFileSystemWrite);