Restore the permission selection listing in the Origin Info Bubble.

chrome/browser/ui/website_settings/website_settings.cc

Index: chrome/browser/ui/website_settings/website_settings.cc
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index 755a01d090287e12b9935363a335fb0fe0374415..aa4533cd155c25d1f1ba315ee95d27264cd0e0ba 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -698,13 +698,12 @@ void WebsiteSettings::PresentSitePermissions() {
                                                       NULL);
     }
 
-    if ((permission_info.setting != CONTENT_SETTING_DEFAULT &&
-         permission_info.setting != permission_info.default_setting) ||
-        (permission_info.type == CONTENT_SETTINGS_TYPE_KEYGEN &&
+    if (permission_info.type == CONTENT_SETTINGS_TYPE_KEYGEN &&
          tab_specific_content_settings()->IsContentBlocked(
-             permission_info.type))) {
-      permission_info_list.push_back(permission_info);
+             permission_info.type)) {

[lgarron, 2016/03/04 01:45:29]

This was introduced in [1].

To me, it seems like we should either:
- Also always show this permission.
- Show the permission when it's non-default, as follows:

    if (permission_info.type == CONTENT_SETTINGS_TYPE_KEYGEN &&
           (permission_info.setting == CONTENT_SETTING_DEFAULT ||
            permission_info.setting == permission_info.default_setting)) {
        continue;
    }

Arguably, you could also exclude the `permission_info.setting ==
CONTENT_SETTING_DEFAULT` line.



[1] https://codereview.chromium.org/1412523003

[palmer, 2016/03/04 18:43:01]

Oh yeah, you are totally right, thanks. Doing this.
I like keeping it for defense in depth against weird values.

+      continue;
     }
+    permission_info_list.push_back(permission_info);
   }
 
   for (const ChooserUIInfo& ui_info : kChooserUIInfo) {