[Android WebView] Fix LoadsImagesAutomatically tests after crbug.com/224317

android_webview/native/aw_settings.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/native/aw_settings.h"
 
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 #include "android_webview/native/aw_contents.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 138 matching lines @@
   prefs.minimum_font_size = Java_AwSettings_getMinimumFontSizeLocked(env, obj);
 
   prefs.minimum_logical_font_size =
       Java_AwSettings_getMinimumLogicalFontSizeLocked(env, obj);
 
   prefs.default_font_size = Java_AwSettings_getDefaultFontSizeLocked(env, obj);
 
   prefs.default_fixed_font_size =
       Java_AwSettings_getDefaultFixedFontSizeLocked(env, obj);
 
+  // Blink's LoadsImagesAutomatically and ImagesEnabled should be

[joth, 2013/06/13 17:27:14]

nit: should -> must.
(coupled with a bug link, I thought this was a comment in future tense "we
should consider.....". Silly language English).

[mnaganov (inactive), 2013/06/17 08:56:54]

Done.

+  // set cris-cross to Android's. See
+  // https://code.google.com/p/chromium/issues/detail?id=224317#c26
   prefs.loads_images_automatically =
+      Java_AwSettings_getImagesEnabledLocked(env, obj);
+  prefs.images_enabled =
       Java_AwSettings_getLoadsImagesAutomaticallyLocked(env, obj);
 
-  prefs.images_enabled = Java_AwSettings_getImagesEnabledLocked(env, obj);
-
   prefs.javascript_enabled =
       Java_AwSettings_getJavaScriptEnabledLocked(env, obj);
 
   prefs.allow_universal_access_from_file_urls =
       Java_AwSettings_getAllowUniversalAccessFromFileURLsLocked(env, obj);
 
   prefs.allow_file_access_from_file_urls =
       Java_AwSettings_getAllowFileAccessFromFileURLsLocked(env, obj);
 
   prefs.javascript_can_open_windows_automatically =
@@ skipping 88 matching lines @@
 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) {
   return base::android::ConvertUTF8ToJavaString(
       env, content::GetUserAgent(GURL())).Release();
 }
 
 bool RegisterAwSettings(JNIEnv* env) {
   return RegisterNativesImpl(env) >= 0;
 }
 
 }  // namespace android_webview