Adding <keygen> Content Setting (Android UI)

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

 // Copyright 2015 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.
 
 package org.chromium.chrome.browser.preferences.website;
 
 import org.chromium.chrome.browser.ContentSettingsType;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ skipping 39 matching lines @@
     /**
      * Fetches preferences for all sites that have them.
      * TODO(mvanouwerkerk): Add an argument |url| to only fetch permissions for
      * sites from the same origin as that of |url| - https://crbug.com/459222.
      */
     public void fetchAllPreferences() {
         TaskQueue queue = new TaskQueue();
         // Populate features from more specific to less specific.
         // Geolocation lookup permission is per-origin and per-embedder.
         queue.add(new GeolocationInfoFetcher());
+        // Keygen permissions are per-origin.

[newt (away), 2015/12/15 00:10:01]

this needs to come after MidiInfoFetcher, as per the comment above: "Populate
features from more specific to less specific."

The logic for merging sites depends on these lookups happening in the right
order.

[svaldez, 2015/12/15 21:45:56]

Done.

+        queue.add(new KeygenInfoFetcher());
         // Midi sysex access permission is per-origin and per-embedder.
         queue.add(new MidiInfoFetcher());
         // Cookies are stored per-origin.
         queue.add(new CookieInfoFetcher());
         // Fullscreen are stored per-origin.
         queue.add(new FullscreenInfoFetcher());
         // Local storage info is per-origin.
         queue.add(new LocalStorageInfoFetcher());
         // Website storage is per-host.
         queue.add(new WebStorageInfoFetcher());
@@ skipping 168 matching lines @@
                 if (address == null) continue;
                 Set<Website> sites = findOrCreateSitesByHost(address);
                 for (Website site : sites) {
                     site.setJavaScriptException(exception);
                 }
             }
             queue.next();
         }
     }
 
+    private class KeygenInfoFetcher implements Task {
+        @Override
+        public void run(TaskQueue queue) {
+            for (KeygenInfo info : WebsitePreferenceBridge.getKeygenInfo()) {
+                WebsiteAddress address = WebsiteAddress.create(info.getOrigin());
+                if (address == null) continue;
+                createSiteByOriginAndHost(address).setKeygenInfo(info);
+            }
+            queue.next();
+        }
+    }
+
     private class CookieInfoFetcher implements Task {
         @Override
         public void run(TaskQueue queue) {
             for (CookieInfo info : WebsitePreferenceBridge.getCookieInfo()) {
                 WebsiteAddress address = WebsiteAddress.create(info.getOrigin());
                 if (address == null) continue;
                 createSiteByOriginAndHost(address).setCookieInfo(info);
             }
             queue.next();
         }
@@ skipping 111 matching lines @@
     }
 
     private class PermissionsAvailableCallbackRunner implements Task {
         @Override
         public void run(TaskQueue queue) {
             mCallback.onWebsitePermissionsAvailable(mSitesByOrigin, mSitesByHost);
             queue.next();
         }
     }
 }