Remove the Images category from Site Settings.

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 5536ebefedcad5ea301524d17fb12c0c84d037ce..5728b5c12f76131d4fe0c74df252db3f162940a2 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
@@ -62,7 +62,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_FULLSCREEN_PERMISSION = "fullscreen_permission_list";
-    public static final String PREF_IMAGES_PERMISSION = "images_permission_list";
     public static final String PREF_JAVASCRIPT_PERMISSION = "javascript_permission_list";
     public static final String PREF_LOCATION_ACCESS = "location_access_list";
     public static final String PREF_MIC_CAPTURE_PERMISSION = "microphone_permission_list";
@@ -79,7 +78,6 @@ public class SingleWebsitePreferences extends PreferenceFragment
         PREF_CAMERA_CAPTURE_PERMISSION,
         PREF_COOKIES_PERMISSION,
         PREF_FULLSCREEN_PERMISSION,
-        PREF_IMAGES_PERMISSION,
         PREF_JAVASCRIPT_PERMISSION,
         PREF_LOCATION_ACCESS,
         PREF_MIC_CAPTURE_PERMISSION,
@@ -233,7 +231,6 @@ 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(mvanouwerkerk): Merge in ImagesExceptionInfo? It uses a pattern.
             }
         }
         return merged;
@@ -279,8 +276,6 @@ public class SingleWebsitePreferences extends PreferenceFragment
             } else if (PREF_FULLSCREEN_PERMISSION.equals(preference.getKey())) {
                 preference.setEnabled(false);
                 setUpListPreference(preference, mSite.getFullscreenPermission());
-            } else if (PREF_IMAGES_PERMISSION.equals(preference.getKey())) {
-                setUpListPreference(preference, mSite.getImagesPermission());
             } else if (PREF_JAVASCRIPT_PERMISSION.equals(preference.getKey())) {
                 setUpListPreference(preference, mSite.getJavaScriptPermission());
             } else if (PREF_LOCATION_ACCESS.equals(preference.getKey())) {
@@ -441,8 +436,6 @@ public class SingleWebsitePreferences extends PreferenceFragment
                 return ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES;
             case PREF_FULLSCREEN_PERMISSION:
                 return ContentSettingsType.CONTENT_SETTINGS_TYPE_FULLSCREEN;
-            case PREF_IMAGES_PERMISSION:
-                return ContentSettingsType.CONTENT_SETTINGS_TYPE_IMAGES;
             case PREF_JAVASCRIPT_PERMISSION:
                 return ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT;
             case PREF_LOCATION_ACCESS:
@@ -500,8 +493,6 @@ public class SingleWebsitePreferences extends PreferenceFragment
             mSite.setCookiePermission(permission);
         } else if (PREF_FULLSCREEN_PERMISSION.equals(preference.getKey())) {
             mSite.setFullscreenPermission(permission);
-        } else if (PREF_IMAGES_PERMISSION.equals(preference.getKey())) {
-            mSite.setImagesPermission(permission);
         } else if (PREF_JAVASCRIPT_PERMISSION.equals(preference.getKey())) {
             mSite.setJavaScriptPermission(permission);
         } else if (PREF_LOCATION_ACCESS.equals(preference.getKey())) {
@@ -559,7 +550,6 @@ public class SingleWebsitePreferences extends PreferenceFragment
         WebsitePreferenceBridge.nativeClearCookieData(mSite.getAddress().getOrigin());
         mSite.setFullscreenPermission(null);
         mSite.setGeolocationPermission(null);
-        mSite.setImagesPermission(null);
         mSite.setJavaScriptPermission(null);
         mSite.setMicrophonePermission(null);
         mSite.setMidiPermission(null);