Tracks GVR version crossed with headset type using UMA.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrCoreVersionCheckerImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrCoreVersionCheckerImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrCoreVersionCheckerImpl.java
index 6ab016963dfba4d83af9877639c5858200ea9aef..90fbb381bbf2564d5f688125bf85e4826722b557 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrCoreVersionCheckerImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrCoreVersionCheckerImpl.java
@@ -13,7 +13,6 @@ import com.google.vr.vrcore.base.api.VrCoreUtils;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.PackageUtils;
-
 import org.chromium.chrome.browser.ChromeFeatureList;
 
 /**
@@ -25,14 +24,14 @@ public class VrCoreVersionCheckerImpl implements VrCoreVersionChecker {
     private static final String MIN_SDK_VERSION_PARAM_NAME = "min_sdk_version";
 
     @Override
-    public int getVrCoreCompatibility() {
+    public VrCoreInfo getVrCoreInfo() {
         // Supported Build version is determined by the webvr cardboard support feature.
         // Default is KITKAT unless specified via server side finch config.
         if (Build.VERSION.SDK_INT < ChromeFeatureList.getFieldTrialParamByFeatureAsInt(
                                             ChromeFeatureList.WEBVR_CARDBOARD_SUPPORT,
                                             MIN_SDK_VERSION_PARAM_NAME,
                                             Build.VERSION_CODES.KITKAT)) {
-            return VrCoreVersionChecker.VR_NOT_SUPPORTED;
+            return new VrCoreInfo(null, VrCoreVersionChecker.VR_NOT_SUPPORTED);

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

OOC, why aren't these in an enum instead of ints. amp@?

[amp, 2017/05/05 23:51:54]

I was just following the existing patterns.  I assumed there was some reason we
couldn't do enum's but I don't really know.  Maybe something about having them
defined as annotation values was the reason?  But then I'm not sure why they
needed to be an annotation either (perhaps some GVR api requirement?).

[ddorwin, 2017/05/16 00:15:50]

mthiesse@, do you know?

[mthiesse, 2017/05/16 00:53:41]

One of the bizarre quirks of Android/Java is that this is the canonical way to
make a c-style enum. See the @IntDef garbage in VrCoreVersionChecker.java.

I think there are a couple reasons for it, one being c-like compile-time
guarantees, another being performance, another being simple mappings to actual
c/c++ enums.

Senior Android reviewers actually asked us to use this style of enum.

         }
         try {
             String vrCoreSdkLibraryVersionString = VrCoreUtils.getVrCoreSdkLibraryVersion(
@@ -41,9 +40,9 @@ public class VrCoreVersionCheckerImpl implements VrCoreVersionChecker {
             Version targetSdkLibraryVersion =
                     Version.parse(com.google.vr.ndk.base.BuildConstants.VERSION);
             if (!vrCoreSdkLibraryVersion.isAtLeast(targetSdkLibraryVersion)) {
-                return VrCoreVersionChecker.VR_OUT_OF_DATE;
+                return new VrCoreInfo(vrCoreSdkLibraryVersion, VrCoreVersionChecker.VR_OUT_OF_DATE);
             }
-            return VrCoreVersionChecker.VR_READY;
+            return new VrCoreInfo(vrCoreSdkLibraryVersion, VrCoreVersionChecker.VR_READY);
         } catch (VrCoreNotAvailableException e) {
             Log.i(TAG, "Unable to find VrCore.");
             // Old versions of VrCore are not integrated with the sdk library version check and will
@@ -53,9 +52,9 @@ public class VrCoreVersionCheckerImpl implements VrCoreVersionChecker {
             if (PackageUtils.getPackageVersion(
                         ContextUtils.getApplicationContext(), VR_CORE_PACKAGE_ID)
                     != -1) {
-                return VrCoreVersionChecker.VR_OUT_OF_DATE;
+                return new VrCoreInfo(null, VrCoreVersionChecker.VR_OUT_OF_DATE);
             }
-            return VrCoreVersionChecker.VR_NOT_AVAILABLE;
+            return new VrCoreInfo(null, VrCoreVersionChecker.VR_NOT_AVAILABLE);
         }
     }
 }