Update/port patches for 128.0.6613.88.0

GrapheneOS · Aug 21, 2024 · ebe4115 · ebe4115
1 parent dc203a1
commit ebe4115
Show file tree

Hide file tree

Showing 124 changed files with 39,828 additions and 33,181 deletions.
diff --git a/patches/0001-Vanadium-string-rebranding.patch b/patches/0001-Vanadium-string-rebranding.patch
diff --git a/patches/0002-Vanadium-branding.patch b/patches/0002-Vanadium-branding.patch
@@ -49,10 +49,10 @@ Current incantation of the recolor command:
  create mode 100644 chrome/android/java/res_vanadium_base/values/channel_constants.xml
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index 92b4bddd53412..a52a6e6b13959 100644
+index 617a85a84d6a2..76aaf7ac31443 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -173,24 +173,24 @@ if (current_toolchain == default_toolchain) {
+@@ -174,24 +174,24 @@ if (current_toolchain == default_toolchain) {
        "java/res_base/values/ic_launcher_round_alias.xml",
        "java/res_base/values/values.xml",
        "java/res_base/xml/network_security_config.xml",
@@ -95,7 +95,7 @@ index 92b4bddd53412..a52a6e6b13959 100644
      ]
    }
 
-@@ -2239,24 +2239,24 @@ if (current_toolchain == default_toolchain) {
+@@ -2255,24 +2255,24 @@ if (current_toolchain == default_toolchain) {
    android_resources("chrome_public_apk_base_module_resources") {
      resource_overlay = true
      sources = [

diff --git a/patches/0004-Support-for-extended-version-name-and-increments.patch b/patches/0004-Support-for-extended-version-name-and-increments.patch
@@ -10,10 +10,10 @@ Subject: [PATCH] Support for extended version name and increments
  3 files changed, 38 insertions(+), 5 deletions(-)
 
 diff --git a/build/util/android_chrome_version.py b/build/util/android_chrome_version.py
-index 767e4eeb4d571..281e24f54017d 100755
+index 957bfa0306e6a..adc9798d31f74 100755
 --- a/build/util/android_chrome_version.py
 +++ b/build/util/android_chrome_version.py
-@@ -314,7 +314,7 @@ def TranslateVersionCode(version_code, is_webview=False):
+@@ -317,7 +317,7 @@ def TranslateVersionCode(version_code, is_webview=False):
                                 is_next_build)
 
 
@@ -22,7 +22,7 @@ index 767e4eeb4d571..281e24f54017d 100755
    """Build dict of version codes for the specified build architecture. Eg:
 
    {
-@@ -337,7 +337,7 @@ def GenerateVersionCodes(build_number, patch_number, arch, is_next_build):
+@@ -340,7 +340,7 @@ def GenerateVersionCodes(build_number, patch_number, arch, is_next_build):
 
    Thus, this method is responsible for the final two digits of versionCode.
    """
@@ -31,7 +31,7 @@ index 767e4eeb4d571..281e24f54017d 100755
 
    if is_next_build:
      base_version_code += _NEXT_BUILD_VERSION_CODE_DIFF
-@@ -382,8 +382,8 @@ def main():
+@@ -385,8 +385,8 @@ def main():
    elif args.version_name:
      if not args.arch:
        parser.error('Required --arch')
@@ -71,7 +71,7 @@ index e8056ba1aa001..1336678964c18 100755
 
    return values
 diff --git a/chrome/version.gni b/chrome/version.gni
-index 3677614b402f6..02e7491134be8 100644
+index 10ae6eddf59f1..27b818813e8bc 100644
 --- a/chrome/version.gni
 +++ b/chrome/version.gni
 @@ -39,6 +39,33 @@ if (is_mac) {

diff --git a/patches/0005-temporary-Workaround-for-crashes-at-StackTrace-calls.patch b/patches/0005-temporary-Workaround-for-crashes-at-StackTrace-calls.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] temporary: Workaround for crashes at StackTrace calls
  1 file changed, 4 insertions(+)
 
 diff --git a/tools/cfi/ignores.txt b/tools/cfi/ignores.txt
-index 8cb5c3679b7fe..0700f7095c3fa 100644
+index 3b9a1287cd837..6354afe3cc628 100644
 --- a/tools/cfi/ignores.txt
 +++ b/tools/cfi/ignores.txt
-@@ -280,3 +280,7 @@ src:*third_party/pthreadpool/src/src/portable-api.c
+@@ -284,3 +284,7 @@ src:*third_party/pthreadpool/src/src/portable-api.c
  ######### Uncategorized
 
  src:*native_client/*

diff --git a/patches/0007-enable-stack-clash-protection-for-arm64-targets.patch b/patches/0007-enable-stack-clash-protection-for-arm64-targets.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] enable stack clash protection for arm64 targets
  1 file changed, 4 insertions(+)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index f598fd188a4ce..d8e9203096789 100644
+index 5898b8c54bef2..f78448d0ac6e5 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
 @@ -371,6 +371,10 @@ config("compiler") {

diff --git a/patches/0008-switch-to-fstack-protector-strong.patch b/patches/0008-switch-to-fstack-protector-strong.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] switch to -fstack-protector-strong
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index d8e9203096789..e751d7b359e32 100644
+index f78448d0ac6e5..39edcc66c27ce 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
 @@ -366,7 +366,7 @@ config("compiler") {

diff --git a/patches/0009-enable-fwrapv-in-Clang-for-non-UBSan-builds.patch b/patches/0009-enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] enable -fwrapv in Clang for non-UBSan builds
  1 file changed, 4 insertions(+)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index e751d7b359e32..c2b0ffc5b14e9 100644
+index 39edcc66c27ce..5112a83eccef2 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
 @@ -382,6 +382,10 @@ config("compiler") {

diff --git a/patches/0010-enable-ftrivial-auto-var-init-zero.patch b/patches/0010-enable-ftrivial-auto-var-init-zero.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] enable -ftrivial-auto-var-init=zero
  1 file changed, 4 insertions(+)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index c2b0ffc5b14e9..624297fb2d0a0 100644
+index 5112a83eccef2..e2112016d6db1 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
 @@ -386,6 +386,10 @@ config("compiler") {

diff --git a/patches/0011-disable-broken-warning-for-auto-var-init.patch b/patches/0011-disable-broken-warning-for-auto-var-init.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] disable broken warning for auto var init
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 624297fb2d0a0..77b26305a0d8a 100644
+index e2112016d6db1..95d1248b5bd39 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
 @@ -387,7 +387,7 @@ config("compiler") {

diff --git a/patches/0012-Checkout-PGO-profiles.patch b/patches/0012-Checkout-PGO-profiles.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Checkout PGO profiles
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/DEPS b/DEPS
-index 2ef294f2050ad..aeb7785f9eaa7 100644
+index 24e3d54243d59..5f30d7de632e9 100644
 --- a/DEPS
 +++ b/DEPS
 @@ -149,7 +149,7 @@ vars = {

diff --git a/patches/0013-disable-checkout_nacl.patch b/patches/0013-disable-checkout_nacl.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] disable checkout_nacl
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/DEPS b/DEPS
-index aeb7785f9eaa7..5481322f86a44 100644
+index 5f30d7de632e9..4505e1a6164b9 100644
 --- a/DEPS
 +++ b/DEPS
 @@ -118,7 +118,7 @@ vars = {

diff --git a/patches/0017-disable-WebView-variations-support.patch b/patches/0017-disable-WebView-variations-support.patch
@@ -26,10 +26,10 @@ index f8fca3ff457ee..9e2191c8560d0 100644
 
              // TODO(crbug.com/332706093): See if this can be moved before loading native.
 diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
-index 724325b335a29..ba01cc68e672d 100644
+index 3fee8af683063..2afc2347d2a84 100644
 --- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
 +++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
-@@ -518,10 +518,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
+@@ -520,10 +520,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
                  }
              }
 

diff --git a/patches/0018-disable-Media-Integrity-blink-extension-API-on-webvi.patch b/patches/0018-disable-Media-Integrity-blink-extension-API-on-webvi.patch
@@ -9,10 +9,10 @@ Subject: [PATCH] disable Media Integrity blink extension API on webview by
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/android_webview/common/aw_features.cc b/android_webview/common/aw_features.cc
-index f3d7c477485ce..c3bcdc896d9f5 100644
+index 851bd0a11c535..a72d0672583e3 100644
 --- a/android_webview/common/aw_features.cc
 +++ b/android_webview/common/aw_features.cc
-@@ -77,7 +77,7 @@ BASE_FEATURE(kWebViewDisplayCutout,
+@@ -82,7 +82,7 @@ BASE_FEATURE(kWebViewDisplayCutout,
  // This feature requires `kWebViewMediaIntegrityApi` to be disabled.
  BASE_FEATURE(kWebViewMediaIntegrityApiBlinkExtension,
               "WebViewMediaIntegrityApiBlinkExtension",

diff --git a/patches/0019-disable-navigation-error-correction-by-default.patch b/patches/0019-disable-navigation-error-correction-by-default.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] disable navigation error correction by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc
-index 6a0d1c78df0df..b948773edbb39 100644
+index 194ae44982991..eccb6bea6b66b 100644
 --- a/chrome/browser/net/profile_network_context_service.cc
 +++ b/chrome/browser/net/profile_network_context_service.cc
-@@ -383,7 +383,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParams(
+@@ -382,7 +382,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParams(
  void ProfileNetworkContextService::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,

diff --git a/patches/0020-disable-contextual-search-by-default.patch b/patches/0020-disable-contextual-search-by-default.patch
@@ -22,7 +22,7 @@ index 46146a968f9df..3eea0b291ed27 100644
 
      /**
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
-index cd4fd8104866c..8c8259537bef4 100644
+index 5b20629062d21..edf86071beae6 100644
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
 @@ -323,7 +323,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

diff --git a/patches/0023-disable-hyperlink-auditing-by-default.patch b/patches/0023-disable-hyperlink-auditing-by-default.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] disable hyperlink auditing by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
-index 7c3178793b3fb..dcfece40f6eb9 100644
+index c4b98aa0e759f..71d41bdda2267 100644
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1548,7 +1548,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -1582,7 +1582,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
  void ChromeContentBrowserClient::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);

diff --git a/patches/0026-disable-content-feed-suggestions-by-default.patch b/patches/0026-disable-content-feed-suggestions-by-default.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] disable content feed suggestions by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc
-index 9fb2e05992401..7a724cff9989c 100644
+index f22a559cfa81d..b404f24e2aadc 100644
 --- a/components/feed/feed_feature_list.cc
 +++ b/components/feed/feed_feature_list.cc
-@@ -23,7 +23,7 @@ namespace feed {
+@@ -28,7 +28,7 @@ const char kEnableRssLinkReader[] = "enable-rss-link-reader";
  // changed, please update the cached one's default value in CachedFeatureFlags.
  BASE_FEATURE(kInterestFeedV2,
               "InterestFeedV2",

diff --git a/patches/0027-disable-sensors-access-by-default.patch b/patches/0027-disable-sensors-access-by-default.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] disable sensors access by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
-index 229ac346cfc83..a753f25f774bb 100644
+index d6b35d0d3c785..d9c5dcc65d273 100644
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -374,7 +374,7 @@ void ContentSettingsRegistry::Init() {
+@@ -385,7 +385,7 @@ void ContentSettingsRegistry::Init() {
    // TODO(crbug.com/40602007): Update this to "SECURE_ONLY" once
    // DeviceOrientationEvents and DeviceMotionEvents are only fired in secure
    // contexts.

diff --git a/patches/0028-block-playing-protected-media-by-default.patch b/patches/0028-block-playing-protected-media-by-default.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] block playing protected media by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
-index a753f25f774bb..1fa4de5a0040a 100644
+index d9c5dcc65d273..7969111de6361 100644
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
 @@ -211,7 +211,7 @@ void ContentSettingsRegistry::Init() {

diff --git a/patches/0030-disable-background-sync-by-default.patch b/patches/0030-disable-background-sync-by-default.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] disable background sync by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
-index 1fa4de5a0040a..9af5fe90dae2d 100644
+index 7969111de6361..70aa29783fffb 100644
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
 @@ -238,7 +238,7 @@ void ContentSettingsRegistry::Init() {

diff --git a/patches/0032-disable-media-router-media-remoting-by-default.patch b/patches/0032-disable-media-router-media-remoting-by-default.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] disable media router media remoting by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
-index 83ce8035e7e06..6cc85c85936f5 100644
+index 4c1c07e84b41b..e39cbeddfd1e7 100644
 --- a/chrome/browser/media/router/media_router_feature.cc
 +++ b/chrome/browser/media/router/media_router_feature.cc
-@@ -152,7 +152,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -161,7 +161,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterStringPref(prefs::kMediaRouterReceiverIdHashToken, "",
                                 PrefRegistry::PUBLIC);
    registry->RegisterBooleanPref(

diff --git a/patches/0033-disable-media-router-by-default.patch b/patches/0033-disable-media-router-by-default.patch
@@ -9,10 +9,10 @@ Subject: [PATCH] disable media router by default
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
-index 6cc85c85936f5..073672e90e56b 100644
+index e39cbeddfd1e7..8013d5d6595a0 100644
 --- a/chrome/browser/media/router/media_router_feature.cc
 +++ b/chrome/browser/media/router/media_router_feature.cc
-@@ -139,7 +139,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) {
+@@ -148,7 +148,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) {
      pref_values.insert(std::make_pair(context, allowed));
      return allowed;
    }
@@ -22,10 +22,10 @@ index 6cc85c85936f5..073672e90e56b 100644
 
  #if !BUILDFLAG(IS_ANDROID)
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
-index a7d35836cb9da..6b40c42d276b3 100644
+index df8be30cd11b3..3ce95c71d102a 100644
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -422,7 +422,7 @@ void ProfileImpl::RegisterProfilePrefs(
+@@ -423,7 +423,7 @@ void ProfileImpl::RegisterProfilePrefs(
  #endif
 
    registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);

diff --git a/patches/0034-disable-offering-translations-by-default.patch b/patches/0034-disable-offering-translations-by-default.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] disable offering translations by default
  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 c91763f863401..4735611281893 100644
+index 0431762d4e726..073f13334cae7 100644
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -91,7 +91,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -95,7 +95,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
    registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
    registry->RegisterBooleanPref(

diff --git a/patches/0035-disable-browser-sign-in-feature-by-default.patch b/patches/0035-disable-browser-sign-in-feature-by-default.patch
@@ -22,10 +22,10 @@ index acf531439ae2c..5b898f5af1c0d 100644
 
  // static
 diff --git a/components/signin/internal/identity_manager/primary_account_manager.cc b/components/signin/internal/identity_manager/primary_account_manager.cc
-index 77b673403fa7b..32b302500befa 100644
+index 2c687029f0f75..85874020c1a0e 100644
 --- a/components/signin/internal/identity_manager/primary_account_manager.cc
 +++ b/components/signin/internal/identity_manager/primary_account_manager.cc
-@@ -245,7 +245,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -249,7 +249,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
        prefs::kGoogleServicesSyncingGaiaIdMigratedToSignedIn, std::string());
    registry->RegisterStringPref(
        prefs::kGoogleServicesSyncingUsernameMigratedToSignedIn, std::string());

diff --git a/patches/0036-disable-safe-browsing-reporting-opt-in-by-default.patch b/patches/0036-disable-safe-browsing-reporting-opt-in-by-default.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] disable safe browsing reporting opt-in by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc
-index f7727d7947010..677e57395e5b6 100644
+index 91d53d21e39cb..58877d34c667d 100644
 --- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
 +++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
-@@ -168,7 +168,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -174,7 +174,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterBooleanPref(
        prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
    registry->RegisterBooleanPref(

diff --git a/patches/0037-disable-unused-safe-browsing-option-by-default.patch b/patches/0037-disable-unused-safe-browsing-option-by-default.patch
@@ -12,10 +12,10 @@ that privacy is preserved.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc
-index 677e57395e5b6..d0989d3d8e3b8 100644
+index 58877d34c667d..519d3994cb372 100644
 --- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
 +++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
-@@ -174,7 +174,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -180,7 +180,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterTimePref(
        prefs::kSafeBrowsingEsbProtegoPingWithoutTokenLastLogTime, base::Time());
    registry->RegisterBooleanPref(

diff --git a/patches/0038-disable-media-DRM-preprovisioning-by-default.patch b/patches/0038-disable-media-DRM-preprovisioning-by-default.patch
@@ -10,7 +10,7 @@ support is enabled.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
-index cf95df196df99..5596134db16f4 100644
+index c1033de7b245d..9fb876b8b2a6c 100644
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
 @@ -1147,7 +1147,7 @@ BASE_FEATURE(kMediaDrmPersistentLicense,

diff --git a/patches/0039-disable-autofill-server-communication-by-default.patch b/patches/0039-disable-autofill-server-communication-by-default.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] disable autofill server communication by default
  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 db915b5ad02ff..991af89b9332d 100644
+index e7ce36f5825e3..5e0715dcbf908 100644
 --- a/components/autofill/core/common/autofill_features.cc
 +++ b/components/autofill/core/common/autofill_features.cc
-@@ -868,7 +868,7 @@ const base::FeatureParam<std::string>
+@@ -923,7 +923,7 @@ const base::FeatureParam<std::string>
  // i.e., https://other.autofill.server:port/tbproxy/af/
  BASE_FEATURE(kAutofillServerCommunication,
               "AutofillServerCommunication",

diff --git a/patches/0043-disable-learn-more-link-in-incognito-new-tab.patch b/patches/0043-disable-learn-more-link-in-incognito-new-tab.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] disable learn more link in incognito new tab
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/IncognitoDescriptionView.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/IncognitoDescriptionView.java
-index 35cc768c250d9..8f32de41329ff 100644
+index c51ab338383e4..a85cad0dec1a2 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/IncognitoDescriptionView.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/IncognitoDescriptionView.java
 @@ -358,9 +358,9 @@ public class IncognitoDescriptionView extends LinearLayout {