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

Side by Side Diff: chrome/test/base/browser_tests_main.cc

Issue 2208613002: Remove MOJO_SHELL_CLIENT define. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot merge Created 4 years, 4 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
« no previous file with comments | « chrome/test/BUILD.gn ('k') | content/app/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <algorithm> 5 #include <algorithm>
6 6
7 #include "base/sys_info.h" 7 #include "base/sys_info.h"
8 #include "chrome/test/base/chrome_test_launcher.h" 8 #include "chrome/test/base/chrome_test_launcher.h"
9 #include "chrome/test/base/chrome_test_suite.h" 9 #include "chrome/test/base/chrome_test_suite.h"
10 10
11 #if defined(MOJO_SHELL_CLIENT) 11 #if defined(USE_AURA)
12 #include "chrome/test/base/mash_browser_tests_main.h" 12 #include "chrome/test/base/mash_browser_tests_main.h"
13 #endif 13 #endif
14 14
15 int main(int argc, char** argv) { 15 int main(int argc, char** argv) {
16 #if defined(MOJO_SHELL_CLIENT) 16 #if defined(USE_AURA)
17 int exit_code = 0; 17 int exit_code = 0;
18 if (RunMashBrowserTests(argc, argv, &exit_code)) 18 if (RunMashBrowserTests(argc, argv, &exit_code))
19 return exit_code; 19 return exit_code;
20 #endif 20 #endif
21 21
22 int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2); 22 int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2);
23 ChromeTestSuiteRunner runner; 23 ChromeTestSuiteRunner runner;
24 ChromeTestLauncherDelegate delegate(&runner); 24 ChromeTestLauncherDelegate delegate(&runner);
25 return LaunchChromeTests(default_jobs, &delegate, argc, argv); 25 return LaunchChromeTests(default_jobs, &delegate, argc, argv);
26 } 26 }
OLDNEW
« no previous file with comments | « chrome/test/BUILD.gn ('k') | content/app/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698