Update patches for M142

Author: Hibbiki

patch/0001-Patch-installer-to-close-previous-browser-instance-o.patch

@@ -1,4 +1,4 @@
-From b66ad118bce15fda95bd0a7b537f57a68270a524 Mon Sep 17 00:00:00 2001
+From 6672d08c0f5587b6450b2137cf41cd69acc37b10 Mon Sep 17 00:00:00 2001
 From: Hibiki Tachibana <57486057+Hibbiki@users.noreply.github.com>
 Date: Thu, 5 Aug 2021 02:09:34 +0200
 Subject: [PATCH 1/4] Patch installer to close previous browser instance on
@@ -10,7 +10,7 @@ Signed-off-by: Hibiki Tachibana <57486057+Hibbiki@users.noreply.github.com>
  1 file changed, 48 insertions(+)
 
 diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
-index e92470fe15e08..20d6c9369eeb4 100644
+index 3393a297bb712..40f877019cd32 100644
 --- a/chrome/installer/setup/install_worker.cc
 +++ b/chrome/installer/setup/install_worker.cc
 @@ -29,6 +29,8 @@
@@ -30,7 +30,7 @@ index e92470fe15e08..20d6c9369eeb4 100644
  #include "chrome/install_static/buildflags.h"
  #include "chrome/install_static/install_details.h"
  #include "chrome/install_static/install_modes.h"
-@@ -218,6 +221,46 @@ void AddDeleteUninstallEntryForMSIWorkItems(
+@@ -198,6 +201,46 @@ void AddDeleteUninstallEntryForMSIWorkItems(
    delete_reg_key->set_best_effort(true);
  }
 
@@ -77,7 +77,7 @@ index e92470fe15e08..20d6c9369eeb4 100644
  // Adds Chrome specific install work items to |install_list|.
  void AddChromeWorkItems(const InstallParams& install_params,
                          WorkItemList* install_list) {
-@@ -230,6 +273,11 @@ void AddChromeWorkItems(const InstallParams& install_params,
+@@ -209,6 +252,11 @@ void AddChromeWorkItems(const InstallParams& install_params,
 
    const base::FilePath& target_path = installer_state.target_path();
 
@@ -87,8 +87,8 @@ index e92470fe15e08..20d6c9369eeb4 100644
 +    ClosePreviousChromeProcess(target_path);
 +
    if (current_version.IsValid()) {
+     // TODO(crbug.com/441478433): Delete this cleanup some time in 2027.
      // Delete the archive from an existing install to save some disk space.
-     base::FilePath old_installer_dir(
 -- 
-2.47.0.windows.2
+2.50.1.windows.1
 

patch/0002-Patch-updater-to-work-with-unsigned-and-unbranded-bu.patch

@@ -1,4 +1,4 @@
-From 14a121509a65c4faa707fd7d705d4119e151dda6 Mon Sep 17 00:00:00 2001
+From b6d0c246ec55919274446bcb7701a17eb5c4af7c Mon Sep 17 00:00:00 2001
 From: Hibiki Tachibana <57486057+Hibbiki@users.noreply.github.com>
 Date: Wed, 12 Jun 2024 02:14:41 +0200
 Subject: [PATCH 2/4] Patch updater to work with unsigned and unbranded builds
@@ -26,7 +26,7 @@ index 7de32cf745755..9bbb8ecadd23a 100644
          .base_app_id = L"Chromium",                // A distinct base_app_id.
          .browser_prog_id_prefix = L"ChromiumHTM",  // Browser ProgID prefix.
 diff --git a/chrome/updater/BUILD.gn b/chrome/updater/BUILD.gn
-index 65e5c411f6038..a91f6e912b8a9 100644
+index 58400305cb10a..b2fa2db65c701 100644
 --- a/chrome/updater/BUILD.gn
 +++ b/chrome/updater/BUILD.gn
 @@ -358,6 +358,7 @@ if (is_win || is_mac || is_linux) {
@@ -38,7 +38,7 @@ index 65e5c411f6038..a91f6e912b8a9 100644
          "//chrome/updater/app/server/win:updater_idl_system",
          "//chrome/updater/app/server/win:updater_idl_user",
 diff --git a/chrome/updater/win/installer/installer.cc b/chrome/updater/win/installer/installer.cc
-index f5b930591ebbc..878caf2a9d725 100644
+index 2444634092235..71f13cfa910f5 100644
 --- a/chrome/updater/win/installer/installer.cc
 +++ b/chrome/updater/win/installer/installer.cc
 @@ -11,6 +11,11 @@
@@ -53,23 +53,23 @@ index f5b930591ebbc..878caf2a9d725 100644
  #include "chrome/updater/win/installer/installer.h"
 
  #include <shellapi.h>
-@@ -30,6 +35,7 @@
+@@ -31,6 +36,7 @@
  #include "base/memory/ref_counted.h"
  #include "base/path_service.h"
  #include "base/strings/strcat.h"
 +#include "base/strings/stringprintf.h"
  #include "base/strings/utf_string_conversions.h"
  #include "base/synchronization/waitable_event.h"
  #include "base/task/thread_pool.h"
-@@ -44,6 +50,7 @@
+@@ -45,6 +51,7 @@
  #include "base/win/scoped_localalloc.h"
  #include "base/win/windows_version.h"
  #include "chrome/installer/util/lzma_util.h"
 +#include "chrome/install_static/install_modes.h"
  #include "chrome/updater/branded_constants.h"
  #include "chrome/updater/constants.h"
  #include "chrome/updater/ping_configurator.h"
-@@ -74,11 +81,19 @@ namespace {
+@@ -75,11 +82,19 @@ namespace {
  // program file image used to create this process. The implementation of this
  // function only handles UTF8 tags.
  std::string ExtractTag() {
@@ -125,5 +125,5 @@ index d22b29c4875fc..6f7a0bbfc616e 100755
      def _generate_target_manifest(self, appid, installer_path, manifest_path,
                                    manifest_dict_replacements):
 -- 
-2.47.0.windows.2
+2.50.1.windows.1
 

patch/0003-Ensure-bogus-ElevationService-is-not-being-created-d.patch

@@ -1,4 +1,4 @@
-From 2f9be0801fbebd9e3ba3e55405fcd246b68a94f0 Mon Sep 17 00:00:00 2001
+From 5221611b74b49a818db69aa6389c83eabb9860c0 Mon Sep 17 00:00:00 2001
 From: Hibiki Tachibana <57486057+Hibbiki@users.noreply.github.com>
 Date: Sat, 22 Jul 2023 01:33:35 +0200
 Subject: [PATCH 3/4] Ensure bogus ElevationService is not being created during
@@ -10,26 +10,26 @@ Signed-off-by: Hibiki Tachibana <57486057+Hibbiki@users.noreply.github.com>
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
-index 20d6c9369eeb4..a05913e2a4b60 100644
+index 40f877019cd32..52b872a32ee18 100644
 --- a/chrome/installer/setup/install_worker.cc
 +++ b/chrome/installer/setup/install_worker.cc
-@@ -345,6 +345,7 @@ void AddChromeWorkItems(const InstallParams& install_params,
+@@ -320,6 +320,7 @@ void AddChromeWorkItems(const InstallParams& install_params,
        ->set_best_effort(true);
  }
 
 +#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
  // Adds work items to register the Elevation Service with Windows. Only for
  // system level installs.
  void AddElevationServiceWorkItems(const base::FilePath& elevation_service_path,
-@@ -430,7 +431,6 @@ void AddTracingServiceWorkItems(const InstallationState& original_state,
+@@ -405,7 +406,6 @@ void AddTracingServiceWorkItems(const InstallationState& original_state,
    }
  }
 
 -#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
  // Adds work items to add the "store-dmtoken" command to Chrome's version key.
  // This method is a no-op if this is anything other than system-level Chrome.
  // The command is used when enrolling Chrome browser instances into enterprise
-@@ -1054,7 +1054,7 @@ void AddInstallWorkItems(const InstallParams& install_params,
+@@ -1029,7 +1029,7 @@ void AddInstallWorkItems(const InstallParams& install_params,
                                      install_list);
    AddPlatformExperienceHelperWorkItems(installer_state, new_version,
                                         install_list);
@@ -38,7 +38,7 @@ index 20d6c9369eeb4..a05913e2a4b60 100644
    AddFirewallRulesWorkItems(installer_state, !current_version.IsValid(),
                              install_list);
 
-@@ -1064,10 +1064,12 @@ void AddInstallWorkItems(const InstallParams& install_params,
+@@ -1039,10 +1039,12 @@ void AddInstallWorkItems(const InstallParams& install_params,
        installer_state.root_key(),
        GetNotificationHelperPath(target_path, new_version), install_list);
 
@@ -51,7 +51,7 @@ index 20d6c9369eeb4..a05913e2a4b60 100644
 
    AddUpdateDowngradeVersionItem(installer_state.root_key(), current_version,
                                  new_version, install_list);
-@@ -1347,10 +1349,12 @@ void AddFinalizeUpdateWorkItems(const InstallationState& original_state,
+@@ -1322,10 +1324,12 @@ void AddFinalizeUpdateWorkItems(const InstallationState& original_state,
    AddWerHelperRegistration(installer_state.root_key(),
                             GetWerHelperPath(target_path, new_version), list);
 
@@ -65,5 +65,5 @@ index 20d6c9369eeb4..a05913e2a4b60 100644
    const std::wstring client_state_key = install_static::GetClientStateKeyPath();
 
 -- 
-2.47.0.windows.2
+2.50.1.windows.1
 

patch/0004-Fix-Grit-branding-args-for-policy_templates.patch

@@ -1,4 +1,4 @@
-From 833c2c739133f87164ac852f76c337b7e594598f Mon Sep 17 00:00:00 2001
+From 09ce76599632777f51894548f69000c29f2d975c Mon Sep 17 00:00:00 2001
 From: Hibiki Tachibana <57486057+Hibbiki@users.noreply.github.com>
 Date: Thu, 3 Aug 2023 11:25:53 +0200
 Subject: [PATCH 4/4] Fix Grit branding args for policy_templates
@@ -115,5 +115,5 @@ index 283ea725c5a18..f50b5ce395308 100755
      config['version'] = defines['version']
    if 'major_version' in defines:
 -- 
-2.47.0.windows.2
+2.50.1.windows.1