Remove the Images category from Site Settings.

chrome/android/javatests_shell/src/org/chromium/chrome/browser/preferences/website/ContentPreferencesTest.java

Index: chrome/android/javatests_shell/src/org/chromium/chrome/browser/preferences/website/ContentPreferencesTest.java
diff --git a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/preferences/website/ContentPreferencesTest.java b/chrome/android/javatests_shell/src/org/chromium/chrome/browser/preferences/website/ContentPreferencesTest.java
index ca5bb14674a977a4eba1cff12a2687f3e6117114..c27fe6a12c687f51091a9acbeb8d0a44f019ffd6 100644
--- a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/preferences/website/ContentPreferencesTest.java
+++ b/chrome/android/javatests_shell/src/org/chromium/chrome/browser/preferences/website/ContentPreferencesTest.java
@@ -162,25 +162,6 @@ public class ContentPreferencesTest extends ChromeShellTestBase {
         });
     }
 
-    private void setEnableImages(final boolean enabled) {
-        final Preferences preferenceActivity =
-                startContentSettingsCategory(ContentPreferences.IMAGES_KEY);
-
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                final WebsitePreferences websitePreferences =
-                        (WebsitePreferences) preferenceActivity.getFragmentForTest();
-                ChromeSwitchPreference images = (ChromeSwitchPreference)
-                        websitePreferences.findPreference(WebsitePreferences.READ_WRITE_TOGGLE_KEY);
-                websitePreferences.onPreferenceChange(images, enabled);
-                assertEquals("Images should be " + (enabled ? "allowed" : "blocked"), enabled,
-                        PrefServiceBridge.getInstance().imagesEnabled());
-            }
-        });
-        preferenceActivity.finish();
-    }
-
     private void setEnablePopups(final boolean enabled) {
         final Preferences preferenceActivity =
                 startContentSettingsCategory(ContentPreferences.POPUPS_KEY);
@@ -302,34 +283,6 @@ public class ContentPreferencesTest extends ChromeShellTestBase {
     }
 
     /**
-     * Sets Images to be disabled and make sure it is set correctly.
-     * @throws Exception
-     */
-    @SmallTest
-    @Feature({"Preferences"})
-    public void testImagesBlocked() throws Exception {
-        setEnableImages(false);
-
-        // Test that images don't load.
-        loadUrl(TestHttpServerClient.getUrl("chrome/test/data/android/images.html"));
-        assertEquals("0", runJavaScriptCodeInCurrentTab("getImageHeight()"));
-    }
-
-    /**
-     * Sets Images to be Enabled to be true and make sure it is set correctly.
-     * @throws Exception
-     */
-    @SmallTest
-    @Feature({"Preferences"})
-    public void testImagesNotBlocked() throws Exception {
-        setEnableImages(true);
-
-        // Test that images load.
-        loadUrl(TestHttpServerClient.getUrl("chrome/test/data/android/images.html"));
-        assertEquals("5", runJavaScriptCodeInCurrentTab("getImageHeight()"));
-    }
-
-    /**
      * Sets Allow Popups Enabled to be false and make sure it is set correctly.
      * @throws Exception
      */