Implement lazy initialization for VrShellDelegate

chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellTest.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 static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_DAYDREAM;
 import static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_DAYDREAM_VIEW;
 import static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_NON_DAYDREAM;
 
@@ skipping 28 matching lines @@
 public class VrShellTest extends ChromeTabbedActivityTestBase {
     private static final String GOLDEN_DIR =
             "chrome/test/data/android/render_tests";
 
     private VrShellDelegate mDelegate;
     private ViewRenderer mViewRenderer;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mDelegate = getActivity().getVrShellDelegate();
+        mDelegate = VrShellDelegate.getInstanceForTesting();
     }
 
     @Override
     public void startMainActivity() throws InterruptedException {
         startMainActivityOnBlankPage();
         mViewRenderer = new ViewRenderer(getActivity(),
                 GOLDEN_DIR, this.getClass().getSimpleName());
     }
 
     private void enterExitVrMode(boolean supported) {
         MockVrDaydreamApi mockApi = new MockVrDaydreamApi();
         if (!supported) {
             mDelegate.overrideDaydreamApiForTesting(mockApi);
         }
-        VrUtils.forceEnterVr(mDelegate);
+        VrUtils.forceEnterVr();
         if (supported) {
-            VrUtils.waitForVrSupported(mDelegate);
-            assertTrue(mDelegate.isInVR());
+            VrUtils.waitForVrSupported();
+            assertTrue(VrShellDelegate.isInVR());
         } else {
             assertFalse(mockApi.getLaunchInVrCalled());
-            assertFalse(mDelegate.isInVR());
+            assertFalse(VrShellDelegate.isInVR());
         }
         VrUtils.forceExitVr(mDelegate);
-        assertFalse(mDelegate.isInVR());
+        assertFalse(VrShellDelegate.isInVR());
     }
 
     private void enterExitVrModeImage(boolean supported) throws IOException {
         int prevOrientation = getActivity().getRequestedOrientation();
         getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         getInstrumentation().waitForIdleSync();
         mViewRenderer.renderAndCompare(
                 getActivity().getWindow().getDecorView().getRootView(),
                 "blank_page");
 
-        VrUtils.forceEnterVr(mDelegate);
+        VrUtils.forceEnterVr();
         // Currently, screenshots only show the static UI overlay, not the
         // actual content. Thus, 1:1 pixel checking is reliable until a
         // way to take screenshots of VR content is added, in which case
         // % similarity or some other method will need to be used. We're
         // assuming that if the UI overlay is visible, then the device has
         // successfully entered VR mode.
         if (supported) {
-            VrUtils.waitForVrSupported(mDelegate);
+            VrUtils.waitForVrSupported();
             mViewRenderer.renderAndCompare(
                     getActivity().getWindow().getDecorView().getRootView(),
                     "vr_entered");
         } else {
             // TODO(bsheedy): Find a good way to wait before taking a screenshot
             // when running on an unsupported device
             mViewRenderer.renderAndCompare(
                     getActivity().getWindow().getDecorView().getRootView(),
                     "blank_page");
         }
 
         VrUtils.forceExitVr(mDelegate);
         getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         getInstrumentation().waitForIdleSync();
         mViewRenderer.renderAndCompare(
                 getActivity().getWindow().getDecorView().getRootView(),
                 "blank_page");
 
         getActivity().setRequestedOrientation(prevOrientation);
     }
 
     private void enterVrModeNfc(boolean supported) {
         getInstrumentation().waitForIdleSync();
         VrUtils.simNfc(getActivity());
         if (supported) {
-            VrUtils.waitForVrSupported(mDelegate);
-            assertTrue(mDelegate.isInVR());
+            VrUtils.waitForVrSupported();
+            assertTrue(VrShellDelegate.isInVR());
         } else {
-            assertFalse(mDelegate.isInVR());
+            assertFalse(VrShellDelegate.isInVR());
         }
         VrUtils.forceExitVr(mDelegate);
         // TODO(bsheedy): Figure out why NFC tests cause the next test to fail
         // to enter VR unless we sleep for some amount of time after exiting VR
         // in the NFC test
     }
 
     /**
      * Verifies that browser successfully enters VR mode when Daydream headset
      * NFC tag is scanned on a Daydream-ready device. Requires that the phone
@@ skipping 108 matching lines @@
         });
 
         CriteriaHelper.pollUiThread(Criteria.equals(testWidth, new Callable<Integer>() {
             @Override
             public Integer call() {
                 return cvc.getViewportWidthPix();
             }
         }));
     }
 }