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

Side by Side Diff: content/shell/common/webkit_test_helpers.cc

Issue 17575007: Migrate TestRunner includes to new location (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « content/shell/DEPS ('k') | content/shell/renderer/shell_content_renderer_client.cc » ('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/common/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/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "content/shell/common/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/public/testing/WebPreferences.h"
13 #include "webkit/common/webpreferences.h" 13 #include "webkit/common/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;
22 to->dom_paste_enabled = from.DOMPasteAllowed; 22 to->dom_paste_enabled = from.DOMPasteAllowed;
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 FILE_PATH_LITERAL("Source/WebKit/chromium/webkit/support")))) { 138 FILE_PATH_LITERAL("Source/WebKit/chromium/webkit/support")))) {
139 // We're in a WebKit-only checkout. 139 // We're in a WebKit-only checkout.
140 return webkit_path.Append(FILE_PATH_LITERAL("Source/WebKit/chromium")); 140 return webkit_path.Append(FILE_PATH_LITERAL("Source/WebKit/chromium"));
141 } else { 141 } else {
142 // We're in a Chromium checkout, and WebKit is in third_party/WebKit. 142 // We're in a Chromium checkout, and WebKit is in third_party/WebKit.
143 return webkit_path.Append(FILE_PATH_LITERAL("../..")); 143 return webkit_path.Append(FILE_PATH_LITERAL("../.."));
144 } 144 }
145 } 145 }
146 146
147 } // namespace content 147 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/DEPS ('k') | content/shell/renderer/shell_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698