| Index: content/browser/vr/vr_device_manager.cc
|
| diff --git a/content/browser/vr/vr_device_manager.cc b/content/browser/vr/vr_device_manager.cc
|
| index e013358857e8264bbe9a4da28f60e9e8871e935a..c99ee3930095dc92c8e2ed842b8474b887ef83a6 100644
|
| --- a/content/browser/vr/vr_device_manager.cc
|
| +++ b/content/browser/vr/vr_device_manager.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "content/browser/vr/vr_device_manager.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/bind.h"
|
| #include "base/memory/singleton.h"
|
| #include "build/build_config.h"
|
| @@ -27,14 +29,14 @@ VRDeviceManager::VRDeviceManager()
|
| #if defined(OS_ANDROID)
|
| scoped_ptr<VRDeviceProvider> cardboard_provider(
|
| new CardboardVRDeviceProvider());
|
| - RegisterProvider(cardboard_provider.Pass());
|
| + RegisterProvider(std::move(cardboard_provider));
|
| #endif
|
| }
|
|
|
| VRDeviceManager::VRDeviceManager(scoped_ptr<VRDeviceProvider> provider)
|
| : vr_initialized_(false), keep_alive_(true) {
|
| thread_checker_.DetachFromThread();
|
| - RegisterProvider(provider.Pass());
|
| + RegisterProvider(std::move(provider));
|
| SetInstance(this);
|
| }
|
|
|
| @@ -45,7 +47,7 @@ VRDeviceManager::~VRDeviceManager() {
|
|
|
| void VRDeviceManager::BindRequest(mojo::InterfaceRequest<VRService> request) {
|
| VRDeviceManager* device_manager = GetInstance();
|
| - device_manager->bindings_.AddBinding(device_manager, request.Pass());
|
| + device_manager->bindings_.AddBinding(device_manager, std::move(request));
|
| }
|
|
|
| void VRDeviceManager::OnConnectionError() {
|
| @@ -97,7 +99,7 @@ mojo::Array<VRDeviceInfoPtr> VRDeviceManager::GetVRDevices() {
|
| continue;
|
|
|
| vr_device_info->index = device->id();
|
| - out_devices.push_back(vr_device_info.Pass());
|
| + out_devices.push_back(std::move(vr_device_info));
|
| }
|
|
|
| return out_devices;
|
|
|