Implement lazy initialization for VrShellDelegate

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

Index: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrDaydreamApiImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrDaydreamApiImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrDaydreamApiImpl.java
index 20f8aec7038ddeb6a32dec1ef096aee497e56199..e73a1f340cc6acc3ff6af94bdc92e8debfe43600 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrDaydreamApiImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrDaydreamApiImpl.java
@@ -24,7 +24,6 @@ import org.chromium.ui.base.WindowAndroid;
  * use it, or API calls begin to silently fail.
  */
 public class VrDaydreamApiImpl implements VrDaydreamApi {
-    private static final String TAG = "VrDaydreamApiImpl";
     private final Context mContext;
 
     public VrDaydreamApiImpl(Context context) {
@@ -70,10 +69,10 @@ public class VrDaydreamApiImpl implements VrDaydreamApi {
 
     @Override
     public boolean exitFromVr(int requestCode, final Intent intent) {
-        DaydreamApi daydreamApi = DaydreamApi.create(mContext);
-        if (daydreamApi == null) return false;
         Activity activity = WindowAndroid.activityFromContext(mContext);
         Assert.assertNotNull(activity);
+        DaydreamApi daydreamApi = DaydreamApi.create(activity);
+        if (daydreamApi == null) return false;
         daydreamApi.exitFromVr(activity, requestCode, intent);
         daydreamApi.close();
         return true;