Change what cc_unittests run for Fuchsia

Fuchsia doesn't support the GL renderer backend and always uses
Vulkan. This mainly stops running parameterized pixel tests with
GLRenderer or SkiaRenderer+GL on Fuchsia, except
LayerTreeHostCopyRequestTest* will start running on SkiaRenderer+Vulkan
when Vulkan is enabled.

Bug: 1117587
Change-Id: I47a9e1286a9278c4aa901359bcb1a020b3b63ec4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2401322Reviewed-by: Sean Gilhuly <sgilhuly@chromium.org>
Commit-Queue: kylechar <kylechar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805930}

cc/trees/layer_tree_host_pixeltest_blending.cc

@@ -262,8 +262,10 @@ class LayerTreeHostBlendingPixelTest
 
 std::vector<RasterTestConfig> const kTestCases = {
     {viz::RendererType::kSoftware, TestRasterType::kBitmap},
+#if BUILDFLAG(ENABLE_GL_BACKEND_TESTS)
     {viz::RendererType::kGL, TestRasterType::kZeroCopy},
     {viz::RendererType::kSkiaGL, TestRasterType::kGpu},
+#endif  // BUILDFLAG(ENABLE_GL_BACKEND_TESTS)
 #if BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
     {viz::RendererType::kSkiaVk, TestRasterType::kOop},
 #endif  // BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)

cc/trees/layer_tree_host_pixeltest_filters.cc

@@ -12,7 +12,6 @@
 #include "cc/test/layer_tree_pixel_test.h"
 #include "cc/test/pixel_comparator.h"
 #include "cc/test/solid_color_content_layer_client.h"
-#include "components/viz/test/buildflags.h"
 
 #if !defined(OS_ANDROID)
 
@@ -73,38 +72,16 @@ class LayerTreeHostFiltersPixelTest
   }
 };
 
-viz::RendererType const kRendererTypes[] = {
-    viz::RendererType::kGL,       viz::RendererType::kSkiaGL,
-    viz::RendererType::kSoftware,
-#if BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
-    viz::RendererType::kSkiaVk,
-#endif  // BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
-#if BUILDFLAG(ENABLE_DAWN_BACKEND_TESTS)
-    viz::RendererType::kSkiaDawn,
-#endif  // BUILDFLAG(ENABLE_DAWN_BACKEND_TESTS)
-};
-
 INSTANTIATE_TEST_SUITE_P(All,
                          LayerTreeHostFiltersPixelTest,
-                         ::testing::ValuesIn(kRendererTypes),
+                         ::testing::ValuesIn(viz::GetRendererTypes()),
                          ::testing::PrintToStringParamName());
 
 using LayerTreeHostFiltersPixelTestGPU = LayerTreeHostFiltersPixelTest;
 
-viz::RendererType const kRendererTypesGpu[] = {
-    viz::RendererType::kGL,
-    viz::RendererType::kSkiaGL,
-#if BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
-    viz::RendererType::kSkiaVk,
-#endif  // BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
-#if BUILDFLAG(ENABLE_DAWN_BACKEND_TESTS)
-    viz::RendererType::kSkiaDawn,
-#endif  // BUILDFLAG(ENABLE_DAWN_BACKEND_TESTS)
-};
-
 INSTANTIATE_TEST_SUITE_P(All,
                          LayerTreeHostFiltersPixelTestGPU,
-                         ::testing::ValuesIn(kRendererTypesGpu),
+                         ::testing::ValuesIn(viz::GetGpuRendererTypes()),
                          ::testing::PrintToStringParamName());
 
 TEST_P(LayerTreeHostFiltersPixelTest, BackdropFilterBlurRect) {
@@ -384,18 +361,10 @@ class LayerTreeHostBlurFiltersPixelTestGPULayerList
 };
 
 // TODO(sgilhuly): Enable these tests for Skia Dawn, and switch over to using
-// kRendererTypesGpu.
-viz::RendererType const kRendererTypesGpuNonDawn[] = {
-    viz::RendererType::kGL,
-    viz::RendererType::kSkiaGL,
-#if BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
-    viz::RendererType::kSkiaVk,
-#endif  // BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
-};
-
+// viz::GetGpuRendererTypes().
 INSTANTIATE_TEST_SUITE_P(PixelResourceTest,
                          LayerTreeHostBlurFiltersPixelTestGPULayerList,
-                         ::testing::ValuesIn(kRendererTypesGpuNonDawn),
+                         ::testing::ValuesIn(viz::GetGpuRendererTypesNoDawn()),
                          ::testing::PrintToStringParamName());
 
 TEST_P(LayerTreeHostBlurFiltersPixelTestGPULayerList,
@@ -499,7 +468,7 @@ class LayerTreeHostFiltersScaledPixelTest
 
 INSTANTIATE_TEST_SUITE_P(All,
                          LayerTreeHostFiltersScaledPixelTest,
-                         ::testing::ValuesIn(kRendererTypes),
+                         ::testing::ValuesIn(viz::GetRendererTypes()),
                          ::testing::PrintToStringParamName());
 
 TEST_P(LayerTreeHostFiltersScaledPixelTest, StandardDpi) {
@@ -1183,7 +1152,7 @@ class BackdropFilterOffsetTest : public LayerTreeHostFiltersPixelTest {
 
 INSTANTIATE_TEST_SUITE_P(All,
                          BackdropFilterOffsetTest,
-                         ::testing::ValuesIn(kRendererTypes),
+                         ::testing::ValuesIn(viz::GetRendererTypes()),
                          ::testing::PrintToStringParamName());
 
 TEST_P(BackdropFilterOffsetTest, StandardDpi) {
@@ -1243,7 +1212,7 @@ class BackdropFilterInvertTest : public LayerTreeHostFiltersPixelTest {
 
 INSTANTIATE_TEST_SUITE_P(All,
                          BackdropFilterInvertTest,
-                         ::testing::ValuesIn(kRendererTypes),
+                         ::testing::ValuesIn(viz::GetRendererTypes()),
                          ::testing::PrintToStringParamName());
 
 TEST_P(BackdropFilterInvertTest, StandardDpi) {

cc/trees/layer_tree_host_pixeltest_masks.cc

@@ -31,12 +31,14 @@ namespace {
 // https://crbug.com/979703
 std::vector<RasterTestConfig> const kTestCases = {
     {viz::RendererType::kSoftware, TestRasterType::kBitmap},
+#if BUILDFLAG(ENABLE_GL_BACKEND_TESTS)
     {viz::RendererType::kGL, TestRasterType::kGpu},
     {viz::RendererType::kGL, TestRasterType::kOneCopy},
     {viz::RendererType::kGL, TestRasterType::kZeroCopy},
     {viz::RendererType::kSkiaGL, TestRasterType::kGpu},
     {viz::RendererType::kSkiaGL, TestRasterType::kOneCopy},
     {viz::RendererType::kSkiaGL, TestRasterType::kZeroCopy},
+#endif  // BUILDFLAG(ENABLE_GL_BACKEND_TESTS)
 #if BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
     {viz::RendererType::kSkiaVk, TestRasterType::kOop},
     {viz::RendererType::kSkiaVk, TestRasterType::kZeroCopy},
@@ -882,6 +884,7 @@ class LayerTreeHostMaskAsBlendingPixelTest
 
 MaskTestConfig const kTestConfigs[] = {
     MaskTestConfig{{viz::RendererType::kSoftware, TestRasterType::kBitmap}, 0},
+#if BUILDFLAG(ENABLE_GL_BACKEND_TESTS)
     MaskTestConfig{{viz::RendererType::kGL, TestRasterType::kZeroCopy}, 0},
     MaskTestConfig{{viz::RendererType::kGL, TestRasterType::kZeroCopy},
                    kUseAntialiasing},
@@ -892,6 +895,7 @@ MaskTestConfig const kTestConfigs[] = {
     MaskTestConfig{{viz::RendererType::kSkiaGL, TestRasterType::kZeroCopy}, 0},
     MaskTestConfig{{viz::RendererType::kSkiaGL, TestRasterType::kZeroCopy},
                    kUseAntialiasing},
+#endif  // BUILDFLAG(ENABLE_GL_BACKEND_TESTS)
 #if BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
     MaskTestConfig{{viz::RendererType::kSkiaVk, TestRasterType::kZeroCopy}, 0},
     MaskTestConfig{{viz::RendererType::kSkiaVk, TestRasterType::kZeroCopy},

cc/trees/layer_tree_host_pixeltest_mirror.cc

@@ -7,7 +7,6 @@
 #include "cc/layers/solid_color_layer.h"
 #include "cc/test/layer_tree_pixel_test.h"
 #include "cc/test/pixel_comparator.h"
-#include "components/viz/test/buildflags.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/transform_util.h"
 
@@ -25,20 +24,9 @@ class LayerTreeHostMirrorPixelTest
   viz::RendererType renderer_type() const { return GetParam(); }
 };
 
-const viz::RendererType kRendererTypes[] = {
-    viz::RendererType::kGL,       viz::RendererType::kSkiaGL,
-    viz::RendererType::kSoftware,
-#if BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
-    viz::RendererType::kSkiaVk,
-#endif  // BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
-#if BUILDFLAG(ENABLE_DAWN_BACKEND_TESTS)
-    viz::RendererType::kSkiaDawn,
-#endif  // BUILDFLAG(ENABLE_DAWN_BACKEND_TESTS)
-};
-
 INSTANTIATE_TEST_SUITE_P(All,
                          LayerTreeHostMirrorPixelTest,
-                         ::testing::ValuesIn(kRendererTypes),
+                         ::testing::ValuesIn(viz::GetRendererTypes()),
                          ::testing::PrintToStringParamName());
 
 // Verifies that a mirror layer with a scale mirrors another layer correctly.

cc/trees/layer_tree_host_pixeltest_readback.cc

@@ -430,10 +430,12 @@ TEST_P(LayerTreeHostReadbackPixelTest, MultipleReadbacksOnLayer) {
 // readback.
 ReadbackTestConfig const kTestConfigs[] = {
     ReadbackTestConfig{viz::RendererType::kSoftware, TestReadBackType::kBitmap},
+#if BUILDFLAG(ENABLE_GL_BACKEND_TESTS)
     ReadbackTestConfig{viz::RendererType::kGL, TestReadBackType::kTexture},
     ReadbackTestConfig{viz::RendererType::kGL, TestReadBackType::kBitmap},
     ReadbackTestConfig{viz::RendererType::kSkiaGL, TestReadBackType::kTexture},
     ReadbackTestConfig{viz::RendererType::kSkiaGL, TestReadBackType::kBitmap},
+#endif  // BUILDFLAG(ENABLE_GL_BACKEND_TESTS)
 #if BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
     ReadbackTestConfig{viz::RendererType::kSkiaVk, TestReadBackType::kBitmap},
 #endif  // BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)

cc/trees/layer_tree_host_pixeltest_scrollbars.cc

@@ -15,7 +15,6 @@
 #include "cc/test/layer_tree_pixel_test.h"
 #include "cc/test/pixel_comparator.h"
 #include "cc/trees/layer_tree_impl.h"
-#include "components/viz/test/buildflags.h"
 #include "components/viz/test/test_in_process_context_provider.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 
@@ -74,20 +73,9 @@ class PaintedScrollbar : public FakeScrollbar {
   SkColor color_ = SK_ColorGREEN;
 };
 
-viz::RendererType const kRendererTypes[] = {
-    viz::RendererType::kGL,
-    viz::RendererType::kSkiaGL,
-#if BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
-    viz::RendererType::kSkiaVk,
-#endif  // BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
-#if BUILDFLAG(ENABLE_DAWN_BACKEND_TESTS)
-    viz::RendererType::kSkiaDawn,
-#endif  // BUILDFLAG(ENABLE_DAWN_BACKEND_TESTS)
-};
-
 INSTANTIATE_TEST_SUITE_P(All,
                          LayerTreeHostScrollbarsPixelTest,
-                         ::testing::ValuesIn(kRendererTypes),
+                         ::testing::ValuesIn(viz::GetGpuRendererTypes()),
                          ::testing::PrintToStringParamName());
 
 TEST_P(LayerTreeHostScrollbarsPixelTest, NoScale) {
@@ -259,7 +247,7 @@ class PaintedOverlayScrollbar : public FakeScrollbar {
 
 INSTANTIATE_TEST_SUITE_P(All,
                          LayerTreeHostOverlayScrollbarsPixelTest,
-                         ::testing::ValuesIn(kRendererTypes),
+                         ::testing::ValuesIn(viz::GetGpuRendererTypes()),
                          ::testing::PrintToStringParamName());
 
 // Simulate increasing the thickness of a painted overlay scrollbar. Ensure that

cc/trees/layer_tree_host_pixeltest_synchronous.cc

@@ -9,7 +9,7 @@
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/layer_tree_pixel_test.h"
 #include "cc/test/pixel_comparator.h"
-#include "components/viz/test/buildflags.h"
+#include "components/viz/test/test_types.h"
 
 #if !defined(OS_ANDROID)
 
@@ -51,20 +51,9 @@ class LayerTreeHostSynchronousPixelTest
   }
 };
 
-viz::RendererType const kRendererTypesGpu[] = {
-    viz::RendererType::kGL,
-    viz::RendererType::kSkiaGL,
-#if BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
-    viz::RendererType::kSkiaVk,
-#endif  // BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
-#if BUILDFLAG(ENABLE_DAWN_BACKEND_TESTS)
-    viz::RendererType::kSkiaDawn,
-#endif  // BUILDFLAG(ENABLE_DAWN_BACKEND_TESTS)
-};
-
 INSTANTIATE_TEST_SUITE_P(All,
                          LayerTreeHostSynchronousPixelTest,
-                         ::testing::ValuesIn(kRendererTypesGpu),
+                         ::testing::ValuesIn(viz::GetGpuRendererTypes()),
                          ::testing::PrintToStringParamName());
 
 TEST_P(LayerTreeHostSynchronousPixelTest, OneContentLayerZeroCopy) {

cc/trees/layer_tree_host_pixeltest_tiles.cc

@@ -150,10 +150,12 @@ class LayerTreeHostTilesTestPartialInvalidation
 
 std::vector<RasterTestConfig> const kTestCases = {
     {viz::RendererType::kSoftware, TestRasterType::kBitmap},
+#if BUILDFLAG(ENABLE_GL_BACKEND_TESTS)
     {viz::RendererType::kGL, TestRasterType::kOneCopy},
     {viz::RendererType::kGL, TestRasterType::kGpu},
     {viz::RendererType::kSkiaGL, TestRasterType::kOneCopy},
     {viz::RendererType::kSkiaGL, TestRasterType::kGpu},
+#endif  // BUILDFLAG(ENABLE_GL_BACKEND_TESTS)
 #if BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
     {viz::RendererType::kSkiaVk, TestRasterType::kOop},
 #endif  // BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
@@ -189,8 +191,10 @@ TEST_P(LayerTreeHostTilesTestPartialInvalidation, FullRaster) {
 }
 
 std::vector<RasterTestConfig> const kTestCasesMultiThread = {
+#if BUILDFLAG(ENABLE_GL_BACKEND_TESTS)
     {viz::RendererType::kGL, TestRasterType::kOneCopy},
     {viz::RendererType::kSkiaGL, TestRasterType::kOneCopy},
+#endif  // BUILDFLAG(ENABLE_GL_BACKEND_TESTS)
 #if BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
     // TODO(sgilhuly): Switch this to one copy raster once is is supported for
     // Vulkan in these tests.
@@ -233,6 +237,10 @@ TEST_P(LayerTreeHostTilesTestPartialInvalidationMultiThread, FullRaster) {
                base::FilePath(FILE_PATH_LITERAL("blue_yellow_flipped.png")));
 }
 
+// This test doesn't work on Vulkan because on our hardware we can't render to
+// RGBA4444 format using either SwiftShader or native Vulkan. See
+// crbug.com/987278 for details
+#if BUILDFLAG(ENABLE_GL_BACKEND_TESTS)
 class LayerTreeHostTilesTestPartialInvalidationLowBitDepth
     : public LayerTreeHostTilesTestPartialInvalidation {
  protected:
@@ -243,9 +251,6 @@ class LayerTreeHostTilesTestPartialInvalidationLowBitDepth
   }
 };
 
-// This test doesn't work on Vulkan because on our hardware we can't render to
-// RGBA4444 format using either SwiftShader or native Vulkan. See
-// crbug.com/987278 for details
 INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostTilesTestPartialInvalidationLowBitDepth,
@@ -266,6 +271,7 @@ TEST_P(LayerTreeHostTilesTestPartialInvalidationLowBitDepth, FullRaster) {
       picture_layer_,
       base::FilePath(FILE_PATH_LITERAL("blue_yellow_flipped_dither.png")));
 }
+#endif  // BUILDFLAG(ENABLE_GL_BACKEND_TESTS)
 
 }  // namespace
 }  // namespace cc

cc/trees/layer_tree_host_unittest_copyrequest.cc

@@ -176,9 +176,7 @@ class LayerTreeHostCopyRequestTestMultipleRequests
 INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestMultipleRequests,
-    CombineWithCompositorModes({viz::RendererType::kGL,
-                                viz::RendererType::kSkiaGL,
-                                viz::RendererType::kSoftware}),
+    CombineWithCompositorModes(viz::GetRendererTypesNoDawn()),
     PrintTupleToStringParamName());
 
 TEST_P(LayerTreeHostCopyRequestTestMultipleRequests, Test) {
@@ -213,8 +211,7 @@ class LayerTreeHostCopyRequestTestMultipleRequestsOutOfOrder
 INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestMultipleRequestsOutOfOrder,
-    CombineWithCompositorModes({viz::RendererType::kGL,
-                                viz::RendererType::kSkiaGL}),
+    CombineWithCompositorModes(viz::GetGpuRendererTypesNoDawn()),
     PrintTupleToStringParamName());
 
 TEST_P(LayerTreeHostCopyRequestTestMultipleRequestsOutOfOrder, Test) {
@@ -273,8 +270,7 @@ class LayerTreeHostCopyRequestCompletionCausesCommit
 INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestCompletionCausesCommit,
-    CombineWithCompositorModes({viz::RendererType::kGL,
-                                viz::RendererType::kSkiaGL}),
+    CombineWithCompositorModes(viz::GetGpuRendererTypesNoDawn()),
     PrintTupleToStringParamName());
 
 TEST_P(LayerTreeHostCopyRequestCompletionCausesCommit, Test) {
@@ -381,8 +377,7 @@ class LayerTreeHostCopyRequestTestLayerDestroyed
 INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestLayerDestroyed,
-    CombineWithCompositorModes({viz::RendererType::kGL,
-                                viz::RendererType::kSkiaGL}),
+    CombineWithCompositorModes(viz::GetGpuRendererTypesNoDawn()),
     PrintTupleToStringParamName());
 
 TEST_P(LayerTreeHostCopyRequestTestLayerDestroyed, Test) {
@@ -488,8 +483,7 @@ class LayerTreeHostCopyRequestTestInHiddenSubtree
 INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestInHiddenSubtree,
-    CombineWithCompositorModes({viz::RendererType::kGL,
-                                viz::RendererType::kSkiaGL}),
+    CombineWithCompositorModes(viz::GetGpuRendererTypesNoDawn()),
     PrintTupleToStringParamName());
 
 TEST_P(LayerTreeHostCopyRequestTestInHiddenSubtree, Test) {
@@ -610,8 +604,7 @@ class LayerTreeHostTestHiddenSurfaceNotAllocatedForSubtreeCopyRequest
 INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostTestHiddenSurfaceNotAllocatedForSubtreeCopyRequest,
-    CombineWithCompositorModes({viz::RendererType::kGL,
-                                viz::RendererType::kSkiaGL}),
+    CombineWithCompositorModes(viz::GetGpuRendererTypesNoDawn()),
     PrintTupleToStringParamName());
 
 TEST_P(LayerTreeHostTestHiddenSurfaceNotAllocatedForSubtreeCopyRequest, Test) {
@@ -667,8 +660,7 @@ class LayerTreeHostCopyRequestTestClippedOut
 INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestClippedOut,
-    CombineWithCompositorModes({viz::RendererType::kGL,
-                                viz::RendererType::kSkiaGL}),
+    CombineWithCompositorModes(viz::GetGpuRendererTypesNoDawn()),
     PrintTupleToStringParamName());
 
 TEST_P(LayerTreeHostCopyRequestTestClippedOut, Test) {
@@ -728,8 +720,7 @@ class LayerTreeHostCopyRequestTestScaledLayer
 INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestScaledLayer,
-    CombineWithCompositorModes({viz::RendererType::kGL,
-                                viz::RendererType::kSkiaGL}),
+    CombineWithCompositorModes(viz::GetGpuRendererTypesNoDawn()),
     PrintTupleToStringParamName());
 
 TEST_P(LayerTreeHostCopyRequestTestScaledLayer, Test) {
@@ -824,8 +815,7 @@ class LayerTreeHostTestAsyncTwoReadbacksWithoutDraw
 INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostTestAsyncTwoReadbacksWithoutDraw,
-    CombineWithCompositorModes({viz::RendererType::kGL,
-                                viz::RendererType::kSkiaGL}),
+    CombineWithCompositorModes(viz::GetGpuRendererTypesNoDawn()),
     PrintTupleToStringParamName());
 
 TEST_P(LayerTreeHostTestAsyncTwoReadbacksWithoutDraw, Test) {
@@ -968,8 +958,7 @@ class LayerTreeHostCopyRequestTestDeleteSharedImage
 INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestDeleteSharedImage,
-    CombineWithCompositorModes({viz::RendererType::kGL,
-                                viz::RendererType::kSkiaGL}),
+    CombineWithCompositorModes(viz::GetGpuRendererTypesNoDawn()),
     PrintTupleToStringParamName());
 
 TEST_P(LayerTreeHostCopyRequestTestDeleteSharedImage, Test) {
@@ -1112,8 +1101,7 @@ class LayerTreeHostCopyRequestTestCreatesSharedImage
 INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestCreatesSharedImage,
-    CombineWithCompositorModes({viz::RendererType::kGL,
-                                viz::RendererType::kSkiaGL}),
+    CombineWithCompositorModes(viz::GetGpuRendererTypesNoDawn()),
     PrintTupleToStringParamName());
 
 TEST_P(LayerTreeHostCopyRequestTestCreatesSharedImage, Test) {
@@ -1201,8 +1189,7 @@ class LayerTreeHostCopyRequestTestDestroyBeforeCopy
 INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestDestroyBeforeCopy,
-    CombineWithCompositorModes({viz::RendererType::kGL,
-                                viz::RendererType::kSkiaGL}),
+    CombineWithCompositorModes(viz::GetGpuRendererTypesNoDawn()),
     PrintTupleToStringParamName());
 
 TEST_P(LayerTreeHostCopyRequestTestDestroyBeforeCopy, Test) {
@@ -1285,8 +1272,7 @@ class LayerTreeHostCopyRequestTestShutdownBeforeCopy
 INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestShutdownBeforeCopy,
-    CombineWithCompositorModes({viz::RendererType::kGL,
-                                viz::RendererType::kSkiaGL}),
+    CombineWithCompositorModes(viz::GetGpuRendererTypesNoDawn()),
     PrintTupleToStringParamName());
 
 TEST_P(LayerTreeHostCopyRequestTestShutdownBeforeCopy, Test) {
@@ -1418,8 +1404,7 @@ class LayerTreeHostCopyRequestTestMultipleDrawsHiddenCopyRequest
 INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestMultipleDrawsHiddenCopyRequest,
-    CombineWithCompositorModes({viz::RendererType::kGL,
-                                viz::RendererType::kSkiaGL}),
+    CombineWithCompositorModes(viz::GetGpuRendererTypesNoDawn()),
     PrintTupleToStringParamName());
 
 TEST_P(LayerTreeHostCopyRequestTestMultipleDrawsHiddenCopyRequest, Test) {

components/viz/service/display/viz_pixel_test.cc

@@ -5,48 +5,9 @@
 #include "components/viz/service/display/viz_pixel_test.h"
 
 #include "build/build_config.h"
-#include "components/viz/test/buildflags.h"
 #include "ui/base/ui_base_features.h"
 
 namespace viz {
-namespace {
-
-std::vector<RendererType> GetRendererTypes(bool include_software,
-                                           bool include_dawn) {
-  std::vector<RendererType> types;
-  if (include_software)
-    types.push_back(RendererType::kSoftware);
-#if BUILDFLAG(ENABLE_GL_BACKEND_TESTS)
-  types.push_back(RendererType::kGL);
-  types.push_back(RendererType::kSkiaGL);
-#endif
-#if BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
-  types.push_back(RendererType::kSkiaVk);
-#endif
-#if BUILDFLAG(ENABLE_DAWN_BACKEND_TESTS)
-  if (include_dawn)
-    types.push_back(RendererType::kSkiaDawn);
-#endif
-  return types;
-}
-
-}  // namespace
-
-std::vector<RendererType> GetRendererTypes() {
-  return GetRendererTypes(true, true);
-}
-
-std::vector<RendererType> GetRendererTypesNoDawn() {
-  return GetRendererTypes(true, false);
-}
-
-std::vector<RendererType> GetGpuRendererTypes() {
-  return GetRendererTypes(false, true);
-}
-
-std::vector<RendererType> GetGpuRendererTypesNoDawn() {
-  return GetRendererTypes(false, false);
-}
 
 // static
 cc::PixelTest::GraphicsBackend VizPixelTest::RenderTypeToBackend(

components/viz/service/display/viz_pixel_test.h

@@ -13,15 +13,6 @@
 
 namespace viz {
 
-// Returns a list containing all RendererTypes applicable to the platform.
-std::vector<RendererType> GetRendererTypes();
-std::vector<RendererType> GetRendererTypesNoDawn();
-
-// Returns a list containing all RendererTypes, except SoftwareRenderer,
-// applicable to the platform.
-std::vector<RendererType> GetGpuRendererTypes();
-std::vector<RendererType> GetGpuRendererTypesNoDawn();
-
 // Viz pixel test base class. When SetUp() is called the appropriate
 // DirectRenderer implementation is initialized based on RendererType
 // parameter passed to the constructor.

components/viz/test/test_types.cc

@@ -4,6 +4,8 @@
 
 #include "components/viz/test/test_types.h"
 
+#include "components/viz/test/buildflags.h"
+
 namespace viz {
 
 namespace {
@@ -24,10 +26,45 @@ const char* RendererTypeTestSuffix(RendererType type) {
   }
 }
 
+std::vector<RendererType> GetRendererTypes(bool include_software,
+                                           bool include_dawn) {
+  std::vector<RendererType> types;
+  if (include_software)
+    types.push_back(RendererType::kSoftware);
+#if BUILDFLAG(ENABLE_GL_BACKEND_TESTS)
+  types.push_back(RendererType::kGL);
+  types.push_back(RendererType::kSkiaGL);
+#endif
+#if BUILDFLAG(ENABLE_VULKAN_BACKEND_TESTS)
+  types.push_back(RendererType::kSkiaVk);
+#endif
+#if BUILDFLAG(ENABLE_DAWN_BACKEND_TESTS)
+  if (include_dawn)
+    types.push_back(RendererType::kSkiaDawn);
+#endif
+  return types;
+}
+
 }  // namespace
 
 void PrintTo(RendererType type, std::ostream* os) {
   *os << RendererTypeTestSuffix(type);
 }
 
+std::vector<RendererType> GetRendererTypes() {
+  return GetRendererTypes(true, true);
+}
+
+std::vector<RendererType> GetRendererTypesNoDawn() {
+  return GetRendererTypes(true, false);
+}
+
+std::vector<RendererType> GetGpuRendererTypes() {
+  return GetRendererTypes(false, true);
+}
+
+std::vector<RendererType> GetGpuRendererTypesNoDawn() {
+  return GetRendererTypes(false, false);
+}
+
 }  // namespace viz

components/viz/test/test_types.h

@@ -6,6 +6,7 @@
 #define COMPONENTS_VIZ_TEST_TEST_TYPES_H_
 
 #include <ostream>
+#include <vector>
 
 namespace viz {
 
@@ -21,6 +22,15 @@ enum class RendererType {
 
 void PrintTo(RendererType type, std::ostream* os);
 
+// Returns a list containing all RendererTypes applicable to the platform.
+std::vector<RendererType> GetRendererTypes();
+std::vector<RendererType> GetRendererTypesNoDawn();
+
+// Returns a list containing all RendererTypes, except SoftwareRenderer,
+// applicable to the platform.
+std::vector<RendererType> GetGpuRendererTypes();
+std::vector<RendererType> GetGpuRendererTypesNoDawn();
+
 }  // namespace viz
 
 #endif  // COMPONENTS_VIZ_TEST_TEST_TYPES_H_