Skip to content

Commit a3668cb

Browse files
quh4gko8thestinger
authored andcommitted
Update/port patches for 134.0.6998.39.0
1 parent a322948 commit a3668cb

File tree

115 files changed

+33839
-29193
lines changed

Some content is hidden

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

115 files changed

+33839
-29193
lines changed

patches/0001-Vanadium-string-rebranding.patch

+33,450-28,838
Large diffs are not rendered by default.

patches/0002-Vanadium-branding.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ 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 2b75f7f769629..814267f2ad367 100644
52+
index 9cd6abf563e8b..254a9d5811e72 100644
5353
--- a/chrome/android/BUILD.gn
5454
+++ b/chrome/android/BUILD.gn
55-
@@ -173,24 +173,24 @@ if (current_toolchain == default_toolchain) {
55+
@@ -170,24 +170,24 @@ if (current_toolchain == default_toolchain) {
5656
"java/res_base/values/ic_launcher_round_alias.xml",
5757
"java/res_base/values/values.xml",
5858
"java/res_base/xml/network_security_config.xml",
@@ -95,7 +95,7 @@ index 2b75f7f769629..814267f2ad367 100644
9595
]
9696
}
9797

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

patches/0007-enable-stack-clash-protection-for-arm64-targets.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] enable stack clash protection for arm64 targets
88
1 file changed, 4 insertions(+)
99

1010
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
11-
index 88109264ea962..2e4e5205b5de0 100644
11+
index ffbd381f00929..c703777635623 100644
1212
--- a/build/config/compiler/BUILD.gn
1313
+++ b/build/config/compiler/BUILD.gn
1414
@@ -387,6 +387,10 @@ config("compiler") {

patches/0008-switch-to-fstack-protector-strong.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ 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 2e4e5205b5de0..b42626fde7d8f 100644
11+
index c703777635623..fc6c93292a6c8 100644
1212
--- a/build/config/compiler/BUILD.gn
1313
+++ b/build/config/compiler/BUILD.gn
1414
@@ -382,7 +382,7 @@ config("compiler") {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ 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 b42626fde7d8f..608098e9feb3b 100644
11+
index fc6c93292a6c8..87d33c6bfe1f6 100644
1212
--- a/build/config/compiler/BUILD.gn
1313
+++ b/build/config/compiler/BUILD.gn
1414
@@ -398,6 +398,10 @@ config("compiler") {

patches/0010-enable-ftrivial-auto-var-init-zero.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ 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 608098e9feb3b..41cd325f53dd8 100644
11+
index 87d33c6bfe1f6..878b8e641b620 100644
1212
--- a/build/config/compiler/BUILD.gn
1313
+++ b/build/config/compiler/BUILD.gn
1414
@@ -402,6 +402,10 @@ config("compiler") {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ 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 41cd325f53dd8..2ee2f038c6f77 100644
11+
index 878b8e641b620..2f7994bf4a40e 100644
1212
--- a/build/config/compiler/BUILD.gn
1313
+++ b/build/config/compiler/BUILD.gn
1414
@@ -403,7 +403,7 @@ config("compiler") {

patches/0012-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 2500a56425f24..38969384f8154 100644
11+
index 846076ad1ca1c..e046f03a9b3cc 100644
1212
--- a/DEPS
1313
+++ b/DEPS
1414
@@ -149,7 +149,7 @@ vars = {

patches/0013-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 38969384f8154..eb90478c07ad8 100644
11+
index e046f03a9b3cc..6971b2bc1ca92 100644
1212
--- a/DEPS
1313
+++ b/DEPS
1414
@@ -114,7 +114,7 @@ vars = {

patches/0014-disable-first-run-welcome-page.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ index 413ccd41b4bb2..43f86c227274e 100644
2828

2929
/**
3030
diff --git a/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java b/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
31-
index 4aedb8a0f1d95..cff008ce39b67 100644
31+
index d9ad00c856f6d..100e8706f2d1a 100644
3232
--- a/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
3333
+++ b/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
34-
@@ -50,8 +50,8 @@ public class FirstRunStatus {
34+
@@ -52,8 +52,8 @@ public class FirstRunStatus {
3535
* includes ToS and Sign In pages if necessary.
3636
*/
3737
public static boolean getFirstRunFlowComplete() {

patches/0015-disable-seed-based-field-trials.patch

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Subject: [PATCH] disable seed-based field trials
99
2 files changed, 12 insertions(+)
1010

1111
diff --git a/components/variations/service/variations_field_trial_creator_base.cc b/components/variations/service/variations_field_trial_creator_base.cc
12-
index 753fc845cc205..d8fbd413acabc 100644
12+
index e91cfc139cd5b..25d84ca885859 100644
1313
--- a/components/variations/service/variations_field_trial_creator_base.cc
1414
+++ b/components/variations/service/variations_field_trial_creator_base.cc
15-
@@ -260,8 +260,14 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials(
15+
@@ -266,8 +266,14 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials(
1616
}
1717
// Force the variation ids selected in chrome://flags and/or specified using
1818
// the command-line flag.
@@ -27,14 +27,14 @@ index 753fc845cc205..d8fbd413acabc 100644
2727

2828
switch (result) {
2929
case VariationsIdsProvider::ForceIdsResult::INVALID_SWITCH_ENTRY:
30-
@@ -318,13 +324,17 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials(
30+
@@ -332,13 +338,17 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials(
3131

3232
bool used_seed = false;
33-
if (!used_testing_config) {
33+
if (!used_testing_config && client_filterable_state) {
3434
+#if defined(FIELDTRIAL_SEED_ENABLED)
35-
used_seed =
36-
CreateTrialsFromSeed(entropy_providers, feature_list.get(),
37-
safe_seed_manager, synthetic_trial_registry);
35+
used_seed = CreateTrialsFromSeed(
36+
entropy_providers, feature_list.get(), safe_seed_manager,
37+
synthetic_trial_registry, std::move(client_filterable_state));
3838
+#endif
3939
}
4040

patches/0016-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 e4f52fd24f65a..62545c0a6804f 100644
11+
index d0b05aa67320e..373771e3cf12f 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/0017-disable-WebView-variations-support.patch

+4-4
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 223b2f84dc0f6..445757c31077a 100644
12+
index 2a21937734f5d..e261fa0fe615c 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-
@@ -343,12 +343,6 @@ public class WebViewChromiumAwInit {
15+
@@ -349,12 +349,6 @@ public class WebViewChromiumAwInit {
1616

1717
AwBrowserProcess.configureChildProcessLauncher();
1818

@@ -26,10 +26,10 @@ index 223b2f84dc0f6..445757c31077a 100644
2626

2727
// 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 813d087fe7f43..2250510486f0f 100644
29+
index 63a4e88c8dd70..cbfd26bc332a0 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
32-
@@ -554,10 +554,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
32+
@@ -588,10 +588,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
3333
}
3434
}
3535

patches/0018-disable-Media-Integrity-blink-extension-API-on-webvi.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Subject: [PATCH] disable Media Integrity blink extension API on webview by
99
1 file changed, 1 insertion(+), 1 deletion(-)
1010

1111
diff --git a/android_webview/common/aw_features.cc b/android_webview/common/aw_features.cc
12-
index 25597a0e5aa3a..439a305ac439a 100644
12+
index 8adb77e1b8c49..35a6bf3294c0c 100644
1313
--- a/android_webview/common/aw_features.cc
1414
+++ b/android_webview/common/aw_features.cc
15-
@@ -71,7 +71,7 @@ BASE_FEATURE(kWebViewLazyFetchHandWritingIcon,
15+
@@ -72,7 +72,7 @@ BASE_FEATURE(kWebViewLazyFetchHandWritingIcon,
1616
// This feature requires `kWebViewMediaIntegrityApi` to be disabled.
1717
BASE_FEATURE(kWebViewMediaIntegrityApiBlinkExtension,
1818
"WebViewMediaIntegrityApiBlinkExtension",

patches/0019-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 c29bbe4620212..ab19ae156407b 100644
11+
index 99aecddc3e380..0fd86c3c2d219 100644
1212
--- a/chrome/browser/net/profile_network_context_service.cc
1313
+++ b/chrome/browser/net/profile_network_context_service.cc
14-
@@ -511,7 +511,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParams(
14+
@@ -504,7 +504,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParams(
1515
void ProfileNetworkContextService::RegisterProfilePrefs(
1616
user_prefs::PrefRegistrySyncable* registry) {
1717
registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,

patches/0023-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 a1a8e77a2ef3f..01a90b8b97c6b 100644
11+
index 678e42c96fe4a..2c96053005162 100644
1212
--- a/chrome/browser/chrome_content_browser_client.cc
1313
+++ b/chrome/browser/chrome_content_browser_client.cc
14-
@@ -1557,7 +1557,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
14+
@@ -1547,7 +1547,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
1515
void ChromeContentBrowserClient::RegisterProfilePrefs(
1616
user_prefs::PrefRegistrySyncable* registry) {
1717
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);

patches/0027-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 217c1e811de81..65301c0621352 100644
11+
index b1e3ab1d5562a..59e83a2879597 100644
1212
--- a/components/content_settings/core/browser/content_settings_registry.cc
1313
+++ b/components/content_settings/core/browser/content_settings_registry.cc
1414
@@ -383,7 +383,7 @@ void ContentSettingsRegistry::Init() {

patches/0028-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 65301c0621352..4c6690bcce3ab 100644
11+
index 59e83a2879597..9a717be317cf6 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/0029-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 2916d802872a5..445109ad3142f 100644
11+
index 70c10638ec926..2413b417fb449 100644
1212
--- a/components/content_settings/core/browser/cookie_settings.cc
1313
+++ b/components/content_settings/core/browser/cookie_settings.cc
1414
@@ -94,7 +94,7 @@ void CookieSettings::RegisterProfilePrefs(

patches/0030-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 4c6690bcce3ab..5e6bdb6c3e13a 100644
11+
index 9a717be317cf6..d0c1293c51561 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/0033-disable-media-router-by-default.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ index 22437807a9112..9e1fcd17352cb 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 22aa92b18ffe4..fffffdde83029 100644
25+
index b91df021f6402..1355f4cfce794 100644
2626
--- a/chrome/browser/profiles/profile_impl.cc
2727
+++ b/chrome/browser/profiles/profile_impl.cc
28-
@@ -426,7 +426,7 @@ void ProfileImpl::RegisterProfilePrefs(
28+
@@ -429,7 +429,7 @@ void ProfileImpl::RegisterProfilePrefs(
2929
#endif
3030

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

patches/0034-disable-offering-translations-by-default.patch

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

1010
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
11-
index ee2364fc09eb4..4d31a5695c1ff 100644
11+
index e979fdc55ad5d..7b0c8a49cdf72 100644
1212
--- a/chrome/browser/ui/browser_ui_prefs.cc
1313
+++ b/chrome/browser/ui/browser_ui_prefs.cc
14-
@@ -97,7 +97,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
14+
@@ -96,7 +96,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
1515
registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
1616
registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
1717
registry->RegisterBooleanPref(

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ index 75d4f871e93ec..bf475559b3e4b 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 aefc281b823fb..55e33b94197c1 100644
25+
index a8e65158e9234..8ff22287ab742 100644
2626
--- a/components/signin/internal/identity_manager/primary_account_manager.cc
2727
+++ b/components/signin/internal/identity_manager/primary_account_manager.cc
28-
@@ -299,7 +299,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
28+
@@ -297,7 +297,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
2929
prefs::kGoogleServicesSyncingGaiaIdMigratedToSignedIn, std::string());
3030
registry->RegisterStringPref(
3131
prefs::kGoogleServicesSyncingUsernameMigratedToSignedIn, std::string());

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ 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 1f92a936e44f1..276e657612d03 100644
11+
index 90ec1b9162127..efe8115b0f594 100644
1212
--- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
1313
+++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
14-
@@ -196,7 +196,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
14+
@@ -211,7 +211,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
1515
registry->RegisterBooleanPref(
1616
prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
1717
registry->RegisterBooleanPref(

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ 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 276e657612d03..9c47c5958d2e5 100644
15+
index efe8115b0f594..f851bd7fe3fce 100644
1616
--- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
1717
+++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
18-
@@ -202,7 +202,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
18+
@@ -217,7 +217,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
1919
registry->RegisterTimePref(
2020
prefs::kSafeBrowsingEsbProtegoPingWithoutTokenLastLogTime, base::Time());
2121
registry->RegisterBooleanPref(

patches/0038-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 4df38fe102c1b..1f7e821c5442f 100644
13+
index 7bddf0f257968..91f7ddf5d06ca 100644
1414
--- a/media/base/media_switches.cc
1515
+++ b/media/base/media_switches.cc
16-
@@ -1086,7 +1086,7 @@ BASE_FEATURE(kMediaDrmPersistentLicense,
16+
@@ -1064,7 +1064,7 @@ BASE_FEATURE(kMediaDrmPersistentLicense,
1717
// which will trigger provisioning process after MediaDrmBridge is created.
1818
BASE_FEATURE(kMediaDrmPreprovisioning,
1919
"MediaDrmPreprovisioning",

patches/0039-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 700af2be3aa4b..7ad589916fc77 100644
11+
index 36307e012f086..916022da4cdad 100644
1212
--- a/components/autofill/core/common/autofill_features.cc
1313
+++ b/components/autofill/core/common/autofill_features.cc
14-
@@ -939,7 +939,7 @@ const base::FeatureParam<std::string>
14+
@@ -855,7 +855,7 @@ const base::FeatureParam<std::string>
1515
// i.e., https://other.autofill.server:port/tbproxy/af/
1616
BASE_FEATURE(kAutofillServerCommunication,
1717
"AutofillServerCommunication",

patches/0041-disable-search-provider-logo.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ 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 39e6945e3a8f3..f9e2e37d1f4b2 100644
11+
index 8f3eb7153e73c..b3e5049e10a41 100644
1212
--- a/components/search_engines/android/template_url_service_android.cc
1313
+++ b/components/search_engines/android/template_url_service_android.cc
1414
@@ -184,28 +184,7 @@ jboolean TemplateUrlServiceAndroid::IsSearchByImageAvailable(

patches/0045-disable-GaiaAuthFetcher-code-due-to-upstream-bug.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ https://bugs.chromium.org/p/chromium/issues/detail?id=1150817
99
1 file changed, 2 insertions(+)
1010

1111
diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc
12-
index f2655601f16cc..40b40ebf256b9 100644
12+
index 2c0caab95ba2b..952629148b361 100644
1313
--- a/google_apis/gaia/gaia_auth_fetcher.cc
1414
+++ b/google_apis/gaia/gaia_auth_fetcher.cc
1515
@@ -252,6 +252,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(

0 commit comments

Comments
 (0)