Migrate WebVR Cardboard implementation to GVR

device/vr/vr_device_manager.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/vr/vr_device_manager.h"
 
 #include <utility>
 
 #include "base/bind.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
 #include "build/build_config.h"
 
 #if defined(OS_ANDROID)
-#include "device/vr/android/cardboard/cardboard_vr_device_provider.h"
+#include "device/vr/android/gvr/gvr_device_provider.h"
 #endif
 
 namespace device {
 
 namespace {
 VRDeviceManager* g_vr_device_manager = nullptr;
 }
 
 VRDeviceManager::VRDeviceManager()
     : vr_initialized_(false), keep_alive_(false) {
 // Register VRDeviceProviders for the current platform
 #if defined(OS_ANDROID)
-  std::unique_ptr<VRDeviceProvider> cardboard_provider(
-      new CardboardVRDeviceProvider());
-  RegisterProvider(std::move(cardboard_provider));
+  RegisterProvider(base::WrapUnique(new GvrDeviceProvider()));
 #endif
 }
 
 VRDeviceManager::VRDeviceManager(std::unique_ptr<VRDeviceProvider> provider)
     : vr_initialized_(false), keep_alive_(true) {
   thread_checker_.DetachFromThread();
   RegisterProvider(std::move(provider));
   SetInstance(this);
 }
 
@@ skipping 97 matching lines @@
 
   vr_initialized_ = true;
 }
 
 void VRDeviceManager::RegisterProvider(
     std::unique_ptr<VRDeviceProvider> provider) {
   providers_.push_back(make_linked_ptr(provider.release()));
 }
 
 }  // namespace device