Fix re-usage of stale cached WebPreferences in RenderViewHost.

During layout tests when preferences were being overriden they were not
being properly being used as the cached WebPreferences on the
RenderViewHost was not updated. This change fixes that and changes the way
spatial navigation is enabled in layout tests to adapt to this change.

This is an initial change to support the moving of mixed content checks to
the browser.

BUG=576270

Review-Url: https://codereview.chromium.org/2042763002
Cr-Commit-Position: refs/heads/master@{#398276}

components/test_runner/test_preferences.cc

@@ -49,6 +49,7 @@ void TestPreferences::Reset() {
   disable_reading_from_canvas = false;
   strict_mixed_content_checking = false;
   strict_powerful_feature_restrictions = false;
+  spatial_navigation_enabled = false;
 }
 
 }  // namespace test_runner

components/test_runner/test_preferences.h

@@ -43,6 +43,7 @@ struct TEST_RUNNER_EXPORT TestPreferences {
     bool disable_reading_from_canvas;
     bool strict_mixed_content_checking;
     bool strict_powerful_feature_restrictions;
+    bool spatial_navigation_enabled;
 
     TestPreferences();
     void Reset();

components/test_runner/test_runner.cc

@@ -2316,6 +2316,8 @@ void TestRunner::OverridePreference(const std::string& key,
     prefs->should_respect_image_orientation = value->BooleanValue();
   } else if (key == "WebKitWebSecurityEnabled") {
     prefs->web_security_enabled = value->BooleanValue();
+  } else if (key == "WebKitSpatialNavigationEnabled") {
+    prefs->spatial_navigation_enabled = value->BooleanValue();
   } else {
     std::string message("Invalid name for preference: ");
     message.append(key);

content/shell/browser/layout_test/blink_test_controller.cc

@@ -762,6 +762,12 @@ void BlinkTestController::OnPrintMessage(const std::string& message) {
 void BlinkTestController::OnOverridePreferences(const WebPreferences& prefs) {
   should_override_prefs_ = true;
   prefs_ = prefs;
+
+  // Notifies the main RenderViewHost that Blink preferences changed so to avoid
+  // re-usage of cached preferences that are now stale.
+  RenderViewHost* main_render_view_host =
+      main_window_->web_contents()->GetRenderViewHost();
+  main_render_view_host->OnWebkitPreferencesChanged();
 }
 
 void BlinkTestController::OnClearDevToolsLocalStorage() {

content/shell/renderer/layout_test/blink_test_helpers.cc

@@ -50,6 +50,7 @@ void ExportLayoutTestSpecificPreferences(
       from.strict_mixed_content_checking;
   to->strict_powerful_feature_restrictions =
       from.strict_powerful_feature_restrictions;
+  to->spatial_navigation_enabled = from.spatial_navigation_enabled;
 }
 
 // Applies settings that differ between layout tests and regular mode. Some

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-1st-stop.html

@@ -22,7 +22,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-aligned-not-aligned.html

@@ -61,7 +61,7 @@ var resultMap = [
 
 if (window.testRunner) {
     testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-    window.internals.settings.setSpatialNavigationEnabled(true);
+    testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
 }
 
 function runTest()

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-clipped-overflowed-content.html

@@ -49,7 +49,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-container-only-white-space.html

@@ -33,7 +33,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-container-white-space.html

@@ -41,7 +41,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-date.html

@@ -7,7 +7,7 @@ window.jsTestIsAsync = true;
 
 if (window.testRunner) {
     testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-    window.internals.settings.setSpatialNavigationEnabled(true);
+    testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
 }
 </script>
 </head>

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-div-in-anchor.html

@@ -12,7 +12,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-div-overflow-scrol-hidden.html

@@ -21,7 +21,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-div-scrollable-but-without-focusable-content.html

@@ -48,7 +48,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-fully-aligned-horizontally.html

@@ -54,7 +54,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-fully-aligned-vertically.html

@@ -32,7 +32,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-hidden-focusable-element.html

@@ -12,7 +12,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-hidden-iframe-zero-size.html

@@ -12,7 +12,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-hidden-iframe.html

@@ -12,7 +12,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-iframe-nested.html

@@ -41,7 +41,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-iframe-no-focusable-content.html

@@ -37,7 +37,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-iframe-no-scrollable-content.html

@@ -38,7 +38,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-iframe-recursive-offset-parent.html

@@ -31,7 +31,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-iframe-with-offscreen-focusable-element.html

@@ -43,7 +43,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-imagemap-area-not-focusable.html

@@ -16,7 +16,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-imagemap-area-without-image.html

@@ -14,7 +14,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-imagemap-overlapped-areas.html

@@ -24,7 +24,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-imagemap-simple.html

@@ -22,7 +22,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-input.html

@@ -52,7 +52,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-media-elements.html

@@ -24,7 +24,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
     }
 
     function runTest()

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-multiple-select-focusring.html

@@ -9,7 +9,7 @@
 <script>
 if (window.testRunner) {
     testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-    window.internals.settings.setSpatialNavigationEnabled(true);
+    testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
 }
 
 var multiselect = document.getElementById('multiselect');

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-multiple-select.html

@@ -34,7 +34,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-not-below.html

@@ -51,7 +51,7 @@ var resultMap = [
 
 if (window.testRunner) {
     testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-    window.internals.settings.setSpatialNavigationEnabled(true);
+    testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
 }
 
 function runTest()

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-not-rightof.html

@@ -51,7 +51,7 @@ var resultMap = [
 
 if (window.testRunner) {
     testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-    window.internals.settings.setSpatialNavigationEnabled(true);
+    testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
 }
 
 function runTest()

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-offscreen-content.html

@@ -36,7 +36,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-only-clipped-overflow-content.html

@@ -39,7 +39,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-overlapping-elements.html

@@ -72,7 +72,7 @@ var resultMap = [
 
 if (window.testRunner) {
     testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-    window.internals.settings.setSpatialNavigationEnabled(true);
+    testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
 }
 
 function runTest()

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-radio-group.html

@@ -37,7 +37,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-radio.html

@@ -29,7 +29,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-simple-content-overflow.html

@@ -37,7 +37,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-single-select-list.html

@@ -34,7 +34,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-single-select.html

@@ -34,7 +34,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-symmetrically-positioned.html

@@ -60,7 +60,7 @@ var resultMap = [
 
 if (window.testRunner) {
     testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-    window.internals.settings.setSpatialNavigationEnabled(true);
+    testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
 }
 
 function runTest()

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-table-traversal.html

@@ -35,7 +35,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-textarea.html

@@ -62,7 +62,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-tiny-table-traversal.html

@@ -38,7 +38,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-two-elements-one-line.html

@@ -17,7 +17,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html

@@ -42,7 +42,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-z-index.html

@@ -29,7 +29,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }
 

third_party/WebKit/LayoutTests/fast/spatial-navigation/snav-zero-margin-content.html

@@ -33,7 +33,7 @@
     if (window.testRunner) {
       testRunner.dumpAsText();
       testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
-      window.internals.settings.setSpatialNavigationEnabled(true);
+      testRunner.overridePreference("WebKitSpatialNavigationEnabled", 1);
       testRunner.waitUntilDone();
     }