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 "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" |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 RegisterPathProvider(); | 69 RegisterPathProvider(); |
70 ui::RegisterPathProvider(); | 70 ui::RegisterPathProvider(); |
71 RegisterInProcessThreads(); | 71 RegisterInProcessThreads(); |
72 | 72 |
73 InitializeMojo(); | 73 InitializeMojo(); |
74 #endif | 74 #endif |
75 | 75 |
76 ContentTestSuiteBase::Initialize(); | 76 ContentTestSuiteBase::Initialize(); |
77 } | 77 } |
78 | 78 |
79 virtual void Shutdown() OVERRIDE { | |
80 ContentTestSuiteBase::Shutdown(); | |
81 | |
82 #if defined(OS_ANDROID) | |
83 ShutdownMojo(); | |
84 #endif | |
85 } | |
86 | |
87 #if defined(OS_ANDROID) | 79 #if defined(OS_ANDROID) |
88 scoped_ptr<ShellContentClient> content_client_; | 80 scoped_ptr<ShellContentClient> content_client_; |
89 scoped_ptr<ShellContentBrowserClient> browser_content_client_; | 81 scoped_ptr<ShellContentBrowserClient> browser_content_client_; |
90 #endif | 82 #endif |
91 | 83 |
92 DISALLOW_COPY_AND_ASSIGN(ContentBrowserTestSuite); | 84 DISALLOW_COPY_AND_ASSIGN(ContentBrowserTestSuite); |
93 }; | 85 }; |
94 | 86 |
95 class ContentTestLauncherDelegate : public TestLauncherDelegate { | 87 class ContentTestLauncherDelegate : public TestLauncherDelegate { |
96 public: | 88 public: |
(...skipping 22 matching lines...) Expand all Loading... |
119 DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate); | 111 DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate); |
120 }; | 112 }; |
121 | 113 |
122 } // namespace content | 114 } // namespace content |
123 | 115 |
124 int main(int argc, char** argv) { | 116 int main(int argc, char** argv) { |
125 int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2); | 117 int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2); |
126 content::ContentTestLauncherDelegate launcher_delegate; | 118 content::ContentTestLauncherDelegate launcher_delegate; |
127 return LaunchTests(&launcher_delegate, default_jobs, argc, argv); | 119 return LaunchTests(&launcher_delegate, default_jobs, argc, argv); |
128 } | 120 } |
OLD | NEW |