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 190663012: Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: try to fix android by restoring old path just for it Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/test/base/browser_perf_tests_main.cc ('k') | chrome/test/base/chrome_render_view_test.h » ('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 class ChromeBrowserTestSuite : public ChromeTestSuite {
12 public:
13 ChromeBrowserTestSuite(int argc, char** argv) : ChromeTestSuite(argc, argv) {}
14 virtual bool IsBrowserTestSuite() OVERRIDE { return true; }
15 };
16
17 class ChromeBrowserTestSuiteRunner : public ChromeTestSuiteRunner { 11 class ChromeBrowserTestSuiteRunner : public ChromeTestSuiteRunner {
18 public: 12 public:
19 virtual int RunTestSuite(int argc, char** argv) OVERRIDE { 13 virtual int RunTestSuite(int argc, char** argv) OVERRIDE {
20 return ChromeBrowserTestSuite(argc, argv).Run(); 14 return ChromeTestSuite(argc, argv).Run();
21 } 15 }
22 }; 16 };
23 17
24 int main(int argc, char** argv) { 18 int main(int argc, char** argv) {
25 int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2); 19 int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2);
26 ChromeBrowserTestSuiteRunner runner; 20 ChromeBrowserTestSuiteRunner runner;
27 return LaunchChromeTests(default_jobs, &runner, argc, argv); 21 return LaunchChromeTests(default_jobs, &runner, argc, argv);
28 } 22 }
OLDNEW
« no previous file with comments | « chrome/test/base/browser_perf_tests_main.cc ('k') | chrome/test/base/chrome_render_view_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698