Restore the permission selection listing in the Origin Info Bubble.

chrome/browser/ui/website_settings/website_settings.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/website_settings/website_settings.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
@@ skipping 680 matching lines @@
     if (info.primary_pattern == ContentSettingsPattern::Wildcard() &&
         info.secondary_pattern == ContentSettingsPattern::Wildcard()) {
       permission_info.default_setting = permission_info.setting;
       permission_info.setting = CONTENT_SETTING_DEFAULT;
     } else {
       permission_info.default_setting =
           content_settings_->GetDefaultContentSetting(permission_info.type,
                                                       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) {
     ChooserContextBase* context = ui_info.get_context(profile_);
     const GURL origin = site_url_.GetOrigin();
     auto chosen_objects = context->GetGrantedObjects(origin, origin);
     for (scoped_ptr<base::DictionaryValue>& object : chosen_objects) {
       chosen_object_info_list.push_back(
           new WebsiteSettingsUI::ChosenObjectInfo(ui_info, std::move(object)));
     }
@@ skipping 43 matching lines @@
   info.connection_status = site_connection_status_;
   info.connection_status_description =
       UTF16ToUTF8(site_connection_details_);
   info.identity_status = site_identity_status_;
   info.identity_status_description =
       UTF16ToUTF8(site_identity_details_);
   info.cert_id = cert_id_;
   info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
   ui_->SetIdentityInfo(info);
 }