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

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

Issue 110533009: Import TestRunner library into chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 7 years 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
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/public/common/content_switches.h" 11 #include "content/public/common/content_switches.h"
12 #include "content/shell/common/shell_switches.h" 12 #include "content/shell/common/shell_switches.h"
13 #include "third_party/WebKit/public/testing/WebPreferences.h" 13 #include "content/shell/common/test_runner/WebPreferences.h"
14 #include "webkit/common/webpreferences.h" 14 #include "webkit/common/webpreferences.h"
15 15
16 namespace content { 16 namespace content {
17 17
18 void ExportLayoutTestSpecificPreferences( 18 void ExportLayoutTestSpecificPreferences(
19 const WebTestRunner::WebPreferences& from, 19 const WebTestRunner::WebPreferences& 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.allowUniversalAccessFromFileURLs; 22 from.allowUniversalAccessFromFileURLs;
23 to->dom_paste_enabled = from.DOMPasteAllowed; 23 to->dom_paste_enabled = from.DOMPasteAllowed;
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 prefs->viewport_enabled = false; 111 prefs->viewport_enabled = false;
112 } 112 }
113 113
114 base::FilePath GetWebKitRootDirFilePath() { 114 base::FilePath GetWebKitRootDirFilePath() {
115 base::FilePath base_path; 115 base::FilePath base_path;
116 PathService::Get(base::DIR_SOURCE_ROOT, &base_path); 116 PathService::Get(base::DIR_SOURCE_ROOT, &base_path);
117 return base_path.Append(FILE_PATH_LITERAL("third_party/WebKit")); 117 return base_path.Append(FILE_PATH_LITERAL("third_party/WebKit"));
118 } 118 }
119 119
120 } // namespace content 120 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/common/test_runner/WebPreferences.cpp ('k') | content/shell/renderer/shell_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698