Implement lazy initialization for VrShellDelegate

chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrUtils.java

 // 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.
 
 package org.chromium.chrome.browser.vr_shell;
 
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ skipping 26 matching lines @@
     private static final String DATA_KEY =     "google.vr/data";
     private static final ByteOrder BYTE_ORDER = ByteOrder.BIG_ENDIAN;
     private static final int VIEWER_ID = 3;
     private static final int VERSION = 123;
     private static final int RESERVED = 456;
 
     /**
      * Forces the browser into VR mode via a VrShellDelegate call.
      * @param vrDelegate The VRShellDelegate associated with this activity.
      */
     public static void forceEnterVr(final VrShellDelegate vrDelegate) {

[bsheedy, 2017/03/02 22:25:12]

Nit: This input parameter is no longer used now that enterVRIfNecessary() is
static.

[mthiesse, 2017/03/02 22:35:53]

Done.

         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                vrDelegate.enterVRIfNecessary();
+                VrShellDelegate.enterVRIfNecessary();
             }
         });
     }
 
     /**
      * Forces the browser out of VR mode via a VrShellDelegate call.
      * @param vrDelegate The VRShellDelegate associated with this activity.
      */
     public static void forceExitVr(final VrShellDelegate vrDelegate) {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@@ skipping 47 matching lines @@
         } catch (ActivityNotFoundException e) {
             // On unsupported devices, won't find VrCore -> Do nothing
         }
     }
 
     /**
      * Waits until the given VrShellDelegate's isInVR() returns true. Should
      * only be used when VR Shell support is expected.
      * @param delegate The delegate whose VR status will be polled
      */
     public static void waitForVrSupported(final VrShellDelegate delegate) {

[bsheedy, 2017/03/02 22:25:12]

Nit: Also no longer used.

[mthiesse, 2017/03/02 22:35:53]

Done.

         // If VR Shell is supported, mInVr should eventually go to true
         // Relatively long timeout because sometimes GVR takes a while to enter VR
         CriteriaHelper.pollUiThread(Criteria.equals(true, new Callable<Boolean>() {
             @Override
             public Boolean call() {
-                return delegate.isInVR();
+                return VrShellDelegate.isInVR();
             }
         }), 10000, 50);
     }
 }