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

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

Issue 601513002: Add test runner support for overriding web_security_enabled preference. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 6f38b7127318a3e7494171b51eaae9a50d86cda7..fbed2cd8ba50c621e27b75a092b763439b6cab07 100644
--- a/content/shell/common/webkit_test_helpers.cc
+++ b/content/shell/common/webkit_test_helpers.cc
@@ -47,6 +47,8 @@ void ExportLayoutTestSpecificPreferences(const TestPreferences& from,
to->allow_file_access_from_file_urls = from.allow_file_access_from_file_urls;
to->javascript_can_open_windows_automatically =
from.java_script_can_open_windows_automatically;
+ to->web_security_enabled =
+ from.web_security_enabled;
}
// Applies settings that differ between layout tests and regular mode. Some
« 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