Introduce ChromeVR to Chrome on Android (behind a build flag)

device/vr/android/java/src/org/chromium/device/vr/CardboardVRDevice.java

Index: device/vr/android/java/src/org/chromium/device/vr/CardboardVRDevice.java
diff --git a/device/vr/android/java/src/org/chromium/device/vr/CardboardVRDevice.java b/device/vr/android/java/src/org/chromium/device/vr/CardboardVRDevice.java
index ba7d4d817385529df92a5449fd899b0ab67e688b..d19c0cae1fe9a1d663342cc24ffac4b609f7e797 100644
--- a/device/vr/android/java/src/org/chromium/device/vr/CardboardVRDevice.java
+++ b/device/vr/android/java/src/org/chromium/device/vr/CardboardVRDevice.java
@@ -6,12 +6,12 @@ package org.chromium.device.vr;
 
 import android.content.Context;
 
-import com.google.vrtoolkit.cardboard.CardboardDeviceParams;
-import com.google.vrtoolkit.cardboard.FieldOfView;
-import com.google.vrtoolkit.cardboard.HeadMountedDisplay;
-import com.google.vrtoolkit.cardboard.HeadMountedDisplayManager;
-import com.google.vrtoolkit.cardboard.ScreenParams;
-import com.google.vrtoolkit.cardboard.sensors.HeadTracker;
+import com.google.vr.sdk.base.FieldOfView;
+import com.google.vr.sdk.base.GvrViewerParams;
+import com.google.vr.sdk.base.HeadMountedDisplay;
+import com.google.vr.sdk.base.HeadMountedDisplayManager;
+import com.google.vr.sdk.base.ScreenParams;
+import com.google.vr.sdk.base.sensors.HeadTracker;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
@@ -41,7 +41,7 @@ class CardboardVRDevice {
     @CalledByNative
     private void getFieldOfView(float[] outFov) {
         HeadMountedDisplay hmd = mHMDManager.getHeadMountedDisplay();
-        CardboardDeviceParams deviceParams = hmd.getCardboardDeviceParams();
+        GvrViewerParams deviceParams = hmd.getGvrViewerParams();
         FieldOfView fov = deviceParams.getLeftEyeMaxFov();
         outFov[0] = fov.getTop();
         outFov[1] = fov.getBottom();
@@ -52,14 +52,14 @@ class CardboardVRDevice {
     @CalledByNative
     private float getIpd() {
         HeadMountedDisplay hmd = mHMDManager.getHeadMountedDisplay();
-        CardboardDeviceParams deviceParams = hmd.getCardboardDeviceParams();
+        GvrViewerParams deviceParams = hmd.getGvrViewerParams();
         return deviceParams.getInterLensDistance();
     }
 
     @CalledByNative
     private String getDeviceName() {
         HeadMountedDisplay hmd = mHMDManager.getHeadMountedDisplay();
-        CardboardDeviceParams deviceParams = hmd.getCardboardDeviceParams();
+        GvrViewerParams deviceParams = hmd.getGvrViewerParams();
         return deviceParams.getVendor() + " " + deviceParams.getModel();
     }