Moving VR service from /content/browser to /device

device/vr/vr_device_manager.h

Index: device/vr/vr_device_manager.h
diff --git a/content/browser/vr/vr_device_manager.h b/device/vr/vr_device_manager.h
similarity index 74%
rename from content/browser/vr/vr_device_manager.h
rename to device/vr/vr_device_manager.h
index bdf2de6100ae2882e73c48bb4d0b95929af33431..6d28ee476bf7eca8f28b79bccd3ba39d6a535fbf 100644
--- a/content/browser/vr/vr_device_manager.h
+++ b/device/vr/vr_device_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_VR_VR_DEVICE_MANAGER_H
-#define CONTENT_BROWSER_VR_VR_DEVICE_MANAGER_H
+#ifndef DEVICE_VR_VR_DEVICE_MANAGER_H
+#define DEVICE_VR_VR_DEVICE_MANAGER_H
 
 #include <stdint.h>
 
@@ -14,33 +14,34 @@
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "content/browser/vr/vr_device.h"
-#include "content/browser/vr/vr_device_provider.h"
-#include "content/common/content_export.h"
+#include "device/vr/vr_device.h"
+#include "device/vr/vr_device_provider.h"
+#include "device/vr/vr_export.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "third_party/WebKit/public/platform/modules/vr/vr_service.mojom.h"
 
-namespace content {
+namespace device {
 
 class VRDeviceManager : public blink::mojom::VRService {
  public:
-  ~VRDeviceManager() override;
+  DEVICE_VR_EXPORT ~VRDeviceManager() override;
 
-  static void BindRequest(
+  DEVICE_VR_EXPORT static void BindRequest(
       mojo::InterfaceRequest<blink::mojom::VRService> request);
 
   // Returns the VRDeviceManager singleton.
   static VRDeviceManager* GetInstance();
 
-  mojo::Array<blink::mojom::VRDisplayPtr> GetVRDevices();
-  VRDevice* GetDevice(unsigned int index);
+  DEVICE_VR_EXPORT mojo::Array<blink::mojom::VRDisplayPtr> GetVRDevices();
+  DEVICE_VR_EXPORT VRDevice* GetDevice(unsigned int index);
 
  private:
   friend class VRDeviceManagerTest;
 
   VRDeviceManager();
   // Constructor for testing.
-  explicit VRDeviceManager(std::unique_ptr<VRDeviceProvider> provider);
+  DEVICE_VR_EXPORT explicit VRDeviceManager(
+      std::unique_ptr<VRDeviceProvider> provider);
 
   static void SetInstance(VRDeviceManager* service);
   static bool HasInstance();
@@ -50,8 +51,7 @@ class VRDeviceManager : public blink::mojom::VRService {
 
   // mojom::VRService implementation
   void GetDisplays(const GetDisplaysCallback& callback) override;
-  void GetPose(uint32_t index,
-               const GetPoseCallback& callback) override;
+  void GetPose(uint32_t index, const GetPoseCallback& callback) override;
   void ResetPose(uint32_t index) override;
 
   // Mojo connection error handler.