Generalize "hide bookmark star" permission to "override bookmarks UI"

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 d63faecf8636e00e84fadc353892a7855e3c591d..6b0ac3c88bf6dea8ce5c985dbc2c5c5fdeb70a72 100644
--- a/chrome/common/extensions/permissions/chrome_permission_message_provider.cc
+++ b/chrome/common/extensions/permissions/chrome_permission_message_provider.cc
@@ -15,6 +15,22 @@
 
 namespace extensions {
 
+namespace {
+
+PermissionMessages::const_iterator FindMessageByID(
+    const PermissionMessages& messages,
+    int id) {
+  for (PermissionMessages::const_iterator it = messages.begin();
+       it != messages.end(); ++it) {
+    if (it->id() == id)
+      return it;
+  }
+
+  return messages.end();
+}
+
+}  // namespace
+
 ChromePermissionMessageProvider::ChromePermissionMessageProvider() {
 }
 
@@ -44,6 +60,19 @@ PermissionMessages ChromePermissionMessageProvider::GetPermissionMessages(
   messages.insert(messages.end(), manifest_permission_msgs.begin(),
                   manifest_permission_msgs.end());
 
+  PermissionMessages::const_iterator bookmarksPermission =

[not at google - send to devlin, 2014/01/18 00:36:44]

bookmarks_permission

[Mike Wittman, 2014/01/18 00:49:34]

Removed.

+      FindMessageByID(messages, PermissionMessage::kBookmarks);
+
+  PermissionMessages::const_iterator overrideBookmarksUI =

[not at google - send to devlin, 2014/01/18 00:36:44]

override_bookmarks_ui

[Mike Wittman, 2014/01/18 00:49:34]

Done.

+      FindMessageByID(messages, PermissionMessage::kOverrideBookmarksUI);
+
+  // Bookmarks permission message supersedes override bookmarks UI permission
+  // message if both permissions are specified.
+  if (bookmarksPermission != messages.end() &&
+      overrideBookmarksUI != messages.end()) {

[not at google - send to devlin, 2014/01/18 00:36:44]

you can make this slightly more efficient by finding the override bookmarks UI
first, then inlining the bookmarks permission check. that would mean only
iterating over the permissions once in the common case.

// Special hack: bookmarks permission message...
PermissionMessages::const_iterator override_bookmarks_ui = ...;
if (override_bookmarks_ui != messages.end() &&
    FindMessageByID(messages, PermissionMessage::kBookmarks) !=
        messages.end()) {
  messages.erase(override_bookmarks_ui);
}

[Mike Wittman, 2014/01/18 00:49:34]

Done.

+    messages.erase(overrideBookmarksUI);
+  }
+
   return messages;
 }