BASELINE: Update Chromium to 69.0.3497.70

Change-Id: I2b7b56e4e7a8b26656930def0d4575dc32b900a0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 13 insertions, 47 deletions

diff --git a/chromium/testing/test.gni b/chromium/testing/test.gni
index 01c15c8c405..ec62a8f1cfa 100644
--- a/chromium/testing/test.gni
+++ b/chromium/testing/test.gni
@@ -134,10 +134,7 @@ template("test") {
 
         if (!defined(invoker.use_default_launcher) ||
             invoker.use_default_launcher) {
-          deps += [
-            "//build/config:exe_and_shlib_deps",
-            "//testing/android/native_test:native_test_native_code",
-          ]
+          deps += [ "//testing/android/native_test:native_test_native_code" ]
         }
       }
       unittest_apk(_apk_target) {
@@ -256,44 +253,27 @@ template("test") {
   } else if (is_fuchsia) {
     _output_name = invoker.target_name
     _pkg_target = "${_output_name}_pkg"
-    _gen_runner_target = "${_output_name}_runner"
     _exec_target = "${_output_name}__exec"
 
-    group(target_name) {
+    fuchsia_package_runner(target_name) {
       testonly = true
-      deps = [
-        ":$_gen_runner_target",
-        ":$_pkg_target",
-      ]
-
-      # Disable packaging for Chromecast builds. (https://crbug.com/810069)
-      if (is_chromecast) {
-        deps -= [ ":${_pkg_target}" ]
-      }
-    }
-
-    # Makes the script which invokes the executable.
-    test_runner_script(_gen_runner_target) {
       forward_variables_from(invoker, [ "use_test_server" ])
-      test_name = _output_name
-      package_name = _output_name
+      runner_script = "//build/fuchsia/test_runner.py"
+      package = ":$_pkg_target"
+      package_name_override = _output_name
     }
 
     executable(_exec_target) {
-      testonly = true
       forward_variables_from(invoker, "*")
+      testonly = true
       output_name = _exec_target
-      deps += [ "//build/config:exe_and_shlib_deps" ]
     }
 
-    package(_pkg_target) {
+    fuchsia_package(_pkg_target) {
       testonly = true
-      package_name = _output_name
       sandbox_policy = "//build/config/fuchsia/testing_sandbox_policy"
-      binary = get_label_info(_exec_target, "name")
-      deps = [
-        ":$_exec_target",
-      ]
+      binary = ":$_exec_target"
+      package_name_override = _output_name
     }
   } else if (is_ios) {
     import("//build/config/ios/ios_sdk.gni")
@@ -334,14 +314,6 @@ template("test") {
       }
       extra_substitutions += [ "GTEST_BUNDLE_ID_SUFFIX=$_bundle_id_suffix" ]
 
-      if (!defined(deps)) {
-        deps = []
-      }
-      deps += [
-        # All shared libraries must have the sanitizer deps to properly link in
-        # asan mode (this target will be empty in other cases).
-        "//build/config:exe_and_shlib_deps",
-      ]
       if (!defined(bundle_deps)) {
         bundle_deps = []
       }
@@ -376,23 +348,17 @@ template("test") {
       output_name = target_name
       write_runtime_deps = _runtime_deps_file
       data += [ _runtime_deps_file ]
-      deps += [
-        ":$_gen_runner_target",
-        "//build/config:exe_and_shlib_deps",
-      ]
+      deps += [ ":$_gen_runner_target" ]
     }
   } else {
     executable(target_name) {
-      deps = []
-
       forward_variables_from(invoker, "*")
+      if (!defined(deps)) {
+        deps = []
+      }
 
       testonly = true
       deps += [
-        # All shared libraries must have the sanitizer deps to properly link in
-        # asan mode (this target will be empty in other cases).
-        "//build/config:exe_and_shlib_deps",
-
         # Give tests the default manifest on Windows (a no-op elsewhere).
         "//build/win:default_exe_manifest",
       ]