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 "services/shell/tests/util.h" | 5 #include "services/service_manager/tests/util.h" |
6 | 6 |
7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
8 #include "base/base_switches.h" | 8 #include "base/base_switches.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/files/file_path.h" | 11 #include "base/files/file_path.h" |
12 #include "base/macros.h" | 12 #include "base/macros.h" |
13 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
14 #include "base/path_service.h" | 14 #include "base/path_service.h" |
15 #include "base/process/process.h" | 15 #include "base/process/process.h" |
16 #include "base/run_loop.h" | 16 #include "base/run_loop.h" |
17 #include "mojo/edk/embedder/embedder.h" | 17 #include "mojo/edk/embedder/embedder.h" |
18 #include "mojo/edk/embedder/platform_channel_pair.h" | 18 #include "mojo/edk/embedder/platform_channel_pair.h" |
19 #include "mojo/edk/embedder/scoped_platform_handle.h" | 19 #include "mojo/edk/embedder/scoped_platform_handle.h" |
20 #include "services/shell/public/cpp/connection.h" | 20 #include "services/service_manager/public/cpp/connection.h" |
21 #include "services/shell/public/cpp/connector.h" | 21 #include "services/service_manager/public/cpp/connector.h" |
22 #include "services/shell/public/interfaces/connector.mojom.h" | 22 #include "services/service_manager/public/interfaces/connector.mojom.h" |
23 #include "services/shell/public/interfaces/service_factory.mojom.h" | 23 #include "services/service_manager/public/interfaces/service_factory.mojom.h" |
24 #include "services/shell/runner/common/switches.h" | 24 #include "services/service_manager/runner/common/switches.h" |
25 | 25 |
26 namespace shell { | 26 namespace shell { |
27 namespace test { | 27 namespace test { |
28 | 28 |
29 namespace { | 29 namespace { |
30 | 30 |
31 void QuitLoop(base::RunLoop* loop) { | 31 void QuitLoop(base::RunLoop* loop) { |
32 loop->Quit(); | 32 loop->Quit(); |
33 } | 33 } |
34 | 34 |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 DCHECK(process->IsValid()); | 95 DCHECK(process->IsValid()); |
96 receiver->SetPID(process->Pid()); | 96 receiver->SetPID(process->Pid()); |
97 mojo::edk::ChildProcessLaunched(process->Handle(), | 97 mojo::edk::ChildProcessLaunched(process->Handle(), |
98 platform_channel_pair.PassServerHandle(), | 98 platform_channel_pair.PassServerHandle(), |
99 child_token); | 99 child_token); |
100 return connection; | 100 return connection; |
101 } | 101 } |
102 | 102 |
103 } // namespace test | 103 } // namespace test |
104 } // namespace shell | 104 } // namespace shell |
OLD | NEW |