[viz] Simplify test code's GetRendererTypes() post-GLRenderer

This code makes a distinction between "GPU renderers" and "Skia-only GPU
renderers", which at this point is meaningless (the two sets are the
same). I assume that this structure dates back to when GLRenderer and
SkiaRenderer were both being tested.

Bug: 1509883
Change-Id: If1ef7134667057a2156ab4bd5fad0815a3dd8d4a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5123402
Commit-Queue: Colin Blundell <blundell@chromium.org>
Reviewed-by: Vasiliy Telezhnikov <vasilyt@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1238533}

cc/trees/layer_tree_host_pixeltest_filters.cc

@@ -1405,10 +1405,10 @@ class MixedFilterZoomAndOffsetTest : public LayerTreeHostFiltersPixelTest {
 // For now only run on SkiaRenderer-based compositors.
 INSTANTIATE_TEST_SUITE_P(,
                          MixedFilterZoomAndOffsetTest,
-                         ::testing::ValuesIn(viz::GetRendererTypesSkiaOnly()),
+                         ::testing::ValuesIn(viz::GetGpuRendererTypes()),
                          ::testing::PrintToStringParamName());
 
-// viz::GetRendererTypesSkiaOnly() can return an empty list on some platforms.
+// viz::GetGpuRendererTypes() can return an empty list on some platforms.
 GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MixedFilterZoomAndOffsetTest);
 
 TEST_P(MixedFilterZoomAndOffsetTest, StandardDpi) {

components/viz/service/display/renderer_pixeltest.cc

@@ -5979,9 +5979,9 @@ class DelegatedInkTest : public VizPixelTestWithParam,
 
 INSTANTIATE_TEST_SUITE_P(,
                          DelegatedInkTest,
-                         testing::ValuesIn(GetRendererTypesSkiaOnly()),
+                         testing::ValuesIn(GetGpuRendererTypes()),
                          testing::PrintToStringParamName());
-// GetRendererTypesSkiaOnly() can return an empty list, e.g. on Fuchsia ARM64.
+// GetGpuRendererTypes() can return an empty list, e.g. on Fuchsia ARM64.
 GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DelegatedInkTest);
 
 // Test to confirm that predicted points are not drawn if prediction is not
@@ -6034,10 +6034,10 @@ class DelegatedInkWithPredictionTest : public DelegatedInkTest {
 
 INSTANTIATE_TEST_SUITE_P(,
                          DelegatedInkWithPredictionTest,
-                         testing::ValuesIn(GetRendererTypesSkiaOnly()),
+                         testing::ValuesIn(GetGpuRendererTypes()),
                          testing::PrintToStringParamName());
 
-// GetRendererTypesSkiaOnly() can return an empty list, e.g. on Fuchsia ARM64.
+// GetGpuRendererTypes() can return an empty list, e.g. on Fuchsia ARM64.
 GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DelegatedInkWithPredictionTest);
 
 // Draw a single trail and erase it, making sure that no bits of trail are left

components/viz/test/test_types.cc

@@ -27,11 +27,11 @@ const char* RendererTypeTestSuffix(RendererType type) {
   }
 }
 
-std::vector<RendererType> GetRendererTypes(bool include_software,
-                                           bool skia_only) {
+std::vector<RendererType> GetRendererTypes(bool include_software) {
   std::vector<RendererType> types;
-  if (include_software && !skia_only)
+  if (include_software) {
     types.push_back(RendererType::kSoftware);
+  }
 #if BUILDFLAG(ENABLE_GL_BACKEND_TESTS)
   types.push_back(RendererType::kSkiaGL);
 #endif  // BUILDFLAG(ENABLE_GL_BACKEND_TESTS)
@@ -54,15 +54,11 @@ void PrintTo(RendererType type, std::ostream* os) {
 }
 
 std::vector<RendererType> GetRendererTypes() {
-  return GetRendererTypes(true, false);
+  return GetRendererTypes(true);
 }
 
 std::vector<RendererType> GetGpuRendererTypes() {
-  return GetRendererTypes(false, false);
-}
-
-std::vector<RendererType> GetRendererTypesSkiaOnly() {
-  return GetRendererTypes(false, true);
+  return GetRendererTypes(false);
 }
 
 }  // namespace viz

components/viz/test/test_types.h

@@ -27,9 +27,6 @@ std::vector<RendererType> GetRendererTypes();
 // applicable to the platform.
 std::vector<RendererType> GetGpuRendererTypes();
 
-// Returns a list containing all Skia RendererTypes applicable to the platform.
-std::vector<RendererType> GetRendererTypesSkiaOnly();
-
 }  // namespace viz
 
 #endif  // COMPONENTS_VIZ_TEST_TEST_TYPES_H_