[content shell] implement testRunner.overridePreference

BUG=111316
R=jam@chromium.org,tony@chromium.org,tsepez@chromium.org

Review URL: https://codereview.chromium.org/11602009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173791 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 11 insertions, 4 deletions

diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 93a87bd..ac59a21 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -56,6 +56,7 @@ WebPreferences::WebPreferences()
       java_enabled(true),
       allow_scripts_to_close_windows(false),
       uses_page_cache(false),
+      page_cache_supports_plugins(false),
       remote_fonts_enabled(true),
       javascript_can_access_clipboard(false),
       xss_auditor_enabled(true),
@@ -123,6 +124,7 @@ WebPreferences::WebPreferences()
       fixed_position_creates_stacking_context(false),
       sync_xhr_in_documents_enabled(true),
       deferred_image_decoding_enabled(false),
+      should_respect_image_orientation(false),
       number_of_cpu_cores(1),
 #if defined(OS_MACOSX)
       editing_behavior(EDITING_BEHAVIOR_MAC),
@@ -133,14 +135,14 @@ WebPreferences::WebPreferences()
 #else
       editing_behavior(EDITING_BEHAVIOR_MAC),
 #endif
+      supports_multiple_windows(true),
       cookie_enabled(true)
 #if defined(OS_ANDROID)
       ,
       text_autosizing_enabled(true),
       font_scale_factor(1.0f),
       force_enable_zoom(false),
-      user_gesture_required_for_media_playback(true),
-      supports_multiple_windows(true)
+      user_gesture_required_for_media_playback(true)
 #endif
 {
   standard_font_family_map[kCommonScript] =
@@ -291,6 +293,7 @@ void WebPreferences::Apply(WebView* web_view) const {
     settings->setUserStyleSheetLocation(WebURL());
   settings->setAuthorAndUserStylesEnabled(author_and_user_styles_enabled);
   settings->setUsesPageCache(uses_page_cache);
+  settings->setPageCacheSupportsPlugins(page_cache_supports_plugins);
   settings->setDownloadableBinaryFontsEnabled(remote_fonts_enabled);
   settings->setJavaScriptCanAccessClipboard(javascript_can_access_clipboard);
   settings->setXSSAuditorEnabled(xss_auditor_enabled);
@@ -456,10 +459,13 @@ void WebPreferences::Apply(WebView* web_view) const {
       fixed_position_creates_stacking_context);
 
   settings->setDeferredImageDecodingEnabled(deferred_image_decoding_enabled);
+  settings->setShouldRespectImageOrientation(should_respect_image_orientation);
 
   settings->setEditingBehavior(
       static_cast<WebSettings::EditingBehavior>(editing_behavior));
 
+  settings->setSupportsMultipleWindows(supports_multiple_windows);
+
 #if defined(OS_ANDROID)
   settings->setAllowCustomScrollbarInMainFrame(false);
   settings->setTextAutosizingEnabled(text_autosizing_enabled);
@@ -469,7 +475,6 @@ void WebPreferences::Apply(WebView* web_view) const {
   settings->setDoubleTapToZoomEnabled(true);
   settings->setMediaPlaybackRequiresUserGesture(
       user_gesture_required_for_media_playback);
-  settings->setSupportsMultipleWindows(supports_multiple_windows);
 #endif
 
   WebNetworkStateNotifier::setOnLine(is_online);
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index b99873f..f50734b 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -75,6 +75,7 @@ struct WEBKIT_GLUE_EXPORT WebPreferences {
   bool java_enabled;
   bool allow_scripts_to_close_windows;
   bool uses_page_cache;
+  bool page_cache_supports_plugins;
   bool remote_fonts_enabled;
   bool javascript_can_access_clipboard;
   bool xss_auditor_enabled;
@@ -146,8 +147,10 @@ struct WEBKIT_GLUE_EXPORT WebPreferences {
   bool fixed_position_creates_stacking_context;
   bool sync_xhr_in_documents_enabled;
   bool deferred_image_decoding_enabled;
+  bool should_respect_image_orientation;
   int number_of_cpu_cores;
   EditingBehavior editing_behavior;
+  bool supports_multiple_windows;
 
   // This flags corresponds to a Page's Settings' setCookieEnabled state. It
   // only controls whether or not the "document.cookie" field is properly
@@ -161,7 +164,6 @@ struct WEBKIT_GLUE_EXPORT WebPreferences {
   float font_scale_factor;
   bool force_enable_zoom;
   bool user_gesture_required_for_media_playback;
-  bool supports_multiple_windows;
 #endif
 
   // We try to keep the default values the same as the default values in