Remove support for the keygen tag

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
index efb31a1c4a83323c8b4e7537366ada4066f0719d..9b010af10d5ff0733e59f93437a56f199462bf88 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
@@ -73,7 +73,6 @@ public class SingleWebsitePreferences extends PreferenceFragment
     public static final String PREF_CAMERA_CAPTURE_PERMISSION = "camera_permission_list";
     public static final String PREF_COOKIES_PERMISSION = "cookies_permission_list";
     public static final String PREF_JAVASCRIPT_PERMISSION = "javascript_permission_list";
-    public static final String PREF_KEYGEN_PERMISSION = "keygen_permission_list";
     public static final String PREF_LOCATION_ACCESS = "location_access_list";
     public static final String PREF_MIC_CAPTURE_PERMISSION = "microphone_permission_list";
     public static final String PREF_MIDI_SYSEX_PERMISSION = "midi_sysex_permission_list";
@@ -90,7 +89,6 @@ public class SingleWebsitePreferences extends PreferenceFragment
             PREF_CAMERA_CAPTURE_PERMISSION,
             PREF_COOKIES_PERMISSION,
             PREF_JAVASCRIPT_PERMISSION,
-            PREF_KEYGEN_PERMISSION,
             PREF_LOCATION_ACCESS,
             PREF_MIC_CAPTURE_PERMISSION,
             PREF_MIDI_SYSEX_PERMISSION,
@@ -125,13 +123,6 @@ public class SingleWebsitePreferences extends PreferenceFragment
             // TODO(mvanouwerkerk): Avoid modifying the outer class from this inner class.
             mSite = mergePermissionInfoForTopLevelOrigin(mSiteAddress, sites);
 
-            // Display Keygen Content Setting if Keygen is blocked.
-            if (mSite.getKeygenInfo() == null && mWebContents != null
-                    && WebsitePreferenceBridge.getKeygenBlocked(mWebContents)) {
-                String origin = mSiteAddress.getOrigin();
-                mSite.setKeygenInfo(new KeygenInfo(origin, origin, false));
-            }
-
             displaySitePermissions();
         }
     }
@@ -204,10 +195,6 @@ public class SingleWebsitePreferences extends PreferenceFragment
                     && permissionInfoIsForTopLevelOrigin(other.getGeolocationInfo(), origin)) {
                 merged.setGeolocationInfo(other.getGeolocationInfo());
             }
-            if (merged.getKeygenInfo() == null && other.getKeygenInfo() != null
-                    && permissionInfoIsForTopLevelOrigin(other.getKeygenInfo(), origin)) {
-                merged.setKeygenInfo(other.getKeygenInfo());
-            }
             if (merged.getMidiInfo() == null && other.getMidiInfo() != null
                     && permissionInfoIsForTopLevelOrigin(other.getMidiInfo(), origin)) {
                 merged.setMidiInfo(other.getMidiInfo());
@@ -304,8 +291,6 @@ public class SingleWebsitePreferences extends PreferenceFragment
                 setUpListPreference(preference, mSite.getCookiePermission());
             } else if (PREF_JAVASCRIPT_PERMISSION.equals(preference.getKey())) {
                 setUpListPreference(preference, mSite.getJavaScriptPermission());
-            } else if (PREF_KEYGEN_PERMISSION.equals(preference.getKey())) {
-                setUpListPreference(preference, mSite.getKeygenPermission());
             } else if (PREF_LOCATION_ACCESS.equals(preference.getKey())) {
                 setUpLocationPreference(preference);
             } else if (PREF_MIC_CAPTURE_PERMISSION.equals(preference.getKey())) {
@@ -537,8 +522,6 @@ public class SingleWebsitePreferences extends PreferenceFragment
                 return ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES;
             case PREF_JAVASCRIPT_PERMISSION:
                 return ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT;
-            case PREF_KEYGEN_PERMISSION:
-                return ContentSettingsType.CONTENT_SETTINGS_TYPE_KEYGEN;
             case PREF_LOCATION_ACCESS:
                 return ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION;
             case PREF_MIC_CAPTURE_PERMISSION:
@@ -599,8 +582,6 @@ public class SingleWebsitePreferences extends PreferenceFragment
             mSite.setCookiePermission(permission);
         } else if (PREF_JAVASCRIPT_PERMISSION.equals(preference.getKey())) {
             mSite.setJavaScriptPermission(permission);
-        } else if (PREF_KEYGEN_PERMISSION.equals(preference.getKey())) {
-            mSite.setKeygenPermission(permission);
         } else if (PREF_LOCATION_ACCESS.equals(preference.getKey())) {
             mSite.setGeolocationPermission(permission);
         } else if (PREF_MIC_CAPTURE_PERMISSION.equals(preference.getKey())) {
@@ -679,7 +660,6 @@ public class SingleWebsitePreferences extends PreferenceFragment
         mSite.setCookiePermission(ContentSetting.DEFAULT);
         mSite.setGeolocationPermission(ContentSetting.DEFAULT);
         mSite.setJavaScriptPermission(ContentSetting.DEFAULT);
-        mSite.setKeygenPermission(ContentSetting.DEFAULT);
         mSite.setMicrophonePermission(ContentSetting.DEFAULT);
         mSite.setMidiPermission(ContentSetting.DEFAULT);
         mSite.setNotificationPermission(ContentSetting.DEFAULT);