[Fuchsia] Refactor data needed for gpu_integration_tests.

Add the refactored target to gpu integration tests on Fuchsia

Bug: 1058255
Change-Id: I3eb86a55c42a509221af84840d2ecfe0f26035b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2209612Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Chong Gu <chonggu@google.com>
Cr-Commit-Position: refs/heads/master@{#770714}

chrome/test/BUILD.gn

@@ -409,52 +409,15 @@ static_library("test_support") {
 
 group("telemetry_gpu_integration_test") {
   testonly = true
-  deps = [ "//tools/perf/chrome_telemetry_build:telemetry_chrome_test" ]
-
+  data_deps = [
+    "//content/test:telemetry_gpu_integration_test_support",
+    "//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
+  ]
   data = [
     # For isolate contract.
-    "//testing/scripts/common.py",
-    "//testing/xvfb.py",
     "//testing/scripts/gpu_integration_test_adapter.py",
     "//testing/scripts/run_gpu_integration_test_as_googletest.py",
     "//testing/trigger_scripts/trigger_multiple_dimensions.py",
-
-    "//content/test/gpu/",
-    "//content/test/data/gpu/",
-
-    # For the Maps performance test. Include the entire directory to
-    # avoid having to update this BUILD.gn file if more files are
-    # added in the future.
-    "//tools/perf/page_sets/maps_perf_test/",
-
-    # For depth_capture
-    "//content/test/data/media/depth_stream_test_utilities.js",
-    "//content/test/data/media/getusermedia-depth-capture.html",
-    "//content/test/data/media/webrtc_test_utilities.js",
-
-    # For GpuProcess.video
-    "//content/test/data/media/bear.ogv",
-
-    # For webgl_conformance
-    "//third_party/webgl/",
-    "//content/test/gpu/run_gpu_integration_test.py",
-
-    # For pixel_test and trace_test
-    "//media/test/data/four-colors.mp4",
-    "//media/test/data/four-colors-aspect-4x3.mp4",
-    "//media/test/data/four-colors-rot-90.mp4",
-    "//media/test/data/four-colors-rot-180.mp4",
-    "//media/test/data/four-colors-rot-270.mp4",
-    "//media/test/data/four-colors-vp9.webm",
-    "//media/test/data/four-colors-vp9-i420a.webm",
-
-    # For power
-    "//media/test/data/bear-1280x720.mp4",
-  ]
-
-  data_deps = [
-    # For anything using Skia Gold (pixel, maps).
-    "//ui/base:goldctl",
   ]
 }
 

content/test/BUILD.gn

@@ -604,8 +604,9 @@ jumbo_static_library("test_support") {
 if (is_fuchsia) {
   group("fuchsia_telemetry_gpu_integration_test") {
     testonly = true
-    deps = [
+    data_deps = [
       ":telemetry_gpu_integration_test_scripts_only",
+      ":telemetry_gpu_integration_test_support",
       "//fuchsia/engine:web_engine_runner",
       "//fuchsia/engine:web_engine_shell",
     ]
@@ -621,12 +622,52 @@ group("telemetry_gpu_integration_test_scripts_only") {
   data = [
     "//content/test/gpu/",
     "//testing/scripts/run_isolated_script_test.py",
-    "//testing/scripts/common.py",
-    "//testing/xvfb.py",
     "//testing/test_env.py",
   ]
 }
 
+group("telemetry_gpu_integration_test_support") {
+  testonly = true
+  data = [
+    "//content/test/gpu/",
+    "//content/test/data/gpu/",
+
+    # For the Maps performance test. Include the entire directory to
+    # avoid having to update this BUILD.gn file if more files are
+    # added in the future.
+    "//tools/perf/page_sets/maps_perf_test/",
+
+    # For depth_capture
+    "//content/test/data/media/depth_stream_test_utilities.js",
+    "//content/test/data/media/getusermedia-depth-capture.html",
+    "//content/test/data/media/webrtc_test_utilities.js",
+
+    # For GpuProcess.video
+    "//content/test/data/media/bear.ogv",
+
+    # For webgl_conformance
+    "//third_party/webgl/",
+    "//content/test/gpu/run_gpu_integration_test.py",
+
+    # For pixel_test and trace_test
+    "//media/test/data/four-colors.mp4",
+    "//media/test/data/four-colors-aspect-4x3.mp4",
+    "//media/test/data/four-colors-rot-90.mp4",
+    "//media/test/data/four-colors-rot-180.mp4",
+    "//media/test/data/four-colors-rot-270.mp4",
+    "//media/test/data/four-colors-vp9.webm",
+    "//media/test/data/four-colors-vp9-i420a.webm",
+
+    # For power
+    "//media/test/data/bear-1280x720.mp4",
+  ]
+
+  data_deps = [
+    # For anything using Skia Gold (pixel, maps).
+    "//ui/base:goldctl",
+  ]
+}
+
 # browsertest_support can be used by targets that run content_shell based
 # browser tests.
 jumbo_static_library("browsertest_support") {

tools/perf/chrome_telemetry_build/BUILD.gn

@@ -98,9 +98,11 @@ group("telemetry_chrome_test_without_chrome") {
   testonly = true
 
   data = [
-    "//tools/perf/core/",  # chrome_telemetry_build/ depends on core/
-    "//tools/perf/chrome_telemetry_build/",
     "//components/crash/content/tools/generate_breakpad_symbols.py",
+    "//testing/scripts/common.py",
+    "//testing/xvfb.py",
+    "//tools/perf/chrome_telemetry_build/",
+    "//tools/perf/core/",  # chrome_telemetry_build/ depends on core/
   ]
   data_deps = [
     "//third_party/catapult:telemetry_chrome_test_support",