Update/port patches for 126.0.6478.50.0

GrapheneOS · Jun 11, 2024 · ced3558 · ced3558
1 parent 8783374
commit ced3558
Show file tree

Hide file tree

Showing 106 changed files with 34,249 additions and 33,815 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,7 +49,7 @@ 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 d2df06252b50e..a7d27041a8d77 100644
+index 44ffbdcff9316..cd5f90f3babb9 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
 @@ -173,24 +173,24 @@ if (current_toolchain == default_toolchain) {
@@ -95,7 +95,7 @@ index d2df06252b50e..a7d27041a8d77 100644
      ]
    }
 
-@@ -2212,24 +2212,24 @@ if (current_toolchain == default_toolchain) {
+@@ -2225,24 +2225,24 @@ if (current_toolchain == default_toolchain) {
    android_resources("chrome_public_apk_base_module_resources") {
      resource_overlay = true
      sources = [

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,7 +8,7 @@ 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 7a7e228632840..3659e35ae2154 100644
+index 2e753e1295f08..c7c1e58af6d82 100644
 --- a/tools/cfi/ignores.txt
 +++ b/tools/cfi/ignores.txt
 @@ -272,3 +272,7 @@ src:*third_party/pthreadpool/src/src/portable-api.c

diff --git a/patches/0007-switch-to-fstack-protector-strong.patch b/patches/0007-switch-to-fstack-protector-strong.patch
@@ -8,10 +8,10 @@ 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 973d8bcbd2f1f..629e017e4bdb0 100644
+index 6efe967eb0a1c..1f6933f9a7e4b 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -379,7 +379,7 @@ config("compiler") {
+@@ -366,7 +366,7 @@ config("compiler") {
        } else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) {
          if (current_os != "aix") {
            # Not available on aix.

diff --git a/patches/0008-enable-fwrapv-in-Clang-for-non-UBSan-builds.patch b/patches/0008-enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
@@ -8,10 +8,10 @@ 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 629e017e4bdb0..76b219d9e6baf 100644
+index 1f6933f9a7e4b..5c869c2ce6985 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -391,6 +391,10 @@ config("compiler") {
+@@ -378,6 +378,10 @@ config("compiler") {
        }
      }
 

diff --git a/patches/0009-enable-ftrivial-auto-var-init-zero.patch b/patches/0009-enable-ftrivial-auto-var-init-zero.patch
@@ -8,10 +8,10 @@ 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 76b219d9e6baf..279784030e8ac 100644
+index 5c869c2ce6985..1efd79e401c43 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -395,6 +395,10 @@ config("compiler") {
+@@ -382,6 +382,10 @@ config("compiler") {
        cflags += [ "-fwrapv" ]
      }
 

diff --git a/patches/0010-disable-broken-warning-for-auto-var-init.patch b/patches/0010-disable-broken-warning-for-auto-var-init.patch
@@ -8,10 +8,10 @@ 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 279784030e8ac..177081f2a8762 100644
+index 1efd79e401c43..699efe9c7bc52 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -396,7 +396,7 @@ config("compiler") {
+@@ -383,7 +383,7 @@ config("compiler") {
      }
 
      if (is_clang) {

diff --git a/patches/0011-Checkout-PGO-profiles.patch b/patches/0011-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 5b128736051ec..729d02c620eed 100644
+index aa67d392a06a7..1ca8bcf7dd087 100644
 --- a/DEPS
 +++ b/DEPS
 @@ -149,7 +149,7 @@ vars = {

diff --git a/patches/0012-disable-checkout_nacl.patch b/patches/0012-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 729d02c620eed..4652a1bf100d1 100644
+index 1ca8bcf7dd087..cc98a4ebc5349 100644
 --- a/DEPS
 +++ b/DEPS
 @@ -118,7 +118,7 @@ vars = {

diff --git a/patches/0014-disable-seed-based-field-trials.patch b/patches/0014-disable-seed-based-field-trials.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] disable seed-based field trials
  1 file changed, 4 insertions(+)
 
 diff --git a/components/variations/service/variations_field_trial_creator_base.cc b/components/variations/service/variations_field_trial_creator_base.cc
-index c9c4aeee7bd47..c000ccfe10bb7 100644
+index 405f01de4f0e6..54ce659057503 100644
 --- a/components/variations/service/variations_field_trial_creator_base.cc
 +++ b/components/variations/service/variations_field_trial_creator_base.cc
 @@ -325,13 +325,17 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials(

diff --git a/patches/0015-disable-fetching-variations.patch b/patches/0015-disable-fetching-variations.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] disable fetching variations
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java
-index a9a7c4f7cde94..100eeed941870 100644
+index 14b47a9d148f5..4601ee31cf50b 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java
 @@ -39,7 +39,7 @@ public abstract class AsyncInitTaskRunner {

diff --git a/patches/0016-disable-WebView-variations-support.patch b/patches/0016-disable-WebView-variations-support.patch
@@ -9,10 +9,10 @@ Subject: [PATCH] disable WebView variations support
  2 files changed, 10 deletions(-)
 
 diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
-index c4c9b6060ee57..deb85a6afada9 100644
+index 16518da26534b..459f952851f5e 100644
 --- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
 +++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
-@@ -215,12 +215,6 @@ public class WebViewChromiumAwInit {
+@@ -248,12 +248,6 @@ public class WebViewChromiumAwInit {
 
              AwBrowserProcess.configureChildProcessLauncher();
 
@@ -23,10 +23,10 @@ index c4c9b6060ee57..deb85a6afada9 100644
 -            }
 -
              AwBrowserProcess.start();
-             AwBrowserProcess.handleMinidumpsAndSetMetricsConsent(/* updateMetricsConsent= */ true);
-             doNetworkInitializations(context);
+
+             // 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 f4d1a3e4ea20e..e62a6f0b5d284 100644
+index 9a120c99aa92a..0920a4c0db3d5 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
 @@ -460,10 +460,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {

diff --git a/patches/0017-disable-navigation-error-correction-by-default.patch b/patches/0017-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 77d18bd28eeaf..2604904c1c59e 100644
+index 627fc56f4f7cf..ac3505817334e 100644
 --- a/chrome/browser/net/profile_network_context_service.cc
 +++ b/chrome/browser/net/profile_network_context_service.cc
-@@ -429,7 +429,7 @@ void ProfileNetworkContextService::UpdateAdditionalCertificates() {
+@@ -386,7 +386,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParams(
  void ProfileNetworkContextService::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,

diff --git a/patches/0020-disable-metrics-by-default.patch b/patches/0020-disable-metrics-by-default.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] disable metrics by default
  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 f24c982c9a713..e3a6f3f31e0e2 100644
+index 057bd7c9538e4..7acaac620093a 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
 @@ -64,7 +64,7 @@ public abstract class FirstRunActivityBase extends AsyncInitializationActivity

diff --git a/patches/0021-disable-hyperlink-auditing-by-default.patch b/patches/0021-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 b07f8f583dabb..8ffa932f3b34f 100644
+index 7acca810b6f4e..a8b0ef43f1a8b 100644
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1521,7 +1521,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -1526,7 +1526,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
  void ChromeContentBrowserClient::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);

diff --git a/patches/0025-disable-sensors-access-by-default.patch b/patches/0025-disable-sensors-access-by-default.patch
@@ -8,7 +8,7 @@ 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 85637641f1231..b8913525e0f86 100644
+index 6385481208be7..aacd336858e02 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() {

diff --git a/patches/0026-block-playing-protected-media-by-default.patch b/patches/0026-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 b8913525e0f86..7f2581ff952b5 100644
+index aacd336858e02..53ca158325860 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/0027-disable-third-party-cookies-by-default.patch b/patches/0027-disable-third-party-cookies-by-default.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] disable third party cookies by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
-index 8bf5e556192b7..45435425272f6 100644
+index 84567efefbbb6..b16f3596de8cc 100644
 --- a/components/content_settings/core/browser/cookie_settings.cc
 +++ b/components/content_settings/core/browser/cookie_settings.cc
 @@ -93,7 +93,7 @@ void CookieSettings::RegisterProfilePrefs(

diff --git a/patches/0028-disable-background-sync-by-default.patch b/patches/0028-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 7f2581ff952b5..e2d398792173d 100644
+index 53ca158325860..bc360d6d15c69 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/0030-disable-media-router-media-remoting-by-default.patch b/patches/0030-disable-media-router-media-remoting-by-default.patch
@@ -8,7 +8,7 @@ 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 ea08c1b1d2668..bf7feb9e7fb3f 100644
+index 6614f242f3d70..5034bf428e266 100644
 --- a/chrome/browser/media/router/media_router_feature.cc
 +++ b/chrome/browser/media/router/media_router_feature.cc
 @@ -148,7 +148,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {

diff --git a/patches/0031-disable-media-router-by-default.patch b/patches/0031-disable-media-router-by-default.patch
@@ -9,7 +9,7 @@ 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 bf7feb9e7fb3f..7bb7ee04f818b 100644
+index 5034bf428e266..f1affb6c2af22 100644
 --- a/chrome/browser/media/router/media_router_feature.cc
 +++ b/chrome/browser/media/router/media_router_feature.cc
 @@ -135,7 +135,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) {
@@ -22,10 +22,10 @@ index bf7feb9e7fb3f..7bb7ee04f818b 100644
 
  #if !BUILDFLAG(IS_ANDROID)
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
-index 47ada6bf53225..66b1a4272fb8b 100644
+index fbe18f0773bda..47d9d84587332 100644
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -420,7 +420,7 @@ void ProfileImpl::RegisterProfilePrefs(
+@@ -419,7 +419,7 @@ void ProfileImpl::RegisterProfilePrefs(
  #endif
 
    registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);

diff --git a/patches/0033-disable-browser-sign-in-feature-by-default.patch b/patches/0033-disable-browser-sign-in-feature-by-default.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] disable browser sign in feature by default
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc
-index d2c034c279b4d..3ca9d8f18a2ae 100644
+index 04a721f164e85..3de7bd0df0099 100644
 --- a/chrome/browser/signin/account_consistency_mode_manager.cc
 +++ b/chrome/browser/signin/account_consistency_mode_manager.cc
 @@ -123,7 +123,7 @@ AccountConsistencyModeManager::~AccountConsistencyModeManager() {}
@@ -22,15 +22,15 @@ index d2c034c279b4d..3ca9d8f18a2ae 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 8dcdb224c4601..00ef4109901e8 100644
+index 8b14a48a2e84f..aaebb4a6d6aef 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) {
+@@ -247,7 +247,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
        prefs::kGoogleServicesSyncingUsernameMigratedToSignedIn, std::string());
    registry->RegisterBooleanPref(prefs::kAutologinEnabled, true);
    registry->RegisterListPref(prefs::kReverseAutologinRejectedEmailList);
 -  registry->RegisterBooleanPref(prefs::kSigninAllowed, true);
 +  registry->RegisterBooleanPref(prefs::kSigninAllowed, false);
    registry->RegisterBooleanPref(prefs::kSignedInWithCredentialProvider, false);
-   registry->RegisterBooleanPref(prefs::kExplicitBrowserSignin, false);
- }
+   registry->RegisterBooleanPref(kExplicitBrowserSigninWithoutFeatureEnabled,
+                                 false);
diff --git a/patches/0034-disable-browser-autologin-by-default.patch b/patches/0034-disable-browser-autologin-by-default.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] disable browser autologin by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/components/signin/internal/identity_manager/primary_account_manager.cc b/components/signin/internal/identity_manager/primary_account_manager.cc
-index 00ef4109901e8..f899d3cbcfd72 100644
+index aaebb4a6d6aef..c9be5f50ce1c4 100644
 --- a/components/signin/internal/identity_manager/primary_account_manager.cc
 +++ b/components/signin/internal/identity_manager/primary_account_manager.cc
-@@ -225,7 +225,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -245,7 +245,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
        prefs::kGoogleServicesSyncingGaiaIdMigratedToSignedIn, std::string());
    registry->RegisterStringPref(
        prefs::kGoogleServicesSyncingUsernameMigratedToSignedIn, std::string());

diff --git a/patches/0035-disable-safe-browsing-reporting-opt-in-by-default.patch b/patches/0035-disable-safe-browsing-reporting-opt-in-by-default.patch
@@ -8,7 +8,7 @@ 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 9a3609515b393..94f0ee283b840 100644
+index 13d3adea7c15a..9c68b07c93747 100644
 --- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
 +++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
 @@ -172,7 +172,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {

diff --git a/patches/0036-disable-unused-safe-browsing-option-by-default.patch b/patches/0036-disable-unused-safe-browsing-option-by-default.patch
@@ -12,7 +12,7 @@ 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 94f0ee283b840..1f7e16493dc32 100644
+index 9c68b07c93747..52b6e115fd417 100644
 --- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
 +++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
 @@ -178,7 +178,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {

diff --git a/patches/0037-disable-media-DRM-preprovisioning-by-default.patch b/patches/0037-disable-media-DRM-preprovisioning-by-default.patch
@@ -10,10 +10,10 @@ 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 91705c188627a..0d52677eb7627 100644
+index 58025f50cec9e..3ff6ad436924e 100644
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -1185,7 +1185,7 @@ BASE_FEATURE(kMediaDrmPersistentLicense,
+@@ -1162,7 +1162,7 @@ BASE_FEATURE(kMediaDrmPersistentLicense,
  // which will trigger provisioning process after MediaDrmBridge is created.
  BASE_FEATURE(kMediaDrmPreprovisioning,
               "MediaDrmPreprovisioning",

diff --git a/patches/0038-disable-autofill-server-communication-by-default.patch b/patches/0038-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 8b1de61ff69b4..0e7a048d6735d 100644
+index d60123e4b78cd..93eb10a630e8c 100644
 --- a/components/autofill/core/common/autofill_features.cc
 +++ b/components/autofill/core/common/autofill_features.cc
-@@ -793,7 +793,7 @@ const base::FeatureParam<std::string>
+@@ -815,7 +815,7 @@ const base::FeatureParam<std::string>
  // i.e., https://other.autofill.server:port/tbproxy/af/
  BASE_FEATURE(kAutofillServerCommunication,
               "AutofillServerCommunication",

diff --git a/patches/0040-disable-search-provider-logo.patch b/patches/0040-disable-search-provider-logo.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] disable search provider logo
  1 file changed, 1 insertion(+), 22 deletions(-)
 
 diff --git a/components/search_engines/android/template_url_service_android.cc b/components/search_engines/android/template_url_service_android.cc
-index e9195a01c27ae..c58a16d017ea5 100644
+index f63f706a1ba88..7272456f2b69f 100644
 --- a/components/search_engines/android/template_url_service_android.cc
 +++ b/components/search_engines/android/template_url_service_android.cc
-@@ -109,28 +109,7 @@ jboolean TemplateUrlServiceAndroid::IsSearchByImageAvailable(
+@@ -182,28 +182,7 @@ jboolean TemplateUrlServiceAndroid::IsSearchByImageAvailable(
  jboolean TemplateUrlServiceAndroid::DoesDefaultSearchEngineHaveLogo(
      JNIEnv* env,
      const JavaParamRef<jobject>& obj) {

diff --git a/patches/0041-disable-trivial-subdomain-hiding.patch b/patches/0041-disable-trivial-subdomain-hiding.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] disable trivial subdomain hiding
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
-index 9936039f78fdd..3f8768dc819d9 100644
+index 63b6e1583a837..4e8a02f33c66d 100644
 --- a/components/url_formatter/url_formatter.cc
 +++ b/components/url_formatter/url_formatter.cc
-@@ -658,8 +658,7 @@ std::u16string FormatUrlWithAdjustments(
+@@ -659,8 +659,7 @@ std::u16string FormatUrlWithAdjustments(
      *prefix_end = static_cast<size_t>(url_string.length());
 
    // Host.