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

Side by Side Diff: content/test/content_test_launcher.cc

Issue 276993002: Revert 269271 "Mac Video Capture Device: split VCD into VCD and ..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1984/src/
Patch Set: Created 6 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 | Annotate | Revision Log
OLDNEW
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 "content/public/test/test_launcher.h" 5 #include "content/public/test/test_launcher.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/stack_trace.h" 9 #include "base/debug/stack_trace.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "base/process/memory.h" 12 #include "base/process/memory.h"
13 #include "base/sys_info.h" 13 #include "base/sys_info.h"
14 #include "base/test/test_suite.h" 14 #include "base/test/test_suite.h"
15 #include "base/test/test_timeouts.h" 15 #include "base/test/test_timeouts.h"
16 #include "content/public/common/content_switches.h" 16 #include "content/public/common/content_switches.h"
17 #include "content/public/test/content_test_suite_base.h" 17 #include "content/public/test/content_test_suite_base.h"
18 #include "content/shell/app/shell_main_delegate.h" 18 #include "content/shell/app/shell_main_delegate.h"
19 #include "content/shell/common/shell_switches.h" 19 #include "content/shell/common/shell_switches.h"
20 #include "media/base/media_switches.h"
21 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
22 21
23 #if defined(OS_ANDROID) 22 #if defined(OS_ANDROID)
24 #include "base/message_loop/message_loop.h" 23 #include "base/message_loop/message_loop.h"
25 #include "content/app/mojo/mojo_init.h" 24 #include "content/app/mojo/mojo_init.h"
26 #include "content/common/url_schemes.h" 25 #include "content/common/url_schemes.h"
27 #include "content/public/common/content_paths.h" 26 #include "content/public/common/content_paths.h"
28 #include "content/public/test/nested_message_pump_android.h" 27 #include "content/public/test/nested_message_pump_android.h"
29 #include "content/shell/browser/shell_content_browser_client.h" 28 #include "content/shell/browser/shell_content_browser_client.h"
30 #include "content/shell/common/shell_content_client.h" 29 #include "content/shell/common/shell_content_client.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate); 118 DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate);
120 }; 119 };
121 120
122 } // namespace content 121 } // namespace content
123 122
124 int main(int argc, char** argv) { 123 int main(int argc, char** argv) {
125 int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2); 124 int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2);
126 content::ContentTestLauncherDelegate launcher_delegate; 125 content::ContentTestLauncherDelegate launcher_delegate;
127 return LaunchTests(&launcher_delegate, default_jobs, argc, argv); 126 return LaunchTests(&launcher_delegate, default_jobs, argc, argv);
128 } 127 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698