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 23 matching lines...) Expand all Loading... |
34 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 34 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
35 #include "ui/views/test/ui_controls_factory_desktop_aurax11.h" | 35 #include "ui/views/test/ui_controls_factory_desktop_aurax11.h" |
36 #endif | 36 #endif |
37 #endif | 37 #endif |
38 | 38 |
39 #if defined(OS_CHROMEOS) | 39 #if defined(OS_CHROMEOS) |
40 #include "ash/test/ui_controls_factory_ash.h" | 40 #include "ash/test/ui_controls_factory_ash.h" |
41 #endif | 41 #endif |
42 | 42 |
43 #if defined(OS_LINUX) || defined(OS_ANDROID) | 43 #if defined(OS_LINUX) || defined(OS_ANDROID) |
44 #include "chrome/app/chrome_breakpad_client.h" | 44 #include "chrome/app/chrome_crash_reporter_client.h" |
45 #endif | 45 #endif |
46 | 46 |
47 namespace { | 47 namespace { |
48 | 48 |
49 class ChromeTestLauncherDelegate : public content::TestLauncherDelegate { | 49 class ChromeTestLauncherDelegate : public content::TestLauncherDelegate { |
50 public: | 50 public: |
51 explicit ChromeTestLauncherDelegate(ChromeTestSuiteRunner* runner) | 51 explicit ChromeTestLauncherDelegate(ChromeTestSuiteRunner* runner) |
52 : runner_(runner) {} | 52 : runner_(runner) {} |
53 virtual ~ChromeTestLauncherDelegate() {} | 53 virtual ~ChromeTestLauncherDelegate() {} |
54 | 54 |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 ChromeTestSuiteRunner* runner, | 107 ChromeTestSuiteRunner* runner, |
108 int argc, | 108 int argc, |
109 char** argv) { | 109 char** argv) { |
110 #if defined(OS_MACOSX) | 110 #if defined(OS_MACOSX) |
111 chrome_browser_application_mac::RegisterBrowserCrApp(); | 111 chrome_browser_application_mac::RegisterBrowserCrApp(); |
112 #endif | 112 #endif |
113 | 113 |
114 #if defined(OS_LINUX) || defined(OS_ANDROID) | 114 #if defined(OS_LINUX) || defined(OS_ANDROID) |
115 // We leak this pointer intentionally. The breakpad client needs to outlive | 115 // We leak this pointer intentionally. The breakpad client needs to outlive |
116 // all other code. | 116 // all other code. |
117 chrome::ChromeBreakpadClient* breakpad_client = | 117 chrome::ChromeCrashReporterClient* crash_client = |
118 new chrome::ChromeBreakpadClient(); | 118 new chrome::ChromeCrashReporterClient(); |
119 ANNOTATE_LEAKING_OBJECT_PTR(breakpad_client); | 119 ANNOTATE_LEAKING_OBJECT_PTR(crash_client); |
120 breakpad::SetBreakpadClient(breakpad_client); | 120 crash_reporter::SetCrashReporterClient(crash_client); |
121 #endif | 121 #endif |
122 | 122 |
123 ChromeTestLauncherDelegate launcher_delegate(runner); | 123 ChromeTestLauncherDelegate launcher_delegate(runner); |
124 return content::LaunchTests(&launcher_delegate, default_jobs, argc, argv); | 124 return content::LaunchTests(&launcher_delegate, default_jobs, argc, argv); |
125 } | 125 } |
OLD | NEW |