[vr] Fix Java unit tests interacting with VR if VR is disabled

This should fix the x86 downstream bots that are currently blocking
Canary release.

Bug: 864924
Change-Id: I0929373233e58897f91536a5e60813bf3db5e2f7
Reviewed-on: https://chromium-review.googlesource.com/1142126Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Tibor Goldschwendt <tiborg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576092}

chrome/android/java/src/org/chromium/chrome/browser/vr/VrDelegate.java

@@ -35,4 +35,6 @@ public interface VrDelegate {
     void maybeHandleVrIntentPreNative(ChromeActivity activity, Intent intent);
     void setVrModeEnabled(Activity activity, boolean enabled);
     boolean bootsToVr();
+    boolean isDaydreamReadyDevice();
+    boolean isDaydreamCurrentViewer();
 }

chrome/android/java/src/org/chromium/chrome/browser/vr/VrDelegateFallback.java

@@ -112,6 +112,16 @@ import org.chromium.chrome.browser.ChromeActivity;
         return false;
     }
 
+    @Override
+    public boolean isDaydreamReadyDevice() {
+        return false;
+    }
+
+    @Override
+    public boolean isDaydreamCurrentViewer() {
+        return false;
+    }
+
     @Override
     public boolean isVrIntent(Intent intent) {
         return false;

chrome/android/java/src/org/chromium/chrome/browser/vr/VrDelegateImpl.java

@@ -133,6 +133,16 @@ import org.chromium.chrome.browser.ChromeActivity;
         return VrShellDelegate.bootsToVr();
     }
 
+    @Override
+    public boolean isDaydreamReadyDevice() {
+        return VrShellDelegate.isDaydreamReadyDevice();
+    }
+
+    @Override
+    public boolean isDaydreamCurrentViewer() {
+        return VrShellDelegate.isDaydreamCurrentViewer();
+    }
+
     @Override
     public boolean isVrIntent(Intent intent) {
         return VrIntentUtils.isVrIntent(intent);

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

@@ -684,6 +684,11 @@ public class VrShellDelegate
         return getVrClassesWrapper() != null && getVrClassesWrapper().isDaydreamReadyDevice();
     }
 
+    public static boolean isDaydreamCurrentViewer() {
+        if (sInstance != null) return sInstance.isDaydreamCurrentViewerInternal();
+        return getVrDaydreamApi().isDaydreamCurrentViewer();
+    }
+
     /**
      * @return A helper class for creating VR-specific classes that may not be available at compile
      * time.
@@ -797,11 +802,6 @@ public class VrShellDelegate
         return isVrBrowsingSupported(activity) && vrSupportLevel == VrSupportLevel.VR_DAYDREAM;
     }
 
-    /* package */ static boolean isDaydreamCurrentViewer() {
-        if (sInstance != null) return sInstance.isDaydreamCurrentViewerInternal();
-        return getVrDaydreamApi().isDaydreamCurrentViewer();
-    }
-
     /* package */ static boolean isInVrSession() {
         return getVrClassesWrapper() != null && getVrClassesWrapper().isInVrSession();
     }

chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeJUnit4ClassRunner.java

@@ -20,8 +20,7 @@ import org.chromium.base.test.BaseTestResult.PreTestHook;
 import org.chromium.base.test.util.RestrictionSkipCheck;
 import org.chromium.base.test.util.SkipCheck;
 import org.chromium.chrome.browser.ChromeVersionInfo;
-import org.chromium.chrome.browser.vr.VrDaydreamApi;
-import org.chromium.chrome.browser.vr.VrShellDelegate;
+import org.chromium.chrome.browser.vr.VrModuleProvider;
 import org.chromium.chrome.test.util.ChromeRestriction;
 import org.chromium.chrome.test.util.browser.ChromeModernDesign;
 import org.chromium.chrome.test.util.browser.Features;
@@ -68,19 +67,19 @@ public class ChromeJUnit4ClassRunner extends ContentJUnit4ClassRunner {
         }
 
         private boolean isDaydreamReady() {
-            return VrShellDelegate.isDaydreamReadyDevice();
+            return VrModuleProvider.getDelegate().isDaydreamReadyDevice();
         }
 
         private boolean isDaydreamViewPaired() {
-            final VrDaydreamApi daydreamApi = VrShellDelegate.getVrDaydreamApi();
-            if (daydreamApi == null) {
+            if (!isDaydreamReady()) {
                 return false;
             }
 
             // isDaydreamCurrentViewer() creates a concrete instance of DaydreamApi,
             // which can only be done on the main thread
             try {
-                return ThreadUtils.runOnUiThreadBlocking(daydreamApi::isDaydreamCurrentViewer);
+                return ThreadUtils.runOnUiThreadBlocking(
+                        VrModuleProvider.getDelegate()::isDaydreamCurrentViewer);
             } catch (CancellationException | ExecutionException | IllegalArgumentException e) {
                 return false;
             }