Implement lazy initialization for VrShellDelegate

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

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java
index 23c3c65b4b33dacca970607ad1ea491bbf59c67e..9148df992e633cdec54f4acbd5bd34a9d543da37 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java
@@ -78,7 +78,7 @@ public class ChromeInstrumentationTestRunner extends BaseChromiumInstrumentation
                     VrClassesWrapper vrClassesBuilder =
                             (VrClassesWrapper) vrClassesBuilderConstructor.newInstance(
                                     getTargetContext());
-                    mDaydreamApi = vrClassesBuilder.createVrDaydreamApi();
+                    mDaydreamApi = vrClassesBuilder.createVrDaydreamApi(getTargetContext());
                 } catch (ClassNotFoundException | InstantiationException | IllegalAccessException
                         | IllegalArgumentException | InvocationTargetException
                         | NoSuchMethodException e) {
@@ -99,7 +99,7 @@ public class ChromeInstrumentationTestRunner extends BaseChromiumInstrumentation
             }
             // 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();