Vulkan:Disable AtomicCounterBuffer tests on Vulkan

These tests were incorrectly turned on for Vulkan during the recent
test macro refactor.

Bug: angleproject:4125
Change-Id: I36940209e4223182e4810c30b0d0098d4abf0222
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1922591
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com>
Commit-Queue: Tobin Ehlis <tobine@google.com>

src/tests/gl_tests/AtomicCounterBufferTest.cpp

@@ -32,8 +32,6 @@ class AtomicCounterBufferTest : public ANGLETest
 // Test GL_ATOMIC_COUNTER_BUFFER is not supported with version lower than ES31.
 TEST_P(AtomicCounterBufferTest, AtomicCounterBufferBindings)
 {
-    // http://anglebug.com/4092
-    ANGLE_SKIP_TEST_IF(IsWindows() && IsVulkan());
     ASSERT_EQ(3, getClientMajorVersion());
     GLBuffer atomicCounterBuffer;
     glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, 0, atomicCounterBuffer.get());
@@ -439,8 +437,16 @@ void main()
 // is with WGL where if a Vulkan test is run first in the shard, it causes crashes when an OpenGL
 // test is run afterwards.  AtomicCounter* tests are alphabetically first, and having them not run
 // on Vulkan makes every shard our bots currently make do have at least some OpenGL test run before
-// any Vulkan test.
-ANGLE_INSTANTIATE_TEST_ES3_AND_ES31(AtomicCounterBufferTest);
-ANGLE_INSTANTIATE_TEST_ES31(AtomicCounterBufferTest31);
+// any Vulkan test. When these tests can be enabled on Vulkan, can replace the current macros with
+// the updated macros below that include Vulkan:
+// ANGLE_INSTANTIATE_TEST_ES3_AND_ES31(AtomicCounterBufferTest);
+// ANGLE_INSTANTIATE_TEST_ES31(AtomicCounterBufferTest31);
+ANGLE_INSTANTIATE_TEST(AtomicCounterBufferTest,
+                       ES3_OPENGL(),
+                       ES3_OPENGLES(),
+                       ES31_OPENGL(),
+                       ES31_OPENGLES(),
+                       ES31_D3D11());
+ANGLE_INSTANTIATE_TEST(AtomicCounterBufferTest31, ES31_OPENGL(), ES31_OPENGLES(), ES31_D3D11());
 
 }  // namespace