Moving VR service from /content/browser to /device

content/public/android/BUILD.gn

 # Copyright 2014 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")
 
 content_jni_gypi_values = exec_script("//build/gypi_to_gn.py",
                                       [ rebase_path("../../content_jni.gypi") ],
                                       "scope",
@@ skipping 20 matching lines @@
 android_library("content_java") {
   deps = [
     ":content_java_resources",
     "//base:base_java",
     "//device/battery:mojo_bindings_java",
     "//device/battery/android:battery_monitor_android",
     "//device/bluetooth: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",
     "//mojo/android:system_java",
     "//mojo/public/java:bindings",
     "//mojo/public/java:system",
     "//net/android:net_java",
     "//third_party/WebKit/public:blink_headers_java",
     "//third_party/android_tools:android_support_v13_java",
     "//third_party/jsr-305:jsr_305_javalib",
@@ skipping 101 matching lines @@
     "java/src/org/chromium/content/browser/accessibility/captioning/CaptioningChangeDelegate.java",
     "java/src/org/chromium/content/browser/accessibility/captioning/CaptioningStyle.java",
     "java/src/org/chromium/content/browser/accessibility/captioning/EmptyCaptioningBridge.java",
     "java/src/org/chromium/content/browser/accessibility/captioning/KitKatCaptioningBridge.java",
     "java/src/org/chromium/content/browser/accessibility/captioning/SystemCaptioningBridge.java",
     "java/src/org/chromium/content/browser/accessibility/captioning/TextTrackSettings.java",
     "java/src/org/chromium/content/browser/crypto/ByteArrayGenerator.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",
     "java/src/org/chromium/content/browser/input/FloatingPastePopupMenu.java",
     "java/src/org/chromium/content/browser/input/GamepadDevice.java",
     "java/src/org/chromium/content/browser/input/GamepadList.java",
     "java/src/org/chromium/content/browser/input/GamepadMappings.java",
     "java/src/org/chromium/content/browser/input/HandleViewResources.java",
     "java/src/org/chromium/content/browser/input/ImeAdapter.java",
     "java/src/org/chromium/content/browser/input/ImeUtils.java",
@@ skipping 28 matching lines @@
     "java/src/org/chromium/content_public/browser/LoadUrlParams.java",
     "java/src/org/chromium/content_public/browser/NavigationController.java",
     "java/src/org/chromium/content_public/browser/NavigationEntry.java",
     "java/src/org/chromium/content_public/browser/NavigationHistory.java",
     "java/src/org/chromium/content_public/browser/WebContents.java",
     "java/src/org/chromium/content_public/browser/WebContentsObserver.java",
     "java/src/org/chromium/content_public/common/MediaMetadata.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") {
   grd_file = "java/strings/android_content_strings.grd"
   outputs = [
     "values-am/android_content_strings.xml",
     "values-ar/android_content_strings.xml",
     "values-bg/android_content_strings.xml",
     "values-ca/android_content_strings.xml",
     "values-cs/android_content_strings.xml",
@@ skipping 61 matching lines @@
   jni_package = "content"
   classes = [
     "java/util/HashSet.class",
     "android/view/MotionEvent.class",
   ]
 }
 
 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") {
   public_deps = [
     ":content_jni_headers",
     ":jar_jni",
   ]
 }
 
 android_library("content_javatests") {
@@ skipping 89 matching lines @@
   java_files = [
     "junit/src/org/chromium/content/browser/input/GamepadMappingsTest.java",
     "junit/src/org/chromium/content/browser/BindingManagerImplTest.java",
   ]
   deps = [
     ":content_java",
     "//base:base_java",
     "//base:base_java_test_support",
   ]
 }