Tracks GVR version crossed with headset type using UMA.

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

 // Copyright 2016 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.browser.vr_shell;
 
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
@@ skipping 714 matching lines @@
         }
         restoreWindowMode();
         mVrShell.pause();
         removeVrViews();
         destroyVrShell();
         mActivity.getFullscreenManager().setPositionsForTabToNonFullscreen();
     }
 
     private static boolean isVrCoreCompatible(
             VrCoreVersionChecker versionChecker, Tab tabToShowInfobarIn) {
-        int vrCoreCompatibility = versionChecker.getVrCoreCompatibility();
+        int vrCoreCompatibility = versionChecker.getVrCoreInfo().compatibility;

[ddorwin, 2017/05/05 20:29:59]

Can this throw an exception? See line 875.

[tiborg, 2017/05/10 20:39:51]

getVrCoreInfo() always returns non-null and this function is never called with a
null versionChecker parameter (at least that was the assumption so far). It's
not the function from line 875 (even though it has the same name). 

 
         if (vrCoreCompatibility == VrCoreVersionChecker.VR_NOT_AVAILABLE
                 || vrCoreCompatibility == VrCoreVersionChecker.VR_OUT_OF_DATE) {
             promptToUpdateVrServices(vrCoreCompatibility, tabToShowInfobarIn);
         }
 
         return vrCoreCompatibility == VrCoreVersionChecker.VR_READY;
     }
 
     private static void promptToUpdateVrServices(int vrCoreCompatibility, Tab tab) {
@@ skipping 117 matching lines @@
     }
 
     /**
      * @return Pointer to the native VrShellDelegate object.
      */
     @CalledByNative
     private long getNativePointer() {
         return mNativeVrShellDelegate;
     }
 
+    @CalledByNative
+    private VrCoreInfo getVrCoreInfo() {
+        return (mVrCoreVersionChecker != null) ? mVrCoreVersionChecker.getVrCoreInfo() : null;
+    }
+
     private void destroy() {
         if (sInstance == null) return;
         shutdownVr(true, false);
         if (mNativeVrShellDelegate != 0) nativeDestroy(mNativeVrShellDelegate);
         mNativeVrShellDelegate = 0;
         ApplicationStatus.unregisterActivityStateListener(this);
         sInstance = null;
     }
 
     private native long nativeInit();
     private static native void nativeOnLibraryAvailable();
     private native void nativeSetPresentResult(long nativeVrShellDelegate, boolean result);
     private native void nativeDisplayActivate(long nativeVrShellDelegate);
     private native void nativeUpdateVSyncInterval(long nativeVrShellDelegate, long timebaseNanos,
             double intervalSeconds);
     private native void nativeOnPause(long nativeVrShellDelegate);
     private native void nativeOnResume(long nativeVrShellDelegate);
     private native void nativeDestroy(long nativeVrShellDelegate);
 }