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

Side by Side Diff: content/shell/renderer/layout_test/blink_test_helpers.cc

Issue 2707183003: Move //components/test_runner back into //content/shell (Closed)
Patch Set: Trim DEPS Created 3 years, 10 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 unified diff | Download patch
OLDNEW
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/renderer/layout_test/blink_test_helpers.h" 5 #include "content/shell/renderer/layout_test/blink_test_helpers.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "components/test_runner/test_preferences.h"
13 #include "content/public/common/content_switches.h" 12 #include "content/public/common/content_switches.h"
14 #include "content/public/common/web_preferences.h" 13 #include "content/public/common/web_preferences.h"
15 #include "content/shell/common/layout_test/layout_test_switches.h" 14 #include "content/shell/common/layout_test/layout_test_switches.h"
15 #include "content/shell/test_runner/test_preferences.h"
16 16
17 namespace content { 17 namespace content {
18 18
19 void ExportLayoutTestSpecificPreferences( 19 void ExportLayoutTestSpecificPreferences(
20 const test_runner::TestPreferences& from, 20 const test_runner::TestPreferences& from,
21 WebPreferences* to) { 21 WebPreferences* to) {
22 to->allow_universal_access_from_file_urls = 22 to->allow_universal_access_from_file_urls =
23 from.allow_universal_access_from_file_urls; 23 from.allow_universal_access_from_file_urls;
24 to->javascript_can_access_clipboard = from.java_script_can_access_clipboard; 24 to->javascript_can_access_clipboard = from.java_script_can_access_clipboard;
25 to->xss_auditor_enabled = from.xss_auditor_enabled; 25 to->xss_auditor_enabled = from.xss_auditor_enabled;
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 prefs->default_maximum_page_scale_factor = 4.f; 105 prefs->default_maximum_page_scale_factor = 4.f;
106 } 106 }
107 107
108 base::FilePath GetWebKitRootDirFilePath() { 108 base::FilePath GetWebKitRootDirFilePath() {
109 base::FilePath base_path; 109 base::FilePath base_path;
110 PathService::Get(base::DIR_SOURCE_ROOT, &base_path); 110 PathService::Get(base::DIR_SOURCE_ROOT, &base_path);
111 return base_path.Append(FILE_PATH_LITERAL("third_party/WebKit")); 111 return base_path.Append(FILE_PATH_LITERAL("third_party/WebKit"));
112 } 112 }
113 113
114 } // namespace content 114 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698