Skip to content

Commit ced3558

Browse files
quh4gko8thestinger
quh4gko8
authored and
thestinger
committed
Update/port patches for 126.0.6478.50.0
1 parent 8783374 commit ced3558

File tree

106 files changed

+34249
-33815
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+34249
-33815
lines changed

‎patches/0001-Vanadium-string-rebranding.patch

+33,893-33,425
Large diffs are not rendered by default.

‎patches/0002-Vanadium-branding.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Current incantation of the recolor command:
4949
create mode 100644 chrome/android/java/res_vanadium_base/values/channel_constants.xml
5050

5151
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
52-
index d2df06252b50e..a7d27041a8d77 100644
52+
index 44ffbdcff9316..cd5f90f3babb9 100644
5353
--- a/chrome/android/BUILD.gn
5454
+++ b/chrome/android/BUILD.gn
5555
@@ -173,24 +173,24 @@ if (current_toolchain == default_toolchain) {
@@ -95,7 +95,7 @@ index d2df06252b50e..a7d27041a8d77 100644
9595
]
9696
}
9797

98-
@@ -2212,24 +2212,24 @@ if (current_toolchain == default_toolchain) {
98+
@@ -2225,24 +2225,24 @@ if (current_toolchain == default_toolchain) {
9999
android_resources("chrome_public_apk_base_module_resources") {
100100
resource_overlay = true
101101
sources = [

‎patches/0005-temporary-Workaround-for-crashes-at-StackTrace-calls.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] temporary: Workaround for crashes at StackTrace calls
88
1 file changed, 4 insertions(+)
99

1010
diff --git a/tools/cfi/ignores.txt b/tools/cfi/ignores.txt
11-
index 7a7e228632840..3659e35ae2154 100644
11+
index 2e753e1295f08..c7c1e58af6d82 100644
1212
--- a/tools/cfi/ignores.txt
1313
+++ b/tools/cfi/ignores.txt
1414
@@ -272,3 +272,7 @@ src:*third_party/pthreadpool/src/src/portable-api.c

‎patches/0007-switch-to-fstack-protector-strong.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] switch to -fstack-protector-strong
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
11-
index 973d8bcbd2f1f..629e017e4bdb0 100644
11+
index 6efe967eb0a1c..1f6933f9a7e4b 100644
1212
--- a/build/config/compiler/BUILD.gn
1313
+++ b/build/config/compiler/BUILD.gn
14-
@@ -379,7 +379,7 @@ config("compiler") {
14+
@@ -366,7 +366,7 @@ config("compiler") {
1515
} else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) {
1616
if (current_os != "aix") {
1717
# Not available on aix.

‎patches/0008-enable-fwrapv-in-Clang-for-non-UBSan-builds.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] enable -fwrapv in Clang for non-UBSan builds
88
1 file changed, 4 insertions(+)
99

1010
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
11-
index 629e017e4bdb0..76b219d9e6baf 100644
11+
index 1f6933f9a7e4b..5c869c2ce6985 100644
1212
--- a/build/config/compiler/BUILD.gn
1313
+++ b/build/config/compiler/BUILD.gn
14-
@@ -391,6 +391,10 @@ config("compiler") {
14+
@@ -378,6 +378,10 @@ config("compiler") {
1515
}
1616
}
1717

‎patches/0009-enable-ftrivial-auto-var-init-zero.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] enable -ftrivial-auto-var-init=zero
88
1 file changed, 4 insertions(+)
99

1010
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
11-
index 76b219d9e6baf..279784030e8ac 100644
11+
index 5c869c2ce6985..1efd79e401c43 100644
1212
--- a/build/config/compiler/BUILD.gn
1313
+++ b/build/config/compiler/BUILD.gn
14-
@@ -395,6 +395,10 @@ config("compiler") {
14+
@@ -382,6 +382,10 @@ config("compiler") {
1515
cflags += [ "-fwrapv" ]
1616
}
1717

‎patches/0010-disable-broken-warning-for-auto-var-init.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] disable broken warning for auto var init
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
11-
index 279784030e8ac..177081f2a8762 100644
11+
index 1efd79e401c43..699efe9c7bc52 100644
1212
--- a/build/config/compiler/BUILD.gn
1313
+++ b/build/config/compiler/BUILD.gn
14-
@@ -396,7 +396,7 @@ config("compiler") {
14+
@@ -383,7 +383,7 @@ config("compiler") {
1515
}
1616

1717
if (is_clang) {

‎patches/0011-Checkout-PGO-profiles.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] Checkout PGO profiles
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/DEPS b/DEPS
11-
index 5b128736051ec..729d02c620eed 100644
11+
index aa67d392a06a7..1ca8bcf7dd087 100644
1212
--- a/DEPS
1313
+++ b/DEPS
1414
@@ -149,7 +149,7 @@ vars = {

‎patches/0012-disable-checkout_nacl.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] disable checkout_nacl
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/DEPS b/DEPS
11-
index 729d02c620eed..4652a1bf100d1 100644
11+
index 1ca8bcf7dd087..cc98a4ebc5349 100644
1212
--- a/DEPS
1313
+++ b/DEPS
1414
@@ -118,7 +118,7 @@ vars = {

‎patches/0014-disable-seed-based-field-trials.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] disable seed-based field trials
88
1 file changed, 4 insertions(+)
99

1010
diff --git a/components/variations/service/variations_field_trial_creator_base.cc b/components/variations/service/variations_field_trial_creator_base.cc
11-
index c9c4aeee7bd47..c000ccfe10bb7 100644
11+
index 405f01de4f0e6..54ce659057503 100644
1212
--- a/components/variations/service/variations_field_trial_creator_base.cc
1313
+++ b/components/variations/service/variations_field_trial_creator_base.cc
1414
@@ -325,13 +325,17 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials(

‎patches/0015-disable-fetching-variations.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] disable fetching variations
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
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
11-
index a9a7c4f7cde94..100eeed941870 100644
11+
index 14b47a9d148f5..4601ee31cf50b 100644
1212
--- a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java
1313
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java
1414
@@ -39,7 +39,7 @@ public abstract class AsyncInitTaskRunner {

‎patches/0016-disable-WebView-variations-support.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Subject: [PATCH] disable WebView variations support
99
2 files changed, 10 deletions(-)
1010

1111
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
12-
index c4c9b6060ee57..deb85a6afada9 100644
12+
index 16518da26534b..459f952851f5e 100644
1313
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
1414
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
15-
@@ -215,12 +215,6 @@ public class WebViewChromiumAwInit {
15+
@@ -248,12 +248,6 @@ public class WebViewChromiumAwInit {
1616

1717
AwBrowserProcess.configureChildProcessLauncher();
1818

@@ -23,10 +23,10 @@ index c4c9b6060ee57..deb85a6afada9 100644
2323
- }
2424
-
2525
AwBrowserProcess.start();
26-
AwBrowserProcess.handleMinidumpsAndSetMetricsConsent(/* updateMetricsConsent= */ true);
27-
doNetworkInitializations(context);
26+
27+
// TODO(crbug.com/332706093): See if this can be moved before loading native.
2828
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
29-
index f4d1a3e4ea20e..e62a6f0b5d284 100644
29+
index 9a120c99aa92a..0920a4c0db3d5 100644
3030
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
3131
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
3232
@@ -460,10 +460,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {

‎patches/0017-disable-navigation-error-correction-by-default.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] disable navigation error correction by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc
11-
index 77d18bd28eeaf..2604904c1c59e 100644
11+
index 627fc56f4f7cf..ac3505817334e 100644
1212
--- a/chrome/browser/net/profile_network_context_service.cc
1313
+++ b/chrome/browser/net/profile_network_context_service.cc
14-
@@ -429,7 +429,7 @@ void ProfileNetworkContextService::UpdateAdditionalCertificates() {
14+
@@ -386,7 +386,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParams(
1515
void ProfileNetworkContextService::RegisterProfilePrefs(
1616
user_prefs::PrefRegistrySyncable* registry) {
1717
registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,

‎patches/0020-disable-metrics-by-default.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] disable metrics by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
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
11-
index f24c982c9a713..e3a6f3f31e0e2 100644
11+
index 057bd7c9538e4..7acaac620093a 100644
1212
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
1313
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
1414
@@ -64,7 +64,7 @@ public abstract class FirstRunActivityBase extends AsyncInitializationActivity

‎patches/0021-disable-hyperlink-auditing-by-default.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] disable hyperlink auditing by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
11-
index b07f8f583dabb..8ffa932f3b34f 100644
11+
index 7acca810b6f4e..a8b0ef43f1a8b 100644
1212
--- a/chrome/browser/chrome_content_browser_client.cc
1313
+++ b/chrome/browser/chrome_content_browser_client.cc
14-
@@ -1521,7 +1521,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
14+
@@ -1526,7 +1526,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
1515
void ChromeContentBrowserClient::RegisterProfilePrefs(
1616
user_prefs::PrefRegistrySyncable* registry) {
1717
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);

‎patches/0025-disable-sensors-access-by-default.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] disable sensors access by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
11-
index 85637641f1231..b8913525e0f86 100644
11+
index 6385481208be7..aacd336858e02 100644
1212
--- a/components/content_settings/core/browser/content_settings_registry.cc
1313
+++ b/components/content_settings/core/browser/content_settings_registry.cc
1414
@@ -374,7 +374,7 @@ void ContentSettingsRegistry::Init() {

‎patches/0026-block-playing-protected-media-by-default.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] block playing protected media by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
11-
index b8913525e0f86..7f2581ff952b5 100644
11+
index aacd336858e02..53ca158325860 100644
1212
--- a/components/content_settings/core/browser/content_settings_registry.cc
1313
+++ b/components/content_settings/core/browser/content_settings_registry.cc
1414
@@ -211,7 +211,7 @@ void ContentSettingsRegistry::Init() {

‎patches/0027-disable-third-party-cookies-by-default.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] disable third party cookies by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
11-
index 8bf5e556192b7..45435425272f6 100644
11+
index 84567efefbbb6..b16f3596de8cc 100644
1212
--- a/components/content_settings/core/browser/cookie_settings.cc
1313
+++ b/components/content_settings/core/browser/cookie_settings.cc
1414
@@ -93,7 +93,7 @@ void CookieSettings::RegisterProfilePrefs(

‎patches/0028-disable-background-sync-by-default.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] disable background sync by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
11-
index 7f2581ff952b5..e2d398792173d 100644
11+
index 53ca158325860..bc360d6d15c69 100644
1212
--- a/components/content_settings/core/browser/content_settings_registry.cc
1313
+++ b/components/content_settings/core/browser/content_settings_registry.cc
1414
@@ -238,7 +238,7 @@ void ContentSettingsRegistry::Init() {

‎patches/0030-disable-media-router-media-remoting-by-default.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] disable media router media remoting by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
11-
index ea08c1b1d2668..bf7feb9e7fb3f 100644
11+
index 6614f242f3d70..5034bf428e266 100644
1212
--- a/chrome/browser/media/router/media_router_feature.cc
1313
+++ b/chrome/browser/media/router/media_router_feature.cc
1414
@@ -148,7 +148,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {

‎patches/0031-disable-media-router-by-default.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Subject: [PATCH] disable media router by default
99
2 files changed, 2 insertions(+), 2 deletions(-)
1010

1111
diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
12-
index bf7feb9e7fb3f..7bb7ee04f818b 100644
12+
index 5034bf428e266..f1affb6c2af22 100644
1313
--- a/chrome/browser/media/router/media_router_feature.cc
1414
+++ b/chrome/browser/media/router/media_router_feature.cc
1515
@@ -135,7 +135,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) {
@@ -22,10 +22,10 @@ index bf7feb9e7fb3f..7bb7ee04f818b 100644
2222

2323
#if !BUILDFLAG(IS_ANDROID)
2424
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
25-
index 47ada6bf53225..66b1a4272fb8b 100644
25+
index fbe18f0773bda..47d9d84587332 100644
2626
--- a/chrome/browser/profiles/profile_impl.cc
2727
+++ b/chrome/browser/profiles/profile_impl.cc
28-
@@ -420,7 +420,7 @@ void ProfileImpl::RegisterProfilePrefs(
28+
@@ -419,7 +419,7 @@ void ProfileImpl::RegisterProfilePrefs(
2929
#endif
3030

3131
registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);

‎patches/0033-disable-browser-sign-in-feature-by-default.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Subject: [PATCH] disable browser sign in feature by default
99
2 files changed, 2 insertions(+), 2 deletions(-)
1010

1111
diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc
12-
index d2c034c279b4d..3ca9d8f18a2ae 100644
12+
index 04a721f164e85..3de7bd0df0099 100644
1313
--- a/chrome/browser/signin/account_consistency_mode_manager.cc
1414
+++ b/chrome/browser/signin/account_consistency_mode_manager.cc
1515
@@ -123,7 +123,7 @@ AccountConsistencyModeManager::~AccountConsistencyModeManager() {}
@@ -22,15 +22,15 @@ index d2c034c279b4d..3ca9d8f18a2ae 100644
2222

2323
// static
2424
diff --git a/components/signin/internal/identity_manager/primary_account_manager.cc b/components/signin/internal/identity_manager/primary_account_manager.cc
25-
index 8dcdb224c4601..00ef4109901e8 100644
25+
index 8b14a48a2e84f..aaebb4a6d6aef 100644
2626
--- a/components/signin/internal/identity_manager/primary_account_manager.cc
2727
+++ b/components/signin/internal/identity_manager/primary_account_manager.cc
28-
@@ -227,7 +227,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
28+
@@ -247,7 +247,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
2929
prefs::kGoogleServicesSyncingUsernameMigratedToSignedIn, std::string());
3030
registry->RegisterBooleanPref(prefs::kAutologinEnabled, true);
3131
registry->RegisterListPref(prefs::kReverseAutologinRejectedEmailList);
3232
- registry->RegisterBooleanPref(prefs::kSigninAllowed, true);
3333
+ registry->RegisterBooleanPref(prefs::kSigninAllowed, false);
3434
registry->RegisterBooleanPref(prefs::kSignedInWithCredentialProvider, false);
35-
registry->RegisterBooleanPref(prefs::kExplicitBrowserSignin, false);
36-
}
35+
registry->RegisterBooleanPref(kExplicitBrowserSigninWithoutFeatureEnabled,
36+
false);

‎patches/0034-disable-browser-autologin-by-default.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] disable browser autologin by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/components/signin/internal/identity_manager/primary_account_manager.cc b/components/signin/internal/identity_manager/primary_account_manager.cc
11-
index 00ef4109901e8..f899d3cbcfd72 100644
11+
index aaebb4a6d6aef..c9be5f50ce1c4 100644
1212
--- a/components/signin/internal/identity_manager/primary_account_manager.cc
1313
+++ b/components/signin/internal/identity_manager/primary_account_manager.cc
14-
@@ -225,7 +225,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
14+
@@ -245,7 +245,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
1515
prefs::kGoogleServicesSyncingGaiaIdMigratedToSignedIn, std::string());
1616
registry->RegisterStringPref(
1717
prefs::kGoogleServicesSyncingUsernameMigratedToSignedIn, std::string());

‎patches/0035-disable-safe-browsing-reporting-opt-in-by-default.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] disable safe browsing reporting opt-in by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc
11-
index 9a3609515b393..94f0ee283b840 100644
11+
index 13d3adea7c15a..9c68b07c93747 100644
1212
--- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
1313
+++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
1414
@@ -172,7 +172,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {

‎patches/0036-disable-unused-safe-browsing-option-by-default.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ that privacy is preserved.
1212
1 file changed, 1 insertion(+), 1 deletion(-)
1313

1414
diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc
15-
index 94f0ee283b840..1f7e16493dc32 100644
15+
index 9c68b07c93747..52b6e115fd417 100644
1616
--- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
1717
+++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
1818
@@ -178,7 +178,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {

‎patches/0037-disable-media-DRM-preprovisioning-by-default.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ support is enabled.
1010
1 file changed, 1 insertion(+), 1 deletion(-)
1111

1212
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
13-
index 91705c188627a..0d52677eb7627 100644
13+
index 58025f50cec9e..3ff6ad436924e 100644
1414
--- a/media/base/media_switches.cc
1515
+++ b/media/base/media_switches.cc
16-
@@ -1185,7 +1185,7 @@ BASE_FEATURE(kMediaDrmPersistentLicense,
16+
@@ -1162,7 +1162,7 @@ BASE_FEATURE(kMediaDrmPersistentLicense,
1717
// which will trigger provisioning process after MediaDrmBridge is created.
1818
BASE_FEATURE(kMediaDrmPreprovisioning,
1919
"MediaDrmPreprovisioning",

‎patches/0038-disable-autofill-server-communication-by-default.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] disable autofill server communication by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/components/autofill/core/common/autofill_features.cc b/components/autofill/core/common/autofill_features.cc
11-
index 8b1de61ff69b4..0e7a048d6735d 100644
11+
index d60123e4b78cd..93eb10a630e8c 100644
1212
--- a/components/autofill/core/common/autofill_features.cc
1313
+++ b/components/autofill/core/common/autofill_features.cc
14-
@@ -793,7 +793,7 @@ const base::FeatureParam<std::string>
14+
@@ -815,7 +815,7 @@ const base::FeatureParam<std::string>
1515
// i.e., https://other.autofill.server:port/tbproxy/af/
1616
BASE_FEATURE(kAutofillServerCommunication,
1717
"AutofillServerCommunication",

‎patches/0040-disable-search-provider-logo.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] disable search provider logo
88
1 file changed, 1 insertion(+), 22 deletions(-)
99

1010
diff --git a/components/search_engines/android/template_url_service_android.cc b/components/search_engines/android/template_url_service_android.cc
11-
index e9195a01c27ae..c58a16d017ea5 100644
11+
index f63f706a1ba88..7272456f2b69f 100644
1212
--- a/components/search_engines/android/template_url_service_android.cc
1313
+++ b/components/search_engines/android/template_url_service_android.cc
14-
@@ -109,28 +109,7 @@ jboolean TemplateUrlServiceAndroid::IsSearchByImageAvailable(
14+
@@ -182,28 +182,7 @@ jboolean TemplateUrlServiceAndroid::IsSearchByImageAvailable(
1515
jboolean TemplateUrlServiceAndroid::DoesDefaultSearchEngineHaveLogo(
1616
JNIEnv* env,
1717
const JavaParamRef<jobject>& obj) {

‎patches/0041-disable-trivial-subdomain-hiding.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] disable trivial subdomain hiding
88
1 file changed, 1 insertion(+), 2 deletions(-)
99

1010
diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
11-
index 9936039f78fdd..3f8768dc819d9 100644
11+
index 63b6e1583a837..4e8a02f33c66d 100644
1212
--- a/components/url_formatter/url_formatter.cc
1313
+++ b/components/url_formatter/url_formatter.cc
14-
@@ -658,8 +658,7 @@ std::u16string FormatUrlWithAdjustments(
14+
@@ -659,8 +659,7 @@ std::u16string FormatUrlWithAdjustments(
1515
*prefix_end = static_cast<size_t>(url_string.length());
1616

1717
// Host.

0 commit comments

Comments
 (0)