Implement lazy initialization for VrShellDelegate

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

 // Copyright 2014 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.test;
 
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ skipping 60 matching lines @@
                 mAttemptedToGetApi = true;
                 try {
                     Class<? extends VrClassesWrapper> vrClassesBuilderClass =
                             (Class<? extends VrClassesWrapper>) Class.forName(
                                     "org.chromium.chrome.browser.vr_shell.VrClassesWrapperImpl");
                     Constructor<?> vrClassesBuilderConstructor =
                             vrClassesBuilderClass.getConstructor(Context.class);
                     VrClassesWrapper vrClassesBuilder =
                             (VrClassesWrapper) vrClassesBuilderConstructor.newInstance(
                                     getTargetContext());
-                    mDaydreamApi = vrClassesBuilder.createVrDaydreamApi();
+                    mDaydreamApi = vrClassesBuilder.createVrDaydreamApi(getTargetContext());
                 } catch (ClassNotFoundException | InstantiationException | IllegalAccessException
                         | IllegalArgumentException | InvocationTargetException
                         | NoSuchMethodException e) {
                     return null;
                 }
             }
             return mDaydreamApi;
         }
 
         private boolean isDaydreamReady() {
             return getDaydreamApi() == null ? false :
                     getDaydreamApi().isDaydreamReadyDevice();
         }
 
         private boolean isDaydreamViewPaired() {
             if (getDaydreamApi() == null) {
                 return false;
             }
             // isDaydreamCurrentViewer() creates a concrete instance of DaydreamApi,
             // which can only be done on the main thread
-            FutureTask<Boolean> checker = new FutureTask<Boolean>(new Callable<Boolean>() {
+            FutureTask<Boolean> checker = new FutureTask<>(new Callable<Boolean>() {
                 @Override
                 public Boolean call() {
                     return getDaydreamApi().isDaydreamCurrentViewer();
                 }
             });
             ThreadUtils.runOnUiThreadBlocking(checker);
             try {
                 return checker.get().booleanValue();
             } catch (CancellationException | InterruptedException | ExecutionException
                     | IllegalArgumentException e) {
@@ skipping 85 matching lines @@
                 return true;
             }
             if (TextUtils.equals(type, ChromeDisableIf.LARGETABLET)
                     && DeviceFormFactor.isLargeTablet(getTargetContext())) {
                 return true;
             }
             return false;
         }
     }
 }