| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "mojo/public/cpp/application/connect.h" |
| 5 #include "services/js/test/echo_service.mojom.h" | 6 #include "services/js/test/echo_service.mojom.h" |
| 6 #include "services/js/test/js_application_test_base.h" | 7 #include "services/js/test/js_application_test_base.h" |
| 7 | 8 |
| 8 using mojo::String; | 9 using mojo::String; |
| 9 | 10 |
| 10 namespace js { | 11 namespace js { |
| 11 namespace { | 12 namespace { |
| 12 | 13 |
| 13 class JSEchoTest : public test::JSApplicationTestBase { | 14 class JSEchoTest : public test::JSApplicationTestBase { |
| 14 public: | 15 public: |
| 15 JSEchoTest() : JSApplicationTestBase() {} | 16 JSEchoTest() : JSApplicationTestBase() {} |
| 16 ~JSEchoTest() override {} | 17 ~JSEchoTest() override {} |
| 17 | 18 |
| 18 protected: | 19 protected: |
| 19 // ApplicationTestBase: | 20 // ApplicationTestBase: |
| 20 void SetUp() override { | 21 void SetUp() override { |
| 21 ApplicationTestBase::SetUp(); | 22 ApplicationTestBase::SetUp(); |
| 22 const std::string& url = JSAppURL("echo.js"); | 23 const std::string& url = JSAppURL("echo.js"); |
| 23 application_impl()->ConnectToServiceDeprecated(url, &echo_service_); | 24 mojo::ConnectToService(application_impl()->shell(), url, |
| 25 GetProxy(&echo_service_)); |
| 24 } | 26 } |
| 25 | 27 |
| 26 mojo::EchoServicePtr echo_service_; | 28 mojo::EchoServicePtr echo_service_; |
| 27 | 29 |
| 28 private: | 30 private: |
| 29 MOJO_DISALLOW_COPY_AND_ASSIGN(JSEchoTest); | 31 MOJO_DISALLOW_COPY_AND_ASSIGN(JSEchoTest); |
| 30 }; | 32 }; |
| 31 | 33 |
| 32 class JSServiceProviderEchoTest : public test::JSApplicationTestBase { | 34 class JSServiceProviderEchoTest : public test::JSApplicationTestBase { |
| 33 public: | 35 public: |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 String foo; | 117 String foo; |
| 116 EchoStringCallback callback(&foo); | 118 EchoStringCallback callback(&foo); |
| 117 echo_service->EchoString("foo", callback); | 119 echo_service->EchoString("foo", callback); |
| 118 EXPECT_TRUE(echo_service.WaitForIncomingResponse()); | 120 EXPECT_TRUE(echo_service.WaitForIncomingResponse()); |
| 119 EXPECT_EQ("foo", foo); | 121 EXPECT_EQ("foo", foo); |
| 120 echo_service->Quit(); | 122 echo_service->Quit(); |
| 121 } | 123 } |
| 122 | 124 |
| 123 } // namespace | 125 } // namespace |
| 124 } // namespace js | 126 } // namespace js |
| OLD | NEW |