BASELINE: Update Chromium to 74.0.3729.159

Change-Id: I8d2497da544c275415aedd94dd25328d555de811
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

4 files changed, 32 insertions, 19 deletions

diff --git a/chromium/chrome/installer/gcapi/BUILD.gn b/chromium/chrome/installer/gcapi/BUILD.gn
index 297c55a5920..a6a5018578c 100644
--- a/chromium/chrome/installer/gcapi/BUILD.gn
+++ b/chromium/chrome/installer/gcapi/BUILD.gn
@@ -54,7 +54,6 @@ source_set("lib") {
     "//base",
     "//chrome/installer/launcher_support",
     "//chrome/installer/util:with_no_strings",
-    "//components/variations",
     "//google_update",
   ]
 }
@@ -75,7 +74,6 @@ test("gcapi_test") {
     "//chrome/install_static:install_static_util",
     "//chrome/install_static/test:test_support",
     "//chrome/installer/util:with_no_strings",
-    "//components/variations",
     "//testing/gtest",
   ]
 
diff --git a/chromium/chrome/installer/linux/BUILD.gn b/chromium/chrome/installer/linux/BUILD.gn
index cec51216581..05e0c5f9f78 100644
--- a/chromium/chrome/installer/linux/BUILD.gn
+++ b/chromium/chrome/installer/linux/BUILD.gn
@@ -171,7 +171,8 @@ action("strip_chrome_binary") {
     stripped_file,
   ]
   args = [
-    rebase_path("//third_party/eu-strip/bin/eu-strip", root_build_dir),
+    rebase_path("//buildtools/third_party/eu-strip/bin/eu-strip",
+                root_build_dir),
     "-o",
     rebase_path(stripped_file, root_build_dir),
     "-f",
@@ -248,7 +249,7 @@ copy("common_packaging_files") {
     ]
   }
 
-  sources += [ "//third_party/eu-strip/bin/eu-strip" ]
+  sources += [ "//buildtools/third_party/eu-strip/bin/eu-strip" ]
 
   outputs = [
     "$root_out_dir/installer/common/{{source_file_part}}",
diff --git a/chromium/chrome/installer/mini_installer/BUILD.gn b/chromium/chrome/installer/mini_installer/BUILD.gn
index 8d19c74ebe9..ec629333b00 100644
--- a/chromium/chrome/installer/mini_installer/BUILD.gn
+++ b/chromium/chrome/installer/mini_installer/BUILD.gn
@@ -278,6 +278,9 @@ template("generate_mini_installer") {
     #      dependency on //buildtools/third_party/libc++ in builds that set
     #      use_custom_libcxx=true.
     #
+    # The net result is similar to linking with /NODEFAULTLIB, but more precise
+    # as it just excludes the CRT.
+    #
     # But in asan builds we need to link against the asan runtime library, which
     # in turn depends on the standard library and relies on it to run
     # initializers.
diff --git a/chromium/chrome/installer/test/BUILD.gn b/chromium/chrome/installer/test/BUILD.gn
index cb7f71f9d30..17840437ee1 100644
--- a/chromium/chrome/installer/test/BUILD.gn
+++ b/chromium/chrome/installer/test/BUILD.gn
@@ -2,25 +2,36 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/symlink.gni")
 import("//testing/test.gni")
-
 assert(is_win)
 
-executable("alternate_version_generator") {
-  testonly = true
-  sources = [
-    "alternate_version_generator_main.cc",
-  ]
+# Don't target the tool to non-win host for cross build because the tool depends
+# on Win32 API.
+# TODO(thakis): Enable this in cross builds, https://crbug.com/799827
+if (current_toolchain == host_toolchain || host_os != "win") {
+  executable("alternate_version_generator") {
+    testonly = true
+    sources = [
+      "alternate_version_generator_main.cc",
+    ]
 
-  deps = [
-    ":alternate_version_generator_lib",
-    "//base",
-    "//base/test:test_support",
-    "//build/win:default_exe_manifest",
-    "//chrome/common:constants",
-    "//chrome/installer/util:with_rc_strings",
-    "//testing/gtest",
-  ]
+    deps = [
+      ":alternate_version_generator_lib",
+      "//base",
+      "//base/test:test_support",
+      "//build/win:default_exe_manifest",
+      "//chrome/common:constants",
+      "//chrome/installer/util:with_rc_strings",
+      "//testing/gtest",
+    ]
+  }
+} else {
+  binary_symlink("alternate_version_generator") {
+    testonly = true
+    binary_label = ":$target_name($host_toolchain)"
+    binary_output_name = "alternate_version_generator.exe"
+  }
 }
 
 static_library("alternate_version_generator_lib") {