Re-enable disabled VR browser test

Re-enables WebVrBrowserTestOpenVrDisabled.TestWebVrNoDevicesWithoutOpenVr
and increases the timeout that was flakily being hit when many tests
were run in parallel.

Bug: 890380
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:linux_vr;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: Iebb10f25848ac0ab3a2913fff4e35dad919fd4bc
Reviewed-on: https://chromium-review.googlesource.com/1252642Reviewed-by: Bill Orr <billorr@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595266}

chrome/browser/vr/test/xr_browser_test.cc

@@ -30,6 +30,7 @@ namespace vr {
 constexpr base::TimeDelta XrBrowserTestBase::kPollCheckIntervalShort;
 constexpr base::TimeDelta XrBrowserTestBase::kPollCheckIntervalLong;
 constexpr base::TimeDelta XrBrowserTestBase::kPollTimeoutShort;
+constexpr base::TimeDelta XrBrowserTestBase::kPollTimeoutMedium;
 constexpr base::TimeDelta XrBrowserTestBase::kPollTimeoutLong;
 constexpr char XrBrowserTestBase::kVrOverrideEnvVar[];
 constexpr char XrBrowserTestBase::kVrOverrideVal[];
@@ -91,7 +92,7 @@ content::WebContents* XrBrowserTestBase::GetFirstTabWebContents() {
 void XrBrowserTestBase::LoadUrlAndAwaitInitialization(const GURL& url) {
   ui_test_utils::NavigateToURL(browser(), url);
   EXPECT_TRUE(PollJavaScriptBoolean(
-      "isInitializationComplete()", kPollTimeoutShort,
+      "isInitializationComplete()", kPollTimeoutMedium,
       browser()->tab_strip_model()->GetActiveWebContents()))
       << "Timed out waiting for JavaScript test initialization.";
 }

chrome/browser/vr/test/xr_browser_test.h

@@ -34,6 +34,8 @@ class XrBrowserTestBase : public InProcessBrowserTest {
       base::TimeDelta::FromMilliseconds(100);
   static constexpr base::TimeDelta kPollTimeoutShort =
       base::TimeDelta::FromMilliseconds(1000);
+  static constexpr base::TimeDelta kPollTimeoutMedium =
+      base::TimeDelta::FromMilliseconds(5000);
   static constexpr base::TimeDelta kPollTimeoutLong =
       base::TimeDelta::FromMilliseconds(10000);
   // Still considered XR-wide instead of VR-specific since OpenVR can be used

chrome/browser/vr/webxr_vr_transition_browser_test.cc

@@ -80,14 +80,8 @@ IN_PROC_BROWSER_TEST_F(WebXrVrBrowserTestWebXrDisabled,
 
 // Tests that WebVR does not return any devices if OpenVR support is disabled.
 // Since WebVR isn't actually used, we can remove the GPU requirement.
-#if defined(OS_WIN)
-#define MAYBE_TestWebVrNoDevicesWithoutOpenVr \
-  DISABLED_TestWebVrNoDevicesWithoutOpenVr
-#else
-#define MAYBE_TestWebVrNoDevicesWithoutOpenVr TestWebVrNoDevicesWithoutOpenVr
-#endif
 IN_PROC_BROWSER_TEST_F(WebVrBrowserTestOpenVrDisabled,
-                       MAYBE_TestWebVrNoDevicesWithoutOpenVr) {
+                       TestWebVrNoDevicesWithoutOpenVr) {
   LoadUrlAndAwaitInitialization(GetHtmlTestFile("generic_webvr_page"));
   EXPECT_FALSE(XrDeviceFound())
       << "Found a VRDisplay even with OpenVR disabled";