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..9996abb1bd02d3c7a724eed37bce73aed2921872 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -698,13 +698,14 @@ 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 &&
-         tab_specific_content_settings()->IsContentBlocked(
-             permission_info.type))) {
-      permission_info_list.push_back(permission_info);
+    if (permission_info.type == CONTENT_SETTINGS_TYPE_KEYGEN &&
+        (permission_info.setting == CONTENT_SETTING_DEFAULT ||
+         permission_info.setting == permission_info.default_setting) &&
+        !tab_specific_content_settings()->IsContentBlocked(
+            permission_info.type)) {
+      continue;
     }
+    permission_info_list.push_back(permission_info);
   }
 
   for (const ChooserUIInfo& ui_info : kChooserUIInfo) {