| Index: device/vr/vr_device_manager.cc
|
| diff --git a/device/vr/vr_device_manager.cc b/device/vr/vr_device_manager.cc
|
| index 530feb82cb083761a9a53921e48409aa2976c5f7..e4bf84100820d407b4a942b763c7b12cd30e3628 100644
|
| --- a/device/vr/vr_device_manager.cc
|
| +++ b/device/vr/vr_device_manager.cc
|
| @@ -27,14 +27,13 @@ VRDeviceManager::VRDeviceManager()
|
| has_scheduled_poll_(false) {
|
| // Register VRDeviceProviders for the current platform
|
| #if defined(OS_ANDROID)
|
| - RegisterProvider(base::WrapUnique(new GvrDeviceProvider()));
|
| + scoped_refptr<VRDeviceProvider> provider = new GvrDeviceProvider();
|
| + RegisterProvider(std::move(provider));
|
| #endif
|
| }
|
|
|
| -VRDeviceManager::VRDeviceManager(std::unique_ptr<VRDeviceProvider> provider)
|
| - : vr_initialized_(false),
|
| - keep_alive_(true),
|
| - has_scheduled_poll_(false) {
|
| +VRDeviceManager::VRDeviceManager(scoped_refptr<VRDeviceProvider> provider)
|
| + : vr_initialized_(false), keep_alive_(true), has_scheduled_poll_(false) {
|
| thread_checker_.DetachFromThread();
|
| RegisterProvider(std::move(provider));
|
| SetInstance(this);
|
| @@ -55,7 +54,7 @@ VRDeviceManager* VRDeviceManager::GetInstance() {
|
| void VRDeviceManager::SetInstance(VRDeviceManager* instance) {
|
| // Unit tests can create multiple instances but only one should exist at any
|
| // given time so g_vr_device_manager should only go from nullptr to
|
| - // non-nullptr and vica versa.
|
| + // non-nullptr and vice versa.
|
| CHECK_NE(!!instance, !!g_vr_device_manager);
|
| g_vr_device_manager = instance;
|
| }
|
| @@ -146,8 +145,8 @@ void VRDeviceManager::InitializeProviders() {
|
| }
|
|
|
| void VRDeviceManager::RegisterProvider(
|
| - std::unique_ptr<VRDeviceProvider> provider) {
|
| - providers_.push_back(make_linked_ptr(provider.release()));
|
| + scoped_refptr<VRDeviceProvider> provider) {
|
| + providers_.push_back(std::move(provider));
|
| }
|
|
|
| void VRDeviceManager::SchedulePollEvents() {
|
|
|