Switch Cookie to use ContentSettingException instead of CookieInfo on Android

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 2bbff07d813578fe2e9e02e67162fca7a47d342b..f8f0b4a3ef20f9d590ca3373e40c843301ab8a9f 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
@@ -205,10 +205,6 @@ public class SingleWebsitePreferences extends PreferenceFragment
         // small because most sites have very few permissions.
         for (Set<Website> websiteSet : websiteSets) {
             for (Website other : websiteSet) {
-                if (merged.getCookieInfo() == null && other.getCookieInfo() != null
-                        && permissionInfoIsForTopLevelOrigin(other.getCookieInfo(), origin)) {
-                    merged.setCookieInfo(other.getCookieInfo());
-                }
                 if (merged.getFullscreenInfo() == null && other.getFullscreenInfo() != null
                         && permissionInfoIsForTopLevelOrigin(other.getFullscreenInfo(), origin)) {
                     merged.setFullscreenInfo(other.getFullscreenInfo());
@@ -267,6 +263,7 @@ public class SingleWebsitePreferences extends PreferenceFragment
                 // TODO(mvanouwerkerk): Merge in PopupExceptionInfo? It uses a pattern, and is never
                 // set on Android.
                 // TODO(mvanouwerkerk): Merge in JavaScriptExceptionInfo? It uses a pattern.
+                // TODO(lshang): Merge in CookieException? It will use patterns.
             }
         }
         return merged;