| 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/c/system/main.h" | 12 #include "mojo/public/c/system/main.h" |
| 13 #include "mojo/public/cpp/bindings/binding_set.h" | 13 #include "mojo/public/cpp/bindings/binding_set.h" |
| 14 #include "services/shell/public/cpp/application_runner.h" | |
| 15 #include "services/shell/public/cpp/connector.h" | 14 #include "services/shell/public/cpp/connector.h" |
| 16 #include "services/shell/public/cpp/interface_factory.h" | 15 #include "services/shell/public/cpp/interface_factory.h" |
| 17 #include "services/shell/public/cpp/service.h" | 16 #include "services/shell/public/cpp/service.h" |
| 17 #include "services/shell/public/cpp/service_runner.h" |
| 18 #include "services/shell/public/interfaces/connector.mojom.h" | 18 #include "services/shell/public/interfaces/connector.mojom.h" |
| 19 #include "services/shell/tests/connect/connect_test.mojom.h" | 19 #include "services/shell/tests/connect/connect_test.mojom.h" |
| 20 | 20 |
| 21 namespace shell { | 21 namespace shell { |
| 22 | 22 |
| 23 namespace { | 23 namespace { |
| 24 | 24 |
| 25 void QuitLoop(base::RunLoop* loop) { | 25 void QuitLoop(base::RunLoop* loop) { |
| 26 loop->Quit(); | 26 loop->Quit(); |
| 27 } | 27 } |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 mojo::BindingSet<test::mojom::UserIdTest> user_id_test_bindings_; | 217 mojo::BindingSet<test::mojom::UserIdTest> user_id_test_bindings_; |
| 218 test::mojom::ExposedInterfacePtr caller_; | 218 test::mojom::ExposedInterfacePtr caller_; |
| 219 | 219 |
| 220 DISALLOW_COPY_AND_ASSIGN(ConnectTestApp); | 220 DISALLOW_COPY_AND_ASSIGN(ConnectTestApp); |
| 221 }; | 221 }; |
| 222 | 222 |
| 223 } // namespace shell | 223 } // namespace shell |
| 224 | 224 |
| 225 MojoResult MojoMain(MojoHandle shell_handle) { | 225 MojoResult MojoMain(MojoHandle shell_handle) { |
| 226 MojoResult rv = | 226 MojoResult rv = |
| 227 shell::ApplicationRunner(new shell::ConnectTestApp).Run(shell_handle); | 227 shell::ServiceRunner(new shell::ConnectTestApp).Run(shell_handle); |
| 228 return rv; | 228 return rv; |
| 229 } | 229 } |
| OLD | NEW |