| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/shell/webkit_test_helpers.h" | 5 #include "content/shell/common/webkit_test_helpers.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| 11 #include "content/shell/shell_switches.h" | 11 #include "content/shell/common/shell_switches.h" |
| 12 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web
Preferences.h" | 12 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web
Preferences.h" |
| 13 #include "webkit/glue/webpreferences.h" | 13 #include "webkit/glue/webpreferences.h" |
| 14 | 14 |
| 15 namespace content { | 15 namespace content { |
| 16 | 16 |
| 17 void ExportLayoutTestSpecificPreferences( | 17 void ExportLayoutTestSpecificPreferences( |
| 18 const WebTestRunner::WebPreferences& from, | 18 const WebTestRunner::WebPreferences& from, |
| 19 WebPreferences* to) { | 19 WebPreferences* to) { |
| 20 to->allow_universal_access_from_file_urls = | 20 to->allow_universal_access_from_file_urls = |
| 21 from.allowUniversalAccessFromFileURLs; | 21 from.allowUniversalAccessFromFileURLs; |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 FILE_PATH_LITERAL("Source/WebKit/chromium/webkit/support")))) { | 137 FILE_PATH_LITERAL("Source/WebKit/chromium/webkit/support")))) { |
| 138 // We're in a WebKit-only checkout. | 138 // We're in a WebKit-only checkout. |
| 139 return webkit_path.Append(FILE_PATH_LITERAL("Source/WebKit/chromium")); | 139 return webkit_path.Append(FILE_PATH_LITERAL("Source/WebKit/chromium")); |
| 140 } else { | 140 } else { |
| 141 // We're in a Chromium checkout, and WebKit is in third_party/WebKit. | 141 // We're in a Chromium checkout, and WebKit is in third_party/WebKit. |
| 142 return webkit_path.Append(FILE_PATH_LITERAL("../..")); | 142 return webkit_path.Append(FILE_PATH_LITERAL("../..")); |
| 143 } | 143 } |
| 144 } | 144 } |
| 145 | 145 |
| 146 } // namespace content | 146 } // namespace content |
| OLD | NEW |