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

Side by Side Diff: content/shell/browser/layout_test/layout_test_browser_main.cc

Issue 1118183003: content: Rename webkit_test_helpers.{cc,h} to blink_test_helpers.{cc,h} (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: content/shell/renderer/layout_test Created 5 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/browser/layout_test/layout_test_browser_main.h" 5 #include "content/shell/browser/layout_test/layout_test_browser_main.h"
6 6
7 #include <iostream> 7 #include <iostream>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/files/file_util.h" 11 #include "base/files/file_util.h"
12 #include "base/files/scoped_temp_dir.h" 12 #include "base/files/scoped_temp_dir.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
16 #include "base/strings/sys_string_conversions.h" 16 #include "base/strings/sys_string_conversions.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "base/threading/thread_restrictions.h" 18 #include "base/threading/thread_restrictions.h"
19 #include "content/public/browser/browser_main_runner.h" 19 #include "content/public/browser/browser_main_runner.h"
20 #include "content/public/common/url_constants.h" 20 #include "content/public/common/url_constants.h"
21 #include "content/shell/browser/shell.h" 21 #include "content/shell/browser/shell.h"
22 #include "content/shell/browser/webkit_test_controller.h" 22 #include "content/shell/browser/webkit_test_controller.h"
23 #include "content/shell/common/shell_switches.h" 23 #include "content/shell/common/shell_switches.h"
24 #include "content/shell/common/webkit_test_helpers.h" 24 #include "content/shell/renderer/layout_test/blink_test_helpers.h"
25 #include "net/base/filename_util.h" 25 #include "net/base/filename_util.h"
26 26
27 #if defined(OS_ANDROID) 27 #if defined(OS_ANDROID)
28 #include "base/run_loop.h" 28 #include "base/run_loop.h"
29 #include "content/shell/browser/layout_test/layout_test_android.h" 29 #include "content/shell/browser/layout_test/layout_test_android.h"
30 #endif 30 #endif
31 31
32 namespace { 32 namespace {
33 33
34 GURL GetURLForLayoutTest(const std::string& test_name, 34 GURL GetURLForLayoutTest(const std::string& test_name,
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 } 221 }
222 222
223 exit_code = RunTests(main_runner); 223 exit_code = RunTests(main_runner);
224 224
225 #if !defined(OS_ANDROID) 225 #if !defined(OS_ANDROID)
226 main_runner->Shutdown(); 226 main_runner->Shutdown();
227 #endif 227 #endif
228 228
229 return exit_code; 229 return exit_code;
230 } 230 }
OLDNEW
« no previous file with comments | « content/shell/BUILD.gn ('k') | content/shell/browser/layout_test/layout_test_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698