| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| 11 #include "base/bind.h" | 11 #include "base/bind.h" |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/memory/ptr_util.h" | 13 #include "base/memory/ptr_util.h" |
| 14 #include "base/message_loop/message_loop.h" | 14 #include "base/message_loop/message_loop.h" |
| 15 #include "base/process/process_handle.h" | 15 #include "base/process/process_handle.h" |
| 16 #include "base/run_loop.h" | 16 #include "base/run_loop.h" |
| 17 #include "mojo/public/cpp/bindings/binding_set.h" | 17 #include "mojo/public/cpp/bindings/binding_set.h" |
| 18 #include "services/shell/public/cpp/interface_factory.h" | 18 #include "services/service_manager/public/cpp/interface_factory.h" |
| 19 #include "services/shell/public/cpp/service.h" | 19 #include "services/service_manager/public/cpp/service.h" |
| 20 #include "services/shell/public/cpp/service_test.h" | 20 #include "services/service_manager/public/cpp/service_test.h" |
| 21 #include "services/shell/public/interfaces/service_manager.mojom.h" | 21 #include "services/service_manager/public/interfaces/service_manager.mojom.h" |
| 22 #include "services/shell/tests/shell/shell_unittest.mojom.h" | 22 #include "services/service_manager/tests/shell/shell_unittest.mojom.h" |
| 23 | 23 |
| 24 namespace shell { | 24 namespace shell { |
| 25 | 25 |
| 26 namespace { | 26 namespace { |
| 27 | 27 |
| 28 class ShellTestClient | 28 class ShellTestClient |
| 29 : public test::ServiceTestClient, | 29 : public test::ServiceTestClient, |
| 30 public InterfaceFactory<test::mojom::CreateInstanceTest>, | 30 public InterfaceFactory<test::mojom::CreateInstanceTest>, |
| 31 public test::mojom::CreateInstanceTest { | 31 public test::mojom::CreateInstanceTest { |
| 32 public: | 32 public: |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 } | 206 } |
| 207 | 207 |
| 208 driver.set_connection_error_handler( | 208 driver.set_connection_error_handler( |
| 209 base::Bind(&ShellTest::OnDriverQuit, | 209 base::Bind(&ShellTest::OnDriverQuit, |
| 210 base::Unretained(this))); | 210 base::Unretained(this))); |
| 211 driver->QuitDriver(); | 211 driver->QuitDriver(); |
| 212 base::RunLoop().Run(); | 212 base::RunLoop().Run(); |
| 213 } | 213 } |
| 214 | 214 |
| 215 } // namespace shell | 215 } // namespace shell |
| OLD | NEW |