Remove GL based viz tests on Fuchsia

This CL modifies viz_unittests to remove tests that use either
GLRenderer or SkiaRenderer+GL. For pixel tests they will continue to run
with SoftwareRenderer and SkiaRenderer+Vulkan for Fuchsia. For other
tests, if the tests was specific to GLRenderer it's been removed on
Fuchsia as well.

For tests that aren't running on SkiaRenderer+Vulkan yet I've left them
running on GL backed renderers to avoid losing test coverage. Once the
tests are switched over the GL backed renderers can be removed.

Bug: 1117587, 1043849
Change-Id: Ic55b8eeb31045b3eec410c01fa4631503d1683c5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2367638
Commit-Queue: kylechar <kylechar@chromium.org>
Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801095}

components/viz/common/BUILD.gn

@@ -345,14 +345,6 @@ viz_source_set("unit_tests") {
     "frame_sinks/begin_frame_source_unittest.cc",
     "frame_sinks/copy_output_util_unittest.cc",
     "frame_sinks/delay_based_time_source_unittest.cc",
-    "gl_i420_converter_pixeltest.cc",
-    "gl_i420_converter_unittest.cc",
-    "gl_scaler_overscan_pixeltest.cc",
-    "gl_scaler_pixeltest.cc",
-    "gl_scaler_shader_pixeltest.cc",
-    "gl_scaler_test_util.cc",
-    "gl_scaler_test_util.h",
-    "gl_scaler_unittest.cc",
     "gpu/context_cache_controller_unittest.cc",
     "quads/draw_quad_unittest.cc",
     "quads/render_pass_io_unittest.cc",
@@ -366,6 +358,19 @@ viz_source_set("unit_tests") {
     "yuv_readback_unittest.cc",
   ]
 
+  if (enable_viz_gl_tests) {
+    sources += [
+      "gl_i420_converter_pixeltest.cc",
+      "gl_i420_converter_unittest.cc",
+      "gl_scaler_overscan_pixeltest.cc",
+      "gl_scaler_pixeltest.cc",
+      "gl_scaler_shader_pixeltest.cc",
+      "gl_scaler_test_util.cc",
+      "gl_scaler_test_util.h",
+      "gl_scaler_unittest.cc",
+    ]
+  }
+
   deps = [
     ":common",
     "//base/test:test_support",

components/viz/service/BUILD.gn

@@ -460,9 +460,6 @@ viz_source_set("unit_tests") {
     "display/display_unittest.cc",
     "display/draw_polygon_unittest.cc",
     "display/frame_rate_decider_unittest.cc",
-    "display/gl_renderer_copier_pixeltest.cc",
-    "display/gl_renderer_copier_unittest.cc",
-    "display/gl_renderer_unittest.cc",
     "display/layer_quad_unittest.cc",
     "display/renderer_pixeltest.cc",
     "display/shader_unittest.cc",
@@ -496,6 +493,14 @@ viz_source_set("unit_tests") {
     "surfaces/surface_unittest.cc",
   ]
 
+  if (enable_viz_gl_tests) {
+    sources += [
+      "display/gl_renderer_copier_pixeltest.cc",
+      "display/gl_renderer_copier_unittest.cc",
+      "display/gl_renderer_unittest.cc",
+    ]
+  }
+
   if (!use_aura && !is_mac) {
     sources -= [ "display_embedder/buffer_queue_unittest.cc" ]
   }
@@ -571,6 +576,10 @@ viz_source_set("unit_tests") {
 
   defines = []
 
+  if (enable_viz_gl_tests) {
+    defines += [ "ENABLE_VIZ_GL_TESTS" ]
+  }
+
   if (enable_vulkan) {
     deps += [
       "//gpu/vulkan:test_support",

components/viz/service/display/copy_output_scaling_pixeltest.cc

@@ -293,22 +293,22 @@ class CopyOutputScalingPixelTest
 
 // Parameters common to all test instantiations. These are tuples consisting of
 // {scale_from, scale_to, i420_format}.
-const auto kParameters = testing::Combine(
-    // TODO(crbug.com/1117587): Don't run with GLRenderer on Fuchsia.
-    testing::Values(RendererType::kGL,
-#if !defined(OS_FUCHSIA)
-                    RendererType::kSkiaGL,
+const auto kParameters =
+    testing::Combine(testing::Values(
+#if defined(ENABLE_VIZ_GL_TESTS)
+                         RendererType::kGL,
+                         RendererType::kSkiaGL,
 #endif
-                    RendererType::kSoftware),
-    testing::Values(gfx::Vector2d(1, 1),
-                    gfx::Vector2d(2, 1),
-                    gfx::Vector2d(1, 2),
-                    gfx::Vector2d(2, 2)),
-    testing::Values(gfx::Vector2d(1, 1),
-                    gfx::Vector2d(2, 1),
-                    gfx::Vector2d(1, 2)),
-    testing::Values(CopyOutputResult::Format::RGBA_BITMAP,
-                    CopyOutputResult::Format::I420_PLANES));
+                         RendererType::kSoftware),
+                     testing::Values(gfx::Vector2d(1, 1),
+                                     gfx::Vector2d(2, 1),
+                                     gfx::Vector2d(1, 2),
+                                     gfx::Vector2d(2, 2)),
+                     testing::Values(gfx::Vector2d(1, 1),
+                                     gfx::Vector2d(2, 1),
+                                     gfx::Vector2d(1, 2)),
+                     testing::Values(CopyOutputResult::Format::RGBA_BITMAP,
+                                     CopyOutputResult::Format::I420_PLANES));
 
 TEST_P(CopyOutputScalingPixelTest, ScaledCopyOfDrawnFrame) {
   RunTest();

components/viz/service/display/viz_pixel_test.cc

@@ -15,8 +15,10 @@ std::vector<RendererType> GetRendererTypes(bool include_software,
   std::vector<RendererType> types;
   if (include_software)
     types.push_back(RendererType::kSoftware);
+#if defined(ENABLE_VIZ_GL_TESTS)
   types.push_back(RendererType::kGL);
   types.push_back(RendererType::kSkiaGL);
+#endif
 #if defined(ENABLE_VIZ_VULKAN_TESTS)
   types.push_back(RendererType::kSkiaVulkan);
 #endif

components/viz/viz.gni

@@ -4,6 +4,10 @@
 
 import("//testing/test.gni")
 
+# Fuchsia doesn't support GL rendering so there is no need to run tests for
+# that code path.
+enable_viz_gl_tests = !is_fuchsia
+
 viz_remove_configs = []
 viz_add_configs = [ "//build/config:precompiled_headers" ]