patches: refresh for chromium 142

Author: wukko

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;
 +

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,15 +275,15 @@ 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);
 +  registry->RegisterBooleanPref(prefs::kImportDialogExtensions, true);
  }
 
  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>

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);
  }
 

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,

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) {

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();
 

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)) {

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
 

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));

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",