| 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/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 #include "mojo/public/c/system/main.h" | 10 #include "mojo/public/c/system/main.h" |
| 11 #include "mojo/public/cpp/bindings/binding_set.h" | 11 #include "mojo/public/cpp/bindings/binding_set.h" |
| 12 #include "services/shell/public/cpp/application_runner.h" | |
| 13 #include "services/shell/public/cpp/connector.h" | 12 #include "services/shell/public/cpp/connector.h" |
| 14 #include "services/shell/public/cpp/service.h" | 13 #include "services/shell/public/cpp/service.h" |
| 14 #include "services/shell/public/cpp/service_runner.h" |
| 15 #include "services/shell/tests/lifecycle/lifecycle_unittest.mojom.h" | 15 #include "services/shell/tests/lifecycle/lifecycle_unittest.mojom.h" |
| 16 | 16 |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| 19 void QuitLoop(base::RunLoop* loop) { | 19 void QuitLoop(base::RunLoop* loop) { |
| 20 loop->Quit(); | 20 loop->Quit(); |
| 21 } | 21 } |
| 22 | 22 |
| 23 class Parent : public shell::Service, | 23 class Parent : public shell::Service, |
| 24 public shell::InterfaceFactory<shell::test::mojom::Parent>, | 24 public shell::InterfaceFactory<shell::test::mojom::Parent>, |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 std::unique_ptr<shell::Connection> child_connection_; | 71 std::unique_ptr<shell::Connection> child_connection_; |
| 72 mojo::BindingSet<shell::test::mojom::Parent> parent_bindings_; | 72 mojo::BindingSet<shell::test::mojom::Parent> parent_bindings_; |
| 73 | 73 |
| 74 DISALLOW_COPY_AND_ASSIGN(Parent); | 74 DISALLOW_COPY_AND_ASSIGN(Parent); |
| 75 }; | 75 }; |
| 76 | 76 |
| 77 } // namespace | 77 } // namespace |
| 78 | 78 |
| 79 MojoResult MojoMain(MojoHandle shell_handle) { | 79 MojoResult MojoMain(MojoHandle shell_handle) { |
| 80 Parent* parent = new Parent; | 80 Parent* parent = new Parent; |
| 81 return shell::ApplicationRunner(parent).Run(shell_handle); | 81 return shell::ServiceRunner(parent).Run(shell_handle); |
| 82 } | 82 } |
| OLD | NEW |