Implement Site Settings \ Images category.

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/ContentPreferencesTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/ContentPreferencesTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/ContentPreferencesTest.java
index cd1e3649ccd3c84a5deb7907c82faf03ca9dbea2..3c623a027a365258c5f2c25a1b8e57db3a7c92a5 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/ContentPreferencesTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/ContentPreferencesTest.java
@@ -160,6 +160,26 @@ public class ContentPreferencesTest extends ChromeShellTestBase {
         });
     }
 
+    private void setEnableImages(final boolean enabled) {
+        Preferences preferenceActivity =
+                startContentSettingsCategory(ContentPreferences.IMAGES_KEY);
+
+        final WebsitePreferences websitePreferences =

[newt (away), 2015/04/09 23:43:20]

lines 167-170 should happen on the UI thread, i.e. move them inside run()

[Finnur, 2015/04/10 17:03:26]

Done.

+                (WebsitePreferences) preferenceActivity.getFragmentForTest();
+        final ChromeSwitchPreference images = (ChromeSwitchPreference)
+                websitePreferences.findPreference(WebsitePreferences.READ_WRITE_TOGGLE_KEY);
+
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                websitePreferences.onPreferenceChange(images, enabled);
+                assertEquals("Images should be " + (enabled ? "allowed" : "blocked"), enabled,
+                        PrefServiceBridge.getInstance().imagesEnabled());
+            }
+        });
+        preferenceActivity.finish();
+    }
+
     private void setEnablePopups(final boolean enabled) {
         Preferences preferenceActivity =
                 startContentSettingsCategory(ContentPreferences.POPUPS_KEY);
@@ -265,6 +285,34 @@ 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
      */