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