| Index: device/vr/vr_device_manager_unittest.cc
|
| diff --git a/device/vr/vr_device_manager_unittest.cc b/device/vr/vr_device_manager_unittest.cc
|
| index 454f6c4b41fb0ab3a99e37cbc5dab326909f4fee..43187f002fdc6e1bee410741890255aeb801f9c4 100644
|
| --- a/device/vr/vr_device_manager_unittest.cc
|
| +++ b/device/vr/vr_device_manager_unittest.cc
|
| @@ -30,7 +30,7 @@ class VRDeviceManagerTest : public testing::Test {
|
| }
|
|
|
| protected:
|
| - FakeVRDeviceProvider* provider_;
|
| + scoped_refptr<FakeVRDeviceProvider> provider_;
|
| std::unique_ptr<VRDeviceManager> device_manager_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(VRDeviceManagerTest);
|
| @@ -41,9 +41,9 @@ VRDeviceManagerTest::VRDeviceManagerTest() {}
|
| VRDeviceManagerTest::~VRDeviceManagerTest() {}
|
|
|
| void VRDeviceManagerTest::SetUp() {
|
| - std::unique_ptr<FakeVRDeviceProvider> provider(new FakeVRDeviceProvider());
|
| - provider_ = provider.get();
|
| - device_manager_.reset(new VRDeviceManager(std::move(provider)));
|
| + FakeVRDeviceProvider* provider = new FakeVRDeviceProvider();
|
| + provider_ = provider;
|
| + device_manager_.reset(new VRDeviceManager(provider));
|
| }
|
|
|
| TEST_F(VRDeviceManagerTest, InitializationTest) {
|
| @@ -70,7 +70,7 @@ TEST_F(VRDeviceManagerTest, GetDevicesBasicTest) {
|
| VRDevice* queried_device = GetDevice(1);
|
| EXPECT_EQ(nullptr, queried_device);
|
|
|
| - std::unique_ptr<FakeVRDevice> device1(new FakeVRDevice(provider_));
|
| + std::unique_ptr<FakeVRDevice> device1(new FakeVRDevice(provider_.get()));
|
| provider_->AddDevice(device1.get());
|
| webvr_devices = device_manager_->GetVRDevices();
|
| // Should have successfully returned one device.
|
| @@ -78,7 +78,7 @@ TEST_F(VRDeviceManagerTest, GetDevicesBasicTest) {
|
| // The WebVRDevice index should match the device id.
|
| EXPECT_EQ(webvr_devices[0]->index, device1->id());
|
|
|
| - std::unique_ptr<FakeVRDevice> device2(new FakeVRDevice(provider_));
|
| + std::unique_ptr<FakeVRDevice> device2(new FakeVRDevice(provider_.get()));
|
| provider_->AddDevice(device2.get());
|
| webvr_devices = device_manager_->GetVRDevices();
|
| // Should have successfully returned two devices.
|
|
|