Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / shell / common / webkit_test_helpers.cc

diff --git a/src/content/shell/common/webkit_test_helpers.cc b/src/content/shell/common/webkit_test_helpers.cc
index bd9c17c..fbed2cd 100644 (file)
--- a/src/content/shell/common/webkit_test_helpers.cc
+++ b/src/content/shell/common/webkit_test_helpers.cc
@@ -5,7 +5,7 @@
 #include "content/shell/common/webkit_test_helpers.h"
 
 #include "base/command_line.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
@@ -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