Tracks GVR version crossed with headset type using UMA.

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

 // Copyright 2017 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 static org.chromium.chrome.browser.vr_shell.VrTestRule.PAGE_LOAD_TIMEOUT_S;
 import static org.chromium.chrome.browser.vr_shell.VrUtils.POLL_TIMEOUT_SHORT_MS;
 import static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_VIEWER_DAYDREAM;
 import static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_VIEWER_NON_DAYDREAM;
@@ skipping 161 matching lines @@
 
         mVrTestRule.executeStepAndWait(
                 "stepCheckFrameDataWhileNonFocusedTab()", mVrTestRule.getFirstTabWebContents());
         mVrTestRule.endTest(mVrTestRule.getFirstTabWebContents());
     }
 
     /**
      * Helper function to run the tests checking for the upgrade/install InfoBar being present since
      * all that differs is the value returned by VrCoreVersionChecker and a couple asserts.
      *
-     * @param checkerReturnValue The value to have the VrCoreVersionChecker return
+     * @param checkerReturnCompatibility The compatibility to have the VrCoreVersionChecker return
      */
-    private void infoBarTestHelper(int checkerReturnValue) throws InterruptedException {
+    private void infoBarTestHelper(int checkerReturnCompatibility) throws InterruptedException {
         MockVrCoreVersionCheckerImpl mockChecker = new MockVrCoreVersionCheckerImpl();
-        mockChecker.setMockReturnValue(checkerReturnValue);
+        mockChecker.setMockReturnValue(new VrCoreInfo(null, checkerReturnCompatibility));
         VrUtils.getVrShellDelegateInstance().overrideVrCoreVersionCheckerForTesting(mockChecker);
         mVrTestRule.loadUrlAndAwaitInitialization(
                 VrTestRule.getHtmlTestFile("generic_webvr_page"), PAGE_LOAD_TIMEOUT_S);
         String displayFound = "VRDisplay Found";
         String barPresent = "InfoBar present";
-        if (checkerReturnValue == VrCoreVersionChecker.VR_READY) {
+        if (checkerReturnCompatibility == VrCoreCompatibility.VR_READY) {
             Assert.assertTrue(
                     displayFound, mVrTestRule.vrDisplayFound(mVrTestRule.getFirstTabWebContents()));
             Assert.assertFalse(barPresent,
                     VrUtils.isInfoBarPresent(mVrTestRule.getActivity().getWindow().getDecorView()));
-        } else if (checkerReturnValue == VrCoreVersionChecker.VR_OUT_OF_DATE
-                || checkerReturnValue == VrCoreVersionChecker.VR_NOT_AVAILABLE) {
+        } else if (checkerReturnCompatibility == VrCoreCompatibility.VR_OUT_OF_DATE
+                || checkerReturnCompatibility == VrCoreCompatibility.VR_NOT_AVAILABLE) {
             // Out of date and missing cases are the same, but with different text
             String expectedMessage, expectedButton;
-            if (checkerReturnValue == VrCoreVersionChecker.VR_OUT_OF_DATE) {
+            if (checkerReturnCompatibility == VrCoreCompatibility.VR_OUT_OF_DATE) {
                 expectedMessage = mVrTestRule.getActivity().getString(
                         R.string.vr_services_check_infobar_update_text);
                 expectedButton = mVrTestRule.getActivity().getString(
                         R.string.vr_services_check_infobar_update_button);
             } else {
                 expectedMessage = mVrTestRule.getActivity().getString(
                         R.string.vr_services_check_infobar_install_text);
                 expectedButton = mVrTestRule.getActivity().getString(
                         R.string.vr_services_check_infobar_install_button);
             }
             Assert.assertFalse(
                     displayFound, mVrTestRule.vrDisplayFound(mVrTestRule.getFirstTabWebContents()));
             Assert.assertTrue(barPresent,
                     VrUtils.isInfoBarPresent(mVrTestRule.getActivity().getWindow().getDecorView()));
             TextView tempView =
                     (TextView) mVrTestRule.getActivity().getWindow().getDecorView().findViewById(
                             R.id.infobar_message);
             Assert.assertEquals(expectedMessage, tempView.getText().toString());
             tempView = (TextView) mVrTestRule.getActivity().getWindow().getDecorView().findViewById(
                     R.id.button_primary);
             Assert.assertEquals(expectedButton, tempView.getText().toString());
-        } else if (checkerReturnValue == VrCoreVersionChecker.VR_NOT_SUPPORTED) {
+        } else if (checkerReturnCompatibility == VrCoreCompatibility.VR_NOT_SUPPORTED) {
             Assert.assertFalse(
                     displayFound, mVrTestRule.vrDisplayFound(mVrTestRule.getFirstTabWebContents()));
             Assert.assertFalse(barPresent,
                     VrUtils.isInfoBarPresent(mVrTestRule.getActivity().getWindow().getDecorView()));
         } else {
-            Assert.fail(
-                    "Invalid VrCoreVersionChecker value: " + String.valueOf(checkerReturnValue));
+            Assert.fail("Invalid VrCoreVersionChecker compatibility: "
+                    + String.valueOf(checkerReturnCompatibility));
         }
-        Assert.assertEquals(checkerReturnValue, mockChecker.getLastReturnValue());
+        Assert.assertEquals(
+                checkerReturnCompatibility, mockChecker.getLastReturnValue().compatibility);
     }
 
     /**
      * Tests that the upgrade/install VR Services InfoBar is not present when VR Services is
      * installed and up to date.
      */
     @Test
     @MediumTest
     public void testInfoBarNotPresentWhenVrServicesCurrent() throws InterruptedException {
-        infoBarTestHelper(VrCoreVersionChecker.VR_READY);
+        infoBarTestHelper(VrCoreCompatibility.VR_READY);
     }
 
     /**
      * Tests that the upgrade VR Services InfoBar is present when VR Services is outdated.
      */
     @Test
     @MediumTest
     public void testInfoBarPresentWhenVrServicesOutdated() throws InterruptedException {
-        infoBarTestHelper(VrCoreVersionChecker.VR_OUT_OF_DATE);
+        infoBarTestHelper(VrCoreCompatibility.VR_OUT_OF_DATE);
     }
 
     /**
      * Tests that the install VR Services InfoBar is present when VR Services is missing.
      */
     @Test
     @MediumTest
     public void testInfoBarPresentWhenVrServicesMissing() throws InterruptedException {
-        infoBarTestHelper(VrCoreVersionChecker.VR_NOT_AVAILABLE);
+        infoBarTestHelper(VrCoreCompatibility.VR_NOT_AVAILABLE);
     }
 
     /**
      * Tests that the install VR Services InfoBar is not present when VR is not supported on the
      * device.
      */
     @Test
     @MediumTest
     public void testInfoBarNotPresentWhenVrServicesNotSupported() throws InterruptedException {
-        infoBarTestHelper(VrCoreVersionChecker.VR_NOT_SUPPORTED);
+        infoBarTestHelper(VrCoreCompatibility.VR_NOT_SUPPORTED);
     }
 
     /**
      * Tests that the reported WebVR capabilities match expectations on the devices the WebVR tests
      * are run on continuously.
      */
     @Test
     @MediumTest
     public void testDeviceCapabilitiesMatchExpectations() throws InterruptedException {
         mVrTestRule.loadUrlAndAwaitInitialization(
@@ skipping 11 matching lines @@
     @MediumTest
     @RetryOnFailure(message = "Flaky on L crbug.com/713781")
     public void testPresentationLocksFocus() throws InterruptedException {
         mVrTestRule.loadUrlAndAwaitInitialization(
                 VrTestRule.getHtmlTestFile("test_presentation_locks_focus"), PAGE_LOAD_TIMEOUT_S);
         mVrTestRule.enterPresentationAndWait(
                 mVrTestRule.getFirstTabCvc(), mVrTestRule.getFirstTabWebContents());
         mVrTestRule.endTest(mVrTestRule.getFirstTabWebContents());
     }
 }