5 files changed, 22 insertions, 5 deletions
diff --git a/chromium/chrome/installer/gcapi_mac/BUILD.gn b/chromium/chrome/installer/gcapi_mac/BUILD.gn
index d07b0fff3de..5212e3c6b76 100644
--- a/chromium/chrome/installer/gcapi_mac/BUILD.gn
+++ b/chromium/chrome/installer/gcapi_mac/BUILD.gn
@@ -7,15 +7,20 @@ import("//build/config/sysroot.gni")
 assert(is_mac)
 
 config("gcapi_config") {
+  # gcapi can be bundled with installers of other software, which might run
+  # on older macOS versions than chrome itself. To not making a dependency on
+  # gcapi a problem for these installers, make it target a very old version
+  # of macOS.
+  min_version = "10.8"
   cflags = [
     "-isysroot",
     rebase_path(sysroot, root_build_dir),
-    "-mmacosx-version-min=10.6",
+    "-mmacosx-version-min=$min_version",
   ]
   ldflags = [
     "-isysroot",
     rebase_path(sysroot, root_build_dir),
-    "-mmacosx-version-min=10.6",
+    "-mmacosx-version-min=$min_version",
   ]
 }
 
@@ -47,7 +52,7 @@ executable("gcapi_example") {
 
   # Every executable by default links to a hermetic libc++, so that we can
   # guarantee the capability of the standard library. Neither gcapi_lib
-  # not gcapi_example contain any significant use of the standard library
+  # nor gcapi_example contain any significant use of the standard library
   # and gcapi_lib is supposed to be redistributable to partners who don't
   # want to link our hermetic libc++, so set no_default_deps to not link to
   # our hermetic libc++.
diff --git a/chromium/chrome/installer/mac/BUILD.gn b/chromium/chrome/installer/mac/BUILD.gn
index c6f23f82ac2..108dd95d867 100644
--- a/chromium/chrome/installer/mac/BUILD.gn
+++ b/chromium/chrome/installer/mac/BUILD.gn
@@ -92,12 +92,22 @@ copy("copies") {
 
   if (is_chrome_branded) {
     sources += [
+      "//chrome/app/theme/google_chrome/mac/app_beta.icns",
       "//chrome/app/theme/google_chrome/mac/app_canary.icns",
+      "//chrome/app/theme/google_chrome/mac/app_dev.icns",
+      "//chrome/app/theme/google_chrome/mac/document_beta.icns",
       "//chrome/app/theme/google_chrome/mac/document_canary.icns",
+      "//chrome/app/theme/google_chrome/mac/document_dev.icns",
       "internal/Google_Chrome.provisionprofile",
+      "internal/Google_Chrome_Beta.provisionprofile",
       "internal/Google_Chrome_Canary.provisionprofile",
+      "internal/Google_Chrome_Dev.provisionprofile",
+      "internal/chrome_beta_dmg_dsstore",
+      "internal/chrome_beta_dmg_icon.icns",
       "internal/chrome_canary_dmg_dsstore",
       "internal/chrome_canary_dmg_icon.icns",
+      "internal/chrome_dev_dmg_dsstore",
+      "internal/chrome_dev_dmg_icon.icns",
       "internal/chrome_dmg_background.png",
       "internal/chrome_dmg_dsstore",
       "internal/chrome_dmg_icon.icns",
diff --git a/chromium/chrome/installer/mini_installer/BUILD.gn b/chromium/chrome/installer/mini_installer/BUILD.gn
index 056d425c419..a04d7f31c2a 100644
--- a/chromium/chrome/installer/mini_installer/BUILD.gn
+++ b/chromium/chrome/installer/mini_installer/BUILD.gn
@@ -180,6 +180,7 @@ template("generate_mini_installer") {
       "//chrome/browser/extensions/default_extensions",
       "//chrome/common/win:eventlog_provider",
       "//chrome/installer/setup",
+      "//mojo/core:shared_library",
       "//third_party/icu:icudata",
       chrome_dll_target,
     ]
diff --git a/chromium/chrome/installer/setup/BUILD.gn b/chromium/chrome/installer/setup/BUILD.gn
index 0c20390a7cf..7bf0b6d6db6 100644
--- a/chromium/chrome/installer/setup/BUILD.gn
+++ b/chromium/chrome/installer/setup/BUILD.gn
@@ -56,6 +56,7 @@ if (is_win) {
       "brand_behaviors.h",
       "install.cc",
       "install.h",
+      "install_params.h",
       "install_worker.cc",
       "install_worker.h",
       "installer_crash_reporter_client.cc",
@@ -66,6 +67,7 @@ if (is_win) {
       "installer_state.h",
       "launch_chrome.cc",
       "launch_chrome.h",
+      "modify_params.h",
       "progress_calculator.cc",
       "progress_calculator.h",
       "setup_constants.cc",
diff --git a/chromium/chrome/installer/util/BUILD.gn b/chromium/chrome/installer/util/BUILD.gn
index dae16bd9569..0b770ce3744 100644
--- a/chromium/chrome/installer/util/BUILD.gn
+++ b/chromium/chrome/installer/util/BUILD.gn
@@ -174,8 +174,6 @@ static_library("with_no_strings") {
       "move_tree_work_item.h",
       "registry_key_backup.cc",
       "registry_key_backup.h",
-      "self_reg_work_item.cc",
-      "self_reg_work_item.h",
       "set_reg_value_work_item.cc",
       "set_reg_value_work_item.h",
       "work_item.cc",
@@ -312,6 +310,7 @@ if (is_win) {
       "experiment_storage_unittest.cc",
       "experiment_unittest.cc",
       "google_update_settings_unittest.cc",
+      "helper_unittest.cc",
       "install_util_unittest.cc",
       "l10n_string_util_unittest.cc",
       "logging_installer_unittest.cc",