Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1657)

Unified Diff: content/shell/common/webkit_test_helpers.cc

Issue 842643002: Mixed Content: Create a strict-mode Setting. [2/3] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Dropping //chrome changes + pref. Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/common/webkit_test_helpers.cc
diff --git a/content/shell/common/webkit_test_helpers.cc b/content/shell/common/webkit_test_helpers.cc
index 8d254aaa51a260462c3ba5c7e6016dae304d06c3..e069ccfb091e3df25e22e5512a64e2fdf137b03a 100644
--- a/content/shell/common/webkit_test_helpers.cc
+++ b/content/shell/common/webkit_test_helpers.cc
@@ -49,6 +49,8 @@ void ExportLayoutTestSpecificPreferences(const TestPreferences& from,
from.java_script_can_open_windows_automatically;
to->web_security_enabled =
from.web_security_enabled;
+ to->strict_mixed_content_checking =
+ from.strict_mixed_content_checking;
}
// Applies settings that differ between layout tests and regular mode. Some
@@ -73,6 +75,7 @@ void ApplyLayoutTestDefaultPreferences(WebPreferences* prefs) {
prefs->hyperlink_auditing_enabled = false;
prefs->allow_displaying_insecure_content = true;
prefs->allow_running_insecure_content = true;
+ prefs->strict_mixed_content_checking = false;
prefs->webgl_errors_to_console_enabled = false;
base::string16 serif;
#if defined(OS_MACOSX)
« no previous file with comments | « content/shell/common/test_runner/test_preferences.cc ('k') | content/shell/renderer/test_runner/test_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698