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

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

Issue 1544273002: Switch to standard integer types in content/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 "components/test_runner/test_preferences.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 16
16 namespace content { 17 namespace content {
17 18
18 void ExportLayoutTestSpecificPreferences( 19 void ExportLayoutTestSpecificPreferences(
19 const test_runner::TestPreferences& from, 20 const test_runner::TestPreferences& from,
20 WebPreferences* to) { 21 WebPreferences* to) {
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 prefs->default_maximum_page_scale_factor = 4.f; 110 prefs->default_maximum_page_scale_factor = 4.f;
110 } 111 }
111 112
112 base::FilePath GetWebKitRootDirFilePath() { 113 base::FilePath GetWebKitRootDirFilePath() {
113 base::FilePath base_path; 114 base::FilePath base_path;
114 PathService::Get(base::DIR_SOURCE_ROOT, &base_path); 115 PathService::Get(base::DIR_SOURCE_ROOT, &base_path);
115 return base_path.Append(FILE_PATH_LITERAL("third_party/WebKit")); 116 return base_path.Append(FILE_PATH_LITERAL("third_party/WebKit"));
116 } 117 }
117 118
118 } // namespace content 119 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/common/shell_content_client.cc ('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