Switch Cookie to use ContentSettingException instead of CookieInfo on Android

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

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java
index e4b777d705040f0ccb02ab4faddc0c2e3f0708a1..bbe3824479f4a5f57ec8a6d151bc9c3b76e2d636 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java
@@ -59,8 +59,8 @@ public class WebsitePermissionsFetcher {
         queue.add(new GeolocationInfoFetcher());
         // Midi sysex access permission is per-origin and per-embedder.
         queue.add(new MidiInfoFetcher());
-        // Cookies are stored per-origin.
-        queue.add(new CookieInfoFetcher());
+        // Cookies are stored per-host.
+        queue.add(new CookieExceptionInfoFetcher());
         // Fullscreen are stored per-origin.
         queue.add(new FullscreenInfoFetcher());
         // Keygen permissions are per-origin.
@@ -84,7 +84,9 @@ public class WebsitePermissionsFetcher {
         queue.add(new MicrophoneCaptureInfoFetcher());
         // Background sync permission is per-origin.
         queue.add(new BackgroundSyncExceptionInfoFetcher());
+
         queue.add(new PermissionsAvailableCallbackRunner());
+
         queue.next();
     }
 
@@ -105,8 +107,8 @@ public class WebsitePermissionsFetcher {
             // Geolocation lookup permission is per-origin and per-embedder.
             queue.add(new GeolocationInfoFetcher());
         } else if (category.showCookiesSites()) {
-            // Cookies are stored per-origin.
-            queue.add(new CookieInfoFetcher());
+            // Cookies exceptions are patterns.
+            queue.add(new CookieExceptionInfoFetcher());
         } else if (category.showStorageSites()) {
             // Local storage info is per-origin.
             queue.add(new LocalStorageInfoFetcher());
@@ -255,24 +257,31 @@ public class WebsitePermissionsFetcher {
         }
     }
 
-    private class KeygenInfoFetcher extends Task {
+    private class CookieExceptionInfoFetcher extends Task {
         @Override
         public void run() {
-            for (KeygenInfo info : WebsitePreferenceBridge.getKeygenInfo()) {
-                WebsiteAddress address = WebsiteAddress.create(info.getOrigin());
+            for (ContentSettingException exception :
+                    WebsitePreferenceBridge.getContentSettingsExceptions(
+                            ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES)) {
+                // The pattern "*" represents the default setting, not a specific website.
+                if (exception.getPattern().equals("*")) continue;
+                WebsiteAddress address = WebsiteAddress.create(exception.getPattern());
                 if (address == null) continue;
-                createSiteByOriginAndHost(address).setKeygenInfo(info);
+                Set<Website> sites = findOrCreateSitesByHost(address);
+                for (Website site : sites) {
+                    site.setCookieException(exception);
+                }
             }
         }
     }
 
-    private class CookieInfoFetcher extends Task {
+    private class KeygenInfoFetcher extends Task {
         @Override
         public void run() {
-            for (CookieInfo info : WebsitePreferenceBridge.getCookieInfo()) {
+            for (KeygenInfo info : WebsitePreferenceBridge.getKeygenInfo()) {
                 WebsiteAddress address = WebsiteAddress.create(info.getOrigin());
                 if (address == null) continue;
-                createSiteByOriginAndHost(address).setCookieInfo(info);
+                createSiteByOriginAndHost(address).setKeygenInfo(info);
             }
         }
     }