patches: refresh & update for chromium 142

2026-04-14 00:14:20 +09:00 · 2025-10-29 01:23:20 +06:00
parent 9cfd581f96
commit c12e746219
89 changed files with 692 additions and 664 deletions
--- a/patches/extra/brave/chrome-importer-files.patch
+++ b/patches/extra/brave/chrome-importer-files.patch
@@ -189,7 +189,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +}  // namespace
 --- /dev/null
 +++ b/chrome/common/importer/chrome_importer_utils.cc
-@@ -0,0 +1,241 @@
+@@ -0,0 +1,243 @@
 +/* Copyright (c) 2019 The Brave Authors, 2025 imput. All rights reserved.
 + * This Source Code Form is subject to the terms of the Mozilla Public
 + * License, v. 2.0. If a copy of the MPL was not distributed with this file,
@@ -235,7 +235,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +  base::ReadFileToString(preference_path, &preference_content);
 +
 +  std::optional<base::Value::Dict> preference =
-+      base::JSONReader::ReadDict(preference_content);
+      base::JSONReader::ReadDict(preference_content,
+                                 base::JSON_PARSE_CHROMIUM_EXTENSIONS);
 +  if (!preference) {
 +    return std::nullopt;
 +  }
@@ -335,7 +336,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +    std::string local_state_content;
 +    base::ReadFileToString(local_state_path, &local_state_content);
 +    std::optional<base::Value::Dict> local_state_dict =
-+        base::JSONReader::ReadDict(local_state_content);
+        base::JSONReader::ReadDict(local_state_content,
+                                   base::JSON_PARSE_CHROMIUM_EXTENSIONS);
 +    if (!local_state_dict)
 +      return profiles;
 +
@@ -2733,7 +2735,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +#endif  // BRAVE_UTILITY_IMPORTER_BRAVE_EXTERNAL_PROCESS_IMPORTER_BRIDGE_H_
 --- /dev/null
 +++ b/chrome/utility/importer/chrome_importer.cc
-@@ -0,0 +1,435 @@
+@@ -0,0 +1,437 @@
 +/* Copyright (c) 2019 The Brave Authors. All rights reserved.
 + * This Source Code Form is subject to the terms of the Mozilla Public
 + * License, v. 2.0. If a copy of the MPL was not distributed with this file,
@@ -2822,7 +2824,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +  std::string local_state_content;
 +  base::ReadFileToString(local_state_path, &local_state_content);
 +  std::optional<base::Value::Dict> local_state =
-+      base::JSONReader::ReadDict(local_state_content);
+      base::JSONReader::ReadDict(local_state_content,
+                                 base::JSON_PARSE_CHROMIUM_EXTENSIONS);
 +  if (!local_state) {
 +    return false;
 +  }
@@ -3006,7 +3009,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +  base::ReadFileToString(copy_bookmark_file.copied_file_path(),
 +                         &bookmarks_content);
 +  std::optional<base::Value::Dict> bookmark_dict =
-+      base::JSONReader::ReadDict(bookmarks_content);
+      base::JSONReader::ReadDict(bookmarks_content,
+                                 base::JSON_PARSE_CHROMIUM_EXTENSIONS);
 +  if (!bookmark_dict)
 +    return;
 +
--- a/patches/extra/brave/custom-importer.patch
+++ b/patches/extra/brave/custom-importer.patch
@@ -244,7 +244,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   }
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -4260,6 +4260,9 @@ inline constexpr char kServiceWorkerToCo
+@@ -4266,6 +4266,9 @@ inline constexpr char kServiceWorkerToCo
 inline constexpr char kSharedWorkerBlobURLFixEnabled[] =
     "worker.shared_worker_blob_url_fix_enabled";
 
@@ -256,7 +256,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 inline constexpr char kClearWindowNameForNewBrowsingContextGroup[] =
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -1161,6 +1161,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -1164,6 +1164,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
       settings_api::PrefType::kBoolean;
   (*s_allowlist)[::prefs::kImportDialogSearchEngine] =
       settings_api::PrefType::kBoolean;
@@ -275,7 +275,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "chrome/browser/ui/webui/settings/metrics_reporting_handler.h"
 #include "chrome/browser/ui/webui/settings/on_startup_handler.h"
 #include "chrome/browser/ui/webui/settings/password_manager_handler.h"
-@@ -202,6 +203,7 @@ void SettingsUI::RegisterProfilePrefs(
+@@ -201,6 +202,7 @@ void SettingsUI::RegisterProfilePrefs(
   registry->RegisterBooleanPref(prefs::kImportDialogHistory, true);
   registry->RegisterBooleanPref(prefs::kImportDialogSavedPasswords, true);
   registry->RegisterBooleanPref(prefs::kImportDialogSearchEngine, true);
@@ -283,7 +283,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 }
 
 SettingsUI::SettingsUI(content::WebUI* web_ui)
-@@ -231,7 +233,7 @@ SettingsUI::SettingsUI(content::WebUI* w
+@@ -230,7 +232,7 @@ SettingsUI::SettingsUI(content::WebUI* w
   AddSettingsPageUIHandler(std::make_unique<DownloadsHandler>(profile));
   AddSettingsPageUIHandler(std::make_unique<ExtensionControlHandler>());
   AddSettingsPageUIHandler(std::make_unique<FontHandler>(profile));
@@ -294,7 +294,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if BUILDFLAG(IS_WIN)
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -893,6 +893,8 @@ void AddImportDataStrings(content::WebUI
+@@ -900,6 +900,8 @@ void AddImportDataStrings(content::WebUI
       {"importHistory", IDS_SETTINGS_IMPORT_HISTORY_CHECKBOX},
       {"importFavorites", IDS_SETTINGS_IMPORT_FAVORITES_CHECKBOX},
       {"importPasswords", IDS_SETTINGS_IMPORT_PASSWORDS_CHECKBOX},
@@ -319,7 +319,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       </div>
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -1203,6 +1203,10 @@ static_library("ui") {
+@@ -1237,6 +1237,10 @@ static_library("ui") {
       "webui/settings/accessibility_main_handler.h",
       "webui/settings/appearance_handler.cc",
       "webui/settings/appearance_handler.h",
@@ -330,7 +330,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       "webui/settings/browser_lifetime_handler.cc",
       "webui/settings/browser_lifetime_handler.h",
       "webui/settings/captions_handler.cc",
-@@ -1355,6 +1359,13 @@ static_library("ui") {
+@@ -1391,6 +1395,13 @@ static_library("ui") {
       ]
     }
 
@@ -459,7 +459,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "components/mirroring/service/mirroring_service.h"
 #include "services/passage_embeddings/passage_embeddings_service.h"
 #include "services/proxy_resolver/proxy_resolver_factory_impl.h"  // nogncheck
-@@ -146,6 +148,13 @@ static_assert(BUILDFLAG(ENABLE_PRINTING)
+@@ -144,6 +146,13 @@ static_assert(BUILDFLAG(ENABLE_PRINTING)
 
 namespace {
 
@@ -473,7 +473,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 auto RunFilePatcher(mojo::PendingReceiver<patch::mojom::FilePatcher> receiver) {
   return std::make_unique<patch::FilePatcherImpl>(std::move(receiver));
 }
-@@ -465,6 +474,7 @@ void RegisterMainThreadServices(mojo::Se
+@@ -456,6 +465,7 @@ void RegisterMainThreadServices(mojo::Se
   services.Add(ContentBookmarkParser);
 
 #if !BUILDFLAG(IS_ANDROID)
@@ -583,7 +583,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   // entire group has been collected and is ready to be written to the profile.
 --- a/chrome/app/generated_resources.grd
 +++ b/chrome/app/generated_resources.grd
-@@ -11122,6 +11122,15 @@ Check your passwords anytime in <ph name
+@@ -11171,6 +11171,15 @@ Check your passwords anytime in <ph name
             Microsoft Edge
           </message>
         </if>
--- a/patches/helium/core/add-component-l10n-support.patch
+++ b/patches/helium/core/add-component-l10n-support.patch
@@ -51,7 +51,7 @@
 
 namespace errors = extensions::manifest_errors;
 namespace keys = extensions::manifest_keys;
-@@ -113,6 +118,19 @@ std::optional<base::Value::Dict> LoadMes
+@@ -114,6 +119,19 @@ std::optional<base::Value::Dict> LoadMes
   return dictionary;
 }
 
@@ -71,7 +71,7 @@
 // Localizes manifest value of string type for a given key.
 bool LocalizeManifestValue(const std::string& key,
                            const extensions::MessageBundle& messages,
-@@ -360,13 +378,16 @@ bool LocalizeManifest(const extensions::
+@@ -361,13 +379,16 @@ bool LocalizeManifest(const extensions::
 bool LocalizeExtension(const base::FilePath& extension_path,
                        base::Value::Dict* manifest,
                        GzippedMessagesPermission gzip_permission,
@@ -90,7 +90,7 @@
                                                gzip_permission, error));
 
   if (!message_bundle && !error->empty())
-@@ -504,6 +525,42 @@ extensions::MessageBundle* LoadMessageCa
+@@ -505,6 +526,42 @@ extensions::MessageBundle* LoadMessageCa
   return extensions::MessageBundle::Create(catalogs, error);
 }
 
--- a/patches/helium/core/add-component-managed-schema-support.patch
+++ b/patches/helium/core/add-component-managed-schema-support.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc
 +++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc
-@@ -94,9 +94,11 @@ class ManagedValueStoreCache::ExtensionT
+@@ -97,9 +97,11 @@ class ManagedValueStoreCache::ExtensionT
 
   // Loads the schemas of the |extensions| and passes a ComponentMap to
   // Register().
@@ -13,7 +13,7 @@
 
   raw_ptr<Profile> profile_;
   policy::PolicyDomain policy_domain_;
-@@ -175,6 +177,22 @@ bool ManagedValueStoreCache::ExtensionTr
+@@ -178,6 +180,22 @@ bool ManagedValueStoreCache::ExtensionTr
   return extension->manifest()->FindPath(manifest_keys::kStorageManagedSchema);
 }
 
@@ -36,7 +36,7 @@
 // static
 void ManagedValueStoreCache::ExtensionTracker::LoadSchemasOnFileTaskRunner(
     ExtensionSet extensions,
-@@ -199,14 +217,21 @@ void ManagedValueStoreCache::ExtensionTr
+@@ -202,14 +220,21 @@ void ManagedValueStoreCache::ExtensionTr
 
   content::GetUIThreadTaskRunner({})->PostTask(
       FROM_HERE, base::BindOnce(&ExtensionTracker::Register, self,
--- a/patches/helium/core/add-default-browser-reject-button.patch
+++ b/patches/helium/core/add-default-browser-reject-button.patch
@@ -1,6 +1,6 @@
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -1416,6 +1416,11 @@ inline constexpr char kExtensionCommands
+@@ -1407,6 +1407,11 @@ inline constexpr char kExtensionCommands
 inline constexpr char kPluginsAlwaysOpenPdfExternally[] =
     "plugins.always_open_pdf_externally";
 
@@ -25,7 +25,7 @@
   registry->RegisterIntegerPref(prefs::kPdfInfoBarTimesShown, 0);
 --- a/chrome/browser/ui/startup/infobar_utils.cc
 +++ b/chrome/browser/ui/startup/infobar_utils.cc
-@@ -208,6 +208,11 @@ void AddInfoBarsIfNecessary(Browser* bro
+@@ -211,6 +211,11 @@ void AddInfoBarsIfNecessary(BrowserWindo
     return;
   }
 
@@ -39,9 +39,9 @@
 #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 --- a/components/infobars/core/confirm_infobar_delegate.h
 +++ b/components/infobars/core/confirm_infobar_delegate.h
-@@ -81,6 +81,8 @@ class ConfirmInfoBarDelegate : public in
-   // custom layout to show the link text before the button.
-   virtual bool ShouldShowLinkBeforeButton() const;
+@@ -84,6 +84,8 @@ class ConfirmInfoBarDelegate : public in
+   // on the infobar.
+   virtual int GetLinkSpacingWhenPositionedBeforeButton() const;
 
 +  virtual bool OkButtonShouldAlwaysLead() const;
 +
@@ -50,8 +50,8 @@
   // Defaults to true.
 --- a/components/infobars/core/confirm_infobar_delegate.cc
 +++ b/components/infobars/core/confirm_infobar_delegate.cc
-@@ -67,6 +67,10 @@ bool ConfirmInfoBarDelegate::ShouldShowL
-   return false;
+@@ -71,6 +71,10 @@ int ConfirmInfoBarDelegate::GetLinkSpaci
+   return 0;
 }
 
 +bool ConfirmInfoBarDelegate::OkButtonShouldAlwaysLead() const {
@@ -119,7 +119,7 @@
   raw_ptr<Profile> profile_;
 --- a/chrome/browser/ui/views/infobars/confirm_infobar.cc
 +++ b/chrome/browser/ui/views/infobars/confirm_infobar.cc
-@@ -123,7 +123,9 @@ void ConfirmInfoBar::Layout(PassKey) {
+@@ -126,7 +126,9 @@ void ConfirmInfoBar::Layout(PassKey) {
   }
 
   if constexpr (!views::PlatformStyle::kIsOkButtonLeading) {
--- a/patches/helium/core/add-disable-ech-flag.patch
+++ b/patches/helium/core/add-disable-ech-flag.patch
@@ -31,7 +31,7 @@
 #include "base/containers/to_vector.h"
 #include "base/feature_list.h"
 #include "base/functional/bind.h"
-@@ -249,6 +250,10 @@ network::mojom::SSLConfigPtr SSLConfigSe
+@@ -263,6 +264,10 @@ network::mojom::SSLConfigPtr SSLConfigSe
 
   config->ech_enabled = ech_enabled_.GetValue();
 
--- a/patches/helium/core/add-helium-versioning.patch
+++ b/patches/helium/core/add-helium-versioning.patch
@@ -162,7 +162,7 @@
   background-color: var(--background-color);
 --- a/chrome/app/chrome_main_delegate.cc
 +++ b/chrome/app/chrome_main_delegate.cc
-@@ -358,15 +358,15 @@ bool HandleCreditsSwitch(const base::Com
+@@ -367,15 +367,15 @@ bool HandleCreditsSwitch(const base::Com
 bool HandleVersionSwitches(const base::CommandLine& command_line) {
 #if !BUILDFLAG(IS_MAC)
   if (command_line.HasSwitch(switches::kProductVersion)) {
--- a/patches/helium/core/add-middle-click-autoscroll-flag.patch
+++ b/patches/helium/core/add-middle-click-autoscroll-flag.patch
@@ -49,7 +49,7 @@
 BASE_FEATURE(kRemoveClientHints, "RemoveClientHints", base::FEATURE_DISABLED_BY_DEFAULT);
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -1902,9 +1902,9 @@ void WebView::ApplyWebPreferences(const
+@@ -1905,9 +1905,9 @@ void WebView::ApplyWebPreferences(const
       prefs.default_maximum_page_scale_factor);
 #endif
 
--- a/patches/helium/core/add-native-bangs.patch
+++ b/patches/helium/core/add-native-bangs.patch
@@ -678,7 +678,7 @@
 
 --- a/components/search_engines/template_url.cc
 +++ b/components/search_engines/template_url.cc
-@@ -1685,6 +1685,8 @@ bool TemplateURL::IsBetterThanConflictin
+@@ -1693,6 +1693,8 @@ bool TemplateURL::IsBetterThanConflictin
                                 : base::Time(),
         // Prefer engines that CANNOT be auto-replaced.
         !engine->safe_for_autoreplace(),
@@ -689,7 +689,7 @@
         // Favor prepopulated engines over other auto-generated engines.
 --- a/components/search_engines/template_url.h
 +++ b/components/search_engines/template_url.h
-@@ -842,6 +842,8 @@ class TemplateURL {
+@@ -847,6 +847,8 @@ class TemplateURL {
            starter_pack_id() == template_url_starter_pack_data::kAiMode;
   }
 
@@ -724,7 +724,7 @@
 COMPONENT_EXPORT(HELIUM) GURL GetDummyURL();
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1959,6 +1959,9 @@ void AddPrivacyStrings(content::WebUIDat
+@@ -1973,6 +1973,9 @@ void AddPrivacyStrings(content::WebUIDat
       {"heliumServicesToggle", IDS_SETTINGS_HELIUM_SERVICES_TOGGLE},
       {"heliumServicesToggleDescription",
         IDS_SETTINGS_HELIUM_SERVICES_TOGGLE_DESCRIPTION},
@@ -736,7 +736,7 @@
       {"heliumExtProxyToggleDescription",
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -1937,6 +1937,12 @@
+@@ -1945,6 +1945,12 @@
   <message name="IDS_SETTINGS_HELIUM_SERVICES_EXT_PROXY_TOGGLE_DESCRIPTION" desc="Description of the toggle for enabling/disabling of downloading and proxying extensions">
     When enabled, Helium will proxy extension downloads and updates to protect your privacy. When disabled, downloading and updating extensions will not work.
   </message>
@@ -751,7 +751,7 @@
   </message>
 --- a/chrome/browser/resources/settings/privacy_page/services_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/services_page.html
-@@ -49,6 +49,11 @@
+@@ -50,6 +50,11 @@
                 label="$i18n{heliumExtProxyToggle}"
                 sub-label="$i18n{heliumExtProxyToggleDescription}">
             </settings-toggle-button>
@@ -765,7 +765,7 @@
     </template>
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -204,6 +204,7 @@ void RegisterBrowserUserPrefs(user_prefs
+@@ -208,6 +208,7 @@ void RegisterBrowserUserPrefs(user_prefs
 
   {
     registry->RegisterBooleanPref(prefs::kHeliumServicesEnabled, true);
@@ -775,7 +775,7 @@
     registry->RegisterBooleanPref(prefs::kHeliumDidOnboarding, false);
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -356,6 +356,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -357,6 +357,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
       settings_api::PrefType::kBoolean;
   (*s_allowlist)[::prefs::kHeliumExtProxyEnabled] =
       settings_api::PrefType::kBoolean;
@@ -796,9 +796,9 @@
 }  // namespace prefs
 
 #endif  // COMPONENTS_HELIUM_SERVICES_PREF_NAMES_H_
--- a/components/omnibox/browser/omnibox_edit_model.cc
-+++ b/components/omnibox/browser/omnibox_edit_model.cc
-@@ -826,6 +826,17 @@ bool OmniboxEditModel::AcceptKeyword(
+--- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
+@@ -840,6 +840,17 @@ bool OmniboxEditModel::AcceptKeyword(
 
   controller_->StopAutocomplete(/*clear_result=*/false);
 
@@ -816,7 +816,7 @@
   is_keyword_hint_ = false;
   keyword_mode_entry_method_ = entry_method;
   if (original_user_text_with_keyword_.empty()) {
-@@ -868,9 +879,6 @@ bool OmniboxEditModel::AcceptKeyword(
+@@ -882,9 +893,6 @@ bool OmniboxEditModel::AcceptKeyword(
   }
 
   base::RecordAction(base::UserMetricsAction("AcceptedKeywordHint"));
@@ -826,7 +826,7 @@
   EmitEnteredKeywordModeHistogram(entry_method, turl, !user_text_.empty());
   return true;
 }
-@@ -1522,7 +1530,13 @@ void OmniboxEditModel::InternalSetUserTe
+@@ -1543,7 +1551,13 @@ void OmniboxEditModel::InternalSetUserTe
 
 std::u16string OmniboxEditModel::MaybeStripKeyword(
     const std::u16string& text) const {
@@ -841,9 +841,9 @@
              ? AutocompleteInput::SplitReplacementStringFromInput(text, false)
              : text;
 }
-@@ -2780,10 +2794,12 @@ bool OmniboxEditModel::MaybeAcceptKeywor
-   if (!AllowKeywordSpaceTriggering())
+@@ -2756,10 +2770,12 @@ bool OmniboxEditModel::MaybeAcceptKeywor
     return false;
+   }
 
 +  std::u16string new_keyword = base::ToLowerASCII(
 +    AutocompleteInput::SplitKeywordFromInput(new_text, false, nullptr));
--- a/patches/helium/core/add-update-channel-flag.patch
+++ b/patches/helium/core/add-update-channel-flag.patch
@@ -90,7 +90,7 @@
      "Configures the frame rate the browser is throttled to when Energy Saver is enabled. Helium flag.",
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -300,6 +300,8 @@ static_library("browser") {
+@@ -264,6 +264,8 @@ static_library("browser") {
     "btm/btm_browser_signin_detector_factory.h",
     "btm/stateful_bounce_counter.cc",
     "btm/stateful_bounce_counter.h",
--- a/patches/helium/core/add-updater-preference.patch
+++ b/patches/helium/core/add-updater-preference.patch
@@ -86,7 +86,7 @@ TODO: guard services_page.html with is_mac
   registrar.Add(prefs::kHeliumServicesEnabled, observer);
 --- a/chrome/browser/resources/settings/privacy_page/services_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/services_page.html
-@@ -61,6 +61,13 @@
+@@ -62,6 +62,13 @@
                     sub-label="$i18n{heliumSpellcheckToggleDescription}">
                 </settings-toggle-button>
             </if>
@@ -102,7 +102,7 @@ TODO: guard services_page.html with is_mac
     </template>
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1969,6 +1969,10 @@ void AddPrivacyStrings(content::WebUIDat
+@@ -1983,6 +1983,10 @@ void AddPrivacyStrings(content::WebUIDat
         IDS_SETTINGS_HELIUM_SERVICES_EXT_PROXY_TOGGLE},
       {"heliumExtProxyToggleDescription",
         IDS_SETTINGS_HELIUM_SERVICES_EXT_PROXY_TOGGLE_DESCRIPTION},
@@ -115,7 +115,7 @@ TODO: guard services_page.html with is_mac
         IDS_SETTINGS_HELIUM_SERVICES_OVERRIDE_DESCRIPTION},
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -366,6 +366,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -367,6 +367,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
       settings_api::PrefType::kBoolean;
   (*s_allowlist)[::prefs::kHeliumSpellcheckEnabled] =
       settings_api::PrefType::kBoolean;
@@ -126,7 +126,7 @@ TODO: guard services_page.html with is_mac
   (*s_allowlist)[::prefs::kHeliumServicesConsented] =
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -215,6 +215,7 @@ void RegisterBrowserUserPrefs(user_prefs
+@@ -219,6 +219,7 @@ void RegisterBrowserUserPrefs(user_prefs
     registry->RegisterStringPref(prefs::kHeliumServicesOrigin, "");
     registry->RegisterBooleanPref(prefs::kHeliumDidOnboarding, false);
     registry->RegisterBooleanPref(prefs::kHeliumServicesConsented, false);
@@ -136,7 +136,7 @@ TODO: guard services_page.html with is_mac
   registry->RegisterBooleanPref(
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -1949,6 +1949,12 @@
+@@ -1957,6 +1957,12 @@
   <message name="IDS_SETTINGS_HELIUM_SERVICES_SPELLCHECK_TOGGLE_DESCRIPTION" desc="Description of the for enabling/disabling of downloading spellcheck files">
     Helium will fetch dictionary files used for spell checking when requested. When disabled, spell checking will not work.
   </message>
--- a/patches/helium/core/clean-context-menu.patch
+++ b/patches/helium/core/clean-context-menu.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
 +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -1106,11 +1106,6 @@ void RenderViewContextMenu::InitMenu() {
+@@ -1127,11 +1127,6 @@ void RenderViewContextMenu::InitMenu() {
     AppendSpellingAndSearchSuggestionItems();
   }
 
@@ -12,7 +12,7 @@
   if (editable) {
     AppendOtherEditableItems();
   }
-@@ -2166,7 +2161,6 @@ void RenderViewContextMenu::AppendPageIt
+@@ -2214,7 +2209,6 @@ void RenderViewContextMenu::AppendPageIt
                                   IDS_CONTENT_CONTEXT_SAVEPAGEAS);
   menu_model_.AddItemWithStringId(IDC_PRINT, IDS_CONTENT_CONTEXT_PRINT);
   AppendLiveCaptionItem();
@@ -20,9 +20,9 @@
   if (IsRegionSearchEnabled()) {
     AppendRegionSearchItem();
   }
-@@ -2295,8 +2289,7 @@ void RenderViewContextMenu::AppendMediaR
+@@ -2343,8 +2337,7 @@ void RenderViewContextMenu::AppendMediaR
 
- void RenderViewContextMenu::AppendReadingModeItem() {
+ void RenderViewContextMenu::AppendReadAnythingItem() {
   // Show Read Anything option if it's not already open in the side panel.
 -  if (GetBrowser() && GetBrowser()->is_type_normal() &&
 -      !IsReadAnythingEntryShowing(GetBrowser())) {
@@ -30,7 +30,7 @@
     menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPEN_IN_READING_MODE,
                                     IDS_CONTENT_CONTEXT_READING_MODE);
   }
-@@ -3567,10 +3560,12 @@ void RenderViewContextMenu::ExecuteComma
+@@ -3620,10 +3613,12 @@ void RenderViewContextMenu::ExecuteComma
 }
 
 void RenderViewContextMenu::AddSpellCheckServiceItem(bool is_checked) {
@@ -43,7 +43,7 @@
   if (is_checked) {
     menu_model_.AddCheckItemWithStringId(
         IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE,
-@@ -3947,6 +3942,8 @@ bool RenderViewContextMenu::IsVideoFrame
+@@ -4000,6 +3995,8 @@ bool RenderViewContextMenu::IsVideoFrame
 bool RenderViewContextMenu::AppendQRCodeGeneratorItem(bool for_image,
                                                       bool draw_icon,
                                                       bool add_separator) {
@@ -54,7 +54,7 @@
   }
 --- a/chrome/browser/ui/browser_tab_strip_model_delegate.cc
 +++ b/chrome/browser/ui/browser_tab_strip_model_delegate.cc
-@@ -308,6 +308,7 @@ void BrowserTabStripModelDelegate::AddTo
+@@ -310,6 +310,7 @@ void BrowserTabStripModelDelegate::AddTo
 }
 
 bool BrowserTabStripModelDelegate::SupportsReadLater() {
--- a/patches/helium/core/disable-ad-topics-and-etc.patch
+++ b/patches/helium/core/disable-ad-topics-and-etc.patch
@@ -1,20 +1,20 @@
 --- a/services/network/public/cpp/features.cc
 +++ b/services/network/public/cpp/features.cc
-@@ -490,7 +490,7 @@ BASE_FEATURE(kUpdateRequestForCorsRedire
+@@ -421,7 +421,7 @@ BASE_FEATURE(kUpdateRequestForCorsRedire
+ 
+ // https://github.com/patcg-individual-drafts/topics
 // Kill switch for the Topics API.
- BASE_FEATURE(kBrowsingTopics,
-              "BrowsingTopics",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             base::FEATURE_DISABLED_BY_DEFAULT);
+-BASE_FEATURE(kBrowsingTopics, base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kBrowsingTopics, base::FEATURE_DISABLED_BY_DEFAULT);
 
 // Enable the shared storage API. Note that enabling this feature does not
 // automatically expose this API to the web, it only allows the element to be
-@@ -574,7 +574,7 @@ BASE_FEATURE(kSharedStorageTransactional
+@@ -500,7 +500,7 @@ BASE_FEATURE(kSharedStorageTransactional
+ 
+ // Kill switch for the Interest Group API, i.e. if disabled, the
 // API exposure will be disabled regardless of the OT config.
- BASE_FEATURE(kInterestGroupStorage,
-              "InterestGroupStorage",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             base::FEATURE_DISABLED_BY_DEFAULT);
+-BASE_FEATURE(kInterestGroupStorage, base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kInterestGroupStorage, base::FEATURE_DISABLED_BY_DEFAULT);
 // TODO(crbug.com/40176812): Adjust these limits in response to usage.
 BASE_FEATURE_PARAM(int,
                    kInterestGroupStorageMaxOwners,
--- a/patches/helium/core/disable-fedcm-bubble.patch
+++ b/patches/helium/core/disable-fedcm-bubble.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop.cc
 +++ b/chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop.cc
-@@ -1279,6 +1279,9 @@ gfx::Rect FedCmAccountSelectionView::Get
+@@ -1272,6 +1272,9 @@ gfx::Rect FedCmAccountSelectionView::Get
 
 void FedCmAccountSelectionView::ShouldShowDialog(bool& should_show) {
   if (dialog_type_ == DialogType::BUBBLE) {
--- a/patches/helium/core/disable-live-caption-completely.patch
+++ b/patches/helium/core/disable-live-caption-completely.patch
@@ -1,6 +1,6 @@
 --- a/components/live_caption/caption_util.cc
 +++ b/components/live_caption/caption_util.cc
-@@ -127,6 +127,7 @@ std::optional<ui::CaptionStyle> GetCapti
+@@ -125,6 +125,7 @@ std::optional<ui::CaptionStyle> GetCapti
 }
 
 bool IsLiveCaptionFeatureSupported() {
--- a/patches/helium/core/disable-touch-ui.patch
+++ b/patches/helium/core/disable-touch-ui.patch
@@ -1,6 +1,6 @@
 --- a/ui/base/pointer/touch_ui_controller.cc
 +++ b/ui/base/pointer/touch_ui_controller.cc
-@@ -175,13 +175,7 @@ void TouchUiController::TouchUiScoperFor
+@@ -177,13 +177,7 @@ void TouchUiController::TouchUiScoperFor
 // static
 TouchUiController* TouchUiController::Get() {
   static base::NoDestructor<TouchUiController> instance([] {
--- a/patches/helium/core/disable-update-toast.patch
+++ b/patches/helium/core/disable-update-toast.patch
@@ -1,11 +1,11 @@
 --- a/chrome/browser/ui/ui_features.cc
 +++ b/chrome/browser/ui/ui_features.cc
-@@ -724,7 +724,7 @@ bool HasTabSearchToolbarButton() {
+@@ -627,7 +627,7 @@ bool HasTabSearchToolbarButton() {
+   return is_tab_search_moving;
+ }
 
- BASE_FEATURE(kNonMilestoneUpdateToast,
-              "NonMilestoneUpdateToast",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             base::FEATURE_DISABLED_BY_DEFAULT);
+-BASE_FEATURE(kNonMilestoneUpdateToast, base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kNonMilestoneUpdateToast, base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+ BASE_FEATURE(kBookmarkTabGroupConversion, base::FEATURE_DISABLED_BY_DEFAULT);
 
- BASE_FEATURE(kBookmarkTabGroupConversion,
-              "BookmarkTabGroupConversion",
--- a/patches/helium/core/enable-parallel-downloading.patch
+++ b/patches/helium/core/enable-parallel-downloading.patch
@@ -1,14 +1,17 @@
 --- a/components/download/public/common/download_features.cc
 +++ b/components/download/public/common/download_features.cc
-@@ -11,11 +11,7 @@ namespace features {
+@@ -9,13 +9,7 @@
+ namespace download {
+ namespace features {
 
- BASE_FEATURE(kParallelDownloading,
-              "ParallelDownloading",
+-BASE_FEATURE(kParallelDownloading,
 -#if BUILDFLAG(IS_ANDROID)
-              base::FEATURE_ENABLED_BY_DEFAULT
+-             base::FEATURE_ENABLED_BY_DEFAULT
 -#else
 -             base::FEATURE_DISABLED_BY_DEFAULT
 -#endif
- );
+-);
+BASE_FEATURE(kParallelDownloading, base::FEATURE_ENABLED_BY_DEFAULT);
 
 #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+ BASE_FEATURE(kBackoffInDownloading, base::FEATURE_DISABLED_BY_DEFAULT);
--- a/patches/helium/core/enable-tab-hover-cards.patch
+++ b/patches/helium/core/enable-tab-hover-cards.patch
@@ -1,16 +1,17 @@
 --- a/chrome/browser/ui/ui_features.cc
 +++ b/chrome/browser/ui/ui_features.cc
-@@ -317,12 +317,7 @@ BASE_FEATURE(kTabGroupMenuMoreEntryPoint
+@@ -285,13 +285,7 @@ bool IsTabGroupMenuMoreEntryPointsEnable
+ 
+ // Enables preview images in tab-hover cards.
 // https://crbug.com/928954
- BASE_FEATURE(kTabHoverCardImages,
-              "TabHoverCardImages",
+-BASE_FEATURE(kTabHoverCardImages,
 -#if BUILDFLAG(IS_MAC)
 -             base::FEATURE_DISABLED_BY_DEFAULT
 -#else
 -             base::FEATURE_ENABLED_BY_DEFAULT
 -#endif
 -);
-+             base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kTabHoverCardImages, base::FEATURE_ENABLED_BY_DEFAULT);
+ 
+ BASE_FEATURE(kTabGroupHoverCards, base::FEATURE_DISABLED_BY_DEFAULT);
 
- BASE_FEATURE(kTabModalUsesDesktopWidget,
-              "TabModalUsesDesktopWidget",
--- a/patches/helium/core/enable-tab-search-toolbar-button.patch
+++ b/patches/helium/core/enable-tab-search-toolbar-button.patch
@@ -23,16 +23,16 @@
     if (tab_search_action.has_value()) {
 --- a/chrome/browser/ui/ui_features.cc
 +++ b/chrome/browser/ui/ui_features.cc
-@@ -671,7 +671,7 @@ BASE_FEATURE(kTabStripBrowserApi,
+@@ -577,7 +577,7 @@ BASE_FEATURE(kByDateHistoryInSidePanel,
 
- BASE_FEATURE(kTabstripComboButton,
-              "TabstripComboButton",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             base::FEATURE_ENABLED_BY_DEFAULT);
+ BASE_FEATURE(kTabStripBrowserApi, base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+-BASE_FEATURE(kTabstripComboButton, base::FEATURE_DISABLED_BY_DEFAULT);
+BASE_FEATURE(kTabstripComboButton, base::FEATURE_ENABLED_BY_DEFAULT);
 
 // This serves as a "kill-switch" for migrating the Tab Search feature to be a
 // toolbar button for non-ChromeOS users in the US.
-@@ -707,6 +707,8 @@ bool HasTabSearchToolbarButton() {
+@@ -612,6 +612,8 @@ bool HasTabSearchToolbarButton() {
     return false;
   }
 
--- a/patches/helium/core/exclude-irrelevant-flags.patch
+++ b/patches/helium/core/exclude-irrelevant-flags.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -13311,11 +13311,278 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -13399,11 +13399,278 @@ const FeatureEntry kFeatureEntries[] = {
     // AboutFlagsHistogramTest unit test to verify this process).
 };
 
@@ -280,7 +280,7 @@
   FlagsStateSingleton(const FlagsStateSingleton&) = delete;
   FlagsStateSingleton& operator=(const FlagsStateSingleton&) = delete;
   ~FlagsStateSingleton() override = default;
-@@ -13334,7 +13601,7 @@ class FlagsStateSingleton : public flags
+@@ -13422,7 +13689,7 @@ class FlagsStateSingleton : public flags
 
   void RestoreDefaultState() {
     flags_state_ =
@@ -289,7 +289,7 @@
   }
 
  private:
-@@ -13659,7 +13926,7 @@ base::span<const FeatureEntry> GetFeatur
+@@ -13747,7 +14014,7 @@ base::span<const FeatureEntry> GetFeatur
       !entries_for_testing->empty()) {
     return *entries_for_testing;
   }
--- a/patches/helium/core/flags-setup.patch
+++ b/patches/helium/core/flags-setup.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -4919,11 +4919,13 @@ const FeatureEntry::FeatureVariation kNt
+@@ -4990,11 +4990,13 @@ const FeatureEntry::FeatureVariation kSe
 // calculate and verify checksum.
 //
 // When adding a new choice, add it to the end of the list.
--- a/patches/helium/core/hide-avatar-via-toolbar-prefs.patch
+++ b/patches/helium/core/hide-avatar-via-toolbar-prefs.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -229,6 +229,10 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -230,6 +230,10 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
   (*s_allowlist)[::prefs::kSplitViewDragAndDropEnabled] =
       settings_api::PrefType::kBoolean;
 
@@ -13,7 +13,7 @@
   (*s_allowlist)[::prefs::kPinnedActions] = settings_api::PrefType::kList;
 --- a/chrome/browser/ui/actions/chrome_action_id.h
 +++ b/chrome/browser/ui/actions/chrome_action_id.h
-@@ -554,6 +554,7 @@
+@@ -558,6 +558,7 @@
 #define TOOLBAR_PINNABLE_ACTION_IDS \
   E(kActionHome, IDC_HOME) \
   E(kActionForward, IDC_FORWARD) \
@@ -23,7 +23,7 @@
   E(kActionShowPasswordManager, IDC_SHOW_PASSWORD_MANAGER) \
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -119,6 +119,9 @@ void RegisterBrowserUserPrefs(user_prefs
+@@ -123,6 +123,9 @@ void RegisterBrowserUserPrefs(user_prefs
   registry->RegisterBooleanPref(prefs::kPinSplitTabButton, false,
                                 pref_registration_flags);
 
@@ -211,7 +211,7 @@
   PrefService* prefs() const;
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -1341,6 +1341,10 @@ inline constexpr char kSplitViewDragAndD
+@@ -1332,6 +1332,10 @@ inline constexpr char kSplitViewDragAndD
 inline constexpr char kSplitViewDragAndDropNudgeUsedCount[] =
     "browser.split_view_drag_and_drop_nudge_used_count";
 
--- a/patches/helium/core/hide-extensions-via-toolbar-prefs.patch
+++ b/patches/helium/core/hide-extensions-via-toolbar-prefs.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -232,6 +232,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -233,6 +233,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
   // Custom toolbar button settings.
   (*s_allowlist)[::prefs::kShowAvatarButton] =
       settings_api::PrefType::kBoolean;
@@ -11,7 +11,7 @@
   (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString;
 --- a/chrome/browser/ui/actions/chrome_action_id.h
 +++ b/chrome/browser/ui/actions/chrome_action_id.h
-@@ -555,6 +555,7 @@
+@@ -559,6 +559,7 @@
   E(kActionHome, IDC_HOME) \
   E(kActionForward, IDC_FORWARD) \
   E(kActionAvatar, IDC_SHOW_AVATAR_MENU) \
@@ -21,7 +21,7 @@
   E(kActionShowPasswordManager, IDC_SHOW_PASSWORD_MANAGER) \
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -121,6 +121,8 @@ void RegisterBrowserUserPrefs(user_prefs
+@@ -125,6 +125,8 @@ void RegisterBrowserUserPrefs(user_prefs
 
   registry->RegisterBooleanPref(
       prefs::kShowAvatarButton, true);
@@ -56,7 +56,7 @@
 void PinnedToolbarActionsModel::MaybeMigrateExistingPinnedStates() {
 --- a/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc
 +++ b/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc
-@@ -553,7 +553,9 @@ void ExtensionsToolbarContainer::AnchorA
+@@ -552,7 +552,9 @@ void ExtensionsToolbarContainer::AnchorA
 
   // Fix the position of widgets. Without this fix, extension-installed-bubble
   // and extension-uninstall-dialog may be out of the window border on Linux.
@@ -67,7 +67,7 @@
   {
     views::View* anchor_view = BrowserView::GetBrowserViewForBrowser(browser_)
       ->toolbar_button_provider()->GetAppMenuButton();
-@@ -977,7 +979,9 @@ void ExtensionsToolbarContainer::UpdateC
+@@ -962,7 +964,9 @@ void ExtensionsToolbarContainer::UpdateC
 }
 
 bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const {
@@ -221,7 +221,7 @@
   PrefService* prefs() const;
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -1345,6 +1345,10 @@ inline constexpr char kSplitViewDragAndD
+@@ -1336,6 +1336,10 @@ inline constexpr char kSplitViewDragAndD
 // toolbar.
 inline constexpr char kShowAvatarButton[] = "helium.browser.show_avatar_button";
 
--- a/patches/helium/core/increase-incognito-storage-quota.patch
+++ b/patches/helium/core/increase-incognito-storage-quota.patch
@@ -11,7 +11,7 @@
 #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
 --- a/storage/browser/quota/quota_features.cc
 +++ b/storage/browser/quota/quota_features.cc
-@@ -43,7 +43,7 @@ BASE_FEATURE(kStaticStorageQuota,
+@@ -39,7 +39,7 @@ BASE_FEATURE(kStaticStorageQuota, base::
 
 BASE_FEATURE(kIncreaseIncognitoStorageQuota,
              "IncreaseIncognitoStorageQuota",
--- a/patches/helium/core/infinite-tab-freezing.patch
+++ b/patches/helium/core/infinite-tab-freezing.patch
@@ -1,11 +1,11 @@
 --- a/components/performance_manager/features.cc
 +++ b/components/performance_manager/features.cc
-@@ -248,7 +248,7 @@ BASE_FEATURE(kRecordFreezingEligibilityU
+@@ -222,7 +222,7 @@ BASE_FEATURE(kFreezingFollowsDiscardOptO
 
- BASE_FEATURE(kInfiniteTabsFreezing,
-              "InfiniteTabsFreezing",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             base::FEATURE_ENABLED_BY_DEFAULT);
+ BASE_FEATURE(kRecordFreezingEligibilityUKM, base::FEATURE_ENABLED_BY_DEFAULT);
+ 
+-BASE_FEATURE(kInfiniteTabsFreezing, base::FEATURE_DISABLED_BY_DEFAULT);
+BASE_FEATURE(kInfiniteTabsFreezing, base::FEATURE_ENABLED_BY_DEFAULT);
 
 BASE_FEATURE_PARAM(int,
                    kInfiniteTabsFreezing_NumProtectedTabs,
--- a/patches/helium/core/keyboard-shortcuts.patch
+++ b/patches/helium/core/keyboard-shortcuts.patch
@@ -15,7 +15,7 @@
 #define IDC_VISIT_DESKTOP_OF_LRU_USER_5 34083
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -1509,6 +1509,11 @@ inline constexpr char kPageColorsBlockLi
+@@ -1493,6 +1493,11 @@ inline constexpr char kPageColorsBlockLi
 inline constexpr char kPrefersDefaultScrollbarStyles[] =
     "settings.a11y.prefers_default_scrollbar_styles";
 
@@ -29,7 +29,7 @@
 // asking the user to set up automatic updates when Keystone promotion is
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -142,6 +142,8 @@ void RegisterBrowserUserPrefs(user_prefs
+@@ -146,6 +146,8 @@ void RegisterBrowserUserPrefs(user_prefs
   registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);
   registry->RegisterBooleanPref(prefs::kWebRtcTextLogCollectionAllowed, false);
 
@@ -40,7 +40,7 @@
   registry->RegisterBooleanPref(policy::policy_prefs::kHideWebStoreIcon, false);
 --- a/chrome/browser/ui/browser_command_controller.cc
 +++ b/chrome/browser/ui/browser_command_controller.cc
-@@ -387,7 +387,9 @@ bool BrowserCommandController::IsReserve
+@@ -388,7 +388,9 @@ bool BrowserCommandController::IsReserve
          command_id == IDC_NEW_INCOGNITO_WINDOW || command_id == IDC_NEW_TAB ||
          command_id == IDC_NEW_WINDOW || command_id == IDC_RESTORE_TAB ||
          command_id == IDC_SELECT_NEXT_TAB ||
@@ -51,7 +51,7 @@
 }
 
 void BrowserCommandController::TabStateChanged() {
-@@ -1143,6 +1145,14 @@ bool BrowserCommandController::ExecuteCo
+@@ -1160,6 +1162,14 @@ bool BrowserCommandController::ExecuteCo
     case IDC_DUPLICATE_TARGET_TAB:
       DuplicateKeyboardFocusedTab(browser_);
       break;
@@ -66,7 +66,7 @@
     // Hosted App commands
     case IDC_COPY_URL:
       CopyURL(browser_, browser_->tab_strip_model()->GetActiveWebContents());
-@@ -1888,6 +1898,12 @@ void BrowserCommandController::UpdateCom
+@@ -1912,6 +1922,12 @@ void BrowserCommandController::UpdateCom
 
   bool dev_tools_enabled = DevToolsWindow::AllowDevToolsFor(
       profile(), browser_->tab_strip_model()->GetActiveWebContents());
@@ -81,7 +81,7 @@
                                         dev_tools_enabled);
 --- a/chrome/browser/ui/accelerator_table.cc
 +++ b/chrome/browser/ui/accelerator_table.cc
-@@ -268,8 +268,10 @@ const AcceleratorMapping kDevToolsAccele
+@@ -269,8 +269,10 @@ const AcceleratorMapping kDevToolsAccele
     {ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_DEV_TOOLS},
     {ui::VKEY_J, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
      IDC_DEV_TOOLS_CONSOLE},
@@ -142,7 +142,7 @@
     "G",            IDC_FIND_NEXT,              VIRTKEY, CONTROL
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -581,6 +581,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -584,6 +584,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
 
   (*s_allowlist)[::prefs::kCaretBrowsingEnabled] =
       settings_api::PrefType::kBoolean;
--- a/patches/helium/core/mitigate-fingerprinting-audio-context.patch
+++ b/patches/helium/core/mitigate-fingerprinting-audio-context.patch
@@ -237,7 +237,7 @@ https://github.com/uazo/cromite/blob/b2824377/build/patches/AudioBuffer-Analyser
 
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -585,7 +585,6 @@
+@@ -599,7 +599,6 @@
       // AudioContext.playoutStats interface.
       // https://chromestatus.com/feature/5172818344148992
       name: "AudioContextPlayoutStats",
--- a/patches/helium/core/mitigate-fingerprinting-canvas.patch
+++ b/patches/helium/core/mitigate-fingerprinting-canvas.patch
@@ -21,12 +21,12 @@
 #endif  /* CHROME_BROWSER_HELIUM_FLAG_ENTRIES_H_ */
 --- a/components/fingerprinting_protection_filter/interventions/common/interventions_features.cc
 +++ b/components/fingerprinting_protection_filter/interventions/common/interventions_features.cc
-@@ -12,13 +12,13 @@ namespace fingerprinting_protection_inte
+@@ -10,13 +10,13 @@ namespace fingerprinting_protection_inte
+ 
+ // Whether the canvas interventions should be enabled that add noise to the
 // readback values.
- BASE_FEATURE(kCanvasNoise,
-              "CanvasNoise",
-             base::FeatureState::FEATURE_DISABLED_BY_DEFAULT);
-+             base::FeatureState::FEATURE_ENABLED_BY_DEFAULT);
+-BASE_FEATURE(kCanvasNoise, base::FeatureState::FEATURE_DISABLED_BY_DEFAULT);
+BASE_FEATURE(kCanvasNoise, base::FeatureState::FEATURE_ENABLED_BY_DEFAULT);
 
 BASE_FEATURE_PARAM(bool,
                    kCanvasNoiseInRegularMode,
@@ -35,13 +35,13 @@
 -                   false);
 +                   true);
 
- bool IsCanvasInterventionsEnabledForIncognitoState(bool is_incognito) {
-   if (is_incognito) {
+ // [Experimental] Whether readback of canvases should be blocked.
+ BASE_FEATURE(kBlockCanvasReadback,
 --- a/third_party/blink/renderer/core/canvas_interventions/canvas_interventions_helper.cc
 +++ b/third_party/blink/renderer/core/canvas_interventions/canvas_interventions_helper.cc
-@@ -132,17 +132,6 @@ bool CanvasInterventionsHelper::MaybeNoi
-                              static_cast<int>(high_entropy_canvas_op_types),
-                              canvas_op_exclusive_max);
+@@ -157,17 +157,6 @@ bool CanvasInterventionsHelper::MaybeNoi
+                     GetContextTypeForMetrics(execution_context)}),
+       static_cast<int>(high_entropy_canvas_op_types), canvas_op_exclusive_max);
 
 -  AuditsIssue::ReportUserReidentificationCanvasNoisedIssue(
 -      CaptureSourceLocation(execution_context), execution_context);
@@ -57,8 +57,8 @@
   base::TimeDelta elapsed_time = base::TimeTicks::Now() - start_time;
 
   UMA_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES(kNoiseDurationMetricName,
-@@ -150,9 +139,6 @@ bool CanvasInterventionsHelper::MaybeNoi
-                                           base::Milliseconds(50), 50);
+@@ -175,9 +164,6 @@ bool CanvasInterventionsHelper::MaybeNoi
+                                           base::Milliseconds(100), 100);
   UMA_HISTOGRAM_COUNTS_1M(kCanvasSizeMetricName,
                           pixmap_to_noise.width() * pixmap_to_noise.height());
 -  UseCounter::Count(execution_context, WebFeature::kCanvasReadbackNoise);
--- a/patches/helium/core/onboarding-page.patch
+++ b/patches/helium/core/onboarding-page.patch
@@ -23,7 +23,7 @@
 #endif  // COMPONENTS_HELIUM_SERVICES_PREF_NAMES_H_
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -201,6 +201,8 @@ void RegisterBrowserUserPrefs(user_prefs
+@@ -205,6 +205,8 @@ void RegisterBrowserUserPrefs(user_prefs
   {
     registry->RegisterBooleanPref(prefs::kHeliumServicesEnabled, true);
     registry->RegisterStringPref(prefs::kHeliumServicesOrigin, "");
@@ -34,7 +34,7 @@
   registry->RegisterBooleanPref(
 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
 +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -57,6 +57,7 @@
+@@ -58,6 +58,7 @@
 #include "chrome/common/chrome_version.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/webui_url_constants.h"
@@ -42,7 +42,7 @@
 #include "components/custom_handlers/protocol_handler_registry.h"
 #include "components/prefs/pref_service.h"
 #include "components/privacy_sandbox/privacy_sandbox_features.h"
-@@ -480,6 +481,15 @@ StartupBrowserCreatorImpl::DetermineStar
+@@ -488,6 +489,15 @@ StartupBrowserCreatorImpl::DetermineStar
   LaunchResult launch_result =
       tabs.empty() ? LaunchResult::kNormally : LaunchResult::kWithGivenUrls;
 
@@ -60,7 +60,7 @@
     whats_new::LogStartupType(whats_new::StartupType::kIneligible);
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
-@@ -1206,6 +1206,10 @@
+@@ -1216,6 +1216,10 @@
    "META": {"sizes": {"includes": [30],}},
     "includes": [7480],
   },
@@ -73,7 +73,7 @@
   # START ios/ section.
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -8694,6 +8694,7 @@ static_library("browser_generated_files"
+@@ -8621,6 +8621,7 @@ static_library("browser_generated_files"
     "//chrome/browser/v8_compile_hints/proto",
     "//chrome/browser/web_applications/mojom:mojom_web_apps_enum",
     "//chrome/common/request_header_integrity:buildflags",
@@ -83,7 +83,7 @@
     "//components/webui/chrome_urls/mojom:mojo_bindings",
 --- a/chrome/chrome_paks.gni
 +++ b/chrome/chrome_paks.gni
-@@ -463,11 +463,13 @@ template("chrome_extra_paks") {
+@@ -468,11 +468,13 @@ template("chrome_extra_paks") {
     if (!is_android && !is_chromeos) {
       sources += [
         "$root_gen_dir/chrome/intro_resources.pak",
@@ -109,7 +109,7 @@
 #if !BUILDFLAG(IS_ANDROID)
 --- a/chrome/common/webui_url_constants.h
 +++ b/chrome/common/webui_url_constants.h
-@@ -595,6 +595,8 @@ inline constexpr char kChromeUIProfilePi
+@@ -597,6 +597,8 @@ inline constexpr char kChromeUIProfilePi
 inline constexpr char kChromeUIProfilePickerStartupQuery[] = "startup";
 inline constexpr char kChromeUIProfilePickerGlicQuery[] = "glic";
 inline constexpr char kChromeUIProfilePickerUrl[] = "chrome://profile-picker/";
@@ -120,7 +120,7 @@
     "chrome://history-sync-optin/";
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -162,6 +162,10 @@ static_library("ui") {
+@@ -164,6 +164,10 @@ static_library("ui") {
     "webui/net_internals/net_internals_ui.h",
     "webui/ntp_tiles_internals_ui.cc",
     "webui/ntp_tiles_internals_ui.h",
@@ -141,7 +141,7 @@
 #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
 #include "chrome/browser/ui/webui/policy/policy_ui.h"
 #include "chrome/browser/ui/webui/predictors/predictors_ui.h"
-@@ -415,6 +416,7 @@ void RegisterChromeWebUIConfigs() {
+@@ -417,6 +418,7 @@ void RegisterChromeWebUIConfigs() {
 #if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
   map.AddWebUIConfig(std::make_unique<ManagedUserProfileNoticeUIConfig>());
   map.AddWebUIConfig(std::make_unique<IntroUIConfig>());
@@ -496,9 +496,9 @@
   registrar.Add(prefs::kHeliumServicesOrigin, observer);
   registrar.Add(pref_name, observer);
 }
--- a/chrome/browser/ui/browser_navigator.cc
-+++ b/chrome/browser/ui/browser_navigator.cc
-@@ -579,7 +579,8 @@ bool IsHostAllowedInIncognito(const GURL
+--- a/chrome/browser/ui/incognito_allowed_url.cc
+++ b/chrome/browser/ui/incognito_allowed_url.cc
+@@ -48,7 +48,8 @@ bool IsHostAllowedInIncognito(const GURL
          host != chrome::kChromeUIHelpHost &&
          host != chrome::kChromeUIHistoryHost &&
          host != chrome::kChromeUIExtensionsHost &&
@@ -510,7 +510,7 @@
 }  // namespace
 --- a/chrome/browser/ui/webui/settings/search_engines_handler.cc
 +++ b/chrome/browser/ui/webui/settings/search_engines_handler.cc
-@@ -344,7 +344,9 @@ void SearchEnginesHandler::HandleSetDefa
+@@ -349,7 +349,9 @@ void SearchEnginesHandler::HandleSetDefa
   CHECK(choice_made_location ==
             search_engines::ChoiceMadeLocation::kSearchSettings ||
         choice_made_location ==
@@ -523,7 +523,7 @@
 
 --- a/chrome/browser/favicon/favicon_utils.cc
 +++ b/chrome/browser/favicon/favicon_utils.cc
-@@ -188,6 +188,7 @@ bool ShouldThemifyFavicon(GURL url) {
+@@ -189,6 +189,7 @@ bool ShouldThemifyFavicon(GURL url) {
          url.host_piece() != chrome::kChromeUIVersionHost &&
          url.host_piece() != chrome::kChromeUINetExportHost &&
          url.host_piece() != chrome::kChromeUINewTabHost &&
@@ -533,7 +533,7 @@
 
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -1909,6 +1909,12 @@
+@@ -1917,6 +1917,12 @@
   <message name="IDS_SETTINGS_HELIUM_SERVICES_DESCRIPTION" desc="Description of the controls available on the Helium services settings page">
     Manage what Helium services are allowed in your browser
   </message>
@@ -548,7 +548,7 @@
   </message>
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -356,6 +356,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -357,6 +357,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
       settings_api::PrefType::kBoolean;
   (*s_allowlist)[::prefs::kHeliumServicesOrigin] =
       settings_api::PrefType::kString;
@@ -559,7 +559,7 @@
   (*s_allowlist)[::prefs::kPrivacyGuideViewed] =
 --- a/chrome/browser/resources/settings/privacy_page/services_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/services_page.html
-@@ -2,9 +2,41 @@
+@@ -2,10 +2,42 @@
     .label-wrapper {
         padding: var(--cr-section-vertical-padding) 0;
     }
@@ -582,6 +582,7 @@
 +    }
 </style>
 
+ <settings-subpage page-title="$i18n{heliumServicesTitle}" route-path$="[[routePath]]">
 <div class="cr-col first">
 +    <template is="dom-if" if="[[!prefs.helium.services.user_consented.value]]">
 +        <div class="cr-row" id="onboarding-notice">
@@ -601,7 +602,7 @@
     <settings-toggle-button id="servicesToggleButton"
         pref="{{prefs.helium.services.enabled}}"
         label="$i18n{heliumServicesToggle}"
-@@ -14,6 +46,7 @@
+@@ -15,6 +47,7 @@
         <cr-collapse id="servicesCollapse" opened="[[prefs.helium.services.enabled.value]]">
         </cr-collapse>
     </div>
@@ -611,7 +612,7 @@
 
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1955,6 +1955,8 @@ void AddPrivacyStrings(content::WebUIDat
+@@ -1969,6 +1969,8 @@ void AddPrivacyStrings(content::WebUIDat
       {"securityPageDescription", IDS_SETTINGS_SECURITY_DESCRIPTION},
       {"heliumServicesTitle", IDS_SETTINGS_HELIUM_SERVICES},
       {"heliumServicesDescription", IDS_SETTINGS_HELIUM_SERVICES_DESCRIPTION},
--- a/patches/helium/core/open-new-tabs-next-to-active-tab-option.patch
+++ b/patches/helium/core/open-new-tabs-next-to-active-tab-option.patch
@@ -12,7 +12,7 @@
   </message>
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -221,6 +221,10 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -222,6 +222,10 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
   (*s_allowlist)[::prefs::kUseCustomChromeFrame] =
       settings_api::PrefType::kBoolean;
 #endif
@@ -39,9 +39,9 @@
             label="$i18n{showTabGroupsInBookmarksBar}">
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -106,6 +106,8 @@ void RegisterBrowserUserPrefs(user_prefs
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF;
- #endif
+@@ -110,6 +110,8 @@ void RegisterBrowserUserPrefs(user_prefs
+   registry->RegisterIntegerPref(prefs::kSessionRestoreInfoBarTimesShown, 0);
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 
 +  registry->RegisterBooleanPref(prefs::kNewTabNextToActive, false);
 +
@@ -65,7 +65,7 @@
 #include "components/reading_list/core/reading_list_model.h"
 #include "components/tab_groups/tab_group_id.h"
 #include "components/tab_groups/tab_group_visual_data.h"
-@@ -1545,7 +1547,11 @@ void TabStripModel::AddTab(std::unique_p
+@@ -1548,7 +1550,11 @@ void TabStripModel::AddTab(std::unique_p
     // For all other types, respect what was passed to us, normalizing -1s and
     // values that are too large.
     if (index < 0 || index > count()) {
@@ -80,7 +80,7 @@
 
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -511,6 +511,7 @@ void AddAppearanceStrings(content::WebUI
+@@ -513,6 +513,7 @@ void AddAppearanceStrings(content::WebUI
       {"lightMode", IDS_NTP_CUSTOMIZE_CHROME_COLOR_SCHEME_MODE_LIGHT_LABEL},
       {"darkMode", IDS_NTP_CUSTOMIZE_CHROME_COLOR_SCHEME_MODE_DARK_LABEL},
       {"systemMode", IDS_NTP_CUSTOMIZE_CHROME_COLOR_SCHEME_MODE_SYSTEM_LABEL},
@@ -90,7 +90,7 @@
       {"allowSplitViewDragAndDrop",
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -1315,6 +1315,10 @@ inline constexpr char
+@@ -1306,6 +1306,10 @@ inline constexpr char
         "restricted_managed_guest_session_extension_cleanup_exempt_list";
 #endif  // BUILDFLAG(IS_CHROMEOS)
 
--- a/patches/helium/core/override-chrome-protocol.patch
+++ b/patches/helium/core/override-chrome-protocol.patch
@@ -10,7 +10,7 @@
 inline constexpr char kViewSourceScheme[] = "view-source";
 --- a/chrome/browser/profiles/profile_io_data.cc
 +++ b/chrome/browser/profiles/profile_io_data.cc
-@@ -38,6 +38,7 @@ bool ProfileIOData::IsHandledProtocol(co
+@@ -44,6 +44,7 @@ bool ProfileIOData::IsHandledProtocol(co
       extensions::kExtensionScheme,
 #endif
       content::kChromeUIScheme,
@@ -62,7 +62,7 @@
   // Prevent future modification of the scheme lists. This is to prevent
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -888,10 +888,18 @@ void RenderThreadImpl::RegisterSchemes()
+@@ -887,10 +887,18 @@ void RenderThreadImpl::RegisterSchemes()
       chrome_scheme);
   WebSecurityPolicy::RegisterURLSchemeAsWebUI(chrome_scheme);
 
@@ -91,9 +91,9 @@
       url.SchemeIs(content::kChromeUIUntrustedScheme) ||
       url.SchemeIs(content::kViewSourceScheme) ||
       url.SchemeIs(url::kTraceScheme) ||
--- a/chrome/browser/ui/browser_navigator.cc
-+++ b/chrome/browser/ui/browser_navigator.cc
-@@ -550,7 +550,8 @@ std::unique_ptr<content::WebContents> Cr
+--- a/chrome/browser/ui/incognito_allowed_url.cc
+++ b/chrome/browser/ui/incognito_allowed_url.cc
+@@ -19,7 +19,8 @@ namespace {
 bool IsHostAllowedInIncognito(const GURL& url) {
   std::string scheme = url.scheme();
   std::string_view host = url.host_piece();
@@ -103,7 +103,9 @@
     return true;
   }
 
-@@ -638,6 +639,12 @@ base::WeakPtr<content::NavigationHandle>
+--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
+@@ -544,6 +544,12 @@ base::WeakPtr<content::NavigationHandle>
     }
   }
 
@@ -118,7 +120,7 @@
   // handling.
 --- a/chrome/browser/extensions/extension_tab_util.cc
 +++ b/chrome/browser/extensions/extension_tab_util.cc
-@@ -1299,7 +1299,8 @@ bool ExtensionTabUtil::IsKillURL(const G
+@@ -1297,7 +1297,8 @@ bool ExtensionTabUtil::IsKillURL(const G
     return true;
   }
 
@@ -130,7 +132,7 @@
 
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -2234,6 +2234,13 @@ void Browser::SetContentsBounds(WebConte
+@@ -2287,6 +2287,13 @@ void Browser::SetContentsBounds(WebConte
 }
 
 void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -144,7 +146,7 @@
   std::vector<StatusBubble*> status_bubbles = GetStatusBubbles();
   for (StatusBubble* status_bubble : status_bubbles) {
     StatusBubbleViews* status_bubble_views =
-@@ -2241,7 +2248,7 @@ void Browser::UpdateTargetURL(WebContent
+@@ -2294,7 +2301,7 @@ void Browser::UpdateTargetURL(WebContent
     ContentsWebView* anchor =
         static_cast<ContentsWebView*>(status_bubble_views->base_view());
     if (source == anchor->GetWebContents()) {
@@ -226,7 +228,7 @@
 // bitmask of FormatUrlTypes, see it for details. |unescape_rules| defines how
 --- a/chrome/browser/ui/web_applications/app_browser_controller.cc
 +++ b/chrome/browser/ui/web_applications/app_browser_controller.cc
-@@ -201,7 +201,8 @@ std::u16string AppBrowserController::For
+@@ -223,7 +223,8 @@ std::u16string AppBrowserController::For
     url_formatter::FormatUrlTypes format_types) {
   auto origin = url::Origin::Create(url);
   return url_formatter::FormatUrl(origin.opaque() ? url : origin.GetURL(),
--- a/patches/helium/core/prefer-https-by-default.patch
+++ b/patches/helium/core/prefer-https-by-default.patch
@@ -1,9 +1,9 @@
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -891,7 +891,7 @@ BASE_FEATURE(HttpsFirstBalancedMode, bas
+@@ -969,7 +969,7 @@ BASE_FEATURE(kHttpsFirstBalancedMode, ba
 // Automatically enables HTTPS-First Mode in a balanced configuration when
 // possible.
- BASE_FEATURE(HttpsFirstBalancedModeAutoEnable,
+ BASE_FEATURE(kHttpsFirstBalancedModeAutoEnable,
 -             base::FEATURE_DISABLED_BY_DEFAULT);
 +             base::FEATURE_ENABLED_BY_DEFAULT);
 
--- a/patches/helium/core/proxy-extension-downloads.patch
+++ b/patches/helium/core/proxy-extension-downloads.patch
@@ -155,7 +155,7 @@
   static bool UpdatesFromGallery(const Extension* extension);
 --- a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
 +++ b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
-@@ -50,7 +50,7 @@ ChromeExtensionDownloaderFactory::Create
+@@ -53,7 +53,7 @@ ChromeExtensionDownloaderFactory::Create
     manifest_query_params += "&testrequest=1";
   }
   downloader->set_manifest_query_params(manifest_query_params);
@@ -166,7 +166,7 @@
 
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -354,6 +354,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -355,6 +355,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
   // Helium services page
   (*s_allowlist)[::prefs::kHeliumServicesEnabled] =
       settings_api::PrefType::kBoolean;
@@ -177,7 +177,7 @@
   (*s_allowlist)[::prefs::kHeliumServicesConsented] =
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -204,6 +204,7 @@ void RegisterBrowserUserPrefs(user_prefs
+@@ -208,6 +208,7 @@ void RegisterBrowserUserPrefs(user_prefs
 
   {
     registry->RegisterBooleanPref(prefs::kHeliumServicesEnabled, true);
@@ -187,7 +187,7 @@
     registry->RegisterBooleanPref(prefs::kHeliumServicesConsented, false);
 --- a/chrome/browser/resources/settings/privacy_page/services_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/services_page.html
-@@ -44,6 +44,11 @@
+@@ -45,6 +45,11 @@
     </settings-toggle-button>
     <div class="cr-col">
         <cr-collapse id="servicesCollapse" opened="[[prefs.helium.services.enabled.value]]">
@@ -201,7 +201,7 @@
     </template>
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1959,6 +1959,10 @@ void AddPrivacyStrings(content::WebUIDat
+@@ -1973,6 +1973,10 @@ void AddPrivacyStrings(content::WebUIDat
       {"heliumServicesToggle", IDS_SETTINGS_HELIUM_SERVICES_TOGGLE},
       {"heliumServicesToggleDescription",
         IDS_SETTINGS_HELIUM_SERVICES_TOGGLE_DESCRIPTION},
@@ -214,7 +214,7 @@
         IDS_SETTINGS_HELIUM_SERVICES_OVERRIDE_DESCRIPTION},
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -1931,6 +1931,12 @@
+@@ -1939,6 +1939,12 @@
   <message name="IDS_SETTINGS_HELIUM_SERVICES_TOGGLE_DESCRIPTION" desc="Description of the toggle for enabling/disabling of all Helium services">
     When enabled, Helium will be able to connect to anonymous web services to provide additional functionality. When disabled, additional features will not work.
   </message>
@@ -286,7 +286,7 @@
                             PrefChangeRegistrar& registrar, const base::RepeatingClosure& observer);
 --- a/chrome/browser/extensions/BUILD.gn
 +++ b/chrome/browser/extensions/BUILD.gn
-@@ -563,6 +563,7 @@ source_set("extensions") {
+@@ -559,6 +559,7 @@ source_set("extensions") {
     "//components/enterprise",
     "//components/guest_view/buildflags",
     "//components/guest_view/common",
@@ -357,7 +357,7 @@
 #include "components/update_client/update_query_params.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_task_traits.h"
-@@ -210,9 +213,6 @@ void ExtensionUpdater::EnsureDownloaderC
+@@ -213,9 +216,6 @@ void ExtensionUpdater::EnsureDownloaderC
   if (!downloader_.get()) {
     downloader_ = downloader_factory_.Run(this);
   }
@@ -367,7 +367,7 @@
 }
 
 void ExtensionUpdater::Start() {
-@@ -231,6 +231,15 @@ void ExtensionUpdater::Start() {
+@@ -234,6 +234,15 @@ void ExtensionUpdater::Start() {
     CheckSoon();
     ScheduleNextCheck();
   }
@@ -383,7 +383,7 @@
 }
 
 void ExtensionUpdater::Stop() {
-@@ -357,7 +366,6 @@ void ExtensionUpdater::AddToDownloader(
+@@ -360,7 +369,6 @@ void ExtensionUpdater::AddToDownloader(
     int request_id,
     DownloadFetchPriority fetch_priority,
     ExtensionUpdateCheckParams* update_check_params) {
@@ -391,7 +391,7 @@
 
   // In Kiosk mode extensions are downloaded and updated by the ExternalCache.
   // Therefore we skip updates here to avoid conflicts.
-@@ -458,7 +466,7 @@ void ExtensionUpdater::CheckNow(CheckPar
+@@ -461,7 +469,7 @@ void ExtensionUpdater::CheckNow(CheckPar
   // Add fetch records for extensions that should be fetched by an update URL.
   // These extensions are not yet installed. They come from group policy
   // and external install sources.
@@ -400,7 +400,7 @@
       PendingExtensionManager::Get(profile_);
 
   ExtensionUpdateCheckParams update_check_params;
-@@ -592,7 +600,7 @@ void ExtensionUpdater::CheckNow(CheckPar
+@@ -595,7 +603,7 @@ void ExtensionUpdater::CheckNow(CheckPar
   // OnExtensionDownloadFinished for each extension that was checked.
   downloader_->StartAllPending(extension_cache_);
 
@@ -409,7 +409,7 @@
     update_check_params.priority =
         params.fetch_priority == DownloadFetchPriority::kBackground
             ? ExtensionUpdateCheckParams::UpdateCheckPriority::BACKGROUND
-@@ -813,6 +821,10 @@ void ExtensionUpdater::CleanUpCrxFileIfN
+@@ -816,6 +824,10 @@ void ExtensionUpdater::CleanUpCrxFileIfN
 
 bool ExtensionUpdater::CanUseUpdateService(
     const ExtensionId& extension_id) const {
@@ -422,7 +422,7 @@
   }
 --- a/chrome/browser/extensions/webstore_installer.cc
 +++ b/chrome/browser/extensions/webstore_installer.cc
-@@ -46,6 +46,7 @@
+@@ -45,6 +45,7 @@
 #include "components/crx_file/id_util.h"
 #include "components/download/public/common/download_url_parameters.h"
 #include "components/update_client/update_query_params.h"
@@ -430,7 +430,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/navigation_controller.h"
-@@ -203,7 +204,7 @@ GURL WebstoreInstaller::GetWebstoreInsta
+@@ -206,7 +207,7 @@ GURL WebstoreInstaller::GetWebstoreInsta
   if (!install_source.empty())
     params.push_back(installsource_param);
   params.push_back("uc");
@@ -452,7 +452,7 @@
   // DownloadManager::DownloadUrl callback.
 --- a/chrome/browser/extensions/extension_management.cc
 +++ b/chrome/browser/extensions/extension_management.cc
-@@ -42,6 +42,8 @@
+@@ -43,6 +43,8 @@
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "components/crx_file/id_util.h"
@@ -461,10 +461,10 @@
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/common/content_switches.h"
-@@ -116,6 +118,12 @@ ExtensionManagement::ExtensionManagement
-                              pref_change_callback);
-   pref_change_registrar_.Add(pref_names::kExtensionUnpublishedAvailability,
-                              pref_change_callback);
+@@ -128,6 +130,12 @@ ExtensionManagement::ExtensionManagement
+   pref_change_registrar_.Add(
+       pref_names::kExtensionForceInstallWithNonMalwareViolationsEnabled,
+       pref_change_callback);
 +
 +  helium::ConfigurePrefChangeRegistrarFor(
 +    prefs::kHeliumExtProxyEnabled,
@@ -474,7 +474,7 @@
   // Note that both |global_settings_| and |default_settings_| will be null
   // before first call to Refresh(), so in order to resolve this, Refresh() must
   // be called in the initialization of ExtensionManagement.
-@@ -270,12 +278,20 @@ GURL ExtensionManagement::GetEffectiveUp
+@@ -282,12 +290,20 @@ GURL ExtensionManagement::GetEffectiveUp
         << "Update URL cannot be overridden to be the webstore URL!";
     return update_url;
   }
@@ -540,7 +540,7 @@
   void AddObserver(Observer* observer);
 --- a/chrome/browser/extensions/webstore_data_fetcher.cc
 +++ b/chrome/browser/extensions/webstore_data_fetcher.cc
-@@ -87,7 +87,8 @@ void WebstoreDataFetcher::SetMockItemSni
+@@ -90,7 +90,8 @@ void WebstoreDataFetcher::SetMockItemSni
 }
 
 void WebstoreDataFetcher::Start(
@@ -550,7 +550,7 @@
   if (g_mock_item_snippet_response_) {
     g_mock_item_snippet_response_->set_item_id(id_);
     delegate_->OnFetchItemSnippetParseSuccess(id_,
-@@ -95,7 +96,9 @@ void WebstoreDataFetcher::Start(
+@@ -98,7 +99,9 @@ void WebstoreDataFetcher::Start(
     return;
   }
 
@@ -575,7 +575,7 @@
     max_auto_retries_ = max_retries;
 --- a/chrome/browser/extensions/webstore_standalone_installer.cc
 +++ b/chrome/browser/extensions/webstore_standalone_installer.cc
-@@ -21,6 +21,7 @@
+@@ -20,6 +20,7 @@
 #include "chrome/browser/extensions/webstore_data_fetcher.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/crx_file/id_util.h"
@@ -583,7 +583,7 @@
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/blocklist_extension_prefs.h"
-@@ -72,9 +73,12 @@ void WebstoreStandaloneInstaller::BeginI
+@@ -76,9 +77,12 @@ void WebstoreStandaloneInstaller::BeginI
   webstore_data_fetcher_ =
       std::make_unique<WebstoreDataFetcher>(this, GURL(), id_);
 
--- a/patches/helium/core/reduce-accept-language-headers.patch
+++ b/patches/helium/core/reduce-accept-language-headers.patch
@@ -1,11 +1,11 @@
 --- a/services/network/public/cpp/features.cc
 +++ b/services/network/public/cpp/features.cc
-@@ -202,7 +202,7 @@ BASE_FEATURE(kOmitCorsClientCert,
+@@ -185,7 +185,7 @@ BASE_FEATURE(kOmitCorsClientCert, base::
+ 
+ // Enables support for the `Variants` response header and reduce
 // accept-language. https://github.com/Tanych/accept-language
- BASE_FEATURE(kReduceAcceptLanguage,
-              "ReduceAcceptLanguage",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             base::FEATURE_ENABLED_BY_DEFAULT);
+-BASE_FEATURE(kReduceAcceptLanguage, base::FEATURE_DISABLED_BY_DEFAULT);
+BASE_FEATURE(kReduceAcceptLanguage, base::FEATURE_ENABLED_BY_DEFAULT);
 
 BASE_FEATURE_PARAM(base::TimeDelta,
                    kReduceAcceptLanguageCacheDuration,
--- a/patches/helium/core/reenable-spellcheck-downloads.patch
+++ b/patches/helium/core/reenable-spellcheck-downloads.patch
@@ -96,7 +96,7 @@
 #endif  // COMPONENTS_HELIUM_SERVICES_PREF_NAMES_H_
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -8247,6 +8247,8 @@ static_library("browser") {
+@@ -8264,6 +8264,8 @@ static_library("browser") {
     deps += [
       "//components/spellcheck/browser",
       "//components/spellcheck/common",
@@ -107,7 +107,7 @@
     if (!is_android) {
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -358,6 +358,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -359,6 +359,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
       settings_api::PrefType::kBoolean;
   (*s_allowlist)[::prefs::kHeliumBangsEnabled] =
       settings_api::PrefType::kBoolean;
@@ -118,7 +118,7 @@
   (*s_allowlist)[::prefs::kHeliumServicesConsented] =
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -206,6 +206,7 @@ void RegisterBrowserUserPrefs(user_prefs
+@@ -210,6 +210,7 @@ void RegisterBrowserUserPrefs(user_prefs
     registry->RegisterBooleanPref(prefs::kHeliumServicesEnabled, true);
     registry->RegisterBooleanPref(prefs::kHeliumBangsEnabled, true);
     registry->RegisterBooleanPref(prefs::kHeliumExtProxyEnabled, true);
@@ -128,7 +128,7 @@
     registry->RegisterBooleanPref(prefs::kHeliumServicesConsented, false);
 --- a/chrome/browser/resources/settings/privacy_page/services_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/services_page.html
-@@ -54,6 +54,13 @@
+@@ -55,6 +55,13 @@
                 label="$i18n{heliumBangsToggle}"
                 sub-label="$i18n{heliumBangsToggleDescription}">
             </settings-toggle-button>
@@ -144,7 +144,7 @@
     </template>
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -1943,6 +1943,12 @@
+@@ -1951,6 +1951,12 @@
   <message name="IDS_SETTINGS_HELIUM_SERVICES_BANGS_TOGGLE_DESCRIPTION" desc="Description of the toggle for enabling/disabling of downloading bangs">
     Helium will fetch a list of bangs that help you browse the Internet faster, such as !w or !gh. When disabled, bangs will not work.
   </message>
@@ -159,7 +159,7 @@
   </message>
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1962,6 +1962,9 @@ void AddPrivacyStrings(content::WebUIDat
+@@ -1976,6 +1976,9 @@ void AddPrivacyStrings(content::WebUIDat
       {"heliumBangsToggle", IDS_SETTINGS_HELIUM_SERVICES_BANGS_TOGGLE},
       {"heliumBangsToggleDescription",
         IDS_SETTINGS_HELIUM_SERVICES_BANGS_TOGGLE_DESCRIPTION},
--- a/patches/helium/core/reenable-update-checks.patch
+++ b/patches/helium/core/reenable-update-checks.patch
@@ -39,7 +39,7 @@
 // The default implementation for most embedders returns an empty string.
 --- a/extensions/browser/updater/extension_downloader.cc
 +++ b/extensions/browser/updater/extension_downloader.cc
-@@ -352,6 +352,10 @@ void ExtensionDownloader::DoStartAllPend
+@@ -346,6 +346,10 @@ void ExtensionDownloader::DoStartAllPend
     AddToFetches(fetches_preparing, std::move(task));
   pending_tasks_.clear();
 
--- a/patches/helium/core/scan-chrome-native-messaging-hosts.patch
+++ b/patches/helium/core/scan-chrome-native-messaging-hosts.patch
@@ -25,7 +25,7 @@
 
 --- a/chrome/common/chrome_paths.cc
 +++ b/chrome/common/chrome_paths.cc
-@@ -154,6 +154,11 @@ bool PathProvider(int key, base::FilePat
+@@ -153,6 +153,11 @@ bool PathProvider(int key, base::FilePat
       }
       create_dir = true;
       break;
@@ -37,7 +37,7 @@
     case chrome::DIR_USER_DOCUMENTS:
       if (!GetUserDocumentsDirectory(&cur)) {
         return false;
-@@ -483,11 +488,28 @@ bool PathProvider(int key, base::FilePat
+@@ -481,11 +486,28 @@ bool PathProvider(int key, base::FilePat
 #endif  // !BUILDFLAG(IS_MAC)
       break;
 
@@ -158,7 +158,7 @@
     return false;
 --- a/chrome/common/chrome_paths_mac.mm
 +++ b/chrome/common/chrome_paths_mac.mm
-@@ -111,6 +111,10 @@ bool GetDefaultUserDataDirectory(base::F
+@@ -87,6 +87,10 @@ bool GetDefaultUserDataDirectory(base::F
   return GetDefaultUserDataDirectoryForProduct(ProductDirName(), result);
 }
 
--- a/patches/helium/core/search/engine-defaults.patch
+++ b/patches/helium/core/search/engine-defaults.patch
@@ -1,6 +1,6 @@
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -235,7 +235,7 @@ std::unique_ptr<TemplateURLData> GetPrep
+@@ -261,7 +261,7 @@ std::unique_ptr<TemplateURLData> GetPrep
     std::vector<const TemplateURLPrepopulateData::PrepopulatedEngine*>
         regional_prepopulated_engines) {
   return FindPrepopulatedEngineInternal(prefs, regional_prepopulated_engines,
@@ -31,7 +31,7 @@
     "AE": {
       // United Arab Emirates
       "search_engines": [
-@@ -1183,7 +1196,8 @@
+@@ -1154,7 +1167,8 @@
     "name": "kRegionalSettings",
     "export_items": false,
     "map_key_type": "country_codes::CountryId",
--- a/patches/helium/core/search/force-eu-search-features.patch
+++ b/patches/helium/core/search/force-eu-search-features.patch
@@ -9,14 +9,14 @@
 #include "chrome/browser/signin/account_consistency_mode_manager_factory.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
@@ -84,7 +83,6 @@
- #include "components/plus_addresses/grit/plus_addresses_strings.h"
- #include "components/plus_addresses/plus_address_service.h"
+ #include "components/plus_addresses/core/browser/plus_address_service.h"
+ #include "components/plus_addresses/core/common/features.h"
 #include "components/prefs/pref_service.h"
 -#include "components/regional_capabilities/regional_capabilities_service.h"
 #include "components/safe_browsing/core/common/features.h"
 #include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h"
 #include "components/saved_tab_groups/public/features.h"
-@@ -2479,14 +2477,9 @@ void AddSearchStrings(content::WebUIData
+@@ -2505,14 +2503,9 @@ void AddSearchStrings(content::WebUIData
   html_source->AddString("searchExplanationLearnMoreURL",
                          chrome::kOmniboxLearnMoreURL);
 
@@ -34,7 +34,7 @@
       "saveGuestChoiceText", IDS_SEARCH_ENGINE_CHOICE_GUEST_SESSION_CHECKBOX);
 --- a/components/regional_capabilities/regional_capabilities_service.cc
 +++ b/components/regional_capabilities/regional_capabilities_service.cc
-@@ -166,6 +166,8 @@ std::pair<CountryId, LoadedCountrySource
+@@ -167,6 +167,8 @@ std::pair<CountryId, LoadedCountrySource
 // Pass `out_scope_check_outcome` to collect information about the outcome of
 // the program checks.
 Program CountryIdToProgram(const CountryId& country_id) {
@@ -43,7 +43,7 @@
   static constexpr Program kCountryDerivedPrograms[] = {
 #if BUILDFLAG(IS_IOS)
       // Only iOS can derive Taiyaki scope directly from the country.
-@@ -332,6 +334,7 @@ RegionalCapabilitiesService::GetChoiceSc
+@@ -351,6 +353,7 @@ RegionalCapabilitiesService::GetChoiceSc
 }
 
 bool RegionalCapabilitiesService::IsInEeaCountry() {
@@ -64,7 +64,7 @@
 std::optional<SearchEngineCountryOverride> GetSearchEngineCountryOverride() {
 --- a/components/search_engine_choice_strings.grdp
 +++ b/components/search_engine_choice_strings.grdp
-@@ -98,6 +98,10 @@
+@@ -106,6 +106,10 @@
     These search engines are popular in your region
   </message>
 
--- a/patches/helium/core/search/remove-description-snippet-deps.patch
+++ b/patches/helium/core/search/remove-description-snippet-deps.patch
@@ -15,7 +15,7 @@
           [ "${root_gen_dir}/extensions/strings/extensions_strings_" ]
 --- a/components/search_engines/template_url.cc
 +++ b/components/search_engines/template_url.cc
-@@ -57,10 +57,6 @@
+@@ -58,10 +58,6 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
@@ -26,7 +26,7 @@
 namespace {
 
 const bool kEnableBuiltinSearchProviderAssets =
-@@ -1854,18 +1850,6 @@ std::string TemplateURL::GetBuiltinDescr
+@@ -1878,18 +1874,6 @@ std::string TemplateURL::GetBuiltinDescr
 }
 
 std::optional<std::u16string> TemplateURL::GetBuiltinMarketingSnippet() const {
--- a/patches/helium/core/search/restore-google.patch
+++ b/patches/helium/core/search/restore-google.patch
@@ -1,6 +1,6 @@
 --- a/third_party/search_engines_data/resources/definitions/prepopulated_engines.json
 +++ b/third_party/search_engines_data/resources/definitions/prepopulated_engines.json
-@@ -166,30 +166,14 @@
+@@ -170,30 +170,14 @@
       "id": 114
     },
 
--- a/patches/helium/core/services-prefs.patch
+++ b/patches/helium/core/services-prefs.patch
@@ -1,6 +1,6 @@
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -1903,6 +1903,31 @@
+@@ -1911,6 +1911,31 @@
   <message name="IDS_SETTINGS_SECURITY_DESCRIPTION" desc="Description of the controls available on the security settings page">
     Safe Browsing (protection from dangerous sites) and other security settings
   </message>
@@ -34,7 +34,7 @@
     Google Advanced Protection Program
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1953,6 +1953,18 @@ void AddPrivacyStrings(content::WebUIDat
+@@ -1967,6 +1967,18 @@ void AddPrivacyStrings(content::WebUIDat
       {"permissionsPageDescription", IDS_SETTINGS_PERMISSIONS_DESCRIPTION},
       {"securityPageTitle", IDS_SETTINGS_SECURITY},
       {"securityPageDescription", IDS_SETTINGS_SECURITY_DESCRIPTION},
@@ -55,35 +55,38 @@
       {"advancedProtectionProgramDesc",
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-@@ -83,6 +83,11 @@
-             sub-label="$i18n{permissionsPageDescription}"
-             on-click="onPermissionsPageClick_"
-             role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
-+        <cr-link-row id="heliumServicesLinkRow" start-icon="cr:chrome-product"
-+            class="hr" label="$i18n{heliumServicesTitle}"
-+            sub-label="$i18n{heliumServicesDescription}"
-+            on-click="onHeliumServicesPageClick_"
-+            role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
-         <cr-toast id="deleteBrowsingDataToast" duration="5000">
-           <div>[[dbdDeletionConfirmationToastLabel_]]</div>
-         </cr-toast>
-@@ -115,6 +120,13 @@
-         </settings-subpage>
-       </template>
+@@ -67,6 +67,11 @@
+         sub-label="$i18n{permissionsPageDescription}"
+         on-click="onPermissionsPageClick_"
+         role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
+    <cr-link-row id="heliumServicesLinkRow" start-icon="cr:chrome-product"
+        class="hr" label="$i18n{heliumServicesTitle}"
+        sub-label="$i18n{heliumServicesDescription}"
+        on-click="onHeliumServicesPageClick_"
+        role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
+     <cr-toast id="deleteBrowsingDataToast" duration="5000">
+       <div>[[dbdDeletionConfirmationToastLabel_]]</div>
+     </cr-toast>
+--- a/chrome/browser/resources/settings/privacy_page/privacy_page_index.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page_index.html
+@@ -45,6 +45,14 @@
+     </settings-privacy-page>
+   </template>
 
-+      <template is="dom-if" route-path="/privacy/services">
-+        <settings-subpage id="services" page-title="$i18n{heliumServicesTitle}"
-+            associated-control="[[$$('#heliumServicesLinkRow')]]">
-+          <settings-helium-services-page prefs="{{prefs}}"></settings-helium-services-page>
-+        </settings-subpage>
-+      </template>
+  <template is="dom-if" if="[[renderView_(
+      routes_.HELIUM_SERVICES, currentRoute, inSearchMode)]]">
+    <settings-helium-services-page slot="view" id="heliumServices"
+        data-parent-view-id="privacy" prefs="{{prefs}}"
+        route-path$="[[routes_.HELIUM_SERVICES.path]]">
+    </settings-helium-services-page>
+  </template>
 +
-       <template is="dom-if" route-path="/security">
-         <settings-subpage id="security" page-title="$i18n{securityPageTitle}"
-             associated-control="[[$$('#securityLinkRow')]]"
+   <template is="dom-if" if="[[isAdPrivacyAvailable_]]" restamp>
+     <template is="dom-if" if="[[renderView_(
+         routes_.PRIVACY_SANDBOX, currentRoute, inSearchMode)]]">
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
-@@ -415,6 +415,12 @@ export class SettingsPrivacyPageElement
+@@ -171,6 +171,12 @@ export class SettingsPrivacyPageElement
     Router.getInstance().navigateTo(routes.SITE_SETTINGS);
   }
 
@@ -96,6 +99,27 @@
   private onSecurityPageClick_() {
     this.interactedWithPage_();
     this.metricsBrowserProxy_.recordAction(
+@@ -253,6 +259,10 @@ export class SettingsPrivacyPageElement
+   override getFocusConfig() {
+     const map = new Map();
+ 
+    if (routes.HELIUM_SERVICES) {
+      map.set(routes.HELIUM_SERVICES.path, '#heliumServicesLinkRow');
+    }
+
+     if (routes.COOKIES) {
+       map.set(routes.COOKIES.path, '#thirdPartyCookiesLinkRow');
+     }
+@@ -286,6 +296,9 @@ export class SettingsPrivacyPageElement
+   override getAssociatedControlFor(childViewId: string): HTMLElement {
+     let triggerId: string|null = null;
+     switch (childViewId) {
+      case 'heliumServices':
+        triggerId = 'heliumServicesLinkRow';
+        break;
+       case 'cookies':
+         triggerId = 'thirdPartyCookiesLinkRow';
+         break;
 --- a/chrome/browser/resources/settings/router.ts
 +++ b/chrome/browser/resources/settings/router.ts
@@ -32,6 +32,7 @@ export interface SettingsRoutes {
@@ -119,7 +143,7 @@
   if (visibility.safetyHub !== false) {
 --- a/chrome/browser/resources/settings/BUILD.gn
 +++ b/chrome/browser/resources/settings/BUILD.gn
-@@ -156,6 +156,7 @@ build_webui("build") {
+@@ -155,6 +155,7 @@ build_webui("build") {
     "privacy_page/security_keys_subpage.ts",
     "privacy_page/security_page_v2.ts",
     "privacy_page/security_page.ts",
@@ -129,13 +153,14 @@
     "privacy_sandbox/privacy_sandbox_interest_item.ts",
 --- /dev/null
 +++ b/chrome/browser/resources/settings/privacy_page/services_page.html
-@@ -0,0 +1,45 @@
+@@ -0,0 +1,47 @@
 +<style include="cr-shared-style settings-shared">
 +    .label-wrapper {
 +        padding: var(--cr-section-vertical-padding) 0;
 +    }
 +</style>
 +
+<settings-subpage page-title="$i18n{heliumServicesTitle}" route-path$="[[routePath]]">
 +<div class="cr-col first">
 +    <settings-toggle-button id="servicesToggleButton"
 +        pref="{{prefs.helium.services.enabled}}"
@@ -175,6 +200,7 @@
 +    />
 +  </div>
 +</div>
+</settings-subpage>
 --- /dev/null
 +++ b/chrome/browser/resources/settings/privacy_page/services_page.ts
@@ -0,0 +1,67 @@
@@ -254,8 +280,8 @@
 +import './privacy_page/services_page.js';
 import './safety_hub/safety_hub_page.js';
 import './safety_hub/safety_hub_entry_point.js';
- import './site_settings/all_sites.js';
-@@ -212,6 +213,7 @@ export {ResetDialogPage, SettingsSecurit
+ import './site_settings/ads_page.js';
+@@ -243,6 +244,7 @@ export {ResetDialogPage, SettingsSecurit
 export {SetPinDialogPage, SettingsSecurityKeysSetPinDialogElement} from './privacy_page/security_keys_set_pin_dialog.js';
 export {SecurityKeysSubpageElement} from './privacy_page/security_keys_subpage.js';
 export {HttpsFirstModeSetting, SafeBrowsingSetting, SettingsSecurityPageElement} from './privacy_page/security_page.js';
@@ -273,7 +299,7 @@
 #include "components/policy/core/common/policy_pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_registry_simple.h"
-@@ -197,6 +198,11 @@ void RegisterBrowserUserPrefs(user_prefs
+@@ -201,6 +202,11 @@ void RegisterBrowserUserPrefs(user_prefs
                                 false);
 #endif
 
@@ -287,7 +313,7 @@
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -45,6 +45,7 @@
+@@ -46,6 +46,7 @@
 #include "components/dom_distiller/core/pref_names.h"
 #include "components/drive/drive_pref_names.h"
 #include "components/embedder_support/pref_names.h"
@@ -295,7 +321,7 @@
 #include "components/language/core/browser/pref_names.h"
 #include "components/live_caption/pref_names.h"
 #include "components/media_router/common/pref_names.h"
-@@ -350,6 +351,12 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -351,6 +352,12 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
       settings_api::PrefType::kString;
 #endif
 
--- a/patches/helium/core/split-view.patch
+++ b/patches/helium/core/split-view.patch
@@ -1,24 +1,23 @@
 --- a/chrome/browser/ui/ui_features.cc
 +++ b/chrome/browser/ui/ui_features.cc
-@@ -115,7 +115,7 @@ BASE_FEATURE(kReloadSelectionModel,
+@@ -107,14 +107,14 @@ BASE_FEATURE(kReloadSelectionModel, base
+ // Enforces close tab hotkey to only close the active view of a split tab,
 // when it is the only tab in selection model.
 BASE_FEATURE(kCloseActiveTabInSplitViewViaHotkey,
-              "CloseActiveTabInSplitViewViaHotkey",
 -             base::FEATURE_DISABLED_BY_DEFAULT);
 +             base::FEATURE_ENABLED_BY_DEFAULT);
 
- // When enabled, a scrim is shown behind window modal dialogs to cover the
- // entire browser window. This gives user a visual cue that the browser window
-@@ -137,7 +137,7 @@ BASE_FEATURE(kShowTabGroupsMacSystemMenu
-              base::FEATURE_DISABLED_BY_DEFAULT);
+ #if BUILDFLAG(IS_MAC)
+ // Add tab group colours when viewing tab groups using the top mac OS menu bar.
+ BASE_FEATURE(kShowTabGroupsMacSystemMenu, base::FEATURE_DISABLED_BY_DEFAULT);
 #endif  // BUILDFLAG(IS_MAC)
 
-BASE_FEATURE(kSideBySide, "SideBySide", base::FEATURE_DISABLED_BY_DEFAULT);
-+BASE_FEATURE(kSideBySide, "SideBySide", base::FEATURE_ENABLED_BY_DEFAULT);
+-BASE_FEATURE(kSideBySide, base::FEATURE_DISABLED_BY_DEFAULT);
+BASE_FEATURE(kSideBySide, base::FEATURE_ENABLED_BY_DEFAULT);
 
 // The delay before showing the drop target for the side-by-side drag-and-drop
 // entrypoint.
-@@ -155,17 +155,17 @@ BASE_FEATURE_PARAM(int,
+@@ -132,17 +132,17 @@ BASE_FEATURE_PARAM(int,
                    kSideBySideDropTargetMinWidth,
                    &kSideBySide,
                    "drop_target_min_width",
@@ -39,26 +38,33 @@
 BASE_FEATURE_PARAM(int,
                    kSideBySideDropTargetHideForOSWidth,
                    &kSideBySide,
-@@ -270,7 +270,7 @@ BASE_FEATURE_PARAM(int,
+@@ -243,7 +243,7 @@ BASE_FEATURE_PARAM(int,
+ 
+ // When enabled along with SideBySide flag, split tabs will be restored on
 // startup.
- BASE_FEATURE(kSideBySideSessionRestore,
-              "SideBySideSessionRestore",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             base::FEATURE_ENABLED_BY_DEFAULT);
+-BASE_FEATURE(kSideBySideSessionRestore, base::FEATURE_DISABLED_BY_DEFAULT);
+BASE_FEATURE(kSideBySideSessionRestore, base::FEATURE_ENABLED_BY_DEFAULT);
 
 bool IsRestoringSplitViewEnabled() {
   return base::FeatureList::IsEnabled(features::kSideBySide) &&
+@@ -252,7 +252,7 @@ bool IsRestoringSplitViewEnabled() {
+ 
+ BASE_FEATURE(kSideBySideLinkMenuNewBadge, base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+-BASE_FEATURE(kSideBySideKeyboardShortcut, base::FEATURE_DISABLED_BY_DEFAULT);
+BASE_FEATURE(kSideBySideKeyboardShortcut, base::FEATURE_ENABLED_BY_DEFAULT);
+ 
+ bool IsSideBySideKeyboardShortcutEnabled() {
+   return base::FeatureList::IsEnabled(features::kSideBySide) &&
 --- a/chrome/browser/ui/views/frame/multi_contents_resize_area.cc
 +++ b/chrome/browser/ui/views/frame/multi_contents_resize_area.cc
-@@ -21,9 +21,9 @@
- 
+@@ -24,8 +24,8 @@
 namespace {
 const int kHandleCornerRadius = 2;
-const int kHandleHeight = 24;
+ const int kHandleHeight = 24;
 -const int kHandlePadding = 6;
 -const int kHandleWidth = 4;
-+const int kHandleHeight = 32;
-+const int kHandlePadding = 1;
+const int kHandlePadding = 4;
 +const int kHandleWidth = 2;
 }  // namespace
 
@@ -73,7 +79,7 @@
 
 namespace content {
 class WebContents;
-@@ -54,7 +53,7 @@ class MultiContentsView : public views::
+@@ -56,7 +55,7 @@ class MultiContentsView : public views::
     double end_width = 0;
   };
 
@@ -82,7 +88,7 @@
 
   MultiContentsView(BrowserView* browser_view,
                     std::unique_ptr<MultiContentsViewDelegate> delegate);
-@@ -164,10 +163,6 @@ class MultiContentsView : public views::
+@@ -168,10 +167,6 @@ class MultiContentsView : public views::
     return contents_container_views_[1]->contents_view();
   }
 
@@ -90,10 +96,10 @@
 -    return contents_container_views_[index]->mini_toolbar();
 -  }
 -
-  private:
-   FRIEND_TEST_ALL_PREFIXES(MultiContentsViewBrowserTest, DropTargetLayout);
-   FRIEND_TEST_ALL_PREFIXES(MultiContentsViewBrowserTest, SeparatorLayout);
-@@ -265,10 +260,6 @@ class MultiContentsView : public views::
+   MultiContentsBackgroundView* background_view_for_testing() const {
+     return background_view_;
+   }
+@@ -280,10 +275,6 @@ class MultiContentsView : public views::
   // Nullopt if not currently resizing.
   std::optional<double> initial_start_width_on_resize_;
 
@@ -117,7 +123,7 @@
   line-height: 20px;
 --- a/chrome/browser/ui/views/frame/multi_contents_view.cc
 +++ b/chrome/browser/ui/views/frame/multi_contents_view.cc
-@@ -24,7 +24,6 @@
+@@ -26,7 +26,6 @@
 #include "chrome/browser/ui/views/frame/multi_contents_resize_area.h"
 #include "chrome/browser/ui/views/frame/multi_contents_view_delegate.h"
 #include "chrome/browser/ui/views/frame/multi_contents_view_drop_target_controller.h"
@@ -125,7 +131,7 @@
 #include "chrome/browser/ui/views/frame/scrim_view.h"
 #include "chrome/browser/ui/views/frame/top_container_background.h"
 #include "chrome/browser/ui/views/new_tab_footer/footer_web_view.h"
-@@ -51,11 +50,7 @@ MultiContentsView::MultiContentsView(
+@@ -57,11 +56,7 @@ MultiContentsView::MultiContentsView(
     BrowserView* browser_view,
     std::unique_ptr<MultiContentsViewDelegate> delegate)
     : browser_view_(browser_view),
@@ -138,7 +144,7 @@
   SetLayoutManager(std::make_unique<views::DelegatingLayoutManager>(this));
   SetProperty(views::kElementIdentifierKey, kMultiContentsViewElementId);
 
-@@ -334,11 +329,8 @@ void MultiContentsView::OnResize(int res
+@@ -360,11 +355,8 @@ void MultiContentsView::OnResize(int res
         std::make_optional(contents_container_views_[0]->size().width());
   }
   double total_width = contents_container_views_[0]->size().width() +
@@ -151,7 +157,7 @@
                       static_cast<double>(resize_amount));
 
   // If end_width is within the snap point widths, update to the snap point.
-@@ -432,11 +424,6 @@ views::ProposedLayout MultiContentsView:
+@@ -473,11 +465,6 @@ views::ProposedLayout MultiContentsView:
   gfx::Rect end_rect(resize_rect.top_right(),
                      gfx::Size(widths.end_width, available_space.height()));
 
@@ -163,7 +169,7 @@
   layouts.child_layouts.emplace_back(contents_container_views_[0],
                                      contents_container_views_[0]->GetVisible(),
                                      start_rect);
-@@ -571,8 +558,10 @@ MultiContentsView::ViewWidths MultiConte
+@@ -612,8 +599,10 @@ MultiContentsView::ViewWidths MultiConte
     widths.resize_width = resize_area_->GetPreferredSize().width();
     widths.start_width =
         start_ratio_ * (available_space.width() - widths.resize_width);
@@ -175,7 +181,7 @@
   } else {
     CHECK(!contents_container_views_[1]->GetVisible());
     widths.start_width = available_space.width();
-@@ -645,10 +634,6 @@ void MultiContentsView::SetShouldShowTop
+@@ -686,10 +675,6 @@ void MultiContentsView::SetShouldShowTop
     return;
   }
   contents_separators_.should_show_top = should_show;
@@ -186,7 +192,7 @@
 
   InvalidateLayout();
 }
-@@ -658,8 +643,6 @@ void MultiContentsView::SetShouldShowLea
+@@ -699,8 +684,6 @@ void MultiContentsView::SetShouldShowLea
     return;
   }
   contents_separators_.should_show_leading = should_show;
@@ -195,7 +201,7 @@
 
   InvalidateLayout();
 }
-@@ -669,8 +652,6 @@ void MultiContentsView::SetShouldShowTra
+@@ -710,8 +693,6 @@ void MultiContentsView::SetShouldShowTra
     return;
   }
   contents_separators_.should_show_trailing = should_show;
@@ -206,7 +212,7 @@
 }
 --- a/chrome/browser/ui/views/frame/contents_container_view.cc
 +++ b/chrome/browser/ui/views/frame/contents_container_view.cc
-@@ -19,7 +19,6 @@
+@@ -20,7 +20,6 @@
 #include "chrome/browser/ui/views/frame/contents_container_outline.h"
 #include "chrome/browser/ui/views/frame/contents_separator.h"
 #include "chrome/browser/ui/views/frame/contents_web_view.h"
@@ -214,7 +220,7 @@
 #include "chrome/browser/ui/views/frame/scrim_view.h"
 #include "chrome/browser/ui/views/frame/tab_modal_dialog_host.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
-@@ -50,10 +49,6 @@
+@@ -51,10 +50,6 @@
 #endif
 
 namespace {
@@ -225,7 +231,7 @@
 constexpr int kNewTabFooterSeparatorHeight = 1;
 constexpr int kNewTabFooterHeight = 56;
 }  // namespace
-@@ -121,14 +116,6 @@ ContentsContainerView::ContentsContainer
+@@ -122,14 +117,6 @@ ContentsContainerView::ContentsContainer
   }
 #endif
 
@@ -240,7 +246,7 @@
   view_bounds_observer_.Observe(contents_view_);
 }
 
-@@ -151,112 +138,11 @@ std::vector<views::View*> ContentsContai
+@@ -152,110 +139,11 @@ std::vector<views::View*> ContentsContai
 void ContentsContainerView::UpdateBorderAndOverlay(bool is_in_split,
                                                    bool is_active,
                                                    bool is_highlighted) {
@@ -305,18 +311,15 @@
 -                   ? content_upper_rounded_corners
 -                   : content_rounded_corners;
 -
+-  contents_view_->SetBackgroundRadii(radii);
 -  contents_view_->holder()->SetCornerRadii(radii);
+-  contents_scrim_view_->SetRoundedCorners(kContentRoundedCorners);
 -
 -  if (new_tab_footer_view_) {
 -    new_tab_footer_view_->holder()->SetCornerRadii(
 -        content_lower_rounded_corners);
 -  }
 -
-  if (contents_scrim_view_->layer()->rounded_corner_radii() !=
-      kContentRoundedCorners) {
-    contents_scrim_view_->SetRoundedCorners(kContentRoundedCorners);
-  }
-
 -#if BUILDFLAG(ENABLE_GLIC)
 -  if (glic_border_) {
 -    glic_border_->SetRoundedCorners(content_rounded_corners);
@@ -330,6 +333,7 @@
 -  devtools_web_view_->holder()->SetCornerRadii(kNoRoundedCorners);
 -  devtools_scrim_view_->SetRoundedCorners(kNoRoundedCorners);
 -
+-  contents_view_->SetBackgroundRadii(kNoRoundedCorners);
 -  contents_view_->holder()->SetCornerRadii(kNoRoundedCorners);
 -
 -  if (new_tab_footer_view_) {
@@ -355,7 +359,7 @@
 }
 
 void ContentsContainerView::Layout(PassKey pass_key) {
-@@ -270,9 +156,6 @@ void ContentsContainerView::Layout(PassK
+@@ -269,9 +157,6 @@ void ContentsContainerView::Layout(PassK
 void ContentsContainerView::OnViewBoundsChanged(View* observed_view) {
   if (observed_view == contents_view_) {
     UpdateDevToolsDockedPlacement();
@@ -365,7 +369,7 @@
   }
 }
 
-@@ -519,30 +402,6 @@ views::ProposedLayout ContentsContainerV
+@@ -523,30 +408,6 @@ views::ProposedLayout ContentsContainerV
         non_devtools_contents_bounds, size_bounds);
   }
 
@@ -398,7 +402,7 @@
 }
 --- a/chrome/browser/ui/views/frame/contents_container_view.h
 +++ b/chrome/browser/ui/views/frame/contents_container_view.h
-@@ -70,7 +70,6 @@ class ContentsContainerView : public vie
+@@ -71,7 +71,6 @@ class ContentsContainerView : public vie
   std::vector<views::View*> GetAccessiblePanes();
 
   ContentsWebView* contents_view() { return contents_view_; }
@@ -406,7 +410,7 @@
   ScrimView* contents_scrim_view() { return contents_scrim_view_; }
   views::WebView* devtools_web_view() { return devtools_web_view_; }
   ScrimView* devtools_scrim_view() { return devtools_scrim_view_; }
-@@ -88,9 +87,6 @@ class ContentsContainerView : public vie
+@@ -91,9 +90,6 @@ class ContentsContainerView : public vie
   enterprise_watermark::WatermarkView* watermark_view() {
     return watermark_view_;
   }
@@ -416,7 +420,7 @@
   TabModalDialogHost* web_contents_modal_dialog_host() {
     return &web_contents_modal_dialog_host_;
   }
-@@ -125,9 +121,6 @@ class ContentsContainerView : public vie
+@@ -131,9 +127,6 @@ class ContentsContainerView : public vie
   // container that holds both contents_webview and devtools_webview.
   void UpdateDevToolsDockedPlacement();
 
@@ -426,7 +430,7 @@
   // views::View:
   void ChildVisibilityChanged(View* child) override;
   void Layout(PassKey) override;
-@@ -174,10 +167,6 @@ class ContentsContainerView : public vie
+@@ -180,10 +173,6 @@ class ContentsContainerView : public vie
   // The glic browser view that renders around the web contents area.
   raw_ptr<glic::GlicBorderView> glic_border_ = nullptr;
 
@@ -439,7 +443,7 @@
 
 --- a/chrome/browser/ui/views/frame/multi_contents_drop_target_view.cc
 +++ b/chrome/browser/ui/views/frame/multi_contents_drop_target_view.cc
-@@ -41,11 +41,9 @@
+@@ -42,11 +42,9 @@
 
 namespace {
 
@@ -453,7 +457,7 @@
 
 }  // namespace
 
-@@ -60,7 +58,6 @@ MultiContentsDropTargetView::MultiConten
+@@ -61,19 +59,12 @@ MultiContentsDropTargetView::MultiConten
       ->SetOrientation(views::LayoutOrientation::kVertical)
       .SetMainAxisAlignment(views::LayoutAlignment::kCenter)
       .SetCrossAxisAlignment(views::LayoutAlignment::kCenter)
@@ -461,39 +465,46 @@
       .SetDefault(
           views::kFlexBehaviorKey,
           views::FlexSpecification(views::MinimumFlexSizeRule::kScaleToZero,
-@@ -68,9 +65,6 @@ MultiContentsDropTargetView::MultiConten
+                                    views::MaximumFlexSizeRule::kUnbounded));
 
   auto inner_container = std::make_unique<views::View>();
+-  inner_container->SetPaintToLayer(ui::LAYER_SOLID_COLOR);
+-  inner_container->layer()->SetName(
+-      "MultiContentsDropTargetView/InnerContainer");
+-  inner_container->layer()->SetRoundedCornerRadius(
+-      gfx::RoundedCornersF(kInnerCornerRadius));
+-  inner_container->layer()->SetIsFastRoundedCorner(true);
 
-  inner_container->SetBackground(views::CreateRoundedRectBackground(
-      ui::kColorSysSurface3, kInnerCornerRadius));
-
   inner_container_layout_ =
       &inner_container->SetLayoutManager(std::make_unique<views::FlexLayout>())
-            ->SetOrientation(views::LayoutOrientation::kVertical)
-@@ -263,7 +257,7 @@ bool MultiContentsDropTargetView::Should
+@@ -92,13 +83,13 @@ MultiContentsDropTargetView::MultiConten
+   icon_view_->SetPaintToLayer(ui::LAYER_TEXTURED);
+   icon_view_->layer()->SetFillsBoundsOpaquely(false);
+   icon_view_->SetImage(ui::ImageModel::FromVectorIcon(
+-      kAddCircleIcon, ui::kColorSysPrimary, kIconSize));
+      kAddCircleIcon, ui::kColorMenuIcon, kIconSize));
+ 
+   label_ = inner_container->AddChildView(std::make_unique<views::Label>(
+       l10n_util::GetStringUTF16(IDS_SPLIT_VIEW_DRAG_ENTRYPOINT_LABEL)));
+   label_->SetPaintToLayer(ui::LAYER_TEXTURED);
+   label_->layer()->SetFillsBoundsOpaquely(false);
+-  label_->SetEnabledColor(ui::kColorSysPrimary);
+  label_->SetEnabledColor(ui::kColorMenuIcon);
+   label_->SetElideBehavior(gfx::NO_ELIDE);
+   label_->SetSubpixelRenderingEnabled(false);
+ 
+@@ -279,8 +270,6 @@ void MultiContentsDropTargetView::Disabl
+ 
 void MultiContentsDropTargetView::OnThemeChanged() {
   views::View::OnThemeChanged();
-   const SkColor primary_color =
-      GetColorProvider()->GetColor(ui::kColorSysPrimary);
-+      GetColorProvider()->GetColor(ui::kColorMenuIcon);
-   const ui::ImageModel icon_image_model =
-       ui::ImageModel::FromVectorIcon(kAddCircleIcon, primary_color, kIconSize);
-   icon_view_->SetImage(icon_image_model);
--- a/components/omnibox/common/omnibox_features.cc
-+++ b/components/omnibox/common/omnibox_features.cc
-@@ -386,7 +386,7 @@ BASE_FEATURE(kPreconnectNonSearchOmnibox
- // "invisible focus".
- BASE_FEATURE(kOmniboxRestoreInvisibleFocusOnly,
-              "OmniboxRestoreInvisibleFocusOnly",
-             DISABLED);
-+             ENABLED);
+-  inner_container_->layer()->SetColor(
+-      GetColorProvider()->GetColor(ui::kColorSysSurface3));
+ }
 
- // Enabls adding an aim shortcut in the typed state.
- BASE_FEATURE(kOmniboxAimShortcutTypedState,
+ bool MultiContentsDropTargetView::GetDropFormats(
 --- a/chrome/browser/ui/views/frame/browser_view_layout.cc
 +++ b/chrome/browser/ui/views/frame/browser_view_layout.cc
-@@ -872,27 +872,6 @@ void BrowserViewLayout::LayoutContentsCo
+@@ -874,27 +874,6 @@ void BrowserViewLayout::LayoutContentsCo
                           !layout_result.side_panel_right_aligned);
     left_aligned_side_panel_separator_->SetBoundsRect(
         layout_result.separator_bounds);
@@ -523,15 +534,15 @@
 
 --- a/chrome/browser/ui/views/frame/browser_view.cc
 +++ b/chrome/browser/ui/views/frame/browser_view.cc
-@@ -132,7 +132,6 @@
+@@ -136,7 +136,6 @@
 #include "chrome/browser/ui/views/frame/multi_contents_view.h"
 #include "chrome/browser/ui/views/frame/multi_contents_view_delegate.h"
 #include "chrome/browser/ui/views/frame/multi_contents_view_drop_target_controller.h"
 -#include "chrome/browser/ui/views/frame/multi_contents_view_mini_toolbar.h"
- #include "chrome/browser/ui/views/frame/native_browser_frame.h"
 #include "chrome/browser/ui/views/frame/scrim_view.h"
 #include "chrome/browser/ui/views/frame/tab_modal_dialog_host.h"
-@@ -2356,12 +2355,6 @@ void BrowserView::UpdateToolbar(content:
+ #include "chrome/browser/ui/views/frame/tab_strip_region_view.h"
+@@ -2209,12 +2208,6 @@ void BrowserView::UpdateToolbar(content:
   if (toolbar_) {
     toolbar_->Update(contents);
   }
@@ -614,17 +625,17 @@
 
 --- a/chrome/browser/ui/browser_commands.cc
 +++ b/chrome/browser/ui/browser_commands.cc
-@@ -498,8 +498,12 @@ void ReloadInternal(Browser* browser,
-       browser->tab_strip_model()->GetActiveWebContents();
+@@ -499,8 +499,12 @@ void ReloadInternal(BrowserWindowInterfa
+   WebContents* const active_contents = tab_strip_model->GetActiveWebContents();
 
   std::vector<WebContents*> tabs_to_reload;
 +  const bool only_active_split_tab_selected =
-+      browser->tab_strip_model()->IsActiveTabSplit() &&
-+      browser->tab_strip_model()->selection_model().size() == 2;
+      browser->GetTabStripModel()->IsActiveTabSplit() &&
+      browser->GetTabStripModel()->selection_model().size() == 2;
 
 -  if (base::FeatureList::IsEnabled(features::kReloadSelectionModel)) {
-+  if (base::FeatureList::IsEnabled(features::kReloadSelectionModel)
-+      || only_active_split_tab_selected) {
-     tabs_to_reload.push_back(
-         browser->tab_strip_model()->GetActiveWebContents());
+  if (base::FeatureList::IsEnabled(features::kReloadSelectionModel) ||
+        only_active_split_tab_selected) {
+     tabs_to_reload.push_back(active_contents);
   } else {
+     // Reloading a tab may change the selection (see crbug.com/339061099), so
--- a/patches/helium/core/spoof-extension-downloader-platform.patch
+++ b/patches/helium/core/spoof-extension-downloader-platform.patch
@@ -1,6 +1,6 @@
 --- a/components/update_client/update_query_params.h
 +++ b/components/update_client/update_query_params.h
-@@ -18,7 +18,7 @@ class UpdateQueryParamsDelegate;
+@@ -19,7 +19,7 @@ class UpdateQueryParamsDelegate;
 // browser process.
 class UpdateQueryParams {
  public:
@@ -11,7 +11,7 @@
   UpdateQueryParams(const UpdateQueryParams&) = delete;
 --- a/components/update_client/update_query_params.cc
 +++ b/components/update_client/update_query_params.cc
-@@ -68,7 +68,7 @@ const char kArch[] =
+@@ -68,7 +68,7 @@ constexpr std::string_view kArch =
 #error "unknown arch"
 #endif
 
@@ -41,7 +41,7 @@
       return kWebView;
 --- a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
 +++ b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
-@@ -43,7 +43,7 @@ ChromeExtensionDownloaderFactory::Create
+@@ -46,7 +46,7 @@ ChromeExtensionDownloaderFactory::Create
   }
 #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
   std::string manifest_query_params =
@@ -52,7 +52,7 @@
   if (command_line->HasSwitch(extensions::kSwitchTestRequestParam)) {
 --- a/chrome/browser/extensions/webstore_installer.cc
 +++ b/chrome/browser/extensions/webstore_installer.cc
-@@ -209,7 +209,7 @@ GURL WebstoreInstaller::GetWebstoreInsta
+@@ -212,7 +212,7 @@ GURL WebstoreInstaller::GetWebstoreInsta
   GURL url(
       url_string + "?response=redirect&" +
       update_client::UpdateQueryParams::Get(
--- a/patches/helium/core/ublock-helium-services.patch
+++ b/patches/helium/core/ublock-helium-services.patch
@@ -57,7 +57,7 @@
 #endif  // COMPONENTS_HELIUM_SERVICES_PREF_NAMES_H_
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -368,6 +368,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -369,6 +369,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
       settings_api::PrefType::kBoolean;
   (*s_allowlist)[::prefs::kHeliumUpdateFetchingEnabled] =
       settings_api::PrefType::kBoolean;
@@ -68,7 +68,7 @@
   (*s_allowlist)[::prefs::kHeliumServicesConsented] =
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -216,6 +216,7 @@ void RegisterBrowserUserPrefs(user_prefs
+@@ -220,6 +220,7 @@ void RegisterBrowserUserPrefs(user_prefs
     registry->RegisterBooleanPref(prefs::kHeliumDidOnboarding, false);
     registry->RegisterBooleanPref(prefs::kHeliumServicesConsented, false);
     registry->RegisterBooleanPref(prefs::kHeliumUpdateFetchingEnabled, true);
@@ -96,7 +96,7 @@
 #include "components/policy/core/common/policy_pref_names.h"
 #include "components/supervised_user/core/browser/supervised_user_preferences.h"
 #include "content/public/browser/browser_thread.h"
-@@ -199,6 +203,7 @@ ExtensionService::ExtensionService(
+@@ -205,6 +209,7 @@ ExtensionService::ExtensionService(
       ready_(ready),
       updater_(ExtensionUpdater::Get(profile)),
       component_loader_(ComponentLoader::Get(profile_)),
@@ -104,7 +104,7 @@
       error_controller_(error_controller),
       external_install_manager_(ExternalInstallManager::Get(profile)),
       extension_registrar_delegate_(
-@@ -272,6 +277,33 @@ ExtensionService::ExtensionService(
+@@ -278,6 +283,33 @@ ExtensionService::ExtensionService(
       prefs::kExtensionsUIDeveloperMode,
       base::BindRepeating(&ExtensionService::OnDeveloperModePrefChanged,
                           base::Unretained(this)));
@@ -217,7 +217,7 @@
                 if ( bin.assetSourceRegistry instanceof Object ) {
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -1955,6 +1955,12 @@
+@@ -1963,6 +1963,12 @@
   <message name="IDS_SETTINGS_HELIUM_SERVICES_UPDATE_DESCRIPTION" desc="Description of the toggle for automatic update downloads">
     Helium will automatically download and install browser updates as they become available. We recommend keeping this setting enabled to ensure you get the latest security patches and features.
   </message>
@@ -232,7 +232,7 @@
   </message>
 --- a/chrome/browser/resources/settings/privacy_page/services_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/services_page.html
-@@ -68,6 +68,11 @@
+@@ -69,6 +69,11 @@
                     sub-label="$i18n{heliumUpdatesToggleDescription}">
                 </settings-toggle-button>
             </if>
@@ -246,7 +246,7 @@
     </template>
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1973,6 +1973,10 @@ void AddPrivacyStrings(content::WebUIDat
+@@ -1987,6 +1987,10 @@ void AddPrivacyStrings(content::WebUIDat
         IDS_SETTINGS_HELIUM_SERVICES_UPDATE},
       {"heliumUpdatesToggleDescription",
         IDS_SETTINGS_HELIUM_SERVICES_UPDATE_DESCRIPTION},
--- a/patches/helium/core/ublock-install-as-component.patch
+++ b/patches/helium/core/ublock-install-as-component.patch
@@ -31,7 +31,7 @@
   void AddChromeApp();
 --- a/chrome/browser/extensions/component_loader.cc
 +++ b/chrome/browser/extensions/component_loader.cc
-@@ -57,6 +57,7 @@
+@@ -58,6 +58,7 @@
 #include "ui/accessibility/accessibility_features.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -39,7 +39,7 @@
 
 #if BUILDFLAG(IS_CHROMEOS)
 #include "ash/constants/ash_features.h"
-@@ -429,6 +430,21 @@ void ComponentLoader::AddWebStoreApp() {
+@@ -430,6 +431,21 @@ void ComponentLoader::AddWebStoreApp() {
       l10n_util::GetStringUTF8(IDS_WEBSTORE_APP_DESCRIPTION));
 }
 
@@ -61,7 +61,7 @@
 #if BUILDFLAG(IS_CHROMEOS)
 void ComponentLoader::AddChromeApp() {
   AddWithNameAndDescription(
-@@ -506,6 +522,7 @@ void ComponentLoader::AddDefaultComponen
+@@ -507,6 +523,7 @@ void ComponentLoader::AddDefaultComponen
 
   if (!skip_session_components) {
     AddWebStoreApp();
@@ -71,18 +71,19 @@
 #endif  // BUILDFLAG(IS_CHROMEOS)
 --- a/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
 +++ b/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
-@@ -15,8 +15,10 @@
+@@ -15,9 +15,11 @@
 #include "chrome/common/buildflags.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/grit/browser_resources.h"
 +#include "components/helium_services/extension_ids.h"
+ #include "extensions/buildflags/buildflags.h"
 #include "extensions/common/constants.h"
 #include "printing/buildflags/buildflags.h"
 +#include "third_party/ublock/resources/grit/ublock_resources.h"
 
 #if BUILDFLAG(IS_CHROMEOS)
 #include "ash/keyboard/ui/grit/keyboard_resources.h"
-@@ -31,6 +33,7 @@ bool IsComponentExtensionAllowlisted(con
+@@ -34,6 +36,7 @@ bool IsComponentExtensionAllowlisted(con
   constexpr auto kAllowed = base::MakeFixedFlatSet<std::string_view>({
       extension_misc::kInAppPaymentsSupportAppId,
       extension_misc::kPdfExtensionId,
@@ -90,7 +91,7 @@
 #if BUILDFLAG(IS_CHROMEOS)
       extension_misc::kAssessmentAssistantExtensionId,
       extension_misc::kAccessibilityCommonExtensionId,
-@@ -86,6 +89,7 @@ bool IsComponentExtensionAllowlisted(int
+@@ -89,6 +92,7 @@ bool IsComponentExtensionAllowlisted(int
     case IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST_MV3:
     case IDR_READING_MODE_GDOCS_HELPER_MANIFEST:
     case IDR_WEBSTORE_MANIFEST:
--- a/patches/helium/core/ublock-migrate-prefs.patch
+++ b/patches/helium/core/ublock-migrate-prefs.patch
@@ -18,7 +18,7 @@
 #include "extensions/browser/delayed_install_manager.h"
 #include "extensions/browser/disable_reason.h"
 #include "extensions/browser/extension_file_task_runner.h"
-@@ -248,7 +252,85 @@ void ChromeExtensionRegistrarDelegate::P
+@@ -251,7 +255,85 @@ void ChromeExtensionRegistrarDelegate::P
     }
   }
 
--- a/patches/helium/core/ublock-reconfigure-defaults.patch
+++ b/patches/helium/core/ublock-reconfigure-defaults.patch
@@ -21,7 +21,7 @@
            location <= mojom::ManifestLocation::kMaxValue;
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -6321,7 +6321,8 @@ void AddChromeSchemeFactories(
+@@ -6264,7 +6264,8 @@ void AddChromeSchemeFactories(
   std::vector<std::string> allowed_webui_hosts;
   // Support for chrome:// scheme if appropriate.
   if ((extension->is_extension() || extension->is_platform_app()) &&
@@ -104,7 +104,7 @@
     auto& context_permissions = GetContextPermissions(*context_id_);
 --- a/chrome/browser/extensions/extension_util.cc
 +++ b/chrome/browser/extensions/extension_util.cc
-@@ -186,7 +186,8 @@ void SetIsIncognitoEnabled(const std::st
+@@ -189,7 +189,8 @@ void SetIsIncognitoEnabled(const std::st
 #if !BUILDFLAG(IS_ANDROID)
     // TODO(treib,kalman): Should this be Manifest::IsComponentLocation(..)?
     // (which also checks for kExternalComponent).
@@ -116,8 +116,8 @@
       // See http://crbug.com/112290 and associated CLs for the sordid history.
 --- a/chrome/browser/extensions/standard_management_policy_provider.cc
 +++ b/chrome/browser/extensions/standard_management_policy_provider.cc
-@@ -27,6 +27,14 @@ namespace {
- bool AdminPolicyIsModifiable(const Extension* source_extension,
+@@ -29,6 +29,14 @@ bool AdminPolicyIsModifiable(ExtensionMa
+                              const Extension* source_extension,
                              const Extension* extension,
                              std::u16string* error) {
 +  bool is_u0 = Manifest::IsUBlockComponent(extension->id());
@@ -131,7 +131,7 @@
   // Component and force installed extensions can enable/disable all other
   // extensions including force installed ones (but component are off limits).
   const bool component_or_force_installed =
-@@ -239,6 +247,11 @@ bool StandardManagementPolicyProvider::M
+@@ -257,6 +265,11 @@ bool StandardManagementPolicyProvider::M
     const Extension* extension,
     std::u16string* error) const {
   ManagedInstallationMode mode = settings_->GetInstallationMode(extension);
@@ -205,7 +205,7 @@
                              user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterListPref(pref_names::kDeletedComponentExtensions);
   registry->RegisterDictionaryPref(kExtensionsBlocklistUpdate);
-@@ -2289,14 +2301,14 @@ bool ExtensionPrefs::GetUserExtensionPre
+@@ -2295,14 +2307,14 @@ bool ExtensionPrefs::GetUserExtensionPre
     ExtensionIdContainer* id_container_out) const {
   DCHECK(id_container_out->empty());
 
--- a/patches/helium/core/ublock-setup-sources.patch
+++ b/patches/helium/core/ublock-setup-sources.patch
@@ -93,7 +93,7 @@
 +  ))
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
-@@ -196,7 +196,7 @@
+@@ -202,7 +202,7 @@
     "META": {"sizes": {"includes": [500]}},
     "includes": [2850],
   },
@@ -104,7 +104,7 @@
   },
 --- a/chrome/browser/extensions/BUILD.gn
 +++ b/chrome/browser/extensions/BUILD.gn
-@@ -602,6 +602,7 @@ source_set("extensions") {
+@@ -599,6 +599,7 @@ source_set("extensions") {
     "//net:extras",
     "//services/metrics/public/cpp:ukm_builders",
     "//storage/browser",
@@ -132,7 +132,7 @@
     ]
 --- a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
 +++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
-@@ -24,6 +24,7 @@
+@@ -25,6 +25,7 @@
 #include "extensions/common/extension_id.h"
 #include "pdf/buildflags.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -140,7 +140,7 @@
 
 #if BUILDFLAG(IS_CHROMEOS)
 #include "ash/keyboard/ui/resources/keyboard_resource_util.h"
-@@ -92,6 +93,7 @@ ChromeComponentExtensionResourceManager:
+@@ -95,6 +96,7 @@ ChromeComponentExtensionResourceManager:
 
   AddComponentResourceEntries(kComponentExtensionResources);
   AddComponentResourceEntries(kExtraComponentExtensionResources);
--- a/patches/helium/core/unbreak-chromium-link.patch
+++ b/patches/helium/core/unbreak-chromium-link.patch
@@ -1,6 +1,6 @@
 --- a/chrome/common/url_constants.h
 +++ b/chrome/common/url_constants.h
-@@ -198,7 +198,7 @@ inline constexpr char kChromeUIUntrusted
+@@ -193,7 +193,7 @@ inline constexpr char kChromeUIUntrusted
     "chrome-untrusted://new-tab-page/";
 
 // The URL for the Chromium project used in the About dialog.
--- a/patches/helium/core/update-credits.patch
+++ b/patches/helium/core/update-credits.patch
@@ -1,6 +1,6 @@
 --- a/tools/licenses/licenses.py
 +++ b/tools/licenses/licenses.py
-@@ -1069,8 +1069,8 @@ def GenerateCredits(file_template_file,
+@@ -1072,8 +1072,8 @@ def GenerateCredits(file_template_file,
   reciprocal_template = codecs.open(reciprocal_template_file,
                                     encoding='utf-8').read()
   reciprocal_contents = EvaluateTemplate(reciprocal_template, {
--- a/patches/helium/core/update-default-browser-prefs.patch
+++ b/patches/helium/core/update-default-browser-prefs.patch
@@ -9,7 +9,7 @@
 
 #if defined(USE_AURA)
   registry->RegisterBooleanPref(prefs::kOverscrollHistoryNavigationEnabled,
-@@ -146,7 +146,7 @@ void RegisterBrowserUserPrefs(user_prefs
+@@ -150,7 +150,7 @@ void RegisterBrowserUserPrefs(user_prefs
 
   // We need to register the type of these preferences in order to query
   // them even though they're only typically controlled via policy.
--- a/patches/helium/hop/setup.patch
+++ b/patches/helium/hop/setup.patch
@@ -8,7 +8,7 @@
 #include "components/policy/core/common/local_test_policy_provider.h"
 #include "components/policy/core/common/policy_logger.h"
 #include "components/policy/core/common/policy_map.h"
-@@ -278,6 +279,12 @@ void ChromeBrowserPolicyConnector::SetDe
+@@ -284,6 +285,12 @@ void ChromeBrowserPolicyConnector::SetDe
 std::vector<std::unique_ptr<policy::ConfigurationPolicyProvider>>
 ChromeBrowserPolicyConnector::CreatePolicyProviders() {
   auto providers = BrowserPolicyConnector::CreatePolicyProviders();
@@ -23,7 +23,7 @@
   if (platform_provider) {
 --- a/chrome/browser/policy/chrome_browser_policy_connector.h
 +++ b/chrome/browser/policy/chrome_browser_policy_connector.h
-@@ -109,6 +109,10 @@ class ChromeBrowserPolicyConnector : pub
+@@ -114,6 +114,10 @@ class ChromeBrowserPolicyConnector : pub
     return command_line_provider_;
   }
 
@@ -34,7 +34,7 @@
   // Set ProxyPolicyProvider for testing, caller needs to init and shutdown the
   // provider.
   void SetProxyPolicyProviderForTesting(
-@@ -183,6 +187,9 @@ class ChromeBrowserPolicyConnector : pub
+@@ -188,6 +192,9 @@ class ChromeBrowserPolicyConnector : pub
   // Owned by base class.
   raw_ptr<ConfigurationPolicyProvider> command_line_provider_ = nullptr;
 
@@ -187,7 +187,7 @@
         // Raise the priority of cloud machine policies only when the metapolicy
 --- a/chrome/browser/ui/webui/policy/policy_ui.cc
 +++ b/chrome/browser/ui/webui/policy/policy_ui.cc
-@@ -230,6 +230,7 @@ void CreateAndAddPolicyUIHtmlSource(Prof
+@@ -228,6 +228,7 @@ void CreateAndAddPolicyUIHtmlSource(Prof
         {"sourceCloudFromAsh", IDS_POLICY_SOURCE_CLOUD_FROM_ASH},
         {"sourceRestrictedManagedGuestSessionOverride",
          IDS_POLICY_SOURCE_RESTRICTED_MANAGED_GUEST_SESSION_OVERRIDE},
@@ -195,16 +195,16 @@
     };
 
     source->AddLocalizedStrings(kPolicyTestTypes);
--- a/components/policy/core/browser/policy_conversions.cc
-+++ b/components/policy/core/browser/policy_conversions.cc
-@@ -32,6 +32,7 @@ const webui::LocalizedString kPolicySour
-     {"cloud_from_ash", IDS_POLICY_SOURCE_CLOUD_FROM_ASH},
-     {"restrictedManagedGuestSessionOverride",
-      IDS_POLICY_SOURCE_RESTRICTED_MANAGED_GUEST_SESSION_OVERRIDE},
-+    {"hop", IDS_POLICY_SOURCE_HOP},
- };
+--- a/components/policy/core/browser/policy_conversions.h
+++ b/components/policy/core/browser/policy_conversions.h
+@@ -40,6 +40,7 @@ inline constexpr auto kPolicySources =
+         {"cloud_from_ash", IDS_POLICY_SOURCE_CLOUD_FROM_ASH},
+         {"restrictedManagedGuestSessionOverride",
+          IDS_POLICY_SOURCE_RESTRICTED_MANAGED_GUEST_SESSION_OVERRIDE},
+        {"hop", IDS_POLICY_SOURCE_HOP},
+     });
 
- const char kIdKey[] = "id";
+ inline constexpr char kIdKey[] = "id";
 --- a/components/policy_strings.grdp
 +++ b/components/policy_strings.grdp
@@ -687,6 +687,9 @@ Additional details:
--- a/patches/helium/settings/disable-safety-hub-page.patch
+++ b/patches/helium/settings/disable-safety-hub-page.patch
@@ -18,5 +18,5 @@
 -  if (visibility.safetyHub !== false) {
 +  if (visibility.safetyHub = false) {
     r.SAFETY_HUB = r.PRIVACY.createChild('/safetyCheck');
-     r.SAFETY_HUB.hasMigratedToPlugin = true;
   }
+ 
--- a/patches/helium/settings/fix-appearance-page.patch
+++ b/patches/helium/settings/fix-appearance-page.patch
@@ -21,7 +21,7 @@
   </message>
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -518,7 +518,7 @@ void AddAppearanceStrings(content::WebUI
+@@ -520,7 +520,7 @@ void AddAppearanceStrings(content::WebUI
        IDS_SETTINGS_ALLOW_SPLIT_VIEW_DRAG_AND_DROP},
       {"showTabGroupsInBookmarksBar",
        IDS_SETTINGS_SHOW_TAB_GROUPS_IN_BOOKMARKS_BAR},
@@ -30,7 +30,7 @@
       {"hoverCardTitle", IDS_SETTINGS_HOVER_CARD_TITLE},
       {"showHoverCardImages", IDS_SETTINGS_SHOW_HOVER_CARD_IMAGES},
       {"showHoverCardMemoryUsage", IDS_SETTINGS_SHOW_HOVER_CARD_MEMORY_USAGE},
-@@ -550,9 +550,7 @@ void AddAppearanceStrings(content::WebUI
+@@ -552,9 +552,7 @@ void AddAppearanceStrings(content::WebUI
       {"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
       {"useClassicTheme", IDS_SETTINGS_USE_CLASSIC_THEME},
 #endif
--- a/patches/helium/settings/fix-page-names.patch
+++ b/patches/helium/settings/fix-page-names.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/webui/cr_components/history/history_util.cc
 +++ b/chrome/browser/ui/webui/cr_components/history/history_util.cc
-@@ -50,7 +50,7 @@ content::WebUIDataSource* HistoryUtil::P
+@@ -51,7 +51,7 @@ content::WebUIDataSource* HistoryUtil::P
       {"foundSearchResults", IDS_HISTORY_FOUND_SEARCH_RESULTS},
       {"actorTaskTooltip", IDS_ACTOR_TASK},
       {"historyMenuButton", IDS_HISTORY_HISTORY_MENU_DESCRIPTION},
@@ -11,7 +11,7 @@
       {"loading", IDS_HISTORY_LOADING},
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1797,7 +1797,7 @@ void AddSyncControlsStrings(content::Web
+@@ -1811,7 +1811,7 @@ void AddSyncControlsStrings(content::Web
 void AddPeopleStrings(content::WebUIDataSource* html_source, Profile* profile) {
   static constexpr webui::LocalizedString kLocalizedStrings[] = {
       // Top level people strings:
--- a/patches/helium/settings/fix-text-on-cookies-page.patch
+++ b/patches/helium/settings/fix-text-on-cookies-page.patch
@@ -1,6 +1,6 @@
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -1900,6 +1900,9 @@
+@@ -1908,6 +1908,9 @@
   <message name="IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_TEXT" desc="The text of a confirmation dialog that confirms that the user want to send the 'Do Not Track' header">
     Enabling "Do Not Track" means that a request will be included with your browsing traffic. Any effect depends on whether a website responds to the request, and how the request is interpreted. For example, some websites may respond to this request by showing you ads that aren't based on other websites you've visited. Many websites will still collect and use your browsing data - for example to improve security, to provide content, services, ads and recommendations on their websites, and to generate reporting statistics.
   </message>
@@ -10,7 +10,7 @@
   <message name="IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_LEARN_MORE_ACCESSIBILITY_LABEL" desc="The accessibility label for a link to learn more about Do Not Track">
     Learn more about Do Not Track
   </message>
-@@ -3107,6 +3110,9 @@
+@@ -3144,6 +3147,9 @@
   <message name="IDS_SETTINGS_TRACKING_PROTECTION_SITES_ALLOWED_COOKIES_DESCRIPTION" desc="Description of the section on the Tracking Protection settings page that lets users manage which sites are allowed to use third-party cookies. Explains how to use a wildcard to create an exception for an entire domain.">
     Affects the sites listed here. Inserting “[*.]” before a domain name creates an exception for the entire domain. For example, adding “[*.]google.com” means that third-party cookies can also be active for mail.google.com, because it’s part of google.com.
   </message>
@@ -22,7 +22,7 @@
   </message>
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1945,7 +1945,7 @@ void AddPrivacyStrings(content::WebUIDat
+@@ -1959,7 +1959,7 @@ void AddPrivacyStrings(content::WebUIDat
       {"privacyPageMore", IDS_SETTINGS_PRIVACY_MORE},
       {"doNotTrack", IDS_SETTINGS_ENABLE_DO_NOT_TRACK},
       {"doNotTrackDialogTitle", IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_TITLE},
@@ -31,7 +31,7 @@
       {"doNotTrackDialogLearnMoreA11yLabel",
        IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_LEARN_MORE_ACCESSIBILITY_LABEL},
       // TODO(crbug.com/40122957): This string is no longer used. Remove.
-@@ -2642,7 +2642,7 @@ void AddSiteSettingsStrings(content::Web
+@@ -2668,7 +2668,7 @@ void AddSiteSettingsStrings(content::Web
       {"trackingProtectionSitesAllowedCookiesTitle",
        IDS_SETTINGS_TRACKING_PROTECTION_SITES_ALLOWED_COOKIES_TITLE},
       {"trackingProtectionSitesAllowedCookiesDescription",
--- a/patches/helium/settings/move-search-suggest.patch
+++ b/patches/helium/settings/move-search-suggest.patch
@@ -33,7 +33,7 @@
         it is alays selected but disabled. -->
 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts
 +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
-@@ -250,14 +250,6 @@ export class SettingsPersonalizationOpti
+@@ -256,14 +256,6 @@ export class SettingsPersonalizationOpti
   }
   // </if>
 
@@ -50,15 +50,13 @@
     window.location.href = url;
 --- a/chrome/browser/resources/settings/route.ts
 +++ b/chrome/browser/resources/settings/route.ts
-@@ -221,11 +221,6 @@ function createRoutes(): SettingsRoutes
+@@ -192,9 +192,6 @@ function createRoutes(): SettingsRoutes
+     }
     r.MANAGE_PROFILE = r.PEOPLE.createChild('/manageProfile');
-     r.MANAGE_PROFILE.hasMigratedToPlugin = true;
     // </if>
 -
 -    r.SYNC = r.PEOPLE.createChild('/syncSetup');
-    r.SYNC.hasMigratedToPlugin = true;
 -    r.SYNC_ADVANCED = r.SYNC.createChild('/syncSetup/advanced');
-    r.SYNC_ADVANCED.hasMigratedToPlugin = true;
   }
 
   if (visibility.ai !== false && loadTimeData.getBoolean('showAiPage')) {
--- a/patches/helium/settings/privacy-page-tweaks.patch
+++ b/patches/helium/settings/privacy-page-tweaks.patch
@@ -1,6 +1,6 @@
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -1913,6 +1913,12 @@
+@@ -1921,6 +1921,12 @@
   users to manage security settings">
     Security
   </message>
@@ -15,7 +15,7 @@
   </message>
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1950,9 +1950,9 @@ void AddPrivacyStrings(content::WebUIDat
+@@ -1964,9 +1964,9 @@ void AddPrivacyStrings(content::WebUIDat
        IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_LEARN_MORE_ACCESSIBILITY_LABEL},
       // TODO(crbug.com/40122957): This string is no longer used. Remove.
       {"permissionsPageTitle", IDS_SETTINGS_PERMISSIONS},
@@ -29,41 +29,41 @@
       {"heliumServicesSetupPendingText", IDS_SETTINGS_HELIUM_SERVICES_SETUP_PENDING_TEXT},
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-@@ -39,6 +39,7 @@
-             label="$i18n{clearBrowsingData}"
-             sub-label="$i18n{clearBrowsingDataDescription}"
-             on-click="onClearBrowsingDataClick_"></cr-link-row>
-+        <template is="dom-if" if="[[false]]">
-         <cr-link-row id="thirdPartyCookiesLinkRow"
-             start-icon="privacy:cookie"
-             class="hr" label="$i18n{thirdPartyCookiesLinkRowLabel}"
-@@ -49,6 +50,7 @@
-             on-click="onCookiesClick_"
-             role-description="$i18n{subpageArrowRoleDescription}">
-         </cr-link-row>
-+        </template>
-         <template is="dom-if" if="[[enableIncognitoTrackingProtections_]]">
-           <cr-link-row id="incognitoTrackingProtectionsLinkRow" class="hr"
-               start-icon="settings:visibility-off"
-@@ -73,16 +75,16 @@
-               role-description="$i18n{subpageArrowRoleDescription}">
-           </cr-link-row>
-         </template>
-        <cr-link-row id="securityLinkRow" start-icon="privacy:lock"
-            class="hr" label="$i18n{securityPageTitle}"
-            sub-label="$i18n{securityPageDescription}"
-            on-click="onSecurityPageClick_"
-            role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
-         <cr-link-row id="permissionsLinkRow" start-icon="privacy:page-info"
-             class="hr" label="$i18n{siteSettings}"
-             sub-label="$i18n{permissionsPageDescription}"
-             on-click="onPermissionsPageClick_"
-             role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
-+        <cr-link-row id="securityLinkRow" start-icon="privacy:lock"
-+            class="hr" label="$i18n{securityPageTitle}"
-+            sub-label="$i18n{securityPageDescription}"
-+            on-click="onSecurityPageClick_"
-+            role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
-         <cr-link-row id="heliumServicesLinkRow" start-icon="cr:chrome-product"
-             class="hr" label="$i18n{heliumServicesTitle}"
-             sub-label="$i18n{heliumServicesDescription}"
+@@ -23,6 +23,7 @@
+         label="$i18n{clearBrowsingData}"
+         sub-label="$i18n{clearBrowsingDataDescription}"
+         on-click="onClearBrowsingDataClick_"></cr-link-row>
+    <template is="dom-if" if="[[false]]">
+     <cr-link-row id="thirdPartyCookiesLinkRow"
+         start-icon="privacy:cookie"
+         class="hr" label="$i18n{thirdPartyCookiesLinkRowLabel}"
+@@ -33,6 +34,7 @@
+         on-click="onCookiesClick_"
+         role-description="$i18n{subpageArrowRoleDescription}">
+     </cr-link-row>
+    </template>
+     <template is="dom-if" if="[[enableIncognitoTrackingProtections_]]">
+       <cr-link-row id="incognitoTrackingProtectionsLinkRow" class="hr"
+           start-icon="settings:visibility-off"
+@@ -57,16 +59,16 @@
+           role-description="$i18n{subpageArrowRoleDescription}">
+       </cr-link-row>
+     </template>
+-    <cr-link-row id="securityLinkRow" start-icon="privacy:lock"
+-        class="hr" label="$i18n{securityPageTitle}"
+-        sub-label="$i18n{securityPageDescription}"
+-        on-click="onSecurityPageClick_"
+-        role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
+     <cr-link-row id="permissionsLinkRow" start-icon="privacy:page-info"
+         class="hr" label="$i18n{siteSettings}"
+         sub-label="$i18n{permissionsPageDescription}"
+         on-click="onPermissionsPageClick_"
+         role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
+    <cr-link-row id="securityLinkRow" start-icon="privacy:lock"
+        class="hr" label="$i18n{securityPageTitle}"
+        sub-label="$i18n{securityPageDescription}"
+        on-click="onSecurityPageClick_"
+        role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
+     <cr-link-row id="heliumServicesLinkRow" start-icon="cr:chrome-product"
+         class="hr" label="$i18n{heliumServicesTitle}"
+         sub-label="$i18n{heliumServicesDescription}"
--- a/patches/helium/settings/remove-autofill.patch
+++ b/patches/helium/settings/remove-autofill.patch
@@ -1,11 +1,23 @@
 --- a/chrome/browser/resources/settings/settings_menu/settings_menu.html
 +++ b/chrome/browser/resources/settings/settings_menu/settings_menu.html
-@@ -57,13 +57,6 @@
+@@ -57,25 +57,6 @@
           $i18n{peoplePageTitle}
           <cr-ripple></cr-ripple>
         </a>
+-        <a role="menuitem" id="yourSavedInfo" href="/yourSavedInfo"
+-            hidden="[[!showYourSavedInfoPageMenuItem_(
+-                enableYourSavedInfoSettingsPage_,
+-                pageVisibility_.yourSavedInfo)]]"
+-            class="cr-nav-menu-item">
+-          <cr-icon icon="settings:assignment"></cr-icon>
+-          $i18n{yourSavedInfoPageTitle}
+-          <cr-ripple></cr-ripple>
+-        </a>
 -        <a role="menuitem" id="autofill" href="/autofill"
-            hidden="[[!pageVisibility_.autofill]]"
+-            hidden="[[!showAutofillPageMenuItem_(
+-                enableYourSavedInfoSettingsPage_,
+-                pageVisibility_.autofill)]]"
+-            on-click="onAutofillClick_"
 -            class="cr-nav-menu-item">
 -          <cr-icon icon="settings:assignment"></cr-icon>
 -          $i18n{autofillPageTitle}
@@ -16,15 +28,15 @@
             class="cr-nav-menu-item">
 --- a/chrome/browser/resources/settings/route.ts
 +++ b/chrome/browser/resources/settings/route.ts
-@@ -260,7 +260,7 @@ function createRoutes(): SettingsRoutes
-     r.FONTS.hasMigratedToPlugin = true;
+@@ -223,7 +223,7 @@ function createRoutes(): SettingsRoutes
+     r.FONTS = r.APPEARANCE.createChild('/fonts');
   }
 
 -  if (visibility.autofill !== false) {
 +  if (visibility.autofill = false) {
     r.AUTOFILL = r.BASIC.createSection(
         '/autofill', 'autofill', loadTimeData.getString('autofillPageTitle'));
-     r.AUTOFILL.hasMigratedToPlugin = true;
+     r.PAYMENTS = r.AUTOFILL.createChild('/payments');
 --- a/chrome/browser/resources/settings/settings_main/settings_main.html
 +++ b/chrome/browser/resources/settings/settings_main/settings_main.html
@@ -78,7 +78,7 @@
--- a/patches/helium/settings/remove-dead-imports.patch
+++ b/patches/helium/settings/remove-dead-imports.patch
@@ -35,8 +35,8 @@
 import './privacy_page/security_keys_subpage.js';
 import './privacy_page/security_page_v2.js';
 import './privacy_page/security_page.js';
-@@ -62,15 +44,10 @@ import './site_settings/site_details.js'
- import './site_settings/web_applications_page.js';
+@@ -93,15 +75,10 @@ import './site_settings/web_printing_pag
+ import './site_settings/window_management_page.js';
 import './site_settings/zoom_levels.js';
 // <if expr="not is_chromeos">
 -import './a11y_page/live_caption_section.js';
@@ -51,7 +51,7 @@
 // Sections
 import './a11y_page/a11y_page_index.js';
 import './downloads_page/downloads_page.js';
-@@ -113,39 +90,8 @@ export {SettingsA11yPageElement, ToastAl
+@@ -144,39 +121,8 @@ export {SettingsA11yPageElement, ToastAl
 // <if expr="is_win or is_linux or is_macosx">
 export {SettingsAxAnnotationsSectionElement} from './a11y_page/ax_annotations_section.js';
 // </if>
@@ -91,7 +91,7 @@
 // <if expr="not is_chromeos">
 export {SettingsClearBrowsingDataAccountIndicator} from './clear_browsing_data_dialog/clear_browsing_data_account_indicator.js';
 // </if>
-@@ -154,7 +100,6 @@ export {SettingsClearBrowsingDataDialogE
+@@ -185,7 +131,6 @@ export {SettingsClearBrowsingDataDialogE
 export {getDataTypePrefName, SettingsClearBrowsingDataDialogV2Element} from './clear_browsing_data_dialog/clear_browsing_data_dialog_v2.js';
 export {getTimePeriodString, SettingsClearBrowsingDataTimePicker} from './clear_browsing_data_dialog/clear_browsing_data_time_picker.js';
 export {SettingsHistoryDeletionDialogElement} from './clear_browsing_data_dialog/history_deletion_dialog.js';
@@ -99,7 +99,7 @@
 export {SettingsPasswordsDeletionDialogElement} from './clear_browsing_data_dialog/passwords_deletion_dialog.js';
 export {ControlledButtonElement} from './controls/controlled_button.js';
 export {SettingsCheckboxElement} from './controls/settings_checkbox.js';
-@@ -174,17 +119,12 @@ export {kMenuCloseDelay, SettingsLanguag
+@@ -205,17 +150,12 @@ export {kMenuCloseDelay, SettingsLanguag
 export {LanguageSettingsActionType, LanguageSettingsMetricsProxy, LanguageSettingsMetricsProxyImpl, LanguageSettingsPageImpressionType} from './languages_page/languages_settings_metrics_proxy.js';
 export {LanguageHelper, LanguagesModel} from './languages_page/languages_types.js';
 export {SettingsSpellCheckPageElement} from './languages_page/spell_check_page.js';
@@ -117,7 +117,7 @@
 export {NetworkPredictionOptions} from './performance_page/constants.js';
 export {SettingsAntiAbusePageElement} from './privacy_page/anti_abuse_page.js';
 export {SettingsCollapseRadioButtonElement} from './privacy_page/collapse_radio_button.js';
-@@ -194,16 +134,6 @@ export {SettingsDoNotTrackToggleElement}
+@@ -225,16 +165,6 @@ export {SettingsDoNotTrackToggleElement}
 export {FINGERPRINT_CHECK_DARK_URL, FINGERPRINT_CHECK_LIGHT_URL, FINGERPRINT_SCANNED_ICON_DARK, FINGERPRINT_SCANNED_ICON_LIGHT, FingerprintProgressArcElement, PROGRESS_CIRCLE_BACKGROUND_COLOR_DARK, PROGRESS_CIRCLE_BACKGROUND_COLOR_LIGHT, PROGRESS_CIRCLE_FILL_COLOR_DARK, PROGRESS_CIRCLE_FILL_COLOR_LIGHT} from './privacy_page/fingerprint_progress_arc.js';
 export {IncognitoTrackingProtectionsPageElement} from './privacy_page/incognito_tracking_protections_page.js';
 export {SettingsPersonalizationOptionsElement} from './privacy_page/personalization_options.js';
@@ -134,7 +134,7 @@
 export {SecureDnsResolverType, SettingsSecureDnsElement} from './privacy_page/secure_dns.js';
 export {SecureDnsInputElement} from './privacy_page/secure_dns_input.js';
 export {BioEnrollDialogPage, SettingsSecurityKeysBioEnrollDialogElement} from './privacy_page/security_keys_bio_enroll_dialog.js';
-@@ -215,12 +145,6 @@ export {SecurityKeysSubpageElement} from
+@@ -246,12 +176,6 @@ export {SecurityKeysSubpageElement} from
 export {HttpsFirstModeSetting, SafeBrowsingSetting, SettingsSecurityPageElement} from './privacy_page/security_page.js';
 export {SettingsHeliumServicesPageElement} from './privacy_page/services_page.js';
 export {SecuritySettingsBundleSetting, SettingsSecurityPageV2Element} from './privacy_page/security_page_v2.js';
--- a/patches/helium/settings/remove-safety-hub-entry-points.patch
+++ b/patches/helium/settings/remove-safety-hub-entry-points.patch
@@ -18,9 +18,9 @@
   </template>
 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
 +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
-@@ -10,17 +10,10 @@
-   <settings-subpage page-title="$i18n{siteSettings}"
-       learn-more-url="$i18n{exceptionsLearnMoreURL}">
+@@ -11,17 +11,10 @@
+       learn-more-url="$i18n{exceptionsLearnMoreURL}"
+       route-path$="[[routePath]]">
     <template is="dom-if" if="[[showUnusedSitePermissions_]]">
 -      <div class="cr-row first">
 -        <h2>$i18n{safetyHub}</h2>
@@ -38,7 +38,7 @@
     <div class="cr-row first">
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page_index.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page_index.html
-@@ -22,22 +22,6 @@
+@@ -22,23 +22,6 @@
     </settings-section>
   </template>
 
@@ -53,11 +53,12 @@
 -        routes_.SAFETY_HUB, currentRoute, inSearchMode)]]">
 -      <!-- TODO(crbug.com/40267370): Make the page searchable.-->
 -      <settings-safety-hub-page slot="view" id="safetyHub" no-search
-          data-parent-view-id="safetyHubEntryPoint" prefs="{{prefs}}">
+-          data-parent-view-id="safetyHubEntryPoint" prefs="{{prefs}}"
+-          route-path$="[[routes_.SAFETY_HUB.path]]">
 -      </settings-safety-hub-page>
 -    </template>
 -  </template>
 -
-   <template is="dom-if" if="[[renderOldView_(currentRoute, inSearchMode)]]">
-     <!-- TODO(crbug.com/424223101): Remove <settings-basic-page> once all UIs
-         have been migrated to standalone views. -->
+   <template is="dom-if" if="[[renderPrivacyView_(currentRoute, inSearchMode)]]">
+     <settings-privacy-page slot="view" id="privacy" prefs="{{prefs}}"
+         route-path$="[[routes_.PRIVACY.path]]">
--- a/patches/helium/settings/update-search-suggest-text.patch
+++ b/patches/helium/settings/update-search-suggest-text.patch
@@ -1,6 +1,6 @@
 --- a/chrome/app/settings_chromium_strings.grdp
 +++ b/chrome/app/settings_chromium_strings.grdp
-@@ -348,6 +348,9 @@ Chromium understands forms better and ca
+@@ -306,6 +306,9 @@ Chromium understands forms better and ca
   <message name="IDS_SETTINGS_SUGGEST_PREF_DESC" desc="The description of the checkbox to enable/disable sending omnibox input to the user's default search engine to get additional suggestions.">
     When you type in the address bar or search box, Chromium sends what you type to your default search engine to get better suggestions. This is off in Incognito.
   </message>
@@ -12,7 +12,7 @@
   </message>
 --- a/chrome/app/shared_settings_strings.grdp
 +++ b/chrome/app/shared_settings_strings.grdp
-@@ -257,6 +257,9 @@
+@@ -248,6 +248,9 @@
   <message name="IDS_SETTINGS_SUGGEST_PREF" desc="The label of the checkbox to enable/disable sending omnibox input to the user's default search engine to get additional suggestions.">
     Improve search suggestions
   </message>
@@ -24,7 +24,7 @@
     Signed in to <ph name="EMAIL">$1<ex>abcd@google.com</ex></ph>
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1653,8 +1653,8 @@ void AddPersonalizationOptionsStrings(co
+@@ -1667,8 +1667,8 @@ void AddPersonalizationOptionsStrings(co
       {"enablePersonalizationLoggingDesc",
        IDS_SETTINGS_ENABLE_LOGGING_PREF_DESC},
       {"spellingDescription", IDS_SETTINGS_SPELLING_PREF_DESC},
--- a/patches/helium/ui/app-menu-model.patch
+++ b/patches/helium/ui/app-menu-model.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/toolbar/app_menu_model.cc
 +++ b/chrome/browser/ui/toolbar/app_menu_model.cc
-@@ -731,9 +731,6 @@ SaveAndShareSubMenuModel::SaveAndShareSu
+@@ -736,9 +736,6 @@ SaveAndShareSubMenuModel::SaveAndShareSu
     if (!sharing_hub::SharingIsDisabledByPolicy(browser->profile())) {
       AddItemWithStringIdAndVectorIcon(
           this, IDC_COPY_URL, IDS_APP_MENU_COPY_LINK, kLinkChromeRefreshIcon);
@@ -10,7 +10,7 @@
       AddItemWithStringIdAndVectorIcon(this, IDC_QRCODE_GENERATOR,
                                        IDS_APP_MENU_CREATE_QR_CODE,
                                        kQrCodeChromeRefreshIcon);
-@@ -877,23 +874,8 @@ void ToolsMenuModel::Build(Browser* brow
+@@ -882,23 +879,8 @@ void ToolsMenuModel::Build(Browser* brow
   AddItemWithStringIdAndVectorIcon(this, IDC_NAME_WINDOW, IDS_NAME_WINDOW,
                                    kNameWindowIcon);
 
@@ -34,7 +34,7 @@
   AddSeparator(ui::NORMAL_SEPARATOR);
 
   AddItemWithStringIdAndVectorIcon(this, IDC_PERFORMANCE, IDS_SHOW_PERFORMANCE,
-@@ -1739,22 +1721,8 @@ void AppMenuModel::Build() {
+@@ -1751,22 +1733,8 @@ void AppMenuModel::Build() {
   // Build (and, by extension, Init) should only be called once.
   DCHECK_EQ(0u, GetItemCount());
 
@@ -59,7 +59,7 @@
     AddSeparator(ui::NORMAL_SEPARATOR);
   }
 
-@@ -1781,32 +1749,6 @@ void AppMenuModel::Build() {
+@@ -1803,32 +1771,6 @@ void AppMenuModel::Build() {
 
   AddSeparator(ui::NORMAL_SEPARATOR);
 
@@ -92,7 +92,7 @@
   if (!browser_->profile()->IsOffTheRecord()) {
     auto recent_tabs_sub_menu =
         std::make_unique<RecentTabsSubMenuModel>(provider_, browser_);
-@@ -1828,7 +1770,7 @@ void AppMenuModel::Build() {
+@@ -1850,7 +1792,7 @@ void AppMenuModel::Build() {
         std::make_unique<BookmarkSubMenuModel>(this, browser_);
 
     AddSubMenuWithStringIdAndVectorIcon(
@@ -101,7 +101,7 @@
         bookmark_sub_menu_model_.get(), kBookmarksListsMenuIcon);
     SetElementIdentifierAt(GetIndexOfCommandId(IDC_BOOKMARKS_MENU).value(),
                            kBookmarksMenuItem);
-@@ -1845,23 +1787,10 @@ void AppMenuModel::Build() {
+@@ -1867,23 +1809,10 @@ void AppMenuModel::Build() {
         kTabGroupsMenuItem);
   }
 
@@ -129,7 +129,7 @@
 
   AddItemWithStringIdAndVectorIcon(this, IDC_CLEAR_BROWSING_DATA,
                                    IDS_CLEAR_BROWSING_DATA,
-@@ -1908,9 +1837,6 @@ void AppMenuModel::Build() {
+@@ -1930,9 +1859,6 @@ void AppMenuModel::Build() {
             lens::features::kLensOverlay));
   }
 
@@ -139,7 +139,7 @@
   CreateFindAndEditSubMenu();
 
   sub_menus_.push_back(
-@@ -1959,6 +1885,12 @@ void AppMenuModel::Build() {
+@@ -1981,6 +1907,12 @@ void AppMenuModel::Build() {
 #endif
 #endif
 
@@ -152,7 +152,7 @@
   AddItemWithStringIdAndVectorIcon(this, IDC_OPTIONS, IDS_SETTINGS,
                                    kSettingsMenuIcon);
 
-@@ -2057,35 +1989,22 @@ bool AppMenuModel::AddDefaultBrowserMenu
+@@ -2079,35 +2011,22 @@ bool AppMenuModel::AddDefaultBrowserMenu
   return false;
 }
 
@@ -204,7 +204,7 @@
 #if BUILDFLAG(IS_CHROMEOS)
 --- a/chrome/browser/ui/toolbar/app_menu_model.h
 +++ b/chrome/browser/ui/toolbar/app_menu_model.h
-@@ -278,6 +278,9 @@ class AppMenuModel : public ui::SimpleMe
+@@ -280,6 +280,9 @@ class AppMenuModel : public ui::SimpleMe
   // boolean indicating whether any menu items were added.
   bool AddDefaultBrowserMenuItems();
 
--- a/patches/helium/ui/app-menu-style.patch
+++ b/patches/helium/ui/app-menu-style.patch
@@ -9,7 +9,7 @@
     }
     const auto* const color_provider = view->GetColorProvider();
     cc::PaintFlags flags;
-@@ -1448,21 +1448,8 @@ void AppMenu::PopulateMenu(MenuItemView*
+@@ -1460,21 +1460,8 @@ void AppMenu::PopulateMenu(MenuItemView*
       PopulateMenu(item, model->GetSubmenuModelAt(i));
     }
 
@@ -31,7 +31,7 @@
         ProfileAttributesEntry* profile_attributes =
             GetProfileAttributesFromProfile(browser_->profile());
         if (profile_attributes &&
-@@ -1476,7 +1463,6 @@ void AppMenu::PopulateMenu(MenuItemView*
+@@ -1488,7 +1475,6 @@ void AppMenu::PopulateMenu(MenuItemView*
         break;
       }
       case IDC_UPGRADE_DIALOG: {
@@ -39,7 +39,7 @@
         if (const auto upgrade_substring_text = GetUpgradeDialogSubstringText();
             !upgrade_substring_text.empty()) {
           item->AddChildView(
-@@ -1496,18 +1482,6 @@ void AppMenu::PopulateMenu(MenuItemView*
+@@ -1508,18 +1494,6 @@ void AppMenu::PopulateMenu(MenuItemView*
         break;
       }
       case IDC_WEB_APP_UPGRADE_DIALOG: {
--- a/patches/helium/ui/bangs-ui.patch
+++ b/patches/helium/ui/bangs-ui.patch
@@ -51,7 +51,7 @@
   raw_ptr<HistoryQuickProvider> history_quick_provider_;
 --- a/components/omnibox/browser/autocomplete_controller.cc
 +++ b/components/omnibox/browser/autocomplete_controller.cc
-@@ -94,6 +94,7 @@
+@@ -93,6 +93,7 @@
 #include "components/optimization_guide/machine_learning_tflite_buildflags.h"
 #include "components/search_engines/search_engine_type.h"
 #include "components/search_engines/template_url.h"
@@ -59,7 +59,7 @@
 #include "components/search_engines/template_url_service.h"
 #include "components/search_engines/template_url_starter_pack_data.h"
 #include "components/strings/grit/components_strings.h"
-@@ -1929,7 +1930,21 @@ void AutocompleteController::UpdateKeywo
+@@ -1945,7 +1946,21 @@ void AutocompleteController::UpdateKeywo
           // - For contextual search matches, the description indicates the
           //   alternative UX because they're opened in the side panel.
           i->description = template_url->AdjustedShortNameForLocaleDirection();
@@ -152,15 +152,15 @@
   // deleted out from under us.
 --- a/chrome/browser/ui/views/location_bar/selected_keyword_view.cc
 +++ b/chrome/browser/ui/views/location_bar/selected_keyword_view.cc
-@@ -17,6 +17,7 @@
- #include "components/omnibox/browser/vector_icons.h"
+@@ -18,6 +18,7 @@
+ #include "components/omnibox/common/omnibox_features.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/search_engines/template_url_starter_pack_data.h"
 +#include "components/search_engines/template_url_bang_manager.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/vector_icons/vector_icons.h"
 #include "ui/accessibility/ax_enums.mojom.h"
-@@ -114,6 +115,14 @@ void SelectedKeywordView::SetCustomImage
+@@ -115,6 +116,14 @@ void SelectedKeywordView::SetCustomImage
   } else if (template_url && template_url->starter_pack_id() ==
                                  template_url_starter_pack_data::kAiMode) {
     vector_icon = &omnibox::kSearchSparkIcon;
@@ -177,27 +177,27 @@
              history_embeddings::GetFeatureParameters().omnibox_scoped &&
 --- a/chrome/browser/ui/views/omnibox/omnibox_suggestion_button_row_view.cc
 +++ b/chrome/browser/ui/views/omnibox/omnibox_suggestion_button_row_view.cc
-@@ -24,6 +24,7 @@
+@@ -24,6 +24,8 @@
 #include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/omnibox/browser/vector_icons.h"
 #include "components/omnibox/common/omnibox_feature_configs.h"
 +#include "components/search_engines/template_url_bang_manager.h"
+#include "components/search_engines/template_url_service.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/vector_icons/vector_icons.h"
 #include "third_party/metrics_proto/omnibox_event.pb.h"
-@@ -527,6 +528,27 @@ void OmniboxSuggestionButtonRowView::Upd
+@@ -520,6 +522,26 @@ void OmniboxSuggestionButtonRowView::Upd
       const auto names = SelectedKeywordView::GetKeywordLabelNames(
-           keyword,
+           match().associated_keyword,
           popup_view_->controller()->client()->GetTemplateURLService());
 +
 +      const gfx::VectorIcon* icon = &vector_icons::kSearchChromeRefreshIcon;
 +
-+      if (AutocompleteMatch* associated_keyword = match().associated_keyword.get();
-+          associated_keyword != nullptr) {
-+        TemplateURL* turl = associated_keyword->GetTemplateURL(
-+          popup_view_->controller()->client()->GetTemplateURLService(),
-+          false
-+        );
+      if (std::u16string associated_keyword = match().associated_keyword;
+          !associated_keyword.empty()) {
+        TemplateURLService* turl_service =
+            popup_view_->controller()->client()->GetTemplateURLService();
+        TemplateURL* turl = turl_service->GetTemplateURLForKeyword(associated_keyword);
 +        auto* bang_manager = Bangs::BangManager::GetInstance();
 +
 +        switch (bang_manager->GetCategoryForBang(turl ? turl->bang_id() : 0)) {
--- a/patches/helium/ui/bookmark-button-bg-fix.patch
+++ b/patches/helium/ui/bookmark-button-bg-fix.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/views/bookmarks/bookmark_button.cc
 +++ b/chrome/browser/ui/views/bookmarks/bookmark_button.cc
-@@ -59,7 +59,8 @@ BookmarkButtonBase::BookmarkButtonBase(P
+@@ -60,7 +60,8 @@ BookmarkButtonBase::BookmarkButtonBase(P
   SetImageLabelSpacing(
       GetLayoutConstant(BOOKMARK_BAR_BUTTON_IMAGE_LABEL_PADDING));
 
--- a/patches/helium/ui/center-window-on-launch.patch
+++ b/patches/helium/ui/center-window-on-launch.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/window_sizer/window_sizer.cc
 +++ b/chrome/browser/ui/window_sizer/window_sizer.cc
-@@ -339,9 +339,11 @@ gfx::Rect WindowSizer::GetDefaultWindowB
+@@ -347,9 +347,11 @@ gfx::Rect WindowSizer::GetDefaultWindowB
         static_cast<int>(work_area.width() / 2. - 1.5 * kWindowTilePixels);
   }
 #endif  // !BUILDFLAG(IS_MAC)
--- a/patches/helium/ui/clean-incognito-guest-ntp.patch
+++ b/patches/helium/ui/clean-incognito-guest-ntp.patch
@@ -34,7 +34,7 @@
 <!-- Lazy-load cr_elements to avoid performance penalty introduced by loading Polymer -->
 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
 +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
-@@ -238,7 +238,7 @@ void NTPResourceCache::CreateNewTabIncog
+@@ -241,7 +241,7 @@ void NTPResourceCache::CreateNewTabIncog
   DCHECK(profile_->HasAnyOffTheRecordProfile());
 
   replacements["incognitoTabDescription"] =
--- a/patches/helium/ui/clean-new-tab-page.patch
+++ b/patches/helium/ui/clean-new-tab-page.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/resources/new_tab_page/app.css
 +++ b/chrome/browser/resources/new_tab_page/app.css
-@@ -115,6 +115,7 @@ cr-most-visited {
+@@ -137,6 +137,7 @@ cr-most-visited {
   align-items: center;
   display: flex;
   flex-direction: column;
@@ -10,7 +10,7 @@
   padding-top: var(--ntp-one-google-bar-height);
 --- a/chrome/browser/resources/new_tab_page/app.html
 +++ b/chrome/browser/resources/new_tab_page/app.html
-@@ -1,109 +1,11 @@
+@@ -1,137 +1,11 @@
 -<!-- #html_wrapper_imports_start
 -import {nothing} from '//resources/lit/v3_0/lit.rollup.js';
 -#html_wrapper_imports_end -->
@@ -18,14 +18,28 @@
 -  ${this.lazyRender_ && this.microsoftModuleEnabled_ ? html`
 -    <iframe id="microsoftAuth" src="${this.microsoftAuthIframePath_}"></iframe>
 -  ` : ''}
-  ${this.lazyRender_ && this.oneGoogleBarEnabled_ ? html`
-    <div id="oneGoogleBarScrim" ?hidden="${!this.showBackgroundImage_}"
-        ?fixed="${this.scrolledToTop_}"></div>
-    <ntp-iframe id="oneGoogleBar" src="${this.oneGoogleBarIframePath_}"
-        ?hidden="${!this.oneGoogleBarLoaded_}"
-        allow="camera ${this.oneGoogleBarIframeOrigin_}; display-capture ${this.oneGoogleBarIframeOrigin_}"> <!-- presubmit: ignore-long-line -->
-    </ntp-iframe>
-  ` : ''}
+-  ${this.lazyRender_ && this.oneGoogleBarEnabled_ ?
+-    (
+-      this.ntpRealboxNextEnabled_ ?
+-        html`
+-        <div id="oneGoogleBarStackingContext">
+-          <div id="oneGoogleBarScrim" ?hidden="${!this.showBackgroundImage_}"
+-              ?fixed="${this.scrolledToTop_}"></div>
+-          <ntp-iframe id="oneGoogleBar" src="${this.oneGoogleBarIframePath_}"
+-              ?hidden="${!this.oneGoogleBarLoaded_}"
+-              allow="camera ${this.oneGoogleBarIframeOrigin_}; display-capture ${this.oneGoogleBarIframeOrigin_}"> <!-- presubmit: ignore-long-line -->
+-          </ntp-iframe>
+-        </div>
+-        ` :
+-        html`
+-        <div id="oneGoogleBarScrim" ?hidden="${!this.showBackgroundImage_}"
+-            ?fixed="${this.scrolledToTop_}"></div>
+-        <ntp-iframe id="oneGoogleBar" src="${this.oneGoogleBarIframePath_}"
+-            ?hidden="${!this.oneGoogleBarLoaded_}"
+-            allow="camera ${this.oneGoogleBarIframeOrigin_}; display-capture ${this.oneGoogleBarIframeOrigin_}"> <!-- presubmit: ignore-long-line -->
+-        </ntp-iframe>
+-        `
+-    ) : ''}
 -  <!-- TODO(crbug.com/40743294): Instead of ?hidden="${!this.logoEnabled_}" it would
 -       be nicer to use Lit's conditional rendering. However, that breaks
 -       StartupBrowserCreatorPickerNoParamsTest.ShowPickerWhenAlreadyLaunched on
@@ -33,20 +47,34 @@
 -  <ntp-logo id="logo" ?single-colored="${this.singleColoredLogo_}"
 -      .theme="${this.theme_}" ?hidden="${!this.logoEnabled_}">
 -  </ntp-logo>
+-  ${this.ntpRealboxNextEnabled_ && (this.dropdownIsVisible_ || this.showComposebox_) ? html`
+-    <div id="scrim"
+-        @click="${this.showComposebox_ && this.composeboxCloseByClickOutside_ ? this.onComposeboxClickOutside_ : nothing}"></div>
+-  ` : ''}
 -  <div id="searchboxContainer">
 -    <cr-searchbox id="searchbox" ?is-dark="${this.isThemeDark_()}"
+-        placeholder-text="$i18n{searchBoxPlaceholder}"
 -        ?color-source-is-baseline="${this.colorSourceIsBaseline}"
-        @open-composebox="${this.toggleComposebox_}"
+-        @open-composebox="${this.openComposebox_}"
 -        @open-lens-search="${this.onOpenLensSearch_}"
 -        @open-voice-search="${this.onOpenVoiceSearch_}" ?shown="${this.realboxShown_}"
 -        ?had-secondary-side="${this.realboxHadSecondarySide}"
 -        @had-secondary-side-changed="${this.onRealboxHadSecondarySideChanged_}"
 -        ?can-show-secondary-side="${this.realboxCanShowSecondarySide}"
 -        ?compose-button-enabled="${this.composeButtonEnabled}"
-        ?composebox-enabled="${this.composeboxEnabled}">
+-        ?composebox-enabled="${this.composeboxEnabled}"
+-        realbox-layout-mode="${this.realboxLayoutMode_}"
+-        ?ntp-realbox-next-enabled="${this.ntpRealboxNextEnabled_}"
+-        ?cycling-placeholders="${this.searchboxCyclingPlaceholders_}"
+-        @dropdown-visible-changed="${this.onDropdownVisibleChanged_}">
 -    </cr-searchbox>
 -    ${this.showComposebox_ ? html`
-      <ntp-composebox id="composebox" ?is_collapsible="false" @close-composebox="${this.closeComposebox_}">
+-      <ntp-composebox id="composebox" ?is_collapsible="false"
+-          ?ntp-realbox-next-enabled="${this.ntpRealboxNextEnabled_}"
+-          @composebox-initialized="${this.onComposeboxInitialized_}"
+-          @close-composebox="${this.closeComposebox_}"
+-          @composebox-dropdown-visible-changed="${this.onDropdownVisibleChanged_}"
+-          realbox-layout-mode="${this.realboxLayoutMode_}">
 -      </ntp-composebox>
 -    ` : ''}
 -    ${this.showLensUploadDialog_ ? html`
@@ -86,7 +114,7 @@
 -        </ntp-modules>
 -      `}
 -    ` : ''}
-    ${ (() => { switch (this.getBrowserPromoType_()) {
+-    ${ this.showBrowserPromo_ ? (() => { switch (this.browserPromoType_) {
 -     case "simple":
 -      return html`
 -        <individual-promos maxPromos="${this.browserPromoLimit_}">
@@ -101,7 +129,7 @@
 -      `;
 -     default:
 -      return '';
-    } })() }
+-    } })() : '' }
   ${!this.isFooterVisible_ ? html`
 -      <a id="backgroundImageAttribution"
 -          href="${this.backgroundImageAttributionUrl_}"
@@ -120,7 +148,7 @@
       <ntp-customize-buttons id="customizeButtons"
           ?modules-shown-to-user="${this.modulesShownToUser}"
           ?show-background-image="${this.showBackgroundImage_}"
-@@ -125,23 +27,3 @@ import {nothing} from '//resources/lit/v
+@@ -153,23 +27,3 @@ import {nothing} from '//resources/lit/v
   ` : ''}
   <div id="contentBottomSpacer"></div>
 </div>
@@ -128,9 +156,9 @@
 -  <ntp-voice-search-overlay @close="${this.onVoiceSearchOverlayClose_}">
 -  </ntp-voice-search-overlay>
 -` : ''}
-${this.showComposebox_ ? html`
-  <div id="composeboxScrim"
-       @click="${this.composeboxCloseByClickOutside_ ? this.onComposeboxClickOutside_ : nothing}"></div>
+-${!this.ntpRealboxNextEnabled_ && this.showComposebox_ ? html`
+-  <div id="scrim"
+-      @click="${this.composeboxCloseByClickOutside_ ? this.onComposeboxClickOutside_ : nothing}"></div>
 -` : ''}
 -<svg>
 -  <defs>
--- a/patches/helium/ui/enable-fluent-scrollbar.patch
+++ b/patches/helium/ui/enable-fluent-scrollbar.patch
@@ -1,11 +1,11 @@
 --- a/ui/native_theme/features/native_theme_features.cc
 +++ b/ui/native_theme/features/native_theme_features.cc
-@@ -46,7 +46,7 @@ BASE_FEATURE(kFluentScrollbar,
+@@ -37,7 +37,7 @@ BASE_FEATURE(kFluentScrollbar, base::FEA
+ // TODO(crbug.com/40280779): Right now this feature flag will force Fluent
+ // overlay scrollbars on. We have yet to decide how we will expose this feature
 // once it is complete.
- BASE_FEATURE(kFluentOverlayScrollbar,
-              "FluentOverlayScrollbar",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             base::FEATURE_ENABLED_BY_DEFAULT);
+-BASE_FEATURE(kFluentOverlayScrollbar, base::FEATURE_DISABLED_BY_DEFAULT);
+BASE_FEATURE(kFluentOverlayScrollbar, base::FEATURE_ENABLED_BY_DEFAULT);
 
 // When enabled, scrollbars flash only once when a page is loaded or when they
 // become visible on the viewport instead of flashing after every scroll update.
--- a/patches/helium/ui/fix-omnibox-tabs-icon.patch
+++ b/patches/helium/ui/fix-omnibox-tabs-icon.patch
@@ -1,6 +1,6 @@
 --- a/components/omnibox/browser/autocomplete_match.cc
 +++ b/components/omnibox/browser/autocomplete_match.cc
-@@ -654,7 +654,7 @@ const gfx::VectorIcon& AutocompleteMatch
+@@ -647,7 +647,7 @@ const gfx::VectorIcon& AutocompleteMatch
           case KEYWORD_MODE_STARTER_PACK_HISTORY:
             return vector_icons::kHistoryChromeRefreshIcon;
           case KEYWORD_MODE_STARTER_PACK_TABS:
--- a/patches/helium/ui/immersive-padding.patch
+++ b/patches/helium/ui/immersive-padding.patch
@@ -1,16 +0,0 @@
--- a/chrome/browser/ui/views/frame/immersive_mode_controller_mac.mm
-+++ b/chrome/browser/ui/views/frame/immersive_mode_controller_mac.mm
-@@ -239,11 +239,9 @@ gfx::Insets ImmersiveModeControllerMac::
-     right_left_inset = 66;
-   }
- 
-  // Without this +1 top inset the tabs sit 1px too high. I assume this is
-  // because in fullscreen there is no resize handle.
-   return browser_view_->frame()->GetFrameView()->CaptionButtonsOnLeadingEdge()
-             ? gfx::Insets::TLBR(1, right_left_inset, 0, 0)
-             : gfx::Insets::TLBR(1, 0, 0, right_left_inset);
-+             ? gfx::Insets::TLBR(0, right_left_inset, 0, 0)
-+             : gfx::Insets::TLBR(0, 0, 0, right_left_inset);
- }
- // LINT.ThenChange(//chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.mm:MacTabStripInsets)
- 
--- a/patches/helium/ui/location-bar.patch
+++ b/patches/helium/ui/location-bar.patch
@@ -76,7 +76,7 @@
 
 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
 +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
-@@ -227,7 +227,10 @@ LocationBarView::LocationBarView(Browser
+@@ -231,7 +231,10 @@ LocationBarView::LocationBarView(Browser
                  !v->GetOmniboxPopupView()->IsOpen();
         }));
     views::FocusRing::Get(this)->SetOutsetFocusRingDisabled(true);
@@ -88,7 +88,7 @@
 
 #if BUILDFLAG(OS_LEVEL_GEOLOCATION_PERMISSION_SUPPORTED)
     if (features::IsOsLevelGeolocationPermissionSupportEnabled()) {
-@@ -277,9 +280,9 @@ void LocationBarView::Init() {
+@@ -281,9 +284,9 @@ void LocationBarView::Init() {
       CONTEXT_OMNIBOX_PRIMARY, views::style::STYLE_PRIMARY);
 
   const gfx::FontList& omnibox_chip_font_list = typography_provider.GetFont(
@@ -100,7 +100,7 @@
 
   auto location_icon_view =
       std::make_unique<LocationIconView>(omnibox_chip_font_list, this, this);
-@@ -398,21 +401,11 @@ void LocationBarView::Init() {
+@@ -416,21 +419,11 @@ void LocationBarView::Init() {
     // first so that they appear on the left side of the icon container.
     // TODO(crbug.com/40835681): Improve the ordering heuristics for page action
     // icons and determine a way to handle simultaneous icon animations.
@@ -122,7 +122,7 @@
     if (!apps::features::ShouldShowLinkCapturingUX()) {
       params.types_enabled.push_back(PageActionIconType::kIntentPicker);
     }
-@@ -422,54 +415,8 @@ void LocationBarView::Init() {
+@@ -440,54 +433,8 @@ void LocationBarView::Init() {
     params.types_enabled.push_back(PageActionIconType::kZoom);
     params.types_enabled.push_back(PageActionIconType::kFileSystemAccess);
 
@@ -177,7 +177,7 @@
 
   if (browser_ && !is_popup_mode_) {
     params.types_enabled.push_back(PageActionIconType::kBookmarkStar);
-@@ -510,7 +457,7 @@ bool LocationBarView::IsInitialized() co
+@@ -538,7 +485,7 @@ void LocationBarView::OnPopupOpened() {
 
 int LocationBarView::GetBorderRadius() const {
   return ChromeLayoutProvider::Get()->GetCornerRadiusMetric(
@@ -186,7 +186,7 @@
 }
 
 std::unique_ptr<views::Background> LocationBarView::CreateRoundRectBackground(
-@@ -710,9 +657,9 @@ void LocationBarView::Layout(PassKey) {
+@@ -738,9 +685,9 @@ void LocationBarView::Layout(PassKey) {
   // TODO(manukh): Move constants to layout_constants.cc.
   // The padding between the left edges of the location bar and the LHS icon,
   // e.g. the page info icon, the google G icon, the selected suggestion icon.
@@ -198,7 +198,7 @@
 
   // Apply indentation to align the omnibox input icon and the text with those
   // of the suggestions in the popup. However, there are two exceptions where
-@@ -731,22 +678,22 @@ void LocationBarView::Layout(PassKey) {
+@@ -759,22 +706,22 @@ void LocationBarView::Layout(PassKey) {
                              !location_icon_view_->ShouldShowLabel() &&
                              !ShouldShowKeywordBubble();
   if (should_indent) {
@@ -225,7 +225,7 @@
   }
 
   LocationBarLayout leading_decorations(LocationBarLayout::Position::kLeftEdge,
-@@ -1235,7 +1182,7 @@ int LocationBarView::GetMinimumTrailingW
+@@ -1272,7 +1219,7 @@ int LocationBarView::GetMinimumTrailingW
 }
 
 gfx::Rect LocationBarView::GetLocalBoundsWithoutEndcaps() const {
@@ -234,8 +234,8 @@
   gfx::Rect bounds_without_endcaps(GetLocalBounds());
   bounds_without_endcaps.Inset(gfx::Insets::VH(0, border_radius));
   return bounds_without_endcaps;
-@@ -1249,9 +1196,9 @@ void LocationBarView::RefreshBackground(
-   const bool high_contrast = GetNativeTheme()->UserHasContrastPreference();
+@@ -1287,9 +1234,9 @@ void LocationBarView::RefreshBackground(
+                              ui::NativeTheme::PreferredContrast::kMore;
 
   const auto* const color_provider = GetColorProvider();
 -  SkColor normal = color_provider->GetColor(kColorLocationBarBackground);
@@ -257,7 +257,7 @@
 }
 
 bool LocationIconView::ShouldShowLabelAfterAnimation() const {
-@@ -372,7 +372,7 @@ void LocationIconView::Update(bool suppr
+@@ -367,7 +367,7 @@ void LocationIconView::Update(bool suppr
   // level.
   UpdateLabelColors();
 
@@ -266,7 +266,7 @@
     SetBackgroundColor(SK_ColorTRANSPARENT);
   }
 
-@@ -458,7 +458,7 @@ gfx::Size LocationIconView::GetMinimumSi
+@@ -453,7 +453,7 @@ gfx::Size LocationIconView::GetMinimumSi
 }
 
 void LocationIconView::SetBackgroundColor(SkColor color) {
--- a/patches/helium/ui/omnibox.patch
+++ b/patches/helium/ui/omnibox.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc
 +++ b/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc
-@@ -37,7 +37,7 @@
+@@ -42,7 +42,7 @@
 namespace {
 
 // Value from the spec controlling appearance of the shadow.
@@ -9,7 +9,7 @@
 
 #if !defined(USE_AURA)
 
-@@ -163,7 +163,9 @@ class TopBackgroundView : public views::
+@@ -168,7 +168,9 @@ class TopBackgroundView : public views::
     // not antialiased, since the goal is to completely cover the underlying
     // pixels, and AA would let those on the edge partly bleed through.
     SetBackground(location_bar_->CreateRoundRectBackground(
@@ -20,34 +20,25 @@
   }
 
 #if !defined(USE_AURA)
-@@ -216,7 +218,7 @@ END_METADATA
- // Insets used to position |contents_| within |contents_host_|.
- gfx::Insets GetContentInsets() {
-   return gfx::Insets::TLBR(
-      RoundedOmniboxResultsFrame::GetNonResultSectionHeight(), 0, 0, 0);
-+      RoundedOmniboxResultsFrame::GetNonResultSectionHeight() - 4, 0, 0, 0);
- }
- 
- }  // namespace
-@@ -233,8 +235,7 @@ RoundedOmniboxResultsFrame::RoundedOmnib
-   contents_host_->layer()->SetFillsBoundsOpaquely(false);
- 
-   // Use rounded corners.
+@@ -230,8 +232,7 @@ RoundedOmniboxResultsFrame::RoundedOmnib
+     LocationBarView* location_bar,
+     bool include_cutout)
+     : contents_(contents), include_cutout_(include_cutout) {
 -  const int corner_radius = views::LayoutProvider::Get()->GetCornerRadiusMetric(
 -      views::ShapeContextTokens::kOmniboxExpandedRadius);
 +  const int corner_radius = 12;
-   contents_host_->layer()->SetRoundedCornerRadius(
-       gfx::RoundedCornersF(corner_radius));
-   contents_host_->layer()->SetIsFastRoundedCorner(true);
-@@ -249,6 +250,7 @@ RoundedOmniboxResultsFrame::RoundedOmnib
+   // Host the contents in its own View to simplify layout and customization.
+   auto contents_host_builder =
+       views::Builder<views::View>()
+@@ -263,6 +264,7 @@ RoundedOmniboxResultsFrame::RoundedOmnib
       views::BubbleBorder::Shadow::STANDARD_SHADOW);
   border->set_rounded_corners(gfx::RoundedCornersF(corner_radius));
   border->set_md_shadow_elevation(kElevation);
 +  border->set_draw_border_stroke(true);
   SetBorder(std::move(border));
 
-   AddChildViewRaw(contents_host_.get());
-@@ -285,10 +287,10 @@ int RoundedOmniboxResultsFrame::GetNonRe
+   AddChildView(std::move(contents_host));
+@@ -300,10 +302,10 @@ int RoundedOmniboxResultsFrame::GetNonRe
 
 // static
 gfx::Insets RoundedOmniboxResultsFrame::GetLocationBarAlignmentInsets() {
@@ -60,9 +51,18 @@
 }
 
 // static
+@@ -378,7 +380,7 @@ void RoundedOmniboxResultsFrame::OnMouse
+ 
+ // Insets used to position |contents_| within |contents_host_|.
+ gfx::Insets RoundedOmniboxResultsFrame::GetContentInsets() {
+-  return gfx::Insets::TLBR(GetNonResultSectionHeight(include_cutout_), 0, 0, 0);
+  return gfx::Insets::TLBR(GetNonResultSectionHeight(include_cutout_) - 4, 0, 0, 0);
+ }
+ 
+ BEGIN_METADATA(RoundedOmniboxResultsFrame)
 --- a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
 +++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
-@@ -192,9 +192,6 @@ OmniboxResultView::OmniboxResultView(Omn
+@@ -198,9 +198,6 @@ OmniboxResultView::OmniboxResultView(Omn
 
   SetLayoutManager(std::make_unique<views::FillLayout>());
 
@@ -72,7 +72,7 @@
   local_answer_header_and_suggestion_and_buttons_ =
       AddChildView(std::make_unique<views::View>());
   local_answer_header_and_suggestion_and_buttons_
-@@ -295,8 +292,9 @@ OmniboxResultView::OmniboxResultView(Omn
+@@ -301,8 +298,9 @@ OmniboxResultView::OmniboxResultView(Omn
               &OmniboxResultView::ButtonPressed, base::Unretained(this),
               OmniboxPopupSelection::FOCUSED_BUTTON_REMOVE_SUGGESTION)));
   remove_suggestion_button_->SetProperty(views::kMarginsKey,
@@ -84,7 +84,7 @@
   auto* const remove_focus_ring =
       views::FocusRing::Get(remove_suggestion_button_);
   remove_focus_ring->SetHasFocusPredicate(base::BindRepeating(
-@@ -352,10 +350,9 @@ std::unique_ptr<views::Background> Omnib
+@@ -355,10 +353,9 @@ std::unique_ptr<views::Background> Omnib
         /*for_border_thickness=*/0);
   }
 
@@ -97,7 +97,7 @@
 }
 
 void OmniboxResultView::SetMatch(const AutocompleteMatch& match) {
-@@ -508,14 +505,6 @@ void OmniboxResultView::ApplyThemeAndRef
+@@ -509,14 +506,6 @@ void OmniboxResultView::ApplyThemeAndRef
           popup_view_->controller()->client()->GetTemplateURLService())) {
     const OmniboxPopupSelection::LineState line_state =
         popup_view_->GetSelection().state;
@@ -183,7 +183,7 @@
   // smaller than this bounds; they'll be centered within the bounds.
 --- a/chrome/browser/ui/views/omnibox/omnibox_popup_view_views.cc
 +++ b/chrome/browser/ui/views/omnibox/omnibox_popup_view_views.cc
-@@ -593,15 +593,7 @@ gfx::Rect OmniboxPopupViewViews::GetTarg
+@@ -638,14 +638,7 @@ gfx::Rect OmniboxPopupViewViews::GetTarg
   // added if the results section has no height (result set is empty or all
   // results are hidden). See https://crbug.com/1076646 for additional context.
   if (popup_height != 0) {
@@ -191,11 +191,10 @@
 -    // toolbelt or not. The toolbelt doesn't have an icon or image on the left
 -    // like a regular suggestion nor a big background highlight like an IPH
 -    // suggestion so it doesn't require as much space.
-    const size_t last_result_index =
-        autocomplete_controller->result().size() - 1;
-    int kExtraBottomPadding =
+-    const size_t last_result_index = result_size - 1;
+-    int extra_bottom_padding =
 -        GetMatchAtIndex(last_result_index).IsToolbelt() ? 2 : 8;
-    popup_height += kExtraBottomPadding;
+-    popup_height += extra_bottom_padding;
 +    popup_height += 2;
   }
 
--- a/patches/helium/ui/profile-picker-cleanup.patch
+++ b/patches/helium/ui/profile-picker-cleanup.patch
@@ -22,7 +22,7 @@
 -
 #browseAsGuestButton > cr-icon {
   margin-inline-end: 0;
-   --iron-icon-height: 24px;
+   --iron-icon-height: 20px;
@@ -152,10 +147,10 @@ cr-checkbox {
   --cr-checkbox-label-color: var(--cr-secondary-text-color);
   --cr-checkbox-label-padding-start: 8px;
--- a/patches/helium/ui/remove-dead-profile-actions.patch
+++ b/patches/helium/ui/remove-dead-profile-actions.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
 +++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
-@@ -811,6 +811,7 @@ void ProfileMenuView::MaybeBuildBatchUpl
+@@ -897,6 +897,7 @@ void ProfileMenuView::MaybeBuildBatchUpl
 }
 
 void ProfileMenuView::BuildAutofillSettingsButton() {
@@ -8,7 +8,7 @@
   CHECK(!profile().IsGuestSession());
   AddFeatureButton(
       l10n_util::GetStringUTF16(IDS_PROFILE_MENU_AUTOFILL_SETTINGS_BUTTON),
-@@ -892,6 +893,7 @@ void ProfileMenuView::MaybeBuildChromeAc
+@@ -981,6 +982,7 @@ void ProfileMenuView::MaybeBuildGoogleSe
 }
 
 void ProfileMenuView::MaybeBuildManageGoogleAccountButton() {
--- a/patches/helium/ui/remove-dead-toolbar-actions.patch
+++ b/patches/helium/ui/remove-dead-toolbar-actions.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/browser_actions.cc
 +++ b/chrome/browser/ui/browser_actions.cc
-@@ -42,8 +42,6 @@
+@@ -43,8 +43,6 @@
 #include "chrome/browser/ui/passwords/passwords_model_delegate.h"
 #include "chrome/browser/ui/performance_controls/memory_saver_bubble_controller.h"
 #include "chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.h"
@@ -9,7 +9,7 @@
 #include "chrome/browser/ui/tabs/public/tab_features.h"
 #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h"
 #include "chrome/browser/ui/toolbar/cast/cast_toolbar_button_util.h"
-@@ -214,10 +212,6 @@ void BrowserActions::InitializeBrowserAc
+@@ -216,10 +214,6 @@ void BrowserActions::InitializeBrowserAc
                   SidePanelEntryId::kBookmarks, IDS_BOOKMARK_MANAGER_TITLE,
                   IDS_BOOKMARK_MANAGER_TITLE, kBookmarksSidePanelRefreshIcon,
                   kActionSidePanelShowBookmarks, bwi, true),
@@ -20,7 +20,7 @@
               SidePanelAction(SidePanelEntryId::kAboutThisSite,
                               IDS_PAGE_INFO_ABOUT_THIS_PAGE_TITLE,
                               IDS_PAGE_INFO_ABOUT_THIS_PAGE_TITLE,
-@@ -227,17 +221,7 @@ void BrowserActions::InitializeBrowserAc
+@@ -229,17 +223,7 @@ void BrowserActions::InitializeBrowserAc
                               IDS_SIDE_PANEL_CUSTOMIZE_CHROME_TITLE,
                               IDS_SIDE_PANEL_CUSTOMIZE_CHROME_TITLE,
                               vector_icons::kEditChromeRefreshIcon,
@@ -39,7 +39,7 @@
           .Build());
 
   if (side_panel::history_clusters::
-@@ -266,40 +250,6 @@ void BrowserActions::InitializeBrowserAc
+@@ -268,40 +252,6 @@ void BrowserActions::InitializeBrowserAc
                       kActionSidePanelShowReadAnything, bwi, true)
           .Build());
 
@@ -80,7 +80,7 @@
   root_action_item_->AddChild(
       actions::ActionItem::Builder(
           base::BindRepeating(
-@@ -535,44 +485,6 @@ void BrowserActions::InitializeBrowserAc
+@@ -547,44 +497,6 @@ void BrowserActions::InitializeBrowserAc
           kActionDevTools, IDS_DEV_TOOLS, IDS_DEV_TOOLS, kDeveloperToolsIcon)
           .Build());
 
@@ -125,7 +125,7 @@
   root_action_item_->AddChild(
       ChromeMenuAction(
           base::BindRepeating(
-@@ -587,56 +499,6 @@ void BrowserActions::InitializeBrowserAc
+@@ -599,56 +511,6 @@ void BrowserActions::InitializeBrowserAc
           .SetVisible(!sharing_hub::SharingIsDisabledByPolicy(profile))
           .Build());
 
@@ -182,7 +182,7 @@
   // TODO(crbug.com/435220196): Ideally this action would have
   // ChromeLabsCoordinator passed in as a dependency directly.
   if (IsChromeLabsEnabled() && !bwi->GetAppBrowserController()) {
-@@ -654,34 +516,6 @@ void BrowserActions::InitializeBrowserAc
+@@ -666,34 +528,6 @@ void BrowserActions::InitializeBrowserAc
   }
 
   root_action_item_->AddChild(
@@ -234,16 +234,16 @@
 }  // namespace
 --- a/chrome/browser/ui/web_applications/app_browser_controller.cc
 +++ b/chrome/browser/ui/web_applications/app_browser_controller.cc
-@@ -357,8 +357,6 @@ std::vector<actions::ActionId> AppBrowse
+@@ -380,7 +380,7 @@ std::vector<actions::ActionId> AppBrowse
 #endif  // BUILDFLAG(IS_CHROMEOS)
 
   std::vector<actions::ActionId> types_enabled = {
-      kActionShowPasswordsBubbleOrPage,
-      kActionShowTranslate,
-       kActionZoomNormal,
-       kActionShowFileSystemAccess,
+-      kActionFind,       kActionShowPasswordsBubbleOrPage, kActionShowTranslate,
+      kActionFind,
+       kActionZoomNormal, kActionShowFileSystemAccess,
   };
-@@ -382,12 +380,9 @@ AppBrowserController::GetTitleBarPageAct
+ 
+@@ -403,12 +403,9 @@ AppBrowserController::GetTitleBarPageAct
 
   std::vector<PageActionIconType> types_enabled;
   types_enabled.push_back(PageActionIconType::kFind);
--- a/patches/helium/ui/remove-devtools-annoyances.patch
+++ b/patches/helium/ui/remove-devtools-annoyances.patch
@@ -22,7 +22,7 @@
 import * as Main from '../main/main.js';
 --- a/third_party/devtools-frontend/src/front_end/entrypoints/main/MainImpl.ts
 +++ b/third_party/devtools-frontend/src/front_end/entrypoints/main/MainImpl.ts
-@@ -961,8 +961,10 @@ export class MainMenuItem implements UI.
+@@ -977,8 +977,10 @@ export class MainMenuItem implements UI.
       }, {additionalElement, isPreviewFeature: viewExtension.isPreviewFeature(), jslogContext: id});
     }
 
--- a/patches/helium/ui/restyle-ntp-tiles.patch
+++ b/patches/helium/ui/restyle-ntp-tiles.patch
@@ -1,6 +1,6 @@
 --- a/ui/webui/resources/cr_components/most_visited/most_visited.ts
 +++ b/ui/webui/resources/cr_components/most_visited/most_visited.ts
-@@ -589,7 +589,7 @@ export class MostVisitedElement extends
+@@ -591,7 +591,7 @@ export class MostVisitedElement extends
 
   protected getFaviconUrl_(url: Url): string {
     const faviconUrl = new URL('chrome://favicon2/');
--- a/patches/helium/ui/selected-keyword-view.patch
+++ b/patches/helium/ui/selected-keyword-view.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/views/location_bar/selected_keyword_view.cc
 +++ b/chrome/browser/ui/views/location_bar/selected_keyword_view.cc
-@@ -55,12 +55,8 @@ SelectedKeywordView::GetKeywordLabelName
+@@ -56,12 +56,8 @@ SelectedKeywordView::GetKeywordLabelName
                                  template_url_starter_pack_data::kPage) {
     names.full_name =
         l10n_util::GetStringUTF16(IDS_STARTER_PACK_PAGE_KEYWORD_TEXT);
@@ -14,7 +14,7 @@
   }
   return names;
 }
-@@ -76,6 +72,8 @@ SelectedKeywordView::SelectedKeywordView
+@@ -77,6 +73,8 @@ SelectedKeywordView::SelectedKeywordView
   partial_label_.SetVisible(false);
   label()->SetElideBehavior(gfx::FADE_TAIL);
 
@@ -23,7 +23,7 @@
   // TODO(crbug.com/40890218): `IconLabelBubbleView::GetAccessibleNodeData`
   // would set the name to explicitly empty when the name was missing.
   // That function no longer exists. As a result we need to handle that here.
-@@ -194,7 +192,7 @@ const std::u16string& SelectedKeywordVie
+@@ -197,7 +195,7 @@ const std::u16string& SelectedKeywordVie
 
 int SelectedKeywordView::GetExtraInternalSpacing() const {
   // Align the label text with the suggestion text.
--- a/patches/helium/ui/set-gray-as-default-theme.patch
+++ b/patches/helium/ui/set-gray-as-default-theme.patch
@@ -61,7 +61,7 @@
         class="chrome-color"
 --- a/chrome/browser/themes/theme_service.cc
 +++ b/chrome/browser/themes/theme_service.cc
-@@ -379,6 +379,8 @@ void ThemeService::UseDefaultTheme() {
+@@ -391,6 +391,8 @@ void ThemeService::UseDefaultTheme() {
   }
 
   ClearThemeData(/*clear_ntp_background=*/true);
--- a/patches/helium/ui/side-panel.patch
+++ b/patches/helium/ui/side-panel.patch
@@ -15,7 +15,7 @@
 +constexpr int kOverlapFromToolbar = 3;
 
 // We want the border to visually look like GetBorderThickness() units on all
- // sides. On the top side, background is drawn on top of the top-content
+ // sides except the top. On the top side, background is drawn on top of the
 --- a/chrome/browser/ui/views/side_panel/side_panel_resize_area.cc
 +++ b/chrome/browser/ui/views/side_panel/side_panel_resize_area.cc
@@ -26,14 +26,13 @@ namespace views {
--- a/patches/helium/ui/thinner-infobar.patch
+++ b/patches/helium/ui/thinner-infobar.patch
@@ -11,7 +11,7 @@
     case DISTANCE_RICH_HOVER_BUTTON_ICON_HORIZONTAL:
 --- a/chrome/browser/ui/views/infobars/infobar_container_view.cc
 +++ b/chrome/browser/ui/views/infobars/infobar_container_view.cc
-@@ -112,8 +112,7 @@ void InfoBarContainerView::Layout(PassKe
+@@ -120,8 +120,7 @@ void InfoBarContainerView::Layout(PassKe
   // there drawn by the shadow code (so we don't have to extend our bounds out
   // to be able to draw it; see comments in CalculatePreferredSize() on why the
   // shadow is drawn outside the container bounds).
--- a/patches/helium/ui/top-container.patch
+++ b/patches/helium/ui/top-container.patch
@@ -1,16 +1,16 @@
--- a/chrome/browser/ui/views/frame/browser_view.cc
-+++ b/chrome/browser/ui/views/frame/browser_view.cc
-@@ -787,6 +787,7 @@ class BrowserViewLayoutDelegateImpl : pu
-   }
+--- a/chrome/browser/ui/views/frame/browser_view_layout_delegate_impl.cc
+++ b/chrome/browser/ui/views/frame/browser_view_layout_delegate_impl.cc
+@@ -69,6 +69,7 @@ bool BrowserViewLayoutDelegateImplBase::
+ }
 
-   bool IsContentsSeparatorEnabled() const override {
-+    return false;
-     // Web app windows manage their own separator.
-     // TODO(crbug.com/40102629): Make PWAs set the visibility of the ToolbarView
-     // based on whether it is visible instead of setting the height to 0px. This
+ bool BrowserViewLayoutDelegateImplBase::IsContentsSeparatorEnabled() const {
+  return false;
+   // Web app windows manage their own separator.
+   // TODO(crbug.com/40102629): Make PWAs set the visibility of the ToolbarView
+   // based on whether it is visible instead of setting the height to 0px. This
 --- a/chrome/browser/ui/views/frame/top_container_background.cc
 +++ b/chrome/browser/ui/views/frame/top_container_background.cc
-@@ -6,6 +6,7 @@
+@@ -8,6 +8,7 @@
 
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/color/chrome_color_id.h"
@@ -18,36 +18,13 @@
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/grit/theme_resources.h"
-@@ -68,6 +69,7 @@ void TopContainerBackground::PaintBackgr
+@@ -79,7 +80,8 @@ void TopContainerBackground::PaintBackgr
                                              const BrowserView* browser_view) {
   bool painted = PaintThemeCustomImage(canvas, view, browser_view);
   if (!painted) {
 -    canvas->DrawColor(view->GetColorProvider()->GetColor(kColorToolbar));
-+    canvas->DrawColor(browser_view->frame()->GetFrameView()->GetFrameColor(
+    canvas->DrawColor(browser_view->browser_widget()->GetFrameView()->GetFrameColor(
 +        BrowserFrameActiveState::kUseCurrent));
   }
 }
--- a/chrome/browser/ui/views/frame/contents_separator.cc
-+++ b/chrome/browser/ui/views/frame/contents_separator.cc
-@@ -4,20 +4,9 @@
 
- #include "chrome/browser/ui/views/frame/contents_separator.h"
- 
-#include "chrome/browser/ui/color/chrome_color_id.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
-#include "ui/views/background.h"
-#include "ui/views/controls/separator.h"
- 
-ContentsSeparator::ContentsSeparator() {
-  SetBackground(
-      views::CreateSolidBackground(kColorToolbarContentAreaSeparator));
-
-  // BrowserViewLayout will respect either the height or width of this,
-  // depending on orientation, not simultaneously both.
-  SetPreferredSize(
-      gfx::Size(views::Separator::kThickness, views::Separator::kThickness));
-}
-+ContentsSeparator::ContentsSeparator() {}
- 
- BEGIN_METADATA(ContentsSeparator)
- END_METADATA
--- a/patches/helium/ui/ublock-show-in-settings.patch
+++ b/patches/helium/ui/ublock-show-in-settings.patch
@@ -54,7 +54,7 @@
          !PermissionsData::CanExecuteScriptEverywhere(extension_id, location);
 --- a/extensions/browser/api/management/management_api.cc
 +++ b/extensions/browser/api/management/management_api.cc
-@@ -79,7 +79,8 @@ AutoConfirmForTest auto_confirm_for_test
+@@ -82,7 +82,8 @@ AutoConfirmForTest auto_confirm_for_test
 // Returns true if the extension should be exposed via the chrome.management
 // API.
 bool ShouldExposeViaManagementAPI(const Extension& extension) {
@@ -63,8 +63,8 @@
 +          || Manifest::IsUBlockComponent(extension.id());
 }
 
- std::vector<std::string> CreateWarningsList(const Extension* extension) {
-@@ -763,7 +764,9 @@ ExtensionFunction::ResponseAction Manage
+ // Utility function to make the code below less ifdef-y.
+@@ -780,7 +781,9 @@ ExtensionFunction::ResponseAction Manage
       extensions::ExtensionRegistry::Get(browser_context())
           ->GetExtensionById(target_extension_id_,
                              ExtensionRegistry::EVERYTHING);
@@ -87,7 +87,7 @@
   };
 --- a/chrome/app/generated_resources.grd
 +++ b/chrome/app/generated_resources.grd
-@@ -13227,6 +13227,9 @@ Check your passwords anytime in <ph name
+@@ -13303,6 +13303,9 @@ Check your passwords anytime in <ph name
         <message name="IDS_EXTENSIONS_INSTALL_LOCATION_SHARED_MODULE" desc="The text explaining the the installation of the extension was because of extensions that depend on this shared module">
           Installed because of dependent extension(s).
         </message>
@@ -99,7 +99,7 @@
         <message name="IDS_EXTENSIONS_BLOCKLISTED_MALWARE" desc="The text explaining the reason for disabling extension or app. The extension in question contains malware.">
 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
 +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
-@@ -767,7 +767,10 @@ void ExtensionInfoGenerator::FillExtensi
+@@ -770,7 +770,10 @@ void ExtensionInfoGenerator::FillExtensi
 
   // Location text.
   int location_text = -1;
@@ -183,7 +183,7 @@
 #source-indicator cr-icon {
 --- a/chrome/browser/resources/extensions/item.ts
 +++ b/chrome/browser/resources/extensions/item.ts
-@@ -321,6 +321,15 @@ export class ExtensionsItemElement exten
+@@ -323,6 +323,15 @@ export class ExtensionsItemElement exten
     return classes;
   }
 
@@ -199,7 +199,7 @@
   protected computeSourceIndicatorIcon_(): string {
     switch (getItemSource(this.data)) {
       case SourceType.POLICY:
-@@ -332,6 +341,8 @@ export class ExtensionsItemElement exten
+@@ -334,6 +343,8 @@ export class ExtensionsItemElement exten
         return 'extensions-icons:input';
       case SourceType.UNPACKED:
         return 'extensions-icons:unpacked';
--- a/patches/helium/upstream-fixes/fix-tab-group-split-insertion.patch
+++ b/patches/helium/upstream-fixes/fix-tab-group-split-insertion.patch
@@ -1,17 +0,0 @@
--- a/chrome/browser/ui/views/frame/multi_contents_view_delegate.cc
-+++ b/chrome/browser/ui/views/frame/multi_contents_view_delegate.cc
-@@ -126,9 +126,12 @@ void MultiContentsViewDelegateImpl::Hand
-   const int new_tab_idx =
-       tab_strip_model_->active_index() +
-       (side == MultiContentsDropTargetView::DropSide::START ? 0 : 1);
-+
-+  tabs::TabInterface* active_tab = tab_strip_model_->GetActiveTab();
-   const int inserted_tab_idx = tab_strip_model_->InsertDetachedTabAt(
-      new_tab_idx, std::move(detached_tab), AddTabTypes::ADD_NONE,
-      std::nullopt);
-+      new_tab_idx, std::move(detached_tab),
-+      active_tab->IsPinned() ? AddTabTypes::ADD_PINNED : AddTabTypes::ADD_NONE,
-+      active_tab->GetGroup());
-   tab_strip_model_->AddToNewSplit(
-       {inserted_tab_idx}, split_data,
-       split_tabs::SplitTabCreatedSource::kDragAndDropTab);
--- a/patches/series
+++ b/patches/series
@@ -109,8 +109,6 @@ extra/brave/chrome-importer-files.patch
 extra/brave/custom-importer.patch
 extra/brave/fix-component-content-settings-store.patch

-helium/upstream-fixes/fix-tab-group-split-insertion.patch
-
 helium/core/add-zen-importer.patch
 helium/core/disable-unsupported-importers.patch
 helium/core/fix-building-without-safebrowsing.patch
@@ -217,7 +215,6 @@ helium/ui/app-menu-model.patch
 helium/ui/app-menu-button.patch
 helium/ui/remove-reading-list-from-app-menu.patch
 helium/ui/fix-customize-side-panel.patch
-helium/ui/immersive-padding.patch
 helium/ui/side-panel.patch
 helium/ui/layout-provider.patch
 helium/ui/remove-dead-toolbar-actions.patch