| 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 "base/run_loop.h" | 5 #include "base/run_loop.h" |
| 6 #include "mojo/public/cpp/bindings/binding_set.h" | 6 #include "mojo/public/cpp/bindings/binding_set.h" |
| 7 #include "services/shell/public/cpp/service_test.h" | 7 #include "services/shell/public/cpp/service_test.h" |
| 8 #include "services/shell/tests/shutdown/shutdown_unittest.mojom.h" | 8 #include "services/shell/tests/shutdown/shutdown_unittest.mojom.h" |
| 9 | 9 |
| 10 namespace shell { | 10 namespace shell { |
| 11 namespace { | 11 namespace { |
| 12 | 12 |
| 13 class ShutdownTest : public test::ServiceTest { | 13 class ShutdownTest : public test::ServiceTest { |
| 14 public: | 14 public: |
| 15 ShutdownTest() : test::ServiceTest("mojo:shutdown_unittest") {} | 15 ShutdownTest() : test::ServiceTest("service:shutdown_unittest") {} |
| 16 ~ShutdownTest() override {} | 16 ~ShutdownTest() override {} |
| 17 | 17 |
| 18 private: | 18 private: |
| 19 DISALLOW_COPY_AND_ASSIGN(ShutdownTest); | 19 DISALLOW_COPY_AND_ASSIGN(ShutdownTest); |
| 20 }; | 20 }; |
| 21 | 21 |
| 22 TEST_F(ShutdownTest, ConnectRace) { | 22 TEST_F(ShutdownTest, ConnectRace) { |
| 23 // This test exercises a number of potential shutdown races that can lead to | 23 // This test exercises a number of potential shutdown races that can lead to |
| 24 // client deadlock if any of various parts of the EDK or shell service are not | 24 // client deadlock if any of various parts of the EDK or shell service are not |
| 25 // working as intended. | 25 // working as intended. |
| 26 | 26 |
| 27 mojom::ShutdownTestClientControllerPtr control; | 27 mojom::ShutdownTestClientControllerPtr control; |
| 28 connector()->ConnectToInterface("mojo:shutdown_client", &control); | 28 connector()->ConnectToInterface("service:shutdown_client", &control); |
| 29 | 29 |
| 30 // Connect to shutdown_service and immediately request that it shut down. | 30 // Connect to shutdown_service and immediately request that it shut down. |
| 31 mojom::ShutdownTestServicePtr service; | 31 mojom::ShutdownTestServicePtr service; |
| 32 connector()->ConnectToInterface("mojo:shutdown_service", &service); | 32 connector()->ConnectToInterface("service:shutdown_service", &service); |
| 33 service->ShutDown(); | 33 service->ShutDown(); |
| 34 | 34 |
| 35 // Tell shutdown_client to connect to an interface on shutdown_service and | 35 // Tell shutdown_client to connect to an interface on shutdown_service and |
| 36 // then block waiting for the interface pipe to signal something. If anything | 36 // then block waiting for the interface pipe to signal something. If anything |
| 37 // goes wrong, its pipe won't signal and the client process will hang without | 37 // goes wrong, its pipe won't signal and the client process will hang without |
| 38 // responding to this request. | 38 // responding to this request. |
| 39 base::RunLoop loop; | 39 base::RunLoop loop; |
| 40 control->ConnectAndWait(loop.QuitClosure()); | 40 control->ConnectAndWait(loop.QuitClosure()); |
| 41 loop.Run(); | 41 loop.Run(); |
| 42 } | 42 } |
| 43 | 43 |
| 44 } // namespace | 44 } // namespace |
| 45 } // namespace shell | 45 } // namespace shell |
| OLD | NEW |