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 #ifndef SERVICES_SERVICE_MANAGER_TESTS_UTIL_H_ | 5 #ifndef SERVICES_SERVICE_MANAGER_TESTS_UTIL_H_ |
6 #define SERVICES_SERVICE_MANAGER_TESTS_UTIL_H_ | 6 #define SERVICES_SERVICE_MANAGER_TESTS_UTIL_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 #include <string> | 9 #include <string> |
10 | 10 |
| 11 #include "services/service_manager/public/interfaces/connector.mojom.h" |
| 12 |
11 namespace base { | 13 namespace base { |
12 class Process; | 14 class Process; |
13 } | 15 } |
14 | 16 |
15 namespace service_manager { | 17 namespace service_manager { |
16 class Connection; | |
17 class Connector; | 18 class Connector; |
18 class Identity; | 19 class Identity; |
19 | 20 |
20 namespace test { | 21 namespace test { |
21 | 22 |
22 // Starts the process @ |target_exe_name| and connects to it as |target| using | 23 // Starts the process @ |target_exe_name| and connects to it as |target| using |
23 // |connector|, returning the connection & the process. | 24 // |connector|, returning a ConnectResult for the StartService() call. |
24 // This blocks until the connection is established/rejected by the service | 25 // This blocks until the connection is established/rejected by the service |
25 // manager. | 26 // manager. |
26 std::unique_ptr<Connection> LaunchAndConnectToProcess( | 27 service_manager::mojom::ConnectResult LaunchAndConnectToProcess( |
27 const std::string& target_exe_name, | 28 const std::string& target_exe_name, |
28 const Identity& target, | 29 const Identity& target, |
29 service_manager::Connector* connector, | 30 service_manager::Connector* connector, |
30 base::Process* process); | 31 base::Process* process); |
31 | 32 |
32 } // namespace test | 33 } // namespace test |
33 } // namespace service_manager | 34 } // namespace service_manager |
34 | 35 |
35 #endif // SERVICES_SERVICE_MANAGER_TESTS_UTIL_H_ | 36 #endif // SERVICES_SERVICE_MANAGER_TESTS_UTIL_H_ |
OLD | NEW |