Tracks GVR version crossed with headset type using UMA.

chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/MockVrCoreVersionCheckerImpl.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/MockVrCoreVersionCheckerImpl.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/MockVrCoreVersionCheckerImpl.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/MockVrCoreVersionCheckerImpl.java
index 1e35cec870127a4f2df85a33158b4e765ec052d8..50221fe79e36d660bbd986001a9426234754bacc 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/MockVrCoreVersionCheckerImpl.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/MockVrCoreVersionCheckerImpl.java
@@ -10,21 +10,20 @@ package org.chromium.chrome.browser.vr_shell;
  */
 public class MockVrCoreVersionCheckerImpl extends VrCoreVersionCheckerImpl {
     private boolean mUseActualImplementation;
-    private int mMockReturnValue = VrCoreVersionChecker.VR_READY;
-    private int mLastReturnValue = -1;
+    private VrCoreInfo mMockReturnValue = new VrCoreInfo(null, VrCoreCompatibility.VR_READY);
+    private VrCoreInfo mLastReturnValue = null;
 
     @Override
-    public int getVrCoreCompatibility() {
-        mLastReturnValue =
-                mUseActualImplementation ? super.getVrCoreCompatibility() : mMockReturnValue;
+    public VrCoreInfo getVrCoreInfo() {
+        mLastReturnValue = mUseActualImplementation ? super.getVrCoreInfo() : mMockReturnValue;
         return mLastReturnValue;
     }
 
-    public int getLastReturnValue() {
+    public VrCoreInfo getLastReturnValue() {
         return mLastReturnValue;
     }
 
-    public void setMockReturnValue(int value) {
+    public void setMockReturnValue(VrCoreInfo value) {
         mMockReturnValue = value;
     }