Moving VR service from /content/browser to /device

BUG=612342
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation

Review-Url: https://codereview.chromium.org/2029703002
Cr-Commit-Position: refs/heads/master@{#397828}

content/browser/BUILD.gn

@@ -501,25 +501,6 @@ source_set("browser") {
     configs += [ "//media/mojo/services:mojo_media_config" ]
   }
 
-  if (enable_webvr) {
-    sources += [
-      "vr/vr_device.cc",
-      "vr/vr_device.h",
-      "vr/vr_device_manager.cc",
-      "vr/vr_device_manager.h",
-      "vr/vr_device_provider.h",
-    ]
-  }
-
-  if (enable_webvr && is_android) {
-    sources += [
-      "vr/android/cardboard/cardboard_vr_device.cc",
-      "vr/android/cardboard/cardboard_vr_device.h",
-      "vr/android/cardboard/cardboard_vr_device_provider.cc",
-      "vr/android/cardboard/cardboard_vr_device_provider.h",
-    ]
-  }
-
   if (use_ozone) {
     deps += [ "//ui/ozone" ]
   }
@@ -530,6 +511,10 @@ source_set("browser") {
       "gpu/gpu_surface_tracker.h",
     ]
   }
+
+  if (enable_webvr) {
+    deps += [ "//device/vr" ]
+  }
 }
 
 # See comment at the top of //content/BUILD.gn for how this works.

content/browser/DEPS

@@ -17,6 +17,7 @@ include_rules = [
   "+content/public/browser",
   "+device/battery",  # For battery status service.
   "+device/vibration",  # For Vibration API
+  "+device/vr",  # For WebVR API
   "+gin/v8_initializer.h",
   "+mojo",
   "+services",

content/browser/android/browser_jni_registrar.cc

@@ -38,7 +38,6 @@
 #include "content/browser/screen_orientation/screen_orientation_delegate_android.h"
 #include "content/browser/speech/speech_recognizer_impl_android.h"
 #include "content/browser/time_zone_monitor_android.h"
-#include "content/browser/vr/android/cardboard/cardboard_vr_device.h"
 #include "content/browser/web_contents/web_contents_android.h"
 #include "mojo/android/system/core_impl.h"
 
@@ -58,10 +57,6 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
          RegisterNetworkObserver},
     {"BrowserAccessibilityManager",
      content::RegisterBrowserAccessibilityManager},
-#if defined(ENABLE_WEBVR)
-    {"CardboardVRDevice",
-     content::CardboardVRDevice::RegisterCardboardVRDevice},
-#endif
     {"ContentViewCore", content::RegisterContentViewCore},
     {"ContentViewRenderView",
      content::ContentViewRenderView::RegisterContentViewRenderView},

content/browser/frame_host/render_frame_host_impl.cc

@@ -95,8 +95,8 @@
 
 #if defined(ENABLE_WEBVR)
 #include "base/command_line.h"
-#include "content/browser/vr/vr_device_manager.h"
 #include "content/public/common/content_switches.h"
+#include "device/vr/vr_device_manager.h" // nogncheck
 #endif
 
 using base::TimeDelta;
@@ -2026,7 +2026,7 @@ void RenderFrameHostImpl::RegisterMojoServices() {
 
   if (browser_command_line.HasSwitch(switches::kEnableWebVR)) {
     GetServiceRegistry()->AddService<blink::mojom::VRService>(
-        base::Bind(&VRDeviceManager::BindRequest));
+        base::Bind(&device::VRDeviceManager::BindRequest));
   }
 #endif
 

content/browser/vr/OWNERS

-bajones@chromium.org
-kbr@chromium.org
-hendrikw@chromium.org

content/public/android/BUILD.gn

@@ -38,6 +38,7 @@ android_library("content_java") {
     "//device/usb:java",
     "//device/vibration:mojo_bindings_java",
     "//device/vibration/android:vibration_manager_android",
+    "//device/vr:java",
     "//media/base/android:media_java",
     "//media/capture/video/android:capture_java",
     "//media/midi:midi_java",
@@ -159,7 +160,6 @@ android_library("content_java") {
     "java/src/org/chromium/content/browser/crypto/CipherFactory.java",
     "java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java",
     "java/src/org/chromium/content/browser/input/AnimationIntervalProvider.java",
-    "java/src/org/chromium/content/browser/input/CardboardVRDevice.java",
     "java/src/org/chromium/content/browser/input/ChromiumBaseInputConnection.java",
     "java/src/org/chromium/content/browser/input/CursorAnchorInfoController.java",
     "java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java",
@@ -209,10 +209,6 @@ android_library("content_java") {
     "java/src/org/chromium/content_public/common/Referrer.java",
     "java/src/org/chromium/content_public/common/ScreenOrientationConstants.java",
   ]
-
-  if (enable_webvr) {
-    deps += [ "//third_party/cardboard-java:cardboard-java" ]
-  }
 }
 
 java_strings_grd("content_strings_grd") {
@@ -294,13 +290,6 @@ generate_jar_jni("jar_jni") {
 generate_jni("content_jni_headers") {
   sources = rebase_path(content_jni_gypi_values.sources, "", "../..")
   jni_package = "content"
-
-  if (enable_webvr) {
-    sources += [ "//content/public/android/java/src/org/chromium/content/browser/input/CardboardVRDevice.java" ]
-    public_deps = [
-      "//third_party/cardboard-java:cardboard-java",
-    ]
-  }
 }
 
 group("jni") {

device/BUILD.gn

@@ -60,6 +60,7 @@ test("device_unittests") {
     "nfc/nfc_chromeos_unittest.cc",
     "nfc/nfc_ndef_record_unittest.cc",
     "test/run_all_unittests.cc",
+    "vr/vr_device_manager_unittest.cc",
   ]
 
   deps = [
@@ -69,6 +70,8 @@ test("device_unittests") {
     "//device/bluetooth",
     "//device/bluetooth:mocks",
     "//device/nfc",
+    "//device/vr",
+    "//device/vr:fakes",
     "//mojo/common",
     "//mojo/edk/system",
     "//mojo/public/cpp/bindings",

device/vr/BUILD.gn

+# Copyright 2016 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.
+
+import("//build/config/features.gni")
+import("//mojo/public/tools/bindings/mojom.gni")
+
+if (is_android) {
+  import("//build/config/android/rules.gni")  # For generate_jni().
+}
+
+component("vr") {
+  output_name = "device_vr"
+
+  sources = [
+    "vr_device.cc",
+    "vr_device.h",
+    "vr_device_manager.cc",
+    "vr_device_manager.h",
+    "vr_device_provider.h",
+  ]
+
+  deps = [
+    "//base",
+    "//mojo/edk/system",
+    "//mojo/public/cpp/bindings",
+    "//third_party/WebKit/public:mojo_bindings",
+    "//ui/gfx",
+  ]
+
+  defines = [ "DEVICE_VR_IMPLEMENTATION" ]
+
+  if (is_android) {
+    sources += [
+      "android/cardboard/cardboard_vr_device.cc",
+      "android/cardboard/cardboard_vr_device.h",
+      "android/cardboard/cardboard_vr_device_provider.cc",
+      "android/cardboard/cardboard_vr_device_provider.h",
+    ]
+
+    deps += [ ":jni_headers" ]
+  }
+}
+
+static_library("fakes") {
+  testonly = true
+
+  sources = [
+    "test/fake_vr_device.cc",
+    "test/fake_vr_device.h",
+    "test/fake_vr_device_provider.cc",
+    "test/fake_vr_device_provider.h",
+  ]
+
+  public_deps = [
+    ":vr",
+    "//base",
+    "//mojo/public/cpp/bindings",
+    "//third_party/WebKit/public:mojo_bindings",
+  ]
+}
+
+if (is_android) {
+  java_sources_needing_jni =
+      [ "android/java/src/org/chromium/device/vr/CardboardVRDevice.java" ]
+
+  generate_jni("jni_headers") {
+    sources = java_sources_needing_jni
+    jni_package = "vr"
+
+    public_deps = [
+      "//third_party/cardboard-java:cardboard-java",
+    ]
+  }
+
+  android_library("java") {
+    java_files = java_sources_needing_jni
+    deps = [
+      "//base:base_java",
+      "//third_party/cardboard-java:cardboard-java",
+    ]
+  }
+}

device/vr/DEPS

+include_rules = [
+  "+jni",
+  "+third_party/WebKit/public/platform/modules/vr/vr_service.mojom.h",
+  "+ui/gfx",
+]

device/vr/OWNERS

+bajones@chromium.org
+kbr@chromium.org
+hendrikw@chromium.org
+
+# Changes to Mojo interfaces require a security review to avoid
+# introducing new sandbox escapes.
+per-file *.mojom=set noparent
+per-file *.mojom=dcheng@chromium.org
+per-file *.mojom=inferno@chromium.org
+per-file *.mojom=jln@chromium.org
+per-file *.mojom=jschuh@chromium.org
+per-file *.mojom=kenrb@chromium.org
+per-file *.mojom=mkwst@chromium.org
+per-file *.mojom=nasko@chromium.org
+per-file *.mojom=palmer@chromium.org
+per-file *.mojom=tsepez@chromium.org
+per-file *.mojom=wfh@chromium.org

device/vr/android/BUILD.gn

+# Copyright 2016 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.
+
+import("//build/config/android/config.gni")
+import("//build/config/android/rules.gni")
+
+android_library("vr_android") {
+  java_files = [ "java/src/org/chromium/device/vr/CardboardVRDevice.java" ]
+
+  deps = [
+    "//base:base_java",
+  ]
+}

content/browser/vr/android/cardboard/cardboard_vr_device.cc → device/vr/android/cardboard/cardboard_vr_device.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/vr/android/cardboard/cardboard_vr_device.h"
+#include "device/vr/android/cardboard/cardboard_vr_device.h"
 
 #include <math.h>
 #include <algorithm>
@@ -21,7 +21,7 @@
 
 using base::android::AttachCurrentThread;
 
-namespace content {
+namespace device {
 
 bool CardboardVRDevice::RegisterCardboardVRDevice(JNIEnv* env) {
   return RegisterNativesImpl(env);
@@ -85,7 +85,7 @@ blink::mojom::VRDisplayPtr CardboardVRDevice::GetVRDevice() {
 
   float ipd = Java_CardboardVRDevice_getIpd(env, j_cardboard_device_.obj());
 
-  left_eye->offset= mojo::Array<float>::New(3);
+  left_eye->offset = mojo::Array<float>::New(3);
   left_eye->offset[0] = ipd * -0.5f;
   left_eye->offset[1] = 0.0f;
   left_eye->offset[2] = 0.0f;
@@ -154,4 +154,4 @@ void CardboardVRDevice::ResetPose() {
                                      j_cardboard_device_.obj());
 }
 
-}  // namespace content
+}  // namespace device

content/browser/vr/android/cardboard/cardboard_vr_device.h → device/vr/android/cardboard/cardboard_vr_device.h

@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_VR_CARDBOARD_VR_DEVICE_H
-#define CONTENT_BROWSER_VR_CARDBOARD_VR_DEVICE_H
+#ifndef DEVICE_VR_CARDBOARD_VR_DEVICE_H
+#define DEVICE_VR_CARDBOARD_VR_DEVICE_H
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/macros.h"
-#include "content/browser/vr/vr_device.h"
+#include "device/vr/vr_device.h"
 
-namespace content {
+namespace device {
 
 class CardboardVRDevice : public VRDevice {
  public:
@@ -31,6 +31,6 @@ class CardboardVRDevice : public VRDevice {
   DISALLOW_COPY_AND_ASSIGN(CardboardVRDevice);
 };
 
-}  // namespace content
+}  // namespace device
 
-#endif  // CONTENT_BROWSER_VR_CARDBOARD_VR_DEVICE_H
+#endif  // DEVICE_VR_CARDBOARD_VR_DEVICE_H

content/browser/vr/android/cardboard/cardboard_vr_device_provider.cc → device/vr/android/cardboard/cardboard_vr_device_provider.cc

@@ -2,17 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/vr/android/cardboard/cardboard_vr_device_provider.h"
+#include "device/vr/android/cardboard/cardboard_vr_device_provider.h"
 
-#include "content/browser/vr/android/cardboard/cardboard_vr_device.h"
+#include "device/vr/android/cardboard/cardboard_vr_device.h"
 
-namespace content {
+namespace device {
 
-CardboardVRDeviceProvider::CardboardVRDeviceProvider() : VRDeviceProvider() {
-}
+CardboardVRDeviceProvider::CardboardVRDeviceProvider() : VRDeviceProvider() {}
 
-CardboardVRDeviceProvider::~CardboardVRDeviceProvider() {
-}
+CardboardVRDeviceProvider::~CardboardVRDeviceProvider() {}
 
 void CardboardVRDeviceProvider::GetDevices(std::vector<VRDevice*>* devices) {
   if (!cardboard_device_) {
@@ -26,4 +24,4 @@ void CardboardVRDeviceProvider::Initialize() {
   // No initialization needed for Cardboard devices.
 }
 
-}  // namespace content
+}  // namespace device

content/browser/vr/android/cardboard/cardboard_vr_device_provider.h → device/vr/android/cardboard/cardboard_vr_device_provider.h

@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_VR_CARDBOARD_VR_DEVICE_PROVIDER_H
-#define CONTENT_BROWSER_VR_CARDBOARD_VR_DEVICE_PROVIDER_H
+#ifndef DEVICE_VR_CARDBOARD_VR_DEVICE_PROVIDER_H
+#define DEVICE_VR_CARDBOARD_VR_DEVICE_PROVIDER_H
 
 #include <map>
 #include <memory>
 
 #include "base/macros.h"
-#include "content/browser/vr/vr_device.h"
-#include "content/browser/vr/vr_device_provider.h"
+#include "device/vr/vr_device.h"
+#include "device/vr/vr_device_provider.h"
 
-namespace content {
+namespace device {
 
 class CardboardVRDeviceProvider : public VRDeviceProvider {
  public:
@@ -28,6 +28,6 @@ class CardboardVRDeviceProvider : public VRDeviceProvider {
   DISALLOW_COPY_AND_ASSIGN(CardboardVRDeviceProvider);
 };
 
-}  // namespace content
+}  // namespace device
 
-#endif  // CONTENT_BROWSER_VR_CARDBOARD_VR_DEVICE_PROVIDER_H
+#endif  // DEVICE_VR_CARDBOARD_VR_DEVICE_PROVIDER_H

content/public/android/java/src/org/chromium/content/browser/input/CardboardVRDevice.java → device/vr/android/java/src/org/chromium/device/vr/CardboardVRDevice.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.content.browser.input;
+package org.chromium.device.vr;
 
 import android.content.Context;
 
@@ -19,7 +19,7 @@ import org.chromium.base.annotations.JNINamespace;
 /**
  * This is the implementation of the C++ counterpart CardboardVRDevice.
  */
-@JNINamespace("content")
+@JNINamespace("device")
 class CardboardVRDevice {
     private static final String TAG = "CardboardVRDevice";
     private final HeadMountedDisplayManager mHMDManager;

device/vr/android/vr_jni_registrar.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/android/vr_jni_registrar.h"
+
+#include "base/android/jni_android.h"
+#include "base/android/jni_registrar.h"
+#include "base/macros.h"
+#include "device/vr/android/cardboard/cardboard_vr_device.h"
+
+namespace device {
+namespace android {
+namespace {
+
+const base::android::RegistrationMethod kRegisteredMethods[] = {
+    {"CardboardVRDevice", device::CardboardVRDevice::RegisterJNI},
+};
+
+}  // namespace
+
+bool RegisterVRJni(JNIEnv* env) {
+  return RegisterNativeMethods(env, kRegisteredMethods,
+                               arraysize(kRegisteredMethods));
+}
+
+}  // namespace android
+}  // namespace device

device/vr/android/vr_jni_registrar.h

+// Copyright 2016 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.
+
+#ifndef DEVICE_VR_ANDROID_VR_JNI_REGISTRAR_H_
+#define DEVICE_VR_ANDROID_VR_JNI_REGISTRAR_H_
+
+#include <jni.h>
+
+#include "device/vr/vr_export.h"
+
+namespace device {
+namespace android {
+
+// Registers C++ methods in device/vr classes with JNI.
+// See https://www.chromium.org/developers/design-documents/android-jni
+//
+// Must be called before classes in the VR module are used.
+DEVICE_VR_EXPORT bool RegisterVRJni(JNIEnv* env);
+
+}  // namespace android
+}  // namespace device
+
+#endif  // DEVICE_VR_ANDROID_VR_JNI_REGISTRAR_H_

content/browser/vr/test/fake_vr_device.cc → device/vr/test/fake_vr_device.cc

@@ -2,32 +2,33 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/vr/test/fake_vr_device.h"
+#include "device/vr/test/fake_vr_device.h"
 
-namespace content {
+namespace device {
 
 FakeVRDevice::FakeVRDevice(VRDeviceProvider* provider) : VRDevice(provider) {
   device_ = blink::mojom::VRDisplay::New();
-  state_ = blink::mojom::VRPose::New();
+  pose_ = blink::mojom::VRPose::New();
 }
 
-FakeVRDevice::~FakeVRDevice() {
-}
+FakeVRDevice::~FakeVRDevice() {}
 
 void FakeVRDevice::SetVRDevice(const blink::mojom::VRDisplayPtr& device) {
   device_ = device.Clone();
 }
 
-void FakeVRDevice::SetSensorState(const blink::mojom::VRPosePtr& state) {
-  state_ = state.Clone();
+void FakeVRDevice::SetPose(const blink::mojom::VRPosePtr& pose) {
+  pose_ = pose.Clone();
 }
 
 blink::mojom::VRDisplayPtr FakeVRDevice::GetVRDevice() {
   return device_.Clone();
 }
 
-blink::mojom::VRPosePtr FakeVRDevice::GetSensorState() {
-  return state_.Clone();
+blink::mojom::VRPosePtr FakeVRDevice::GetPose() {
+  return pose_.Clone();
 }
 
-}  // namespace content
+void FakeVRDevice::ResetPose() {}
\ No newline at end of file
+
+}  // namespace device

content/browser/vr/test/fake_vr_device.h → device/vr/test/fake_vr_device.h

@@ -2,34 +2,34 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_VR_TEST_FAKE_VR_DEVICE_H_
-#define CONTENT_BROWSER_VR_TEST_FAKE_VR_DEVICE_H_
+#ifndef DEVICE_VR_TEST_FAKE_VR_DEVICE_H_
+#define DEVICE_VR_TEST_FAKE_VR_DEVICE_H_
 
 #include "base/macros.h"
-#include "content/browser/vr/vr_device.h"
-#include "content/browser/vr/vr_device_provider.h"
+#include "device/vr/vr_device.h"
+#include "device/vr/vr_device_provider.h"
 
-namespace content {
+namespace device {
 
 class FakeVRDevice : public VRDevice {
  public:
   explicit FakeVRDevice(VRDeviceProvider* provider);
   ~FakeVRDevice() override;
 
-  void SetVRDevice(const mojom::VRDisplayPtr& device);
-  void SetPose(const mojom::VRPosePtr& state);
+  void SetVRDevice(const blink::mojom::VRDisplayPtr& device);
+  void SetPose(const blink::mojom::VRPosePtr& state);
 
   blink::mojom::VRDisplayPtr GetVRDevice() override;
   blink::mojom::VRPosePtr GetPose() override;
   void ResetPose() override;
 
  private:
-  mojom::VRDisplayPtr device_;
-  mojom::VRPosePtr state_;
+  blink::mojom::VRDisplayPtr device_;
+  blink::mojom::VRPosePtr pose_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeVRDevice);
 };
 
-}  // namespace content
+}  // namespace device
 
-#endif  // CONTENT_BROWSER_VR_TEST_FAKE_VR_DEVICE_H_
+#endif  // DEVICE_VR_TEST_FAKE_VR_DEVICE_H_

content/browser/vr/test/fake_vr_device_provider.cc → device/vr/test/fake_vr_device_provider.cc

@@ -2,16 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/vr/test/fake_vr_device_provider.h"
+#include "device/vr/test/fake_vr_device_provider.h"
 
-namespace content {
+namespace device {
 
 FakeVRDeviceProvider::FakeVRDeviceProvider() : VRDeviceProvider() {
   initialized_ = false;
 }
 
-FakeVRDeviceProvider::~FakeVRDeviceProvider() {
-}
+FakeVRDeviceProvider::~FakeVRDeviceProvider() {}
 
 void FakeVRDeviceProvider::AddDevice(VRDevice* device) {
   devices_.push_back(device);
@@ -28,11 +27,11 @@ void FakeVRDeviceProvider::RemoveDevice(VRDevice* device) {
   }
 }
 
-void FakeVRDeviceProvider::GetDevices(std::vector<VRDevice*>& devices) {
+void FakeVRDeviceProvider::GetDevices(std::vector<VRDevice*>* devices) {
   std::vector<VRDevice*>::iterator iter;
 
   for (auto device : devices_) {
-    devices.push_back(device);
+    devices->push_back(device);
   }
 }
 
@@ -40,4 +39,4 @@ void FakeVRDeviceProvider::Initialize() {
   initialized_ = true;
 }
 
-}  // namespace content
+}  // namespace device
\ No newline at end of file

content/browser/vr/test/fake_vr_device_provider.h → device/vr/test/fake_vr_device_provider.h

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_VR_TEST_FAKE_VR_DEVICE_PROVIDER_H_
-#define CONTENT_BROWSER_VR_TEST_FAKE_VR_DEVICE_PROVIDER_H_
+#ifndef DEVICE_VR_TEST_FAKE_VR_DEVICE_PROVIDER_H_
+#define DEVICE_VR_TEST_FAKE_VR_DEVICE_PROVIDER_H_
 
 #include <vector>
-#include "content/browser/vr/vr_device.h"
-#include "content/browser/vr/vr_device_provider.h"
+#include "device/vr/vr_device.h"
+#include "device/vr/vr_device_provider.h"
 
-namespace content {
+namespace device {
 
 class FakeVRDeviceProvider : public VRDeviceProvider {
  public:
@@ -22,7 +22,7 @@ class FakeVRDeviceProvider : public VRDeviceProvider {
   void RemoveDevice(VRDevice* device);
   bool IsInitialized() { return initialized_; }
 
-  void GetDevices(std::vector<VRDevice*>& devices) override;
+  void GetDevices(std::vector<VRDevice*>* devices) override;
   void Initialize() override;
 
  private:
@@ -30,6 +30,6 @@ class FakeVRDeviceProvider : public VRDeviceProvider {
   bool initialized_;
 };
 
-}  // namespace content
+}  // namespace device
 
-#endif  // CONTENT_BROWSER_VR_TEST_FAKE_VR_DEVICE_PROVIDER_H_
+#endif  // DEVICE_VR_TEST_FAKE_VR_DEVICE_PROVIDER_H_

content/browser/vr/vr_device.cc → device/vr/vr_device.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/vr/vr_device.h"
-#include "content/browser/vr/vr_device_provider.h"
+#include "device/vr/vr_device.h"
+#include "device/vr/vr_device_provider.h"
 
-namespace content {
+namespace device {
 
 unsigned int VRDevice::next_id_ = 1;
 
@@ -16,7 +16,6 @@ VRDevice::VRDevice(VRDeviceProvider* provider)
     next_id_++;
 }
 
-VRDevice::~VRDevice() {
-}
+VRDevice::~VRDevice() {}
 
-}  // namespace content
+}  // namespace device

content/browser/vr/vr_device.h → device/vr/vr_device.h

@@ -2,10 +2,11 @@
 // 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_H
-#define CONTENT_BROWSER_VR_VR_DEVICE_H
+#ifndef DEVICE_VR_VR_DEVICE_H
+#define DEVICE_VR_VR_DEVICE_H
 
 #include "base/macros.h"
+#include "device/vr/vr_export.h"
 #include "third_party/WebKit/public/platform/modules/vr/vr_service.mojom.h"
 
 namespace blink {
@@ -16,7 +17,7 @@ namespace ui {
 class BaseWindow;
 }
 
-namespace content {
+namespace device {
 
 class VRDeviceProvider;
 
@@ -24,11 +25,11 @@ const unsigned int VR_DEVICE_LAST_ID = 0xFFFFFFFF;
 
 class VRDevice {
  public:
-  explicit VRDevice(VRDeviceProvider* provider);
-  virtual ~VRDevice();
+  DEVICE_VR_EXPORT explicit VRDevice(VRDeviceProvider* provider);
+  DEVICE_VR_EXPORT virtual ~VRDevice();
 
-  VRDeviceProvider* provider() const { return provider_; }
-  unsigned int id() const { return id_; }
+  DEVICE_VR_EXPORT VRDeviceProvider* provider() const { return provider_; }
+  DEVICE_VR_EXPORT unsigned int id() const { return id_; }
 
   virtual blink::mojom::VRDisplayPtr GetVRDevice() = 0;
   virtual blink::mojom::VRPosePtr GetPose() = 0;
@@ -43,6 +44,6 @@ class VRDevice {
   DISALLOW_COPY_AND_ASSIGN(VRDevice);
 };
 
-}  // namespace content
+}  // namespace device
 
-#endif  // CONTENT_BROWSER_VR_VR_DEVICE_H
+#endif  // DEVICE_VR_VR_DEVICE_H

content/browser/vr/vr_device_manager.cc → device/vr/vr_device_manager.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/vr/vr_device_manager.h"
+#include "device/vr/vr_device_manager.h"
 
 #include <utility>
 
@@ -11,10 +11,10 @@
 #include "build/build_config.h"
 
 #if defined(OS_ANDROID)
-#include "content/browser/vr/android/cardboard/cardboard_vr_device_provider.h"
+#include "device/vr/android/cardboard/cardboard_vr_device_provider.h"
 #endif
 
-namespace content {
+namespace device {
 
 namespace {
 VRDeviceManager* g_vr_device_manager = nullptr;
@@ -139,8 +139,7 @@ void VRDeviceManager::GetDisplays(const GetDisplaysCallback& callback) {
   callback.Run(GetVRDevices());
 }
 
-void VRDeviceManager::GetPose(uint32_t index,
-                              const GetPoseCallback& callback) {
+void VRDeviceManager::GetPose(uint32_t index, const GetPoseCallback& callback) {
   VRDevice* device = GetDevice(index);
   if (device) {
     callback.Run(device->GetPose());
@@ -155,4 +154,4 @@ void VRDeviceManager::ResetPose(uint32_t index) {
     device->ResetPose();
 }
 
-}  // namespace content
+}  // namespace device

content/browser/vr/vr_device_manager.h → 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.

content/browser/vr/vr_device_manager_unittest.cc → device/vr/vr_device_manager_unittest.cc

@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/vr/vr_device_manager.h"
+#include "device/vr/vr_device_manager.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
-#include "content/browser/vr/test/fake_vr_device.h"
-#include "content/browser/vr/test/fake_vr_device_provider.h"
-#include "content/browser/vr/vr_device_provider.h"
+#include "device/vr/test/fake_vr_device.h"
+#include "device/vr/test/fake_vr_device_provider.h"
+#include "device/vr/vr_device_provider.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace content {
+namespace device {
 
 class VRDeviceManagerTest : public testing::Test {
  protected:
@@ -32,11 +32,9 @@ class VRDeviceManagerTest : public testing::Test {
   DISALLOW_COPY_AND_ASSIGN(VRDeviceManagerTest);
 };
 
-VRDeviceManagerTest::VRDeviceManagerTest() {
-}
+VRDeviceManagerTest::VRDeviceManagerTest() {}
 
-VRDeviceManagerTest::~VRDeviceManagerTest() {
-}
+VRDeviceManagerTest::~VRDeviceManagerTest() {}
 
 void VRDeviceManagerTest::SetUp() {
   std::unique_ptr<FakeVRDeviceProvider> provider(new FakeVRDeviceProvider());
@@ -97,4 +95,4 @@ TEST_F(VRDeviceManagerTest, GetDevicesBasicTest) {
   EXPECT_EQ(webvr_devices[0]->index, device2->id());
 }
 
-}  // namespace content
+}  // namespace device

content/browser/vr/vr_device_provider.h → device/vr/vr_device_provider.h

@@ -2,12 +2,12 @@
 // 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_PROVIDER_H
-#define CONTENT_BROWSER_VR_VR_DEVICE_PROVIDER_H
+#ifndef DEVICE_VR_VR_DEVICE_PROVIDER_H
+#define DEVICE_VR_VR_DEVICE_PROVIDER_H
 
 #include <vector>
 
-namespace content {
+namespace device {
 
 class VRDevice;
 
@@ -22,6 +22,6 @@ class VRDeviceProvider {
   virtual void Initialize() = 0;
 };
 
-}  // namespace content
+}  // namespace device
 
-#endif  // CONTENT_BROWSER_VR_VR_DEVICE_PROVIDER_H
+#endif  // DEVICE_VR_VR_DEVICE_PROVIDER_H

device/vr/vr_export.h

+// Copyright 2016 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.
+
+#ifndef DEVICE_VR_DEVICE_VR_EXPORT_H_
+#define DEVICE_VR_DEVICE_VR_EXPORT_H_
+
+#if defined(COMPONENT_BUILD) && defined(WIN32)
+
+#if defined(DEVICE_VR_IMPLEMENTATION)
+#define DEVICE_VR_EXPORT __declspec(dllexport)
+#else
+#define DEVICE_VR_EXPORT __declspec(dllimport)
+#endif
+
+#elif defined(COMPONENT_BUILD) && !defined(WIN32)
+
+#if defined(DEVICE_VR_IMPLEMENTATION)
+#define DEVICE_VR_EXPORT __attribute__((visibility("default")))
+#else
+#define DEVICE_VR_EXPORT
+#endif
+
+#else
+#define DEVICE_VR_EXPORT
+#endif
+
+#endif  // DEVICE_VR_DEVICE_VR_EXPORT_H_