VR: Disable VR on standalone VR devices.

Bug: 841850
Change-Id: I0249210c8fe387a3732715be2650ce9aea5af800
Reviewed-on: https://chromium-review.googlesource.com/1054211Reviewed-by: Biao She <bshe@chromium.org>
Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557623}

chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrIntentUtils.java

@@ -155,6 +155,7 @@ public class VrIntentUtils {
      * @return Options that a VR-specific Chrome activity should be launched with.
      */
     public static Bundle getVrIntentOptions(Context context) {
+        if (!VrShellDelegate.isVrEnabled()) return null;
         // These options are used to start the Activity with a custom animation to keep it hidden
         // for a few hundred milliseconds - enough time for us to draw the first black view.
         // The animation is sufficient to hide the 2D screenshot but not to the 2D UI while the

chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java

@@ -788,6 +788,8 @@ public class VrShellDelegate
      */
     public static VrClassesWrapper getVrClassesWrapper() {
         if (sVrClassesWrapper == null) sVrClassesWrapper = createVrClassesWrapper();
+        // Disable VR on standalone VR devices (https://crbug.com/841850).
+        if (sVrClassesWrapper != null && sVrClassesWrapper.bootsToVr()) return null;
         return sVrClassesWrapper;
     }