Implement lazy initialization for VrShellDelegate

chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrClassesWrapper.java

Index: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrClassesWrapper.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrClassesWrapper.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrClassesWrapper.java
index 9b33d71e262c03a98f8f5a69f84f070b7f4bfb78..81003c90ae8881dc61048109e72d2ea52ee8632b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrClassesWrapper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrClassesWrapper.java
@@ -4,7 +4,12 @@
 
 package org.chromium.chrome.browser.vr_shell;
 
-import org.chromium.chrome.browser.compositor.CompositorViewHolder;
+import android.app.Activity;
+import android.content.Context;
+
+import org.chromium.base.VisibleForTesting;
+import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 
 /**
  * Abstracts away the VrClassesWrapperImpl class, which may or may not be present at runtime
@@ -14,18 +19,24 @@ public interface VrClassesWrapper {
     /**
      * Creates a NonPresentingGvrContextImpl instance.
      */
-    public NonPresentingGvrContext createNonPresentingGvrContext();
+    public NonPresentingGvrContext createNonPresentingGvrContext(ChromeActivity activity);
 
     /**
      * Creates a VrShellImpl instance.
      */
-    public VrShell createVrShell(VrShellDelegate delegate,
-            CompositorViewHolder compositorViewHolder);
+    public VrShell createVrShell(
+            ChromeActivity activity, VrShellDelegate delegate, TabModelSelector tabModelSelector);
+
+    /**
+     * Creates a VrDaydreamApImpl instance.
+     */
+    public VrDaydreamApi createVrDaydreamApi(Activity activity);
 
     /**
      * Creates a VrDaydreamApImpl instance.
      */
-    public VrDaydreamApi createVrDaydreamApi();
+    @VisibleForTesting
+    public VrDaydreamApi createVrDaydreamApi(Context context);
 
     /**
     * Creates a VrCoreVersionCheckerImpl instance.
@@ -35,5 +46,5 @@ public interface VrClassesWrapper {
     /**
      * Sets VR Mode to |enabled|.
      */
-    public void setVrModeEnabled(boolean enabled);
+    public void setVrModeEnabled(Activity activity, boolean enabled);
 }