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

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

Issue 1167703002: Move test runner to a component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updates Created 5 years, 6 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
« no previous file with comments | « content/shell/renderer/DEPS ('k') | content/shell/renderer/layout_test/blink_test_runner.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/string_split.h" 10 #include "base/strings/string_split.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "components/test_runner/test_preferences.h"
12 #include "content/public/common/content_switches.h" 13 #include "content/public/common/content_switches.h"
13 #include "content/public/common/web_preferences.h" 14 #include "content/public/common/web_preferences.h"
14 #include "content/shell/common/shell_switches.h" 15 #include "content/shell/common/shell_switches.h"
15 #include "content/shell/common/test_runner/test_preferences.h"
16 16
17 namespace content { 17 namespace content {
18 18
19 void ExportLayoutTestSpecificPreferences(const TestPreferences& from, 19 void ExportLayoutTestSpecificPreferences(const TestPreferences& from,
20 WebPreferences* to) { 20 WebPreferences* to) {
21 to->allow_universal_access_from_file_urls = 21 to->allow_universal_access_from_file_urls =
22 from.allow_universal_access_from_file_urls; 22 from.allow_universal_access_from_file_urls;
23 to->dom_paste_enabled = from.dom_paste_allowed; 23 to->dom_paste_enabled = from.dom_paste_allowed;
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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 if (command_line.HasSwitch(switches::kRegisterFontFiles)) { 127 if (command_line.HasSwitch(switches::kRegisterFontFiles)) {
128 base::SplitString( 128 base::SplitString(
129 command_line.GetSwitchValueASCII(switches::kRegisterFontFiles), 129 command_line.GetSwitchValueASCII(switches::kRegisterFontFiles),
130 ';', 130 ';',
131 &files); 131 &files);
132 } 132 }
133 return files; 133 return files;
134 } 134 }
135 135
136 } // namespace content 136 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/renderer/DEPS ('k') | content/shell/renderer/layout_test/blink_test_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698