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 746 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;
 
-        if (vrCoreCompatibility == VrCoreVersionChecker.VR_NOT_AVAILABLE
-                || vrCoreCompatibility == VrCoreVersionChecker.VR_OUT_OF_DATE) {
+        if (vrCoreCompatibility == VrCoreCompatibility.VR_NOT_AVAILABLE
+                || vrCoreCompatibility == VrCoreCompatibility.VR_OUT_OF_DATE) {
             promptToUpdateVrServices(vrCoreCompatibility, tabToShowInfobarIn);
         }
 
-        return vrCoreCompatibility == VrCoreVersionChecker.VR_READY;
+        return vrCoreCompatibility == VrCoreCompatibility.VR_READY;
     }
 
     private static void promptToUpdateVrServices(int vrCoreCompatibility, Tab tab) {
         if (tab == null) {
             return;
         }
         final Activity activity = tab.getActivity();
         String infobarText;
         String buttonText;
-        if (vrCoreCompatibility == VrCoreVersionChecker.VR_NOT_AVAILABLE) {
+        if (vrCoreCompatibility == VrCoreCompatibility.VR_NOT_AVAILABLE) {
             // Supported, but not installed. Ask user to install instead of upgrade.
             infobarText = activity.getString(R.string.vr_services_check_infobar_install_text);
             buttonText = activity.getString(R.string.vr_services_check_infobar_install_button);
-        } else if (vrCoreCompatibility == VrCoreVersionChecker.VR_OUT_OF_DATE) {
+        } else if (vrCoreCompatibility == VrCoreCompatibility.VR_OUT_OF_DATE) {
             infobarText = activity.getString(R.string.vr_services_check_infobar_update_text);
             buttonText = activity.getString(R.string.vr_services_check_infobar_update_button);
         } else {
             Log.e(TAG, "Unknown VrCore compatibility: " + vrCoreCompatibility);
             return;
         }
 
         SimpleConfirmInfoBarBuilder.Listener listener = new SimpleConfirmInfoBarBuilder.Listener() {
             @Override
             public void onInfoBarDismissed() {}
@@ skipping 96 matching lines @@
     }
 
     /**
      * @return Pointer to the native VrShellDelegate object.
      */
     @CalledByNative
     private long getNativePointer() {
         return mNativeVrShellDelegate;
     }
 
+    @CalledByNative
+    private long getVrCoreInfo() {
+        assert mVrCoreVersionChecker != null;
+        VrCoreInfo vrCoreInfo = mVrCoreVersionChecker.getVrCoreInfo();
+        long nativeVrCoreInfo = (vrCoreInfo.gvrVersion != null)

[ddorwin, 2017/05/24 07:31:37]

nit: It is generally clearer to use positive logic. Yes, !null is the happy
case, but is that more important than positive logic? It's a judgement call.

[tiborg, 2017/05/25 00:06:02]

Makes sense. Changed it.

+                ? nativeMakeNativeVrCoreInfo(mNativeVrShellDelegate,
+                          vrCoreInfo.gvrVersion.majorVersion, vrCoreInfo.gvrVersion.minorVersion,
+                          vrCoreInfo.gvrVersion.patchVersion, vrCoreInfo.compatibility)
+                : nativeMakeNativeVrCoreInfo(
+                          mNativeVrShellDelegate, 0, 0, 0, vrCoreInfo.compatibility);
+        return nativeVrCoreInfo;
+    }
+
     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);
+    private native long nativeMakeNativeVrCoreInfo(long nativeVrShellDelegate, int majorVersion,
+            int minorVersion, int patchVersion, int compatibility);
 }