OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/at_exit.h" | 7 #include "base/at_exit.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/debug/debugger.h" | 9 #include "base/debug/debugger.h" |
10 #include "base/i18n/icu_util.h" | 10 #include "base/i18n/icu_util.h" |
11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
12 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
13 #include "base/process/launch.h" | 13 #include "base/process/launch.h" |
14 #include "base/run_loop.h" | 14 #include "base/run_loop.h" |
15 #include "base/sys_info.h" | 15 #include "base/sys_info.h" |
16 #include "base/threading/thread_task_runner_handle.h" | 16 #include "base/threading/thread_task_runner_handle.h" |
17 #include "chrome/test/base/chrome_test_launcher.h" | 17 #include "chrome/test/base/chrome_test_launcher.h" |
18 #include "chrome/test/base/chrome_test_suite.h" | 18 #include "chrome/test/base/chrome_test_suite.h" |
19 #include "chrome/test/base/mojo_test_connector.h" | 19 #include "chrome/test/base/mojo_test_connector.h" |
20 #include "content/public/common/service_manager_connection.h" | 20 #include "content/public/common/service_manager_connection.h" |
21 #include "content/public/test/test_launcher.h" | 21 #include "content/public/test/test_launcher.h" |
22 #include "mash/package/mash_packaged_service.h" | 22 #include "mash/package/mash_packaged_service.h" |
23 #include "services/shell/public/cpp/connector.h" | 23 #include "services/service_manager/public/cpp/connector.h" |
24 #include "services/shell/public/cpp/service.h" | 24 #include "services/service_manager/public/cpp/service.h" |
25 #include "services/shell/public/cpp/service_context.h" | 25 #include "services/service_manager/public/cpp/service_context.h" |
26 #include "services/shell/public/cpp/service_runner.h" | 26 #include "services/service_manager/public/cpp/service_runner.h" |
27 #include "services/shell/runner/common/switches.h" | 27 #include "services/service_manager/runner/common/switches.h" |
28 #include "services/shell/runner/host/child_process.h" | 28 #include "services/service_manager/runner/host/child_process.h" |
29 #include "services/shell/runner/host/child_process_base.h" | 29 #include "services/service_manager/runner/host/child_process_base.h" |
30 #include "services/shell/runner/init.h" | 30 #include "services/service_manager/runner/init.h" |
31 | 31 |
32 namespace { | 32 namespace { |
33 | 33 |
34 void ConnectToDefaultApps(shell::Connector* connector) { | 34 void ConnectToDefaultApps(shell::Connector* connector) { |
35 connector->Connect("service:mash_session"); | 35 connector->Connect("service:mash_session"); |
36 } | 36 } |
37 | 37 |
38 class MashTestSuite : public ChromeTestSuite { | 38 class MashTestSuite : public ChromeTestSuite { |
39 public: | 39 public: |
40 MashTestSuite(int argc, char** argv) : ChromeTestSuite(argc, argv) {} | 40 MashTestSuite(int argc, char** argv) : ChromeTestSuite(argc, argv) {} |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 if (command_line.HasSwitch(content::kSingleProcessTestsFlag) && | 177 if (command_line.HasSwitch(content::kSingleProcessTestsFlag) && |
178 !command_line.HasSwitch(switches::kPrimordialPipeToken)) { | 178 !command_line.HasSwitch(switches::kPrimordialPipeToken)) { |
179 shell_connection_factory = | 179 shell_connection_factory = |
180 base::Bind(&CreateServiceManagerConnection, &delegate); | 180 base::Bind(&CreateServiceManagerConnection, &delegate); |
181 content::ServiceManagerConnection::SetFactoryForTest( | 181 content::ServiceManagerConnection::SetFactoryForTest( |
182 &shell_connection_factory); | 182 &shell_connection_factory); |
183 } | 183 } |
184 *exit_code = LaunchChromeTests(default_jobs, &delegate, argc, argv); | 184 *exit_code = LaunchChromeTests(default_jobs, &delegate, argc, argv); |
185 return true; | 185 return true; |
186 } | 186 } |
OLD | NEW |