helium/windows: refresh updater patches for m149

Author: dumbmoron

patches/helium/windows/change-branding.patch

@@ -135,7 +135,7 @@
  CHROME_PATCH_FILE_SUFFIX = "_patch"  # prefixed by options.output_name
 
  # compressed full archive suffix, will be prefixed by options.output_name
-@@ -724,7 +718,7 @@ def _ParseOptions():
+@@ -724,7 +724,7 @@ def _ParseOptions():
          '{BSDIFF|ZUCCHINI}.')
      parser.add_option('-n',
                        '--output_name',

patches/helium/windows/helium-versioning.patch

@@ -68,7 +68,7 @@
  </assembly>
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1301,7 +1301,7 @@ base::FilePath GetModulePath(std::wstrin
+@@ -1292,7 +1292,7 @@ base::FilePath GetModulePath(std::wstrin
    // executable's directory and return the path if it can be read. This is the
    // expected location of modules for proper installs.
    const base::FilePath module_path =
@@ -160,7 +160,7 @@
  #include "base/win/registry.h"
  #include "base/win/security_util.h"
  #include "base/win/sid.h"
-@@ -579,10 +580,11 @@ void AddUninstallShortcutWorkItems(const
+@@ -583,10 +584,11 @@ void AddUninstallShortcutWorkItems(const
                                           InstallUtil::GetPublisherName(), true);
      install_list->AddSetRegValueWorkItem(
          reg_root, uninstall_reg, KEY_WOW64_32KEY, L"Version",
@@ -176,7 +176,7 @@
      install_list->AddSetRegValueWorkItem(reg_root, uninstall_reg,
 --- a/chrome/installer/setup/setup_main.cc
 +++ b/chrome/installer/setup/setup_main.cc
-@@ -478,7 +478,7 @@ installer::InstallStatus RenameChromeExe
+@@ -543,7 +543,7 @@ installer::InstallStatus RenameChromeExe
                                      WorkItem::MoveTreeOptions{});
 
    AddFinalizeUpdateWorkItems(original_state,

patches/helium/windows/setup-chromium-version-migration.patch

@@ -24,7 +24,7 @@
                << current_version;
 --- a/chrome/installer/setup/setup_main.cc
 +++ b/chrome/installer/setup/setup_main.cc
-@@ -1235,7 +1235,17 @@ InstallStatus InstallProductsHelper(Inst
+@@ -1308,7 +1308,17 @@ InstallStatus InstallProductsHelper(Inst
      if (!IsDowngradeAllowed(prefs)) {
        const ProductState* product_state =
            original_state.GetProductState(system_install);

patches/helium/windows/updater/build-wiring.patch

@@ -1,14 +1,14 @@
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -57,6 +57,7 @@ if (is_android) {
+@@ -54,6 +54,7 @@ if (is_android) {
 
  if (is_win) {
    import("//build/config/win/manifest.gni")
 +  import("//chrome/updater/winsparkle.gni")
  }
 
  assert(!is_fuchsia, "Fuchsia shouldn't use anything in //chrome")
-@@ -103,6 +104,13 @@ buildflag_header("buildflags") {
+@@ -100,6 +101,13 @@ buildflag_header("buildflags") {
 
    if (is_win) {
      flags += [ "ENABLE_SEGMENT_HEAP=$enable_segment_heap" ]
@@ -22,7 +22,7 @@
    }
 
    # Android and ChromeOS don't support multiple browser processes, so they don't
-@@ -5834,6 +5842,17 @@ static_library("browser") {
+@@ -4069,6 +4077,17 @@ static_library("browser") {
    }
 
    if (is_win) {
@@ -72,7 +72,7 @@
  generate_allowlist_from_histograms_file("webui_name_variants") {
    namespace = "views_metrics"
    input_xml_file = "//tools/metrics/histograms/metadata/page/histograms.xml"
-@@ -3527,7 +3531,7 @@ static_library("ui") {
+@@ -3619,7 +3623,7 @@ static_library("ui") {
          "//chrome/browser/win/installer_downloader:prefs",
          "//chrome/updater/app/server/win:updater_legacy_idl",
        ]

patches/helium/windows/updater/helper.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -5851,6 +5851,7 @@ static_library("browser") {
+@@ -4086,6 +4086,7 @@ static_library("browser") {
          "//components/helium_services",
          "//third_party/winsparkle",
        ]

patches/helium/windows/updater/register.patch

@@ -43,14 +43,11 @@
  #if BUILDFLAG(ENABLE_SESSION_SERVICE)
  #include "chrome/browser/sessions/session_data_service.h"
  #include "chrome/browser/sessions/session_data_service_factory.h"
-@@ -109,9 +114,21 @@ void AttemptRestartInternal(IgnoreUnload
-   content::GetUIThreadTaskRunner({})->PostTask(
+@@ -113,7 +118,21 @@ void AttemptRestartInternal(IgnoreUnload
        FROM_HERE, base::BindOnce(&ExitIgnoreUnloadHandlers));
  #else   // !BUILDFLAG(IS_CHROMEOS).
--
+   // Set the flag to restore state after the restart.
 -  pref_service->SetBoolean(prefs::kRestartLastSessionOnShutdown, true);
--
-+  // Set the flag to restore state after the restart.
 +  bool self_relaunch = true;
 +#if BUILDFLAG(ENABLE_WINSPARKLE)
 +  // If a system-level update is downloaded and waiting, we raise a
@@ -65,6 +62,7 @@
 +  if (self_relaunch) {
 +    pref_service->SetBoolean(prefs::kRestartLastSessionOnShutdown, true);
 +  }
++
    if (ignore_unload_handlers) {
      ExitIgnoreUnloadHandlers();
    } else {