scripts: build-chromium: Update to 125.0.6422.53
Change-Id: I6ee6d8da67ec9b4f81e39f0a5ed9c215f6fe69b7
diff --git a/build-chromium/patches/0020-disable-metrics-by-default.patch b/build-chromium/patches/0020-disable-metrics-by-default.patch
index d61cdff..ab5cdb6 100644
--- a/build-chromium/patches/0020-disable-metrics-by-default.patch
+++ b/build-chromium/patches/0020-disable-metrics-by-default.patch
@@ -8,10 +8,10 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
-index ee84be84d7988..2aeb57ba26e7a 100644
+index f24c982c9a713..e3a6f3f31e0e2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
-@@ -63,7 +63,7 @@ public abstract class FirstRunActivityBase extends AsyncInitializationActivity
+@@ -64,7 +64,7 @@ public abstract class FirstRunActivityBase extends AsyncInitializationActivity
static final String SHOW_SYNC_CONSENT_PAGE = "ShowSyncConsent";
static final String SHOW_HISTORY_SYNC_PAGE = "ShowHistorySync";
diff --git a/build-chromium/patches/0023-disable-article-suggestions-feature-by-default.patch b/build-chromium/patches/0023-disable-article-suggestions-feature-by-default.patch
index fb7f055..a8e4e0a 100644
--- a/build-chromium/patches/0023-disable-article-suggestions-feature-by-default.patch
+++ b/build-chromium/patches/0023-disable-article-suggestions-feature-by-default.patch
@@ -8,7 +8,7 @@
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/feed/core/shared_prefs/pref_names.cc b/components/feed/core/shared_prefs/pref_names.cc
-index 7ac1995862d0b..954915d2fedfe 100644
+index 50f880e715489..c80632a001c40 100644
--- a/components/feed/core/shared_prefs/pref_names.cc
+++ b/components/feed/core/shared_prefs/pref_names.cc
@@ -24,9 +24,9 @@ const char kArticlesListVisible[] = "ntp_snippets.list_visible";
diff --git a/build-chromium/patches/0024-disable-content-feed-suggestions-by-default.patch b/build-chromium/patches/0024-disable-content-feed-suggestions-by-default.patch
index 55d1a1c..0004495 100644
--- a/build-chromium/patches/0024-disable-content-feed-suggestions-by-default.patch
+++ b/build-chromium/patches/0024-disable-content-feed-suggestions-by-default.patch
@@ -8,7 +8,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc
-index b56d1b6968401..7c117f4d0105e 100644
+index 180136f9f6e5f..3c174f994daf6 100644
--- a/components/feed/feed_feature_list.cc
+++ b/components/feed/feed_feature_list.cc
@@ -23,7 +23,7 @@ namespace feed {
diff --git a/build-chromium/patches/0031-disable-media-router-by-default.patch b/build-chromium/patches/0031-disable-media-router-by-default.patch
index 8b2a11c..d38b6ce 100644
--- a/build-chromium/patches/0031-disable-media-router-by-default.patch
+++ b/build-chromium/patches/0031-disable-media-router-by-default.patch
@@ -22,10 +22,10 @@
#if !BUILDFLAG(IS_ANDROID)
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
-index 98bfbc0f96140..010c4bad1ce96 100644
+index 47ada6bf53225..66b1a4272fb8b 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
-@@ -424,7 +424,7 @@ void ProfileImpl::RegisterProfilePrefs(
+@@ -420,7 +420,7 @@ void ProfileImpl::RegisterProfilePrefs(
#endif
registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);
diff --git a/build-chromium/patches/0032-disable-offering-translations-by-default.patch b/build-chromium/patches/0032-disable-offering-translations-by-default.patch
index 11f06d9..b05946d 100644
--- a/build-chromium/patches/0032-disable-offering-translations-by-default.patch
+++ b/build-chromium/patches/0032-disable-offering-translations-by-default.patch
@@ -8,10 +8,10 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
-index bf9682c3e22cb..5db79d5ab1903 100644
+index c91763f863401..4735611281893 100644
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -84,7 +84,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -91,7 +91,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
registry->RegisterBooleanPref(
diff --git a/build-chromium/patches/0033-disable-browser-sign-in-feature-by-default.patch b/build-chromium/patches/0033-disable-browser-sign-in-feature-by-default.patch
index e2945a8..9c82596 100644
--- a/build-chromium/patches/0033-disable-browser-sign-in-feature-by-default.patch
+++ b/build-chromium/patches/0033-disable-browser-sign-in-feature-by-default.patch
@@ -22,7 +22,7 @@
// static
diff --git a/components/signin/internal/identity_manager/primary_account_manager.cc b/components/signin/internal/identity_manager/primary_account_manager.cc
-index bcb78d106f77a..a63e23a1e0657 100644
+index 8dcdb224c4601..00ef4109901e8 100644
--- a/components/signin/internal/identity_manager/primary_account_manager.cc
+++ b/components/signin/internal/identity_manager/primary_account_manager.cc
@@ -227,7 +227,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
diff --git a/build-chromium/patches/0038-disable-autofill-server-communication-by-default.patch b/build-chromium/patches/0038-disable-autofill-server-communication-by-default.patch
index b5fc7dc..0716853 100644
--- a/build-chromium/patches/0038-disable-autofill-server-communication-by-default.patch
+++ b/build-chromium/patches/0038-disable-autofill-server-communication-by-default.patch
@@ -8,10 +8,10 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/autofill/core/common/autofill_features.cc b/components/autofill/core/common/autofill_features.cc
-index 37f895d80e89a..be4ca4499cd0c 100644
+index 8b1de61ff69b4..0e7a048d6735d 100644
--- a/components/autofill/core/common/autofill_features.cc
+++ b/components/autofill/core/common/autofill_features.cc
-@@ -786,7 +786,7 @@ const base::FeatureParam<std::string>
+@@ -793,7 +793,7 @@ const base::FeatureParam<std::string>
// i.e., https://other.autofill.server:port/tbproxy/af/
BASE_FEATURE(kAutofillServerCommunication,
"AutofillServerCommunication",
diff --git a/build-chromium/patches/0077-add-trichrome-browser-apk-targets.patch b/build-chromium/patches/0077-add-trichrome-browser-apk-targets.patch
index d495d2d..11da676 100644
--- a/build-chromium/patches/0077-add-trichrome-browser-apk-targets.patch
+++ b/build-chromium/patches/0077-add-trichrome-browser-apk-targets.patch
@@ -9,10 +9,10 @@
2 files changed, 37 insertions(+)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index 98fe8b1d5282d..c52bd414497f3 100644
+index a7d27041a8d77..ef1aa2682cf62 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
-@@ -2439,6 +2439,10 @@ if (current_toolchain == default_toolchain) {
+@@ -2470,6 +2470,10 @@ if (current_toolchain == default_toolchain) {
is_trichrome = true
is_bundle_module = true
}
@@ -23,7 +23,7 @@
# Exists separately from chrome_public_base_module_java_for_test to allow
# downstream to depend on test support packages without needing to depend on
-@@ -2809,6 +2813,37 @@ if (current_toolchain == default_toolchain) {
+@@ -2843,6 +2847,37 @@ if (current_toolchain == default_toolchain) {
}
}
}
diff --git a/build-chromium/patches/0081-remove-Help-feedback-menu-entry.patch b/build-chromium/patches/0081-remove-Help-feedback-menu-entry.patch
index f3fca69..22c8be5 100644
--- a/build-chromium/patches/0081-remove-Help-feedback-menu-entry.patch
+++ b/build-chromium/patches/0081-remove-Help-feedback-menu-entry.patch
@@ -8,10 +8,10 @@
1 file changed, 2 insertions(+)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
-index 029690ef6b7dd..e556105d3a091 100644
+index f8855e3f7a124..736dc63209f5f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
-@@ -576,6 +576,8 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -577,6 +577,8 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
menu.findItem(R.id.reader_mode_prefs_id)
.setVisible(isCurrentTabNotNull && shouldShowReaderModePrefs(currentTab));
diff --git a/build-chromium/patches/0082-hide-passwords.google.com-link-when-not-supported.patch b/build-chromium/patches/0082-hide-passwords.google.com-link-when-not-supported.patch
index 327e717..478c04a 100644
--- a/build-chromium/patches/0082-hide-passwords.google.com-link-when-not-supported.patch
+++ b/build-chromium/patches/0082-hide-passwords.google.com-link-when-not-supported.patch
@@ -8,10 +8,10 @@
1 file changed, 4 insertions(+)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
-index a5d5e5b46032b..1123ce7b3fa4d 100644
+index b6e151ee98c1d..8db0d1c60252b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
-@@ -40,6 +40,7 @@ import org.chromium.chrome.browser.preferences.Pref;
+@@ -39,6 +39,7 @@ import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
@@ -19,7 +19,7 @@
import org.chromium.chrome.browser.sync.SyncServiceFactory;
import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils;
import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
-@@ -654,6 +655,9 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
+@@ -651,6 +652,9 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
if (mSearchQuery != null && !mNoPasswords) {
return; // Don't add the Manage Account link if there is a search going on.
}
diff --git a/build-chromium/patches/0084-Consolidate-downstream-changes-in-dependencies-sourc.patch b/build-chromium/patches/0085-Consolidate-downstream-changes-in-dependencies-sourc.patch
similarity index 95%
rename from build-chromium/patches/0084-Consolidate-downstream-changes-in-dependencies-sourc.patch
rename to build-chromium/patches/0085-Consolidate-downstream-changes-in-dependencies-sourc.patch
index 9787fcc..67e9bda 100644
--- a/build-chromium/patches/0084-Consolidate-downstream-changes-in-dependencies-sourc.patch
+++ b/build-chromium/patches/0085-Consolidate-downstream-changes-in-dependencies-sourc.patch
@@ -17,7 +17,7 @@
create mode 100644 chrome/android/chrome_ext_java_sources.gni
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index c52bd414497f3..2dd93450d33b1 100644
+index ef1aa2682cf62..925a133b9726e 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -10,6 +10,9 @@ import("//build/config/cronet/config.gni")
@@ -30,7 +30,7 @@
import("//chrome/android/chrome_java_resources.gni")
import("//chrome/android/chrome_public_apk_tmpl.gni")
import("//chrome/android/expectations/expectations.gni")
-@@ -195,6 +198,8 @@ if (current_toolchain == default_toolchain) {
+@@ -196,6 +199,8 @@ if (current_toolchain == default_toolchain) {
android_resources("chrome_app_java_resources") {
sources = chrome_java_resources
@@ -39,7 +39,7 @@
sources += [ "//chrome/android/java/res_app/layout/main.xml" ]
deps = [
-@@ -735,6 +740,11 @@ if (current_toolchain == default_toolchain) {
+@@ -751,6 +756,11 @@ if (current_toolchain == default_toolchain) {
# From java_sources.gni.
sources = chrome_java_sources + [ app_hooks_impl ]
@@ -91,7 +91,7 @@
+chrome_ext_java_sources = [
+]
diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
-index 12b9d4678386b..8a1cf88ba13d0 100644
+index cdb3c68a13da9..bccec1b15d097 100644
--- a/chrome/android/chrome_java_resources.gni
+++ b/chrome/android/chrome_java_resources.gni
@@ -7,6 +7,8 @@
diff --git a/build-chromium/patches/0085-Consolidate-downstream-strings-in-a-separate-file-fo.patch b/build-chromium/patches/0086-Consolidate-downstream-strings-in-a-separate-file-fo.patch
similarity index 97%
rename from build-chromium/patches/0085-Consolidate-downstream-strings-in-a-separate-file-fo.patch
rename to build-chromium/patches/0086-Consolidate-downstream-strings-in-a-separate-file-fo.patch
index 14aa4c6..5a0257d 100644
--- a/build-chromium/patches/0085-Consolidate-downstream-strings-in-a-separate-file-fo.patch
+++ b/build-chromium/patches/0086-Consolidate-downstream-strings-in-a-separate-file-fo.patch
@@ -23,7 +23,7 @@
+<grit-part>
+</grit-part>
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-index 63d06028e357c..0aaf728dd69bb 100644
+index f7054e2a9369d..104a9ffdf533b 100644
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -202,6 +202,7 @@ CHAR_LIMIT guidelines:
diff --git a/build-chromium/patches/0086-Utility-class-for-adding-shared-preference-keys.patch b/build-chromium/patches/0087-Utility-class-for-adding-shared-preference-keys.patch
similarity index 98%
rename from build-chromium/patches/0086-Utility-class-for-adding-shared-preference-keys.patch
rename to build-chromium/patches/0087-Utility-class-for-adding-shared-preference-keys.patch
index 334f70c..4ffd45f 100644
--- a/build-chromium/patches/0086-Utility-class-for-adding-shared-preference-keys.patch
+++ b/build-chromium/patches/0087-Utility-class-for-adding-shared-preference-keys.patch
@@ -11,10 +11,10 @@
create mode 100644 base/android/java/src/org/chromium/base/shared_preferences/SharedPrefsUtils.java
diff --git a/base/BUILD.gn b/base/BUILD.gn
-index 25356ec40cdbf..5d27f15fdba37 100644
+index 5dc15da08eeff..4870d4720fab7 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
-@@ -4633,6 +4633,9 @@ if (is_android) {
+@@ -4669,6 +4669,9 @@ if (is_android) {
"android/java/src/org/chromium/base/shared_preferences/SharedPreferencesManager.java",
"android/java/src/org/chromium/base/shared_preferences/StrictPreferenceKeyChecker.java",
]
diff --git a/build-chromium/patches/0087-Helper-class-for-modifying-preferences-at-chrome-lay.patch b/build-chromium/patches/0088-Helper-class-for-modifying-preferences-at-chrome-lay.patch
similarity index 100%
rename from build-chromium/patches/0087-Helper-class-for-modifying-preferences-at-chrome-lay.patch
rename to build-chromium/patches/0088-Helper-class-for-modifying-preferences-at-chrome-lay.patch
diff --git a/build-chromium/patches/0088-Utility-class-for-modifying-preferences-at-Privacy-s.patch b/build-chromium/patches/0089-Utility-class-for-modifying-preferences-at-Privacy-s.patch
similarity index 97%
rename from build-chromium/patches/0088-Utility-class-for-modifying-preferences-at-Privacy-s.patch
rename to build-chromium/patches/0089-Utility-class-for-modifying-preferences-at-Privacy-s.patch
index 6e80d66..654afeb 100644
--- a/build-chromium/patches/0088-Utility-class-for-modifying-preferences-at-Privacy-s.patch
+++ b/build-chromium/patches/0089-Utility-class-for-modifying-preferences-at-Privacy-s.patch
@@ -49,7 +49,7 @@
+</PreferenceScreen>
+
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-index 1c26a9f482f07..c7180f7e45be4 100644
+index 88c5241c0c93c..96bf04332e1c6 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -85,6 +85,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -61,7 +61,7 @@
Preference ipProtectionPreference = findPreference(PREF_IP_PROTECTION);
ipProtectionPreference.setVisible(shouldShowIpProtectionUI());
ipProtectionPreference.setOnPreferenceClickListener(
-@@ -226,6 +228,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -227,6 +229,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
clearBrowsingDataAdvancedPreference.setVisible(true);
}
@@ -70,7 +70,7 @@
updatePreferences();
}
-@@ -355,6 +359,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -358,6 +362,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
UserPrefs.get(getProfile()).getInteger(COOKIE_CONTROLS_MODE)));
}
diff --git a/build-chromium/patches/0089-Remove-not-applicable-additional-terms-of-services.patch b/build-chromium/patches/0090-Remove-not-applicable-additional-terms-of-services.patch
similarity index 100%
rename from build-chromium/patches/0089-Remove-not-applicable-additional-terms-of-services.patch
rename to build-chromium/patches/0090-Remove-not-applicable-additional-terms-of-services.patch
diff --git a/build-chromium/patches/0092-remove-unwanted-sync-and-services-link.patch b/build-chromium/patches/0093-remove-unwanted-sync-and-services-link.patch
similarity index 92%
rename from build-chromium/patches/0092-remove-unwanted-sync-and-services-link.patch
rename to build-chromium/patches/0093-remove-unwanted-sync-and-services-link.patch
index 3d4a01e..fd875ea 100644
--- a/build-chromium/patches/0092-remove-unwanted-sync-and-services-link.patch
+++ b/build-chromium/patches/0093-remove-unwanted-sync-and-services-link.patch
@@ -8,10 +8,10 @@
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-index c7180f7e45be4..b5cbd66fa8e3e 100644
+index 96bf04332e1c6..92a568237186f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -198,8 +198,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -199,8 +199,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
Preference secureDnsPref = findPreference(PREF_SECURE_DNS);
secureDnsPref.setVisible(SecureDnsSettings.isUiEnabled());
diff --git a/build-chromium/patches/0093-remove-safety-check-menu.patch b/build-chromium/patches/0094-remove-safety-check-menu.patch
similarity index 89%
rename from build-chromium/patches/0093-remove-safety-check-menu.patch
rename to build-chromium/patches/0094-remove-safety-check-menu.patch
index 080dc22..42e5eab 100644
--- a/build-chromium/patches/0093-remove-safety-check-menu.patch
+++ b/build-chromium/patches/0094-remove-safety-check-menu.patch
@@ -8,10 +8,10 @@
1 file changed, 2 insertions(+)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
-index c00cefb5ee138..100ceb72e5667 100644
+index 2f89b9b605017..96b4b169ff38e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
-@@ -240,6 +240,8 @@ public class MainSettings extends ChromeBaseSettingsFragment
+@@ -244,6 +244,8 @@ public class MainSettings extends ChromeBaseSettingsFragment
templateUrlService.load();
}
diff --git a/build-chromium/patches/0094-remove-unwanted-account-and-services-section.patch b/build-chromium/patches/0095-remove-unwanted-account-and-services-section.patch
similarity index 90%
rename from build-chromium/patches/0094-remove-unwanted-account-and-services-section.patch
rename to build-chromium/patches/0095-remove-unwanted-account-and-services-section.patch
index ce07be5..204e3fb 100644
--- a/build-chromium/patches/0094-remove-unwanted-account-and-services-section.patch
+++ b/build-chromium/patches/0095-remove-unwanted-account-and-services-section.patch
@@ -8,10 +8,10 @@
1 file changed, 2 insertions(+)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
-index 100ceb72e5667..085be3bc33a3e 100644
+index 96b4b169ff38e..234838c7ed53b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
-@@ -241,6 +241,8 @@ public class MainSettings extends ChromeBaseSettingsFragment
+@@ -245,6 +245,8 @@ public class MainSettings extends ChromeBaseSettingsFragment
}
getPreferenceScreen().removePreference(findPreference(PREF_SAFETY_CHECK));
diff --git a/build-chromium/patches/0095-remove-translate-offer-preference.patch b/build-chromium/patches/0096-remove-translate-offer-preference.patch
similarity index 95%
rename from build-chromium/patches/0095-remove-translate-offer-preference.patch
rename to build-chromium/patches/0096-remove-translate-offer-preference.patch
index 39abf4b..74e3b36 100644
--- a/build-chromium/patches/0095-remove-translate-offer-preference.patch
+++ b/build-chromium/patches/0096-remove-translate-offer-preference.patch
@@ -8,12 +8,12 @@
1 file changed, 1 insertion(+), 28 deletions(-)
diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
-index 0b4da85180efb..2e0540d8cccd4 100644
+index fbf6133b8fe8d..f2434b078f7f9 100644
--- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
+++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
@@ -97,34 +97,7 @@ public class LanguageSettings extends ChromeBaseSettingsFragment
(ContentLanguagesPreference) findPreference(PREFERRED_LANGUAGES_KEY);
- mLanguageListPref.initialize(this, getPrefService());
+ mLanguageListPref.initialize(this, getProfile(), getPrefService());
- ChromeSwitchPreference translateSwitch =
- (ChromeSwitchPreference) findPreference(TRANSLATE_SWITCH_KEY);
diff --git a/build-chromium/patches/0096-Hide-Sign-In-preference-when-disallowed.patch b/build-chromium/patches/0097-Hide-Sign-In-preference-when-disallowed.patch
similarity index 89%
rename from build-chromium/patches/0096-Hide-Sign-In-preference-when-disallowed.patch
rename to build-chromium/patches/0097-Hide-Sign-In-preference-when-disallowed.patch
index 056ee13..3f1c45d 100644
--- a/build-chromium/patches/0096-Hide-Sign-In-preference-when-disallowed.patch
+++ b/build-chromium/patches/0097-Hide-Sign-In-preference-when-disallowed.patch
@@ -8,10 +8,10 @@
1 file changed, 1 insertion(+)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java
-index e70f4fd44fea1..1a867a507660d 100644
+index 07472d9bb8239..49dc5fbf9322b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java
-@@ -165,6 +165,7 @@ public class SignInPreference extends Preference
+@@ -168,6 +168,7 @@ public class SignInPreference extends Preference
}
private void setupSigninDisallowed() {
diff --git a/build-chromium/patches/0100-Move-search-suggestions-back-to-privacy-section.patch b/build-chromium/patches/0101-Move-search-suggestions-back-to-privacy-section.patch
similarity index 100%
rename from build-chromium/patches/0100-Move-search-suggestions-back-to-privacy-section.patch
rename to build-chromium/patches/0101-Move-search-suggestions-back-to-privacy-section.patch
diff --git a/build-chromium/patches/0108-Add-missing-null-check-for-password-manager-autofill.patch b/build-chromium/patches/0116-Add-missing-null-check-for-password-manager-autofill.patch
similarity index 89%
rename from build-chromium/patches/0108-Add-missing-null-check-for-password-manager-autofill.patch
rename to build-chromium/patches/0116-Add-missing-null-check-for-password-manager-autofill.patch
index d0f01b9..8281d8b 100644
--- a/build-chromium/patches/0108-Add-missing-null-check-for-password-manager-autofill.patch
+++ b/build-chromium/patches/0116-Add-missing-null-check-for-password-manager-autofill.patch
@@ -8,10 +8,10 @@
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/components/autofill/content/renderer/password_autofill_agent.cc
-index 4f7b3011eb1f5..2c74e8fb673be 100644
+index 069ab2d143d9a..9e081ec0d61d8 100644
--- a/components/autofill/content/renderer/password_autofill_agent.cc
+++ b/components/autofill/content/renderer/password_autofill_agent.cc
-@@ -827,7 +827,9 @@ void PasswordAutofillAgent::UpdatePasswordStateForTextChange(
+@@ -825,7 +825,9 @@ void PasswordAutofillAgent::UpdatePasswordStateForTextChange(
void PasswordAutofillAgent::TrackAutofilledElement(
const blink::WebFormControlElement& element) {
diff --git a/build-chromium/patches/0112-Drop-workaround-with-android-autofill-in-compatibili.patch b/build-chromium/patches/0117-Drop-workaround-with-android-autofill-in-compatibili.patch
similarity index 97%
rename from build-chromium/patches/0112-Drop-workaround-with-android-autofill-in-compatibili.patch
rename to build-chromium/patches/0117-Drop-workaround-with-android-autofill-in-compatibili.patch
index 1e3643e..8f249b3 100644
--- a/build-chromium/patches/0112-Drop-workaround-with-android-autofill-in-compatibili.patch
+++ b/build-chromium/patches/0117-Drop-workaround-with-android-autofill-in-compatibili.patch
@@ -11,7 +11,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
-index 7ca1234d3b284..f3be10df2f8cc 100644
+index b2b29e0d6e852..8715bd93e15dc 100644
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
@@ -379,7 +379,7 @@ public abstract class UrlBar extends AutocompleteEditText {
diff --git a/build-chromium/patches/0113-Enable-android-autofill-on-http-authentication-dialo.patch b/build-chromium/patches/0118-Enable-android-autofill-on-http-authentication-dialo.patch
similarity index 100%
rename from build-chromium/patches/0113-Enable-android-autofill-on-http-authentication-dialo.patch
rename to build-chromium/patches/0118-Enable-android-autofill-on-http-authentication-dialo.patch
diff --git a/build-chromium/patches/0114-Enable-usage-of-Android-Autofill-by-default.patch b/build-chromium/patches/0119-Enable-usage-of-Android-Autofill-by-default.patch
similarity index 65%
rename from build-chromium/patches/0114-Enable-usage-of-Android-Autofill-by-default.patch
rename to build-chromium/patches/0119-Enable-usage-of-Android-Autofill-by-default.patch
index c77f21a..117692f 100644
--- a/build-chromium/patches/0114-Enable-usage-of-Android-Autofill-by-default.patch
+++ b/build-chromium/patches/0119-Enable-usage-of-Android-Autofill-by-default.patch
@@ -5,11 +5,12 @@
---
components/autofill/core/common/autofill_features.cc | 2 +-
+ components/autofill/core/common/autofill_features.h | 2 +-
components/autofill/core/common/autofill_prefs.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/autofill/core/common/autofill_features.cc b/components/autofill/core/common/autofill_features.cc
-index be4ca4499cd0c..d27f43c8a0625 100644
+index 0e7a048d6735d..8355f98628e23 100644
--- a/components/autofill/core/common/autofill_features.cc
+++ b/components/autofill/core/common/autofill_features.cc
@@ -703,7 +703,7 @@ BASE_FEATURE(kAutofillEnableSecurityTouchEventFilteringAndroid,
@@ -21,6 +22,19 @@
#endif // BUILDFLAG(IS_ANDROID)
+diff --git a/components/autofill/core/common/autofill_features.h b/components/autofill/core/common/autofill_features.h
+index 4e411b4b396a9..5e5662ec4f3b8 100644
+--- a/components/autofill/core/common/autofill_features.h
++++ b/components/autofill/core/common/autofill_features.h
+@@ -234,7 +234,7 @@ BASE_DECLARE_FEATURE(kAutofillVirtualViewStructureAndroid);
+ inline constexpr base::FeatureParam<bool>
+ kAutofillVirtualViewStructureAndroidSkipsCompatibilityCheck{
+ &kAutofillVirtualViewStructureAndroid, "skip_compatibility_check",
+- false};
++ true};
+ #endif // BUILDFLAG(IS_ANDROID)
+
+ #if BUILDFLAG(IS_APPLE)
diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc
index 054cd27a90c1a..4eda98fc42727 100644
--- a/components/autofill/core/common/autofill_prefs.cc
diff --git a/build-chromium/patches/0115-Disable-Play-services-dependent-password-manager-pre.patch b/build-chromium/patches/0120-Disable-Play-services-dependent-password-manager-pre.patch
similarity index 92%
rename from build-chromium/patches/0115-Disable-Play-services-dependent-password-manager-pre.patch
rename to build-chromium/patches/0120-Disable-Play-services-dependent-password-manager-pre.patch
index 9c20340..34c879d 100644
--- a/build-chromium/patches/0115-Disable-Play-services-dependent-password-manager-pre.patch
+++ b/build-chromium/patches/0120-Disable-Play-services-dependent-password-manager-pre.patch
@@ -9,10 +9,10 @@
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
-index f62e60e3ebdc0..33341569ee597 100644
+index 804e998494ec7..e1d64b4a1f29e 100644
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
-@@ -301,8 +301,8 @@ void PasswordManager::RegisterProfilePrefs(
+@@ -316,8 +316,8 @@ void PasswordManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(prefs::kPasswordsPrefWithNewLabelUsed, false);
#if BUILDFLAG(IS_ANDROID)
diff --git a/build-chromium/patches/0161-enable-hybrid-post-quantum-key-exchange-on-Android.patch b/build-chromium/patches/0159-enable-hybrid-post-quantum-key-exchange-on-Android.patch
similarity index 87%
rename from build-chromium/patches/0161-enable-hybrid-post-quantum-key-exchange-on-Android.patch
rename to build-chromium/patches/0159-enable-hybrid-post-quantum-key-exchange-on-Android.patch
index bb022ba..cec8d16 100644
--- a/build-chromium/patches/0161-enable-hybrid-post-quantum-key-exchange-on-Android.patch
+++ b/build-chromium/patches/0159-enable-hybrid-post-quantum-key-exchange-on-Android.patch
@@ -8,10 +8,10 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/base/features.cc b/net/base/features.cc
-index 35f5f286e8424..f150144b306c6 100644
+index d72f355aea033..a01cd5d31e52a 100644
--- a/net/base/features.cc
+++ b/net/base/features.cc
-@@ -153,7 +153,7 @@ BASE_FEATURE(kPermuteTLSExtensions,
+@@ -157,7 +157,7 @@ BASE_FEATURE(kPermuteTLSExtensions,
BASE_FEATURE(kPostQuantumKyber,
"PostQuantumKyber",