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 <memory> | 5 #include <memory> |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/guid.h" | 8 #include "base/guid.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
11 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
12 #include "mojo/public/cpp/bindings/binding_set.h" | 12 #include "mojo/public/cpp/bindings/binding_set.h" |
13 #include "services/shell/public/c/main.h" | 13 #include "services/service_manager/public/c/main.h" |
14 #include "services/shell/public/cpp/connector.h" | 14 #include "services/service_manager/public/cpp/connector.h" |
15 #include "services/shell/public/cpp/interface_factory.h" | 15 #include "services/service_manager/public/cpp/interface_factory.h" |
16 #include "services/shell/public/cpp/interface_registry.h" | 16 #include "services/service_manager/public/cpp/interface_registry.h" |
17 #include "services/shell/public/cpp/service.h" | 17 #include "services/service_manager/public/cpp/service.h" |
18 #include "services/shell/public/cpp/service_runner.h" | 18 #include "services/service_manager/public/cpp/service_runner.h" |
19 #include "services/shell/public/interfaces/connector.mojom.h" | 19 #include "services/service_manager/public/interfaces/connector.mojom.h" |
20 #include "services/shell/tests/connect/connect_test.mojom.h" | 20 #include "services/service_manager/tests/connect/connect_test.mojom.h" |
21 | 21 |
22 namespace shell { | 22 namespace shell { |
23 | 23 |
24 namespace { | 24 namespace { |
25 | 25 |
26 void QuitLoop(base::RunLoop* loop) { | 26 void QuitLoop(base::RunLoop* loop) { |
27 loop->Quit(); | 27 loop->Quit(); |
28 } | 28 } |
29 | 29 |
30 void ReceiveString(std::string* string, | 30 void ReceiveString(std::string* string, |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 | 214 |
215 DISALLOW_COPY_AND_ASSIGN(ConnectTestApp); | 215 DISALLOW_COPY_AND_ASSIGN(ConnectTestApp); |
216 }; | 216 }; |
217 | 217 |
218 } // namespace shell | 218 } // namespace shell |
219 | 219 |
220 MojoResult ServiceMain(MojoHandle service_request_handle) { | 220 MojoResult ServiceMain(MojoHandle service_request_handle) { |
221 shell::ServiceRunner runner(new shell::ConnectTestApp); | 221 shell::ServiceRunner runner(new shell::ConnectTestApp); |
222 return runner.Run(service_request_handle); | 222 return runner.Run(service_request_handle); |
223 } | 223 } |
OLD | NEW |