[AUTO] Patches auto-rebase for master branch (#2237)

[AUTO] Patches auto-rebase for master branch

build/patches/AImageReader-CFI-crash-mitigations.patch

@@ -90,7 +90,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -3509,6 +3509,10 @@
+@@ -3514,6 +3514,10 @@
        "chrome-signin-team@google.com"
      ],
      "expiry_milestone": 138

build/patches/Add-AllowUserCertificates-flag.patch

@@ -59,7 +59,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =
              "AdaptiveButtonInTopToolbarPageSummary";
      public static final String ALLOW_TAB_CLOSING_UPON_MINIMIZATION =
-@@ -679,6 +680,8 @@ public abstract class ChromeFeatureList {
+@@ -680,6 +681,8 @@ public abstract class ChromeFeatureList {
      public static final CachedFlag sAndroidWindowPopupLargeScreen =
              newCachedFlag(ANDROID_WINDOW_POPUP_LARGE_SCREEN, false);
      public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
@@ -68,7 +68,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final CachedFlag sAsyncNotificationManager =
              newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false, true);
      public static final CachedFlag sAsyncNotificationManagerForDownload =
-@@ -940,6 +943,7 @@ public abstract class ChromeFeatureList {
+@@ -941,6 +944,7 @@ public abstract class ChromeFeatureList {
                      sAccountForSuppressedKeyboardInsets,
                      sAllowTabClosingUponMinimization,
                      sAndroidAppIntegration,

build/patches/Add-a-flag-to-disable-GamePad-API.patch

@@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -8356,9 +8356,9 @@
+@@ -8364,9 +8364,9 @@
      "expiry_milestone": 140
    },
    {

build/patches/Add-bookmark-import-export-actions.patch

@@ -1338,7 +1338,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git 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
 --- 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
-@@ -624,6 +624,7 @@ public abstract class ChromeFeatureList {
+@@ -625,6 +625,7 @@ public abstract class ChromeFeatureList {
      public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID =
              "UseLibunwindstackNativeUnwinderAndroid";
      public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService";

build/patches/Add-cromite-flags-support.patch

@@ -727,7 +727,7 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -1345,5 +1345,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString,
+@@ -1348,5 +1348,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString,
               "WebOtpCrossDeviceSimpleString",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
@@ -737,7 +737,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
 --- a/chrome/browser/flags/android/chrome_feature_list.h
 +++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -285,6 +285,7 @@ constexpr base::FeatureParam<std::string> kQuickDeleteAndroidSurveyTriggerId(
+@@ -286,6 +286,7 @@ constexpr base::FeatureParam<std::string> kQuickDeleteAndroidSurveyTriggerId(
      "trigger_id",
      /*default_value=*/"");
  
@@ -759,7 +759,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
  import java.util.List;
  import java.util.Map;
  
-@@ -923,7 +927,7 @@ public abstract class ChromeFeatureList {
+@@ -924,7 +928,7 @@ public abstract class ChromeFeatureList {
      public static final CachedFlag sWebApkMinShellApkVersion =
              newCachedFlag(WEB_APK_MIN_SHELL_APK_VERSION, true);
  
@@ -768,7 +768,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
              List.of(
                      sAccountForSuppressedKeyboardInsets,
                      sAllowTabClosingUponMinimization,
-@@ -1047,6 +1051,13 @@ public abstract class ChromeFeatureList {
+@@ -1048,6 +1052,13 @@ public abstract class ChromeFeatureList {
                      sUseLibunwindstackNativeUnwinderAndroid,
                      sWebApkMinShellApkVersion);
  
@@ -1637,7 +1637,7 @@ diff --git a/content/common/features.cc b/content/common/features.cc
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -1521,4 +1521,5 @@ bool IsPushSubscriptionChangeEventEnabled() {
+@@ -1527,4 +1527,5 @@ bool IsPushSubscriptionChangeEventEnabled() {
               features::kPushSubscriptionChangeEventOnResubscribe);
  }
  
@@ -1646,7 +1646,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
 diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
 --- a/content/public/common/content_features.h
 +++ b/content/public/common/content_features.h
-@@ -359,6 +359,7 @@ CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess();
+@@ -361,6 +361,7 @@ CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess();
  CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForBrowserProcess();
  CONTENT_EXPORT bool IsPushSubscriptionChangeEventEnabled();
  

build/patches/Add-custom-tab-intents-privacy-option.patch

@@ -267,7 +267,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -1017,7 +1017,7 @@ BASE_FEATURE(kMagicStackAndroid,
+@@ -1020,7 +1020,7 @@ BASE_FEATURE(kMagicStackAndroid,
  // Enables an experimental feature which forces mayLaunchUrl to use a different
  // storage partition. This may reduce performance. This should not be enabled by
  // default.
@@ -279,7 +279,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git 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
 --- 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
-@@ -824,6 +824,8 @@ public abstract class ChromeFeatureList {
+@@ -825,6 +825,8 @@ public abstract class ChromeFeatureList {
      public static final CachedFlag sMiniOriginBar = newCachedFlag(MINI_ORIGIN_BAR, false, true);
      public static final CachedFlag sMostVisitedTilesCustomization =
              newCachedFlag(MOST_VISITED_TILES_CUSTOMIZATION, false);
@@ -288,7 +288,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final CachedFlag sMostVisitedTilesReselect =
              newCachedFlag(MOST_VISITED_TILES_RESELECT, false);
      public static final CachedFlag sMultiInstanceApplicationStatusCleanup =
-@@ -1012,6 +1014,7 @@ public abstract class ChromeFeatureList {
+@@ -1013,6 +1015,7 @@ public abstract class ChromeFeatureList {
                      sMagicStackAndroid,
                      sMiniOriginBar,
                      sMostVisitedTilesCustomization,

build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch

@@ -26,7 +26,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
  #include "base/feature_list.h"
  #include "base/format_macros.h"
  #include "base/functional/bind.h"
-@@ -565,6 +566,15 @@ AutocompleteController::AutocompleteController(
+@@ -567,6 +568,15 @@ AutocompleteController::AutocompleteController(
            provider_client_->GetOmniboxTriggeredFeatureService()),
        steady_state_omnibox_position_(
            metrics::OmniboxEventProto::UNKNOWN_POSITION) {

build/patches/Add-setting-to-clear-data-on-exit.patch

@@ -718,7 +718,7 @@ new file mode 100644
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1922,6 +1922,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
+@@ -1925,6 +1925,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
        {"clearedData", IDS_SETTINGS_CLEARED_DATA},
        {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
        {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},

build/patches/Add-setting-to-invert-tap-and-long-tap.patch

@@ -168,7 +168,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -381,6 +381,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -382,6 +382,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kTabGroupParityBottomSheetAndroid,
      &kTabletTabStripAnimation,
      &kToolbarPhoneCleanup,
@@ -179,7 +179,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git 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
 --- 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
-@@ -454,6 +454,8 @@ public abstract class ChromeFeatureList {
+@@ -455,6 +455,8 @@ public abstract class ChromeFeatureList {
              "DisableToolbarSwipeUp";
      public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM =
              "MoveTopToolbarToBottom";
@@ -188,7 +188,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final String NEW_TAB_PAGE_CUSTOMIZATION_TOOLBAR_BUTTON =
              "NewTabPageCustomizationToolbarButton";
      public static final String NOTIFICATION_ONE_TAP_UNSUBSCRIBE = "NotificationOneTapUnsubscribe";
-@@ -867,6 +869,8 @@ public abstract class ChromeFeatureList {
+@@ -868,6 +870,8 @@ public abstract class ChromeFeatureList {
              newCachedFlag(DISABLE_TOOLBAR_SWIPE_UP, false);
      public static final CachedFlag sMoveTopToolbarToBottom =
              newCachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false);
@@ -197,7 +197,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final CachedFlag sPaintPreviewDemo = newCachedFlag(PAINT_PREVIEW_DEMO, false);
      public static final CachedFlag sPostGetMyMemoryStateToBackground =
              newCachedFlag(POST_GET_MEMORY_PRESSURE_TO_BACKGROUND, true);
-@@ -1071,6 +1075,7 @@ public abstract class ChromeFeatureList {
+@@ -1072,6 +1076,7 @@ public abstract class ChromeFeatureList {
                      sTabWindowManagerReportIndicesMismatch,
                      sTopControlsRefactor,
                      sTraceBinderIpc,

build/patches/Add-support-to-jxl.patch

@@ -2646,7 +2646,7 @@ new file mode 100644
 diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
 --- a/tools/metrics/histograms/enums.xml
 +++ b/tools/metrics/histograms/enums.xml
-@@ -14417,6 +14417,7 @@ from previous Chrome versions.
+@@ -14421,6 +14421,7 @@ from previous Chrome versions.
    <int value="188610022" label="NewMessageListView:enabled"/>
    <int value="189728101" label="FasterLocationReload:disabled"/>
    <int value="189777537" label="DisableInitialMostVisitedFadeIn:enabled"/>

build/patches/Bromite-auto-updater.patch

@@ -1090,7 +1090,7 @@ new file mode 100644
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -335,6 +335,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -336,6 +336,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kProtectedTabsAndroid,
      &kPwaRestoreUi,
      &kPwaRestoreUiAtStartup,
@@ -1101,7 +1101,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git 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
 --- 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
-@@ -416,6 +416,7 @@ public abstract class ChromeFeatureList {
+@@ -417,6 +417,7 @@ public abstract class ChromeFeatureList {
              "HomepageIsNewTabPagePolicyAndroid";
      public static final String HTTPS_FIRST_BALANCED_MODE = "HttpsFirstBalancedMode";
      public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot";

build/patches/Content-settings-infrastructure.patch

@@ -1187,7 +1187,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
  #include "components/password_manager/core/browser/leak_detection_dialog_utils.h"
  #include "components/password_manager/core/browser/manage_passwords_referrer.h"
  #include "components/password_manager/core/common/password_manager_features.h"
-@@ -3811,6 +3815,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
+@@ -3814,6 +3818,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
    policy_indicator::AddLocalizedStrings(html_source);
    AddSecurityKeysStrings(html_source);
  

build/patches/Cromite-Branding.patch

@@ -13169,7 +13169,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git 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
 --- 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
-@@ -1172,7 +1172,7 @@ public abstract class ChromeFeatureList {
+@@ -1173,7 +1173,7 @@ public abstract class ChromeFeatureList {
      public static final MutableFlagWithSafeDefault sSuppressToolbarCapturesAtGestureEnd =
              newMutableFlagWithSafeDefault(SUPPRESS_TOOLBAR_CAPTURES_AT_GESTURE_END, false);
      public static final MutableFlagWithSafeDefault sSwapNewTabAndNewTabInGroupAndroid =

build/patches/Disable-Compose-feature.patch

@@ -46,7 +46,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc
 --- a/chrome/browser/ui/webui/settings/settings_ui.cc
 +++ b/chrome/browser/ui/webui/settings/settings_ui.cc
-@@ -364,7 +364,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
+@@ -372,7 +372,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
        base::FeatureList::IsEnabled(features::kLinkedServicesSetting));
  
  #if BUILDFLAG(ENABLE_COMPOSE)

build/patches/Disable-PrivacyGuide.patch

@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc
 --- a/chrome/browser/ui/webui/settings/settings_ui.cc
 +++ b/chrome/browser/ui/webui/settings/settings_ui.cc
-@@ -338,8 +338,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
+@@ -346,8 +346,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
    bool show_privacy_guide =

build/patches/Disable-smart-selection-by-default.patch

@@ -55,7 +55,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git 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
 --- 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
-@@ -547,6 +547,7 @@ public abstract class ChromeFeatureList {
+@@ -548,6 +548,7 @@ public abstract class ChromeFeatureList {
              "SearchInCCTAlternateTapHandling";
      public static final String SEARCH_RESUMPTION_MODULE_ANDROID = "SearchResumptionModuleAndroid";
      public static final String SEED_ACCOUNTS_REVAMP = "SeedAccountsRevamp";

build/patches/Enable-Global-Privacy-Control.patch

@@ -486,7 +486,7 @@ diff --git a/chrome/browser/ui/prefs/pref_watcher.h b/chrome/browser/ui/prefs/pr
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1871,6 +1871,9 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
+@@ -1874,6 +1874,9 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
        {"doNotTrackDialogMessage", IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_TEXT},
        {"doNotTrackDialogLearnMoreA11yLabel",
         IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_LEARN_MORE_ACCESSIBILITY_LABEL},

build/patches/Enable-native-Android-autofill.patch

@@ -315,7 +315,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  const FeatureEntry::FeatureParam kGroupSuggestionEnableRecentlyOpenedOnly[] = {
      {"group_suggestion_enable_recently_opened", "true"},
      {"group_suggestion_enable_switch_between", "false"},
-@@ -6419,15 +6397,6 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6426,15 +6404,6 @@ const FeatureEntry kFeatureEntries[] = {
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_ANDROID)

build/patches/Enable-search-engine-settings-desktop-ui.patch

@@ -141,7 +141,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
 diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -2143,6 +2143,9 @@
+@@ -2146,6 +2146,9 @@
    <message name="IDS_SETTINGS_SEARCH_ENGINES_QUERY_URL_EXPLANATION" desc="Label for explaining the format of the URL that should be entered by the user in the add/edit search engine dialog.">
      URL with <ph name="SPECIAL_SYMBOL">%s</ph> in place of query
    </message>
@@ -1365,7 +1365,7 @@ diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.h b/chrome/
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -2458,6 +2458,8 @@ void AddSearchEnginesStrings(content::WebUIDataSource* html_source) {
+@@ -2461,6 +2461,8 @@ void AddSearchEnginesStrings(content::WebUIDataSource* html_source) {
        {"searchEnginesQueryURL", IDS_SETTINGS_SEARCH_ENGINES_QUERY_URL},
        {"searchEnginesQueryURLExplanation",
         IDS_SETTINGS_SEARCH_ENGINES_QUERY_URL_EXPLANATION},
@@ -1374,7 +1374,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
        {"searchEnginesMakeDefault", IDS_SETTINGS_SEARCH_ENGINES_MAKE_DEFAULT},
        {"searchEnginesActivate", IDS_SETTINGS_SEARCH_ENGINES_ACTIVATE},
        {"searchEnginesDeactivate", IDS_SETTINGS_SEARCH_ENGINES_DEACTIVATE},
-@@ -3805,7 +3807,11 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
+@@ -3808,7 +3810,11 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
    AddSiteSettingsStrings(html_source, profile);
    AddSiteDataPageStrings(html_source, profile);
    AddStorageAccessStrings(html_source);

build/patches/Enable-share-intent.patch

@@ -468,7 +468,7 @@ new file mode 100644
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -361,6 +361,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -362,6 +362,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kRelatedSearchesAllLanguage,
      &kRelatedSearchesSwitch,
      &kReloadTabUiResourcesIfChanged,
@@ -479,7 +479,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git 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
 --- 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
-@@ -518,6 +518,7 @@ public abstract class ChromeFeatureList {
+@@ -519,6 +519,7 @@ public abstract class ChromeFeatureList {
              "ReadAloudIPHMenuButtonHighlightCCT";
      public static final String READALOUD_PLAYBACK = "ReadAloudPlayback";
      public static final String READALOUD_TAP_TO_SEEK = "ReadAloudTapToSeek";

build/patches/History-number-of-days-privacy-setting.patch

@@ -277,7 +277,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1956,6 +1956,11 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
+@@ -1959,6 +1959,11 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
         IDS_SETTINGS_SAFEBROWSING_ENHANCED_THINGS_TO_CONSIDER_BULLET_THREE},
        {"safeBrowsingStandard", IDS_SETTINGS_SAFEBROWSING_STANDARD},
        {"safeBrowsingStandardDesc", IDS_SETTINGS_SAFEBROWSING_STANDARD_DESC},

build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch

@@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/incognito/Incog
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -5616,9 +5616,9 @@
+@@ -5624,9 +5624,9 @@
      "expiry_milestone": -1
    },
    {

build/patches/Move-navigation-bar-to-bottom.patch

@@ -1882,7 +1882,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
  #include "chrome/browser/android/webapk/webapk_features.h"
  #include "chrome/browser/browser_features.h"
  #include "chrome/browser/contextmenu/context_menu_features.h"
-@@ -326,6 +327,8 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -327,6 +328,8 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kNavBarColorAnimation,
      &kNavBarColorMatchesTabBackground,
      &kNewTabPageAndroidTriggerForPrerender2,
@@ -1894,7 +1894,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git 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
 --- 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
-@@ -450,6 +450,10 @@ public abstract class ChromeFeatureList {
+@@ -451,6 +451,10 @@ public abstract class ChromeFeatureList {
      public static final String NEW_TAB_PAGE_ANDROID_TRIGGER_FOR_PRERENDER2 =
              "NewTabPageAndroidTriggerForPrerender2";
      public static final String NEW_TAB_PAGE_CUSTOMIZATION = "NewTabPageCustomization";
@@ -1905,7 +1905,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final String NEW_TAB_PAGE_CUSTOMIZATION_TOOLBAR_BUTTON =
              "NewTabPageCustomizationToolbarButton";
      public static final String NOTIFICATION_ONE_TAP_UNSUBSCRIBE = "NotificationOneTapUnsubscribe";
-@@ -859,6 +863,10 @@ public abstract class ChromeFeatureList {
+@@ -860,6 +864,10 @@ public abstract class ChromeFeatureList {
              newCachedFlag(NOTIFICATION_TRAMPOLINE, false);
      public static final CachedFlag sOptimizationGuidePushNotifications =
              newCachedFlag(OPTIMIZATION_GUIDE_PUSH_NOTIFICATIONS, true);
@@ -1916,7 +1916,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final CachedFlag sPaintPreviewDemo = newCachedFlag(PAINT_PREVIEW_DEMO, false);
      public static final CachedFlag sPostGetMyMemoryStateToBackground =
              newCachedFlag(POST_GET_MEMORY_PRESSURE_TO_BACKGROUND, true);
-@@ -1036,6 +1044,8 @@ public abstract class ChromeFeatureList {
+@@ -1037,6 +1045,8 @@ public abstract class ChromeFeatureList {
                      sNewTabPageCustomizationToolbarButton,
                      sNotificationTrampoline,
                      sOptimizationGuidePushNotifications,

build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch

@@ -56,7 +56,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git 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
 --- 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
-@@ -322,6 +322,7 @@ public abstract class ChromeFeatureList {
+@@ -323,6 +323,7 @@ public abstract class ChromeFeatureList {
              "ClearBrowsingDataAndroidSurvey";
      public static final String CLEAR_INSTANCE_INFO_WHEN_CLOSED_INTENTIONALLY =
              "ClearInstanceInfoWhenClosedIntentionally";

build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch

@@ -562,7 +562,7 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1961,6 +1961,10 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
+@@ -1964,6 +1964,10 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
        {"dayHistory", IDS_SETTINGS_DAY_HISTORY_DESCRIPTION},
        {"daysHistory", IDS_SETTINGS_DAYS_HISTORY_DESCRIPTION},
        {"foreverHistory", IDS_SETTINGS_FOREVER_HISTORY_DESCRIPTION},

build/patches/Restore-Search-Ready-Omnibox-flag.patch

@@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -352,6 +352,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -353,6 +353,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kReadAloudIPHMenuButtonHighlightCCT,
      &kRecordSuppressionMetrics,
      &kReengagementNotification,
@@ -34,7 +34,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git 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
 --- 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
-@@ -433,6 +433,7 @@ public abstract class ChromeFeatureList {
+@@ -434,6 +434,7 @@ public abstract class ChromeFeatureList {
              "MayLaunchUrlUsesSeparateStoragePartition";
      public static final String MINI_ORIGIN_BAR = "MiniOriginBar";
      public static final String MOST_VISITED_TILES_CUSTOMIZATION = "MostVisitedTilesCustomization";

build/patches/Restore-Simplified-NTP-launch.patch

@@ -1111,7 +1111,7 @@ diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -311,6 +311,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -312,6 +312,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kIncognitoScreenshot,
      &kInstanceSwitcherV2,
      &kKeyboardEscBackNavigation,
@@ -1122,7 +1122,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git 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
 --- 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
-@@ -434,6 +434,7 @@ public abstract class ChromeFeatureList {
+@@ -435,6 +435,7 @@ public abstract class ChromeFeatureList {
              "MayLaunchUrlUsesSeparateStoragePartition";
      public static final String MINI_ORIGIN_BAR = "MiniOriginBar";
      public static final String MOST_VISITED_TILES_CUSTOMIZATION = "MostVisitedTilesCustomization";
@@ -1130,7 +1130,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox";
      public static final String MOST_VISITED_TILES_RESELECT = "MostVisitedTilesReselect";
      public static final String MULTI_INSTANCE_APPLICATION_STATUS_CLEANUP =
-@@ -823,7 +824,7 @@ public abstract class ChromeFeatureList {
+@@ -824,7 +825,7 @@ public abstract class ChromeFeatureList {
                      /* defaultValueInTests= */ true);
      public static final CachedFlag sLockBackPressHandlerAtStart =
              newCachedFlag(LOCK_BACK_PRESS_HANDLER_AT_START, true);

build/patches/Restore-offline-indicator-v2-flag.patch

@@ -117,7 +117,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -329,6 +329,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -330,6 +330,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kNotificationPermissionVariant,
      &kNotificationPermissionBottomSheet,
      &kNotificationTrampoline,
@@ -128,7 +128,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git 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
 --- 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
-@@ -457,6 +457,7 @@ public abstract class ChromeFeatureList {
+@@ -458,6 +458,7 @@ public abstract class ChromeFeatureList {
              "NotificationPermissionBottomSheet";
      public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";
      public static final String NOTIFICATION_TRAMPOLINE = "NotificationTrampoline";

build/patches/Show-NTP-at-startup.patch

@@ -171,7 +171,7 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -371,6 +371,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -372,6 +372,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kSearchInCCT,
      &kSearchInCCTAlternateTapHandling,
      &kSearchResumptionModuleAndroid,

build/patches/Temp-guard-FileSystemAccessPersistentPermissions.patch

@@ -31,9 +31,9 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
 diff --git a/chrome/browser/file_system_access/file_system_access_features.cc b/chrome/browser/file_system_access/file_system_access_features.cc
 --- a/chrome/browser/file_system_access/file_system_access_features.cc
 +++ b/chrome/browser/file_system_access/file_system_access_features.cc
-@@ -23,4 +23,5 @@ BASE_FEATURE(kFileSystemAccessSymbolicLinkCheck,
-              "FileSystemAccessSymbolicLinkCheck",
-              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -29,4 +29,5 @@ BASE_FEATURE(kFileSystemAccessSymbolicLinkCheck,
+ #endif
+ );
  
 +SET_CROMITE_FEATURE_DISABLED(kFileSystemAccessPersistentPermissions);
  }  // namespace features

build/patches/eyeo-133.0.6943.49-chrome_integration.patch

@@ -4023,7 +4023,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
      "//components/affiliations/core/browser:test_support",
      "//components/assist_ranker/proto",
      "//components/autofill/content/browser:test_support",
-@@ -10580,6 +10593,7 @@ if (!is_android) {
+@@ -10581,6 +10594,7 @@ if (!is_android) {
        "//chrome/browser:test_support_ui",
        "//chrome/browser/ui/exclusive_access",
        "//chrome/browser/ui/views/side_panel",