Implement lazy initialization for VrShellDelegate

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

Index: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrClassesWrapperImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrClassesWrapperImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrClassesWrapperImpl.java
index 8190e04db1a6338293d2ecbcc9b88cc2518f79cc..2f67a654f7221e81e0746982fdeae3ca04503728 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrClassesWrapperImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrClassesWrapperImpl.java
@@ -4,16 +4,16 @@
 
 package org.chromium.chrome.browser.vr_shell;
 
+import android.app.Activity;
 import android.content.Context;
 import android.os.StrictMode;
 
 import com.google.vr.ndk.base.AndroidCompat;
 
 import org.chromium.base.Log;
-import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.UsedByReflection;
 import org.chromium.chrome.browser.ChromeActivity;
-import org.chromium.chrome.browser.compositor.CompositorViewHolder;
+import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 
 /**
  * Builder class to create all VR related classes. These VR classes are behind the same build time
@@ -22,24 +22,15 @@ import org.chromium.chrome.browser.compositor.CompositorViewHolder;
 @UsedByReflection("VrShellDelegate.java")
 public class VrClassesWrapperImpl implements VrClassesWrapper {
     private static final String TAG = "VrClassesWrapperImpl";
-    private final Context mContext;
 
     @UsedByReflection("VrShellDelegate.java")
-    public VrClassesWrapperImpl(ChromeActivity activity) {
-        mContext = activity;
-    }
-
-    @UsedByReflection("ChromeInstrumentationTestRunner.java")
-    @VisibleForTesting
-    public VrClassesWrapperImpl(Context context) {
-        mContext = context;
-    }
+    public VrClassesWrapperImpl() {}
 
     @Override
-    public NonPresentingGvrContext createNonPresentingGvrContext() {
+    public NonPresentingGvrContext createNonPresentingGvrContext(ChromeActivity activity) {
         StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
         try {
-            return new NonPresentingGvrContextImpl((ChromeActivity) mContext);
+            return new NonPresentingGvrContextImpl(activity);
         } catch (Exception ex) {
             Log.e(TAG, "Unable to instantiate NonPresentingGvrContextImpl", ex);
             return null;
@@ -49,11 +40,11 @@ public class VrClassesWrapperImpl implements VrClassesWrapper {
     }
 
     @Override
-    public VrShell createVrShell(VrShellDelegate delegate,
-            CompositorViewHolder compositorViewHolder) {
+    public VrShell createVrShell(
+            ChromeActivity activity, VrShellDelegate delegate, TabModelSelector tabModelSelector) {
         StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
         try {
-            return new VrShellImpl((ChromeActivity) mContext, delegate, compositorViewHolder);
+            return new VrShellImpl(activity, delegate, tabModelSelector);
         } catch (Exception ex) {
             Log.e(TAG, "Unable to instantiate VrShellImpl", ex);
             return null;
@@ -63,8 +54,13 @@ public class VrClassesWrapperImpl implements VrClassesWrapper {
     }
 
     @Override
-    public VrDaydreamApi createVrDaydreamApi() {
-        return new VrDaydreamApiImpl(mContext);
+    public VrDaydreamApi createVrDaydreamApi(Activity activity) {
+        return new VrDaydreamApiImpl(activity);
+    }
+
+    @Override
+    public VrDaydreamApi createVrDaydreamApi(Context context) {
+        return new VrDaydreamApiImpl(context);
     }
 
     @Override
@@ -73,7 +69,7 @@ public class VrClassesWrapperImpl implements VrClassesWrapper {
     }
 
     @Override
-    public void setVrModeEnabled(boolean enabled) {
-        AndroidCompat.setVrModeEnabled((ChromeActivity) mContext, enabled);
+    public void setVrModeEnabled(Activity activity, boolean enabled) {
+        AndroidCompat.setVrModeEnabled(activity, enabled);
     }
 }