[fuchsia] Use "web_engine_with_webui" for telemetry tests.

Finishes transitioning layout and GPU tests from using "web_engine" to
using "web_engine_with_webui" instead, and strips unused resources from
"web_engine".

Bug: 1092729
Change-Id: Id6da0e6a051554ee330a219e15e4c9ae25775413
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2485341
Commit-Queue: Kevin Marshall <kmarshall@chromium.org>
Reviewed-by: David Dorwin <ddorwin@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819962}

content/test/BUILD.gn

@@ -637,10 +637,6 @@ if (is_fuchsia) {
       "//fuchsia/engine:web_engine_shell",
       "//fuchsia/engine:web_engine_with_webui",
     ]
-
-    # TODO(crbug.com/1092729): Remove once Catapult is migrated to use
-    # `web_engine_with_webui`.
-    data_deps += [ "//fuchsia/engine:web_engine" ]
   }
 }
 

content/test/gpu/run_gpu_integration_test_fuchsia.py

@@ -43,9 +43,7 @@ def main():
     temp_log_file = True
     additional_target_args['system_log_file'] = args.system_log_file
 
-  # TODO(crbug.com/1092729): Remove 'web_engine' when Catapult is migrated
-  # to use "web_engine_with_webui".
-  package_names = ['web_engine', 'web_engine_with_webui', 'web_engine_shell']
+  package_names = ['web_engine_with_webui', 'web_engine_shell']
   web_engine_dir = os.path.join(args.out_dir, 'gen', 'fuchsia', 'engine')
   gpu_script = [
       os.path.join(path_util.GetChromiumSrcDir(), 'content', 'test', 'gpu',

fuchsia/engine/BUILD.gn

@@ -248,9 +248,7 @@ template("web_engine_package") {
 }
 
 web_engine_package("web_engine") {
-  # TODO(crbug.com/2424514): Set to "false" once telemetry tests are migrated to
-  # use `web_engine_with_webui`.
-  include_webui_resources_pak = !is_official_build
+  include_webui_resources_pak = false
 }
 
 fuchsia_package_runner("web_engine_installer") {