| 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)
|
|
|