Re-Enable vr_pixeltests for Win > 7

vr_pixeltests were failing on Windows 7, so they were disabled for all
windows platforms, though the evidence is that they were fine on other
platforms.  Given that VR is not supported on Win7, only disable these
tests on that platform.

Fixed: 1035767
Change-Id: Ic97593f9b324c30111ec1465ae3da41de7aa2c78
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1985126Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Alexander Cooper <alcooper@chromium.org>
Auto-Submit: Alexander Cooper <alcooper@chromium.org>
Cr-Commit-Position: refs/heads/master@{#729579}

chrome/browser/vr/test/gl_test_environment_unittest.cc

@@ -9,14 +9,7 @@
 
 namespace vr {
 
-// Failing on Win7 Tests (dbg)(1). crbug.com/1035767
-#if defined(OS_WIN)
-#define MAYBE_InitializeAndCleanup DISABLED_InitializeAndCleanup
-#else
-#define MAYBE_InitializeAndCleanup InitializeAndCleanup
-#endif
-
-TEST(GlTestEnvironmentTest, MAYBE_InitializeAndCleanup) {
+TEST(GlTestEnvironmentTest, InitializeAndCleanup) {
   GlTestEnvironment gl_test_environment(gfx::Size(100, 100));
   EXPECT_NE(gl_test_environment.GetFrameBufferForTesting(), 0u);
   EXPECT_EQ(glGetError(), (GLenum)GL_NO_ERROR);

chrome/browser/vr/ui_pixeltest.cc

@@ -18,14 +18,7 @@ constexpr gfx::Transform kIdentity;
 
 }  // namespace
 
-// Failing on Win7 Tests (dbg)(1). crbug.com/1035767
-#if defined(OS_WIN)
-#define MAYBE_DrawVrBrowsingMode DISABLED_DrawVrBrowsingMode
-#else
-#define MAYBE_DrawVrBrowsingMode DrawVrBrowsingMode
-#endif
-
-TEST_F(UiPixelTest, MAYBE_DrawVrBrowsingMode) {
+TEST_F(UiPixelTest, DrawVrBrowsingMode) {
   // Set up scene.
   UiInitialState ui_initial_state;
   ui_initial_state.in_web_vr = false;

testing/buildbot/chromium.win.json

@@ -1064,17 +1064,6 @@
         "test": "vr_common_unittests",
         "test_target": "//chrome/browser/vr:vr_common_unittests"
       },
-      {
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_gtest_merge.py"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "vr_pixeltests",
-        "test_target": "//chrome/browser/vr:vr_pixeltests"
-      },
       {
         "merge": {
           "args": [],
@@ -8488,17 +8477,6 @@
         "test": "vr_common_unittests",
         "test_target": "//chrome/browser/vr:vr_common_unittests"
       },
-      {
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_gtest_merge.py"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "vr_pixeltests",
-        "test_target": "//chrome/browser/vr:vr_pixeltests"
-      },
       {
         "merge": {
           "args": [],
@@ -9816,17 +9794,6 @@
         "test": "vr_common_unittests",
         "test_target": "//chrome/browser/vr:vr_common_unittests"
       },
-      {
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_gtest_merge.py"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "vr_pixeltests",
-        "test_target": "//chrome/browser/vr:vr_pixeltests"
-      },
       {
         "merge": {
           "args": [],

testing/buildbot/test_suite_exceptions.pyl

@@ -1740,6 +1740,12 @@
       'android-pie-x86-fyi-rel',
       'VR Linux',
       'android-code-coverage-native', # crbug/1018431
+      # These tests fail on Win7, and given that We don't support VR there,
+      # these tests are unnecessary there.
+      # chromium.win
+      'Win 7 Tests x64 (1)',
+      'Win7 Tests (1)',
+      'Win7 Tests (dbg)(1)',
     ],
   },
   'wayland_client_perftests': {