OLD | NEW |
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 "chrome/test/base/chrome_test_launcher.h" | 5 #include "chrome/test/base/chrome_test_launcher.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/debug/leak_annotations.h" | 8 #include "base/debug/leak_annotations.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 #include "ui/base/test/ui_controls_aura.h" | 37 #include "ui/base/test/ui_controls_aura.h" |
38 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 38 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
39 #include "ui/views/test/ui_controls_factory_desktop_aurax11.h" | 39 #include "ui/views/test/ui_controls_factory_desktop_aurax11.h" |
40 #endif | 40 #endif |
41 #endif | 41 #endif |
42 | 42 |
43 #if defined(OS_CHROMEOS) | 43 #if defined(OS_CHROMEOS) |
44 #include "ash/test/ui_controls_factory_ash.h" | 44 #include "ash/test/ui_controls_factory_ash.h" |
45 #endif | 45 #endif |
46 | 46 |
47 #if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) | 47 #if defined(OS_LINUX) || defined(OS_ANDROID) |
48 #include "chrome/app/chrome_crash_reporter_client.h" | 48 #include "chrome/app/chrome_crash_reporter_client.h" |
49 #endif | 49 #endif |
50 | 50 |
| 51 #if defined(OS_WIN) |
| 52 #include "chrome/app/chrome_crash_reporter_client_win.h" |
| 53 #endif |
| 54 |
51 ChromeTestSuiteRunner::ChromeTestSuiteRunner() {} | 55 ChromeTestSuiteRunner::ChromeTestSuiteRunner() {} |
52 ChromeTestSuiteRunner::~ChromeTestSuiteRunner() {} | 56 ChromeTestSuiteRunner::~ChromeTestSuiteRunner() {} |
53 | 57 |
54 int ChromeTestSuiteRunner::RunTestSuite(int argc, char** argv) { | 58 int ChromeTestSuiteRunner::RunTestSuite(int argc, char** argv) { |
55 return ChromeTestSuite(argc, argv).Run(); | 59 return ChromeTestSuite(argc, argv).Run(); |
56 } | 60 } |
57 | 61 |
58 ChromeTestLauncherDelegate::ChromeTestLauncherDelegate( | 62 ChromeTestLauncherDelegate::ChromeTestLauncherDelegate( |
59 ChromeTestSuiteRunner* runner) | 63 ChromeTestSuiteRunner* runner) |
60 : runner_(runner) {} | 64 : runner_(runner) {} |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 #if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) | 118 #if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) |
115 // We leak this pointer intentionally. The crash client needs to outlive | 119 // We leak this pointer intentionally. The crash client needs to outlive |
116 // all other code. | 120 // all other code. |
117 ChromeCrashReporterClient* crash_client = new ChromeCrashReporterClient(); | 121 ChromeCrashReporterClient* crash_client = new ChromeCrashReporterClient(); |
118 ANNOTATE_LEAKING_OBJECT_PTR(crash_client); | 122 ANNOTATE_LEAKING_OBJECT_PTR(crash_client); |
119 crash_reporter::SetCrashReporterClient(crash_client); | 123 crash_reporter::SetCrashReporterClient(crash_client); |
120 #endif | 124 #endif |
121 | 125 |
122 return content::LaunchTests(delegate, default_jobs, argc, argv); | 126 return content::LaunchTests(delegate, default_jobs, argc, argv); |
123 } | 127 } |
OLD | NEW |