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 "device/vr/vr_service_impl.h" | 5 #include "device/vr/vr_service_impl.h" |
6 | 6 |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "device/vr/test/fake_vr_device.h" | 9 #include "device/vr/test/fake_vr_device.h" |
10 #include "device/vr/test/fake_vr_device_provider.h" | 10 #include "device/vr/test/fake_vr_device_provider.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 void onDisplaySynced(unsigned int number_of_devices) {} | 23 void onDisplaySynced(unsigned int number_of_devices) {} |
24 | 24 |
25 protected: | 25 protected: |
26 void SetUp() override { | 26 void SetUp() override { |
27 provider_ = new FakeVRDeviceProvider(); | 27 provider_ = new FakeVRDeviceProvider(); |
28 device_manager_.reset(new VRDeviceManager(base::WrapUnique(provider_))); | 28 device_manager_.reset(new VRDeviceManager(base::WrapUnique(provider_))); |
29 } | 29 } |
30 | 30 |
31 std::unique_ptr<VRServiceImpl> BindService() { | 31 std::unique_ptr<VRServiceImpl> BindService() { |
32 mojom::VRServiceClientPtr proxy; | 32 mojom::VRServiceClientPtr proxy; |
33 FakeVRServiceClient client(mojo::GetProxy(&proxy)); | 33 FakeVRServiceClient client(mojo::MakeRequest(&proxy)); |
34 auto service = base::WrapUnique(new VRServiceImpl()); | 34 auto service = base::WrapUnique(new VRServiceImpl()); |
35 service->SetClient(std::move(proxy), | 35 service->SetClient(std::move(proxy), |
36 base::Bind(&VRServiceImplTest::onDisplaySynced, | 36 base::Bind(&VRServiceImplTest::onDisplaySynced, |
37 base::Unretained(this))); | 37 base::Unretained(this))); |
38 return service; | 38 return service; |
39 } | 39 } |
40 | 40 |
41 size_t ServiceCount() { return device_manager_->services_.size(); } | 41 size_t ServiceCount() { return device_manager_->services_.size(); } |
42 | 42 |
43 private: | 43 private: |
(...skipping 20 matching lines...) Expand all Loading... |
64 service_1.reset(); | 64 service_1.reset(); |
65 | 65 |
66 EXPECT_EQ(1u, ServiceCount()); | 66 EXPECT_EQ(1u, ServiceCount()); |
67 | 67 |
68 service_2.reset(); | 68 service_2.reset(); |
69 | 69 |
70 EXPECT_EQ(0u, ServiceCount()); | 70 EXPECT_EQ(0u, ServiceCount()); |
71 } | 71 } |
72 | 72 |
73 } | 73 } |
OLD | NEW |