merge: update to chromium 143.0.7499.40

chromium_version.txt

@@ -1 +1 @@
-142.0.7444.175
+143.0.7499.40

devutils/update_platform_patches.py

@@ -1,10 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-# Copyright 2025 The Helium Authors
-# You can use, redistribute, and/or modify this source code under
-# the terms of the GPL-3.0 license that can be found in the LICENSE file.
-
 # Copyright (c) 2019 The ungoogled-chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE.ungoogled_chromium file.
@@ -67,19 +63,19 @@ def _dir_empty(path):
     return False
 
 
-def _rename_files_with_dirs(root_dir, sorted_file_iter):
+def _rename_files_with_dirs(root_dir, source_dir, sorted_file_iter):
     '''
-    Moves a list of sorted files back to the upstream repo, removing empty directories along the way
+    Moves a list of sorted files back to their original location,
+    removing empty directories along the way
     '''
     past_parent = None
-    upstream_path = Path(os.path.dirname(os.path.realpath(__file__))) / '../patches'
     for partial_path in sorted_file_iter:
         complete_path = Path(root_dir, partial_path)
-        complete_upstream_path = Path(upstream_path, partial_path)
+        complete_source_path = Path(source_dir, partial_path)
         try:
-            complete_path.rename(complete_upstream_path)
+            complete_path.rename(complete_source_path)
         except FileNotFoundError:
-            get_logger().warning('Could not remove prepended patch: %s', complete_path)
+            get_logger().warning('Could not move prepended patch: %s', complete_path)
         if past_parent != complete_path.parent:
             while past_parent and _dir_empty(past_parent):
                 past_parent.rmdir()
@@ -91,7 +87,7 @@ def _rename_files_with_dirs(root_dir, sorted_file_iter):
         complete_path = complete_path.parent
 
 
-def unmerge_platform_patches(platform_patches_dir):
+def unmerge_platform_patches(platform_patches_dir, prepend_patches_dir):
     '''
     Undo merge_platform_patches(), adding any new patches from series.merged as necessary
 
@@ -105,8 +101,8 @@ def unmerge_platform_patches(platform_patches_dir):
         filter(len,
                (platform_patches_dir / _SERIES_PREPEND).read_text(encoding=ENCODING).splitlines()))
 
-    # Move prepended files to original location, preserving changes, and clean up
-    _rename_files_with_dirs(platform_patches_dir, sorted(prepend_series))
+    # Move prepended files back to original location, preserving changes
+    _rename_files_with_dirs(platform_patches_dir, prepend_patches_dir, sorted(prepend_series))
 
     # Determine positions of blank spaces in series.orig
     if not (platform_patches_dir / _SERIES_ORIG).exists():
@@ -175,10 +171,11 @@ def main():
     repo_dir = Path(__file__).resolve().parent.parent
 
     success = False
+    prepend_patches_dir = repo_dir / 'patches'
     if args.command == 'merge':
-        success = merge_platform_patches(args.platform_patches, repo_dir / 'patches')
+        success = merge_platform_patches(args.platform_patches, prepend_patches_dir)
     elif args.command == 'unmerge':
-        success = unmerge_platform_patches(args.platform_patches)
+        success = unmerge_platform_patches(args.platform_patches, prepend_patches_dir)
     else:
         raise NotImplementedError(args.command)
 

patches/contrib/brave/chrome-importer-files.patch

@@ -2735,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,437 @@
+@@ -0,0 +1,436 @@
 +/* 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,
@@ -3103,8 +3103,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +      if (!usage.favicon_url.is_valid())
 +        continue;  // Don't bother importing favicons with invalid URLs.
 +
-+      std::vector<uint8_t> data;
-+      s.ColumnBlobAsVector(1, &data);
++      std::vector<uint8_t> data = s.ColumnBlobAsVector(1);
 +      if (data.empty())
 +        continue;  // Data definitely invalid.
 +

patches/contrib/brave/custom-importer.patch

@@ -177,7 +177,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  }  // namespace user_data_importer
 --- a/tools/metrics/histograms/metadata/sql/histograms.xml
 +++ b/tools/metrics/histograms/metadata/sql/histograms.xml
-@@ -40,6 +40,7 @@ [email protected].
+@@ -42,6 +42,7 @@ [email protected].
    <variant name="DBSCSessions" summary="DBSCSessions"/>
    <variant name="DIPS" summary="DIPS"/>
    <variant name="DownloadRecord" summary="DownloadRecord"/>
@@ -207,7 +207,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  }  // namespace user_data_importer
 --- a/chrome/common/importer/profile_import_process_param_traits_macros.h
 +++ b/chrome/common/importer/profile_import_process_param_traits_macros.h
-@@ -20,11 +20,11 @@
+@@ -23,11 +23,11 @@
  #if BUILDFLAG(IS_WIN)
  IPC_ENUM_TRAITS_MIN_MAX_VALUE(user_data_importer::ImporterType,
                                user_data_importer::TYPE_UNKNOWN,
@@ -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
-@@ -4266,6 +4266,9 @@ inline constexpr char kServiceWorkerToCo
+@@ -4281,6 +4281,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
-@@ -1164,6 +1164,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -1147,6 +1147,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
        settings_api::PrefType::kBoolean;
    (*s_allowlist)[::prefs::kImportDialogSearchEngine] =
        settings_api::PrefType::kBoolean;
@@ -267,23 +267,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    // Supervised Users.  This setting is queried in our Tast tests (b/241943380).
 --- a/chrome/browser/ui/webui/settings/settings_ui.cc
 +++ b/chrome/browser/ui/webui/settings/settings_ui.cc
-@@ -62,6 +62,7 @@
+@@ -63,6 +63,7 @@
  #include "chrome/browser/ui/webui/settings/font_handler.h"
  #include "chrome/browser/ui/webui/settings/hats_handler.h"
  #include "chrome/browser/ui/webui/settings/import_data_handler.h"
 +#include "chrome/browser/ui/webui/settings/brave_import_data_handler.h"
  #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"
-@@ -201,6 +202,7 @@ void SettingsUI::RegisterProfilePrefs(
+@@ -203,6 +204,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)
-@@ -230,7 +232,7 @@ SettingsUI::SettingsUI(content::WebUI* w
+@@ -232,7 +234,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
-@@ -900,6 +900,8 @@ void AddImportDataStrings(content::WebUI
+@@ -999,6 +999,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
-@@ -1237,6 +1237,10 @@ static_library("ui") {
+@@ -1252,6 +1252,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",
-@@ -1391,6 +1395,13 @@ static_library("ui") {
+@@ -1408,6 +1412,13 @@ static_library("ui") {
        ]
      }
 
@@ -412,7 +412,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  // Corresponds to the "id" column of the "visits" SQL table.
 --- a/components/history/core/browser/visit_database.cc
 +++ b/components/history/core/browser/visit_database.cc
-@@ -119,6 +119,8 @@ VisitSource VisitSourceFromInt(int value
+@@ -120,6 +120,8 @@ VisitSource VisitSourceFromInt(int value
      case SOURCE_SAFARI_IMPORTED:
      case SOURCE_ACTOR:
      case SOURCE_OS_MIGRATION_IMPORTED:
@@ -434,7 +434,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  }
 --- a/chrome/utility/BUILD.gn
 +++ b/chrome/utility/BUILD.gn
-@@ -92,6 +92,12 @@ static_library("utility") {
+@@ -90,6 +90,12 @@ static_library("utility") {
      sources += [
        "importer/bookmarks_file_importer.cc",
        "importer/bookmarks_file_importer.h",
@@ -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
-@@ -144,6 +146,13 @@ static_assert(BUILDFLAG(ENABLE_PRINTING)
+@@ -138,6 +140,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));
  }
-@@ -456,6 +465,7 @@ void RegisterMainThreadServices(mojo::Se
+@@ -434,6 +443,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
-@@ -11171,6 +11171,15 @@ Check your passwords anytime in <ph name
+@@ -11279,6 +11279,15 @@ Check your passwords anytime in <ph name
              Microsoft Edge
            </message>
          </if>

patches/contrib/brave/tab-cycling-mru-impl.patch

@@ -35,7 +35,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
  #include "chrome/browser/ui/commerce/ui_utils.h"
  #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_bubble.h"
  #include "chrome/browser/ui/tabs/features.h"
-@@ -3658,6 +3659,44 @@ TabStripSelectionChange TabStripModel::S
+@@ -3703,6 +3704,44 @@ TabStripSelectionChange TabStripModel::S
    return selection;
  }
 
@@ -82,7 +82,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
    // This may happen during automated testing or if a user somehow buffers
 --- a/chrome/browser/ui/tabs/tab_strip_model.h
 +++ b/chrome/browser/ui/tabs/tab_strip_model.h
-@@ -604,6 +604,10 @@ class TabStripModel {
+@@ -611,6 +611,10 @@ class TabStripModel {
        TabStripUserGestureDetails detail = TabStripUserGestureDetails(
            TabStripUserGestureDetails::GestureType::kOther));
 
@@ -93,7 +93,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
    // Moves the active in the specified direction. Respects group boundaries.
    void MoveTabNext();
    void MoveTabPrevious();
-@@ -1132,6 +1136,11 @@ class TabStripModel {
+@@ -1139,6 +1143,11 @@ class TabStripModel {
      kPrevious,
    };
 
@@ -105,7 +105,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
    // Selects either the next tab (kNext), or the previous tab (kPrevious).
    void SelectRelativeTab(TabRelativeDirection direction,
                           TabStripUserGestureDetails detail);
-@@ -1388,6 +1397,9 @@ class TabStripModel {
+@@ -1393,6 +1402,9 @@ class TabStripModel {
    // Tracks whether a modal UI is showing.
    bool showing_modal_ui_ = false;
 
@@ -117,7 +117,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 --- a/chrome/browser/ui/views/frame/browser_view.cc
 +++ b/chrome/browser/ui/views/frame/browser_view.cc
-@@ -285,7 +285,10 @@
+@@ -291,7 +291,10 @@
  #include "ui/compositor/paint_recorder.h"
  #include "ui/content_accelerators/accelerator_util.h"
  #include "ui/display/screen.h"
@@ -128,17 +128,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
  #include "ui/gfx/animation/animation_runner.h"
  #include "ui/gfx/canvas.h"
  #include "ui/gfx/color_utils.h"
-@@ -303,6 +306,7 @@
+@@ -309,6 +312,7 @@
  #include "ui/views/controls/button/menu_button.h"
  #include "ui/views/controls/textfield/textfield.h"
  #include "ui/views/controls/webview/webview.h"
 +#include "ui/views/event_monitor.h"
  #include "ui/views/interaction/element_tracker_views.h"
  #include "ui/views/layout/fill_layout.h"
  #include "ui/views/view.h"
-@@ -726,6 +730,83 @@ bool ConvertedHitTest(views::View* src,
-
- }  // namespace
+@@ -809,6 +813,83 @@ class BrowserView::ExclusiveAccessContex
+   base::WeakPtrFactory<ExclusiveAccessContextImpl> weak_ptr_factory_{this};
+ };
 
 +// Handles events during MRU tab cycling to start/stop tab cycling.
 +class TabCyclingEventHandler : public ui::EventObserver,
@@ -230,9 +230,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
  class TabDragDelegate;
  class TabSearchBubbleHost;
  class TabStrip;
-@@ -566,6 +567,10 @@ class BrowserView : public BrowserWindow
+@@ -555,6 +556,10 @@ class BrowserView : public BrowserWindow
+   bool IsBorderlessModeEnabled() const override;
    void ShowChromeLabs() override;
-   views::WebView* GetContentsWebView() override;
    BrowserView* AsBrowserView() override;
 +
 +  void StartTabCycling();
@@ -241,15 +241,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
    SharingDialog* ShowSharingDialog(content::WebContents* contents,
                                     SharingDialogData data) override;
    void ShowUpdateChromeDialog() override;
-@@ -889,6 +894,7 @@ class BrowserView : public BrowserWindow
-   friend class BrowserViewLayoutDelegateImplNew;
+@@ -860,6 +865,7 @@ class BrowserView : public BrowserWindow
+   friend class BrowserViewLayoutDelegateImpl;
    friend class BrowserViewLayoutDelegateImplOld;
    friend class BrowserViewLayoutDelegateImplBrowsertest;
 +  friend class TabCyclingEventHandler;
    friend class TopControlsSlideControllerTest;
    FRIEND_TEST_ALL_PREFIXES(BrowserViewTest, BrowserView);
    FRIEND_TEST_ALL_PREFIXES(BrowserViewTest, AccessibleWindowTitle);
-@@ -1395,6 +1401,8 @@ class BrowserView : public BrowserWindow
+@@ -1387,6 +1393,8 @@ class BrowserView : public BrowserWindow
 
    base::CallbackListSubscription vertical_tab_subscription_;
 

patches/contrib/bromite/disable-fetching-field-trials.patch

@@ -10,7 +10,7 @@ Subject: Disable fetching of all field trials
 
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -60,7 +60,7 @@ public abstract class ChromeFeatureList
+@@ -61,7 +61,7 @@ public abstract class ChromeFeatureList
       * |kFeaturesExposedToJava| in chrome/browser/flags/android/chrome_feature_list.cc
       */
      public static String getFieldTrialParamByFeature(String featureName, String paramName) {
@@ -19,7 +19,7 @@ Subject: Disable fetching of all field trials
      }
 
      /**
-@@ -72,8 +72,7 @@ public abstract class ChromeFeatureList
+@@ -73,8 +73,7 @@ public abstract class ChromeFeatureList
       */
      public static boolean getFieldTrialParamByFeatureAsBoolean(
              String featureName, String paramName, boolean defaultValue) {
@@ -29,7 +29,7 @@ Subject: Disable fetching of all field trials
      }
 
      /**
-@@ -85,8 +84,7 @@ public abstract class ChromeFeatureList
+@@ -86,8 +85,7 @@ public abstract class ChromeFeatureList
       */
      public static int getFieldTrialParamByFeatureAsInt(
              String featureName, String paramName, int defaultValue) {
@@ -39,7 +39,7 @@ Subject: Disable fetching of all field trials
      }
 
      /**
-@@ -98,8 +96,7 @@ public abstract class ChromeFeatureList
+@@ -99,8 +97,7 @@ public abstract class ChromeFeatureList
       */
      public static double getFieldTrialParamByFeatureAsDouble(
              String featureName, String paramName, double defaultValue) {
@@ -51,7 +51,7 @@ Subject: Disable fetching of all field trials
      /**
 --- a/components/variations/service/variations_service.cc
 +++ b/components/variations/service/variations_service.cc
-@@ -224,22 +224,7 @@ bool GetInstanceManipulations(const net:
+@@ -223,22 +223,7 @@ bool GetInstanceManipulations(const net:
  // Variations seed fetching is only enabled in official Chrome builds, if a URL
  // is specified on the command line, and for testing.
  bool IsFetchingEnabled() {