| 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 "base/run_loop.h" | 5 #include "base/run_loop.h" |
| 6 #include "mojo/public/cpp/application/application_impl.h" | 6 #include "mojo/public/cpp/application/application_impl.h" |
| 7 #include "mojo/public/cpp/application/application_test_base.h" | 7 #include "mojo/public/cpp/application/application_test_base.h" |
| 8 #include "mojo/public/cpp/application/connect.h" |
| 8 #include "mojo/services/contacts/interfaces/contacts.mojom.h" | 9 #include "mojo/services/contacts/interfaces/contacts.mojom.h" |
| 9 | 10 |
| 10 namespace contacts { | 11 namespace contacts { |
| 11 | 12 |
| 12 class ContactAppTest : public mojo::test::ApplicationTestBase { | 13 class ContactAppTest : public mojo::test::ApplicationTestBase { |
| 13 public: | 14 public: |
| 14 ContactAppTest() : ApplicationTestBase() {} | 15 ContactAppTest() : ApplicationTestBase() {} |
| 15 ~ContactAppTest() override {} | 16 ~ContactAppTest() override {} |
| 16 | 17 |
| 17 void SetUp() override { | 18 void SetUp() override { |
| 18 mojo::test::ApplicationTestBase::SetUp(); | 19 mojo::test::ApplicationTestBase::SetUp(); |
| 19 application_impl()->ConnectToServiceDeprecated("mojo:contacts", | 20 mojo::ConnectToService(application_impl()->shell(), "mojo:contacts", |
| 20 &contacts_service_); | 21 GetProxy(&contacts_service_)); |
| 21 } | 22 } |
| 22 | 23 |
| 23 protected: | 24 protected: |
| 24 contacts::ContactsServicePtr contacts_service_; | 25 contacts::ContactsServicePtr contacts_service_; |
| 25 | 26 |
| 26 DISALLOW_COPY_AND_ASSIGN(ContactAppTest); | 27 DISALLOW_COPY_AND_ASSIGN(ContactAppTest); |
| 27 }; | 28 }; |
| 28 | 29 |
| 29 TEST_F(ContactAppTest, Count) { | 30 TEST_F(ContactAppTest, Count) { |
| 30 uint64_t count; | 31 uint64_t count; |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 | 83 |
| 83 contacts_service_->GetPhoto(0, true, [&url](const mojo::String& u) { | 84 contacts_service_->GetPhoto(0, true, [&url](const mojo::String& u) { |
| 84 url = u; | 85 url = u; |
| 85 base::MessageLoop::current()->QuitWhenIdle(); | 86 base::MessageLoop::current()->QuitWhenIdle(); |
| 86 }); | 87 }); |
| 87 { base::RunLoop().Run(); }; | 88 { base::RunLoop().Run(); }; |
| 88 EXPECT_TRUE(url.is_null()); | 89 EXPECT_TRUE(url.is_null()); |
| 89 } | 90 } |
| 90 | 91 |
| 91 } // namespace contacts | 92 } // namespace contacts |
| OLD | NEW |