From 79ca239f61246adaf4ad38eaffdce8b222bec531 Mon Sep 17 00:00:00 2001 From: qoijjj <129108030+qoijjj@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:59:47 -0700 Subject: [PATCH] chore: update patches for v127 --- hardening.patch | 2 +- patches/block-external-extensions.patch | 4 +-- patches/disable-autofill-by-default.patch | 2 +- patches/disable-disk-cache.patch | 4 +-- .../disable-javascript-jit-by-default.patch | 2 +- patches/disable-metrics-reporting.patch | 4 +-- ...e-password-manager-prompt-by-default.patch | 2 +- patches/disable-printing-by-default.patch | 4 +-- patches/disable-promotions-by-default.patch | 4 +-- .../disable-remote-access-by-default.patch | 6 ++--- .../disable-search-suggest-by-default.patch | 2 +- patches/disable-tpcd-bypasses.patch | 6 ++--- patches/enable-audio-service-sandbox.patch | 13 ++------- ...e-network-service-sandbox-by-default.patch | 2 +- ...e-visited-link-database-partitioning.patch | 4 +-- ...-default-supported-http-auth-schemes.patch | 4 +-- ...et-default-secure-dns-mode-automatic.patch | 2 +- patches/set-mv3-only-by-default.patch | 4 +-- ...-ozone-platform-hint-auto-by-default.patch | 27 ++++++++++--------- 19 files changed, 45 insertions(+), 53 deletions(-) diff --git a/hardening.patch b/hardening.patch index fe1ba557..a1ef3266 100644 --- a/hardening.patch +++ b/hardening.patch @@ -242,7 +242,7 @@ index 931b9c0..451591e 100644 +%patch -P2069 -p1 -b .set-default-extension-install-verification-enforce-strict +%patch -P2070 -p1 -b .set-default-secure-dns-mode-automatic +%patch -P2071 -p1 -b .set-mv3-only-by-default -+#%patch -P2072 -p1 -b .set-ozone-platform-hint-auto-by-default ++%patch -P2072 -p1 -b .set-ozone-platform-hint-auto-by-default +%patch -P2073 -p1 -b .show-full-urls-by-default +%patch -P2074 -p1 -b .disable-password-manager-prompt-by-default +%patch -P2075 -p1 -b .enable-network-service-sandbox-by-default diff --git a/patches/block-external-extensions.patch b/patches/block-external-extensions.patch index 17a57833..d572e068 100644 --- a/patches/block-external-extensions.patch +++ b/patches/block-external-extensions.patch @@ -1,8 +1,8 @@ diff --git a/extensions/browser/extension_prefs.cc b/extensions/browser/extension_prefs.cc -index a76ca8e360b6d..3aa68b5855eca 100644 +index 8fa89d4bd502a..1a40bf5d285b6 100644 --- a/extensions/browser/extension_prefs.cc +++ b/extensions/browser/extension_prefs.cc -@@ -2125,7 +2125,7 @@ void ExtensionPrefs::RegisterProfilePrefs( +@@ -2297,7 +2297,7 @@ void ExtensionPrefs::RegisterProfilePrefs( registry->RegisterBooleanPref(pref_names::kAppFullscreenAllowed, true); #endif diff --git a/patches/disable-autofill-by-default.patch b/patches/disable-autofill-by-default.patch index a0732a93..8ef813a9 100644 --- a/patches/disable-autofill-by-default.patch +++ b/patches/disable-autofill-by-default.patch @@ -1,5 +1,5 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc -index 28282ae467544..04dfe52bb7c1f 100644 +index 5c5988144d677..d7e0e8696f56e 100644 --- a/components/autofill/core/common/autofill_prefs.cc +++ b/components/autofill/core/common/autofill_prefs.cc @@ -39,7 +39,7 @@ int GetSyncTransportOptInBitFieldForAccount(const PrefService* prefs, diff --git a/patches/disable-disk-cache.patch b/patches/disable-disk-cache.patch index cc68a75f..e64b7b03 100644 --- a/patches/disable-disk-cache.patch +++ b/patches/disable-disk-cache.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc -index 1ef3b18394447..05fcdd681d6c1 100644 +index 7c3178793b3fb..4d347b8292142 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -1561,7 +1561,7 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() { +@@ -1529,7 +1529,7 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() { // static void ChromeContentBrowserClient::RegisterLocalStatePrefs( PrefRegistrySimple* registry) { diff --git a/patches/disable-javascript-jit-by-default.patch b/patches/disable-javascript-jit-by-default.patch index 3e257077..54d092e1 100644 --- a/patches/disable-javascript-jit-by-default.patch +++ b/patches/disable-javascript-jit-by-default.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc -index ddbe542fb59fb..70b30060d82c7 100644 +index 229ac346cfc83..4d039aa2e28c4 100644 --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc @@ -588,7 +588,7 @@ void ContentSettingsRegistry::Init() { diff --git a/patches/disable-metrics-reporting.patch b/patches/disable-metrics-reporting.patch index 924cb54f..71a83604 100644 --- a/patches/disable-metrics-reporting.patch +++ b/patches/disable-metrics-reporting.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc -index 4c76d3b1be0fa..49e5fe8479176 100644 +index 762b9d42bc7f7..c171edd766926 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -1089,7 +1089,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -1099,7 +1099,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { #endif // BUILDFLAG(IS_CHROMEOS_ASH) registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled, diff --git a/patches/disable-password-manager-prompt-by-default.patch b/patches/disable-password-manager-prompt-by-default.patch index 76decb83..4be0e562 100644 --- a/patches/disable-password-manager-prompt-by-default.patch +++ b/patches/disable-password-manager-prompt-by-default.patch @@ -1,5 +1,5 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc -index f1372ad7d55a7..4ee889c465e1b 100644 +index d1abc1638e9ac..e0818a0515319 100644 --- a/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc @@ -277,14 +277,14 @@ bool HasManuallyFilledFields(const PasswordForm& form) { diff --git a/patches/disable-printing-by-default.patch b/patches/disable-printing-by-default.patch index 2f6546d4..4a3a24bb 100644 --- a/patches/disable-printing-by-default.patch +++ b/patches/disable-printing-by-default.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc -index fbe18f0773bda..15d41c87d6f37 100644 +index a7d35836cb9da..ffc1b07878958 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -398,7 +398,7 @@ void ProfileImpl::RegisterProfilePrefs( +@@ -401,7 +401,7 @@ void ProfileImpl::RegisterProfilePrefs( std::string()); #if BUILDFLAG(ENABLE_PRINTING) diff --git a/patches/disable-promotions-by-default.patch b/patches/disable-promotions-by-default.patch index 17695a7e..9f339cfd 100644 --- a/patches/disable-promotions-by-default.patch +++ b/patches/disable-promotions-by-default.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc -index 86ab9563e08bc..dda149a3ce76d 100644 +index 22a2efe170757..b09d7680953e0 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc -@@ -910,7 +910,7 @@ void StartupBrowserCreator::ClearLaunchedProfilesForTesting() { +@@ -911,7 +911,7 @@ void StartupBrowserCreator::ClearLaunchedProfilesForTesting() { // static void StartupBrowserCreator::RegisterLocalStatePrefs( PrefRegistrySimple* registry) { diff --git a/patches/disable-remote-access-by-default.patch b/patches/disable-remote-access-by-default.patch index 80eff2e2..61314c65 100644 --- a/patches/disable-remote-access-by-default.patch +++ b/patches/disable-remote-access-by-default.patch @@ -1,8 +1,8 @@ diff --git a/remoting/host/policy_watcher.cc b/remoting/host/policy_watcher.cc -index 694f832b5f047..ab220a2f5cb74 100644 +index f7274c6a02f29..660fc9690e9b1 100644 --- a/remoting/host/policy_watcher.cc +++ b/remoting/host/policy_watcher.cc -@@ -166,13 +166,13 @@ base::Value::Dict PolicyWatcher::GetPlatformPolicies() { +@@ -180,7 +180,7 @@ base::Value::Dict PolicyWatcher::GetPlatformPolicies() { base::Value::Dict PolicyWatcher::GetDefaultPolicies() { base::Value::Dict result; @@ -18,7 +18,7 @@ index 694f832b5f047..ab220a2f5cb74 100644 #if BUILDFLAG(IS_CHROMEOS) result.Set(key::kRemoteAccessHostAllowEnterpriseRemoteSupportConnections, true); -@@ -188,7 +188,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() { +@@ -206,7 +206,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() { result.Set(key::kRemoteAccessHostAllowFileTransfer, true); result.Set(key::kRemoteAccessHostAllowUrlForwarding, true); result.Set(key::kRemoteAccessHostEnableUserInterface, true); diff --git a/patches/disable-search-suggest-by-default.patch b/patches/disable-search-suggest-by-default.patch index 2dc59176..e8511926 100644 --- a/patches/disable-search-suggest-by-default.patch +++ b/patches/disable-search-suggest-by-default.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc -index 5b20629062d21..a0f23c5280371 100644 +index cd4fd8104866c..757d919d6496d 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc @@ -318,7 +318,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; diff --git a/patches/disable-tpcd-bypasses.patch b/patches/disable-tpcd-bypasses.patch index 6bb69c7e..e21c1c4e 100644 --- a/patches/disable-tpcd-bypasses.patch +++ b/patches/disable-tpcd-bypasses.patch @@ -12,15 +12,15 @@ index c1340623701ba..07ef347995154 100644 const base::FeatureParam kTpcdReadHeuristicsGrants{ &kTpcdHeuristicsGrants, kTpcdReadHeuristicsGrantsName, true}; diff --git a/net/base/features.cc b/net/base/features.cc -index 3d473c6a298ef..787a35783e88e 100644 +index 85361b539418f..48f0cbc05f721 100644 --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -272,7 +272,7 @@ BASE_FEATURE(kTopLevelTpcdTrialSettings, +@@ -256,7 +256,7 @@ BASE_FEATURE(kTopLevelTpcdTrialSettings, BASE_FEATURE(kTpcdMetadataGrants, "TpcdMetadataGrants", - base::FEATURE_ENABLED_BY_DEFAULT); + base::FEATURE_DISABLED_BY_DEFAULT); - BASE_FEATURE(kTpcdMetadataStagedRollback, + BASE_FEATURE(kTpcdMetadataStageControl, "TpcdMetadataStageControl", diff --git a/patches/enable-audio-service-sandbox.patch b/patches/enable-audio-service-sandbox.patch index ea1776ba..caee99dc 100644 --- a/patches/enable-audio-service-sandbox.patch +++ b/patches/enable-audio-service-sandbox.patch @@ -1,8 +1,8 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc -index 957cb0cf90694..fbd3afe6b6544 100644 +index 75b2720edef81..2763ad5a33c7d 100644 --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc -@@ -40,7 +40,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, +@@ -47,7 +47,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, // kAudioServiceOutOfProcess feature is enabled. BASE_FEATURE(kAudioServiceSandbox, "AudioServiceSandbox", @@ -11,12 +11,3 @@ index 957cb0cf90694..fbd3afe6b6544 100644 base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -230,7 +230,7 @@ BASE_FEATURE(kCooperativeScheduling, - // https://www.w3.org/TR/reporting/#crash-report - BASE_FEATURE(kCrashReporting, - "CrashReporting", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ base::FEATURE_DISABLED_BY_DEFAULT); - - // Controls whether the Digital Goods API is enabled. - // https://github.com/WICG/digital-goods/ diff --git a/patches/enable-network-service-sandbox-by-default.patch b/patches/enable-network-service-sandbox-by-default.patch index 7436743f..057135c5 100644 --- a/patches/enable-network-service-sandbox-by-default.patch +++ b/patches/enable-network-service-sandbox-by-default.patch @@ -1,5 +1,5 @@ diff --git a/sandbox/policy/features.cc b/sandbox/policy/features.cc -index 8a0eb26347f8d..5a6ed19d9d98c 100644 +index fb5a05c3e8dfb..4b28e20829022 100644 --- a/sandbox/policy/features.cc +++ b/sandbox/policy/features.cc @@ -20,7 +20,7 @@ namespace sandbox::policy::features { diff --git a/patches/enable-visited-link-database-partitioning.patch b/patches/enable-visited-link-database-partitioning.patch index 8d4c8064..67cd12bf 100644 --- a/patches/enable-visited-link-database-partitioning.patch +++ b/patches/enable-visited-link-database-partitioning.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc -index 00e268b511265..9f59a42de211b 100644 +index 16e843fd62d0a..400602645bf2f 100644 --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -1769,7 +1769,7 @@ const base::FeatureParam kPartialLowEndModeExcludeCanvasFontCache{ +@@ -1749,7 +1749,7 @@ const base::FeatureParam kPartialLowEndModeExcludeCanvasFontCache{ // TODO(crbug.com/329102369): complete the partitioned hashtable implementation. BASE_FEATURE(kPartitionVisitedLinkDatabase, "PartitionVisitedLinkDatabase", diff --git a/patches/restrict-default-supported-http-auth-schemes.patch b/patches/restrict-default-supported-http-auth-schemes.patch index f7513acc..cb280948 100644 --- a/patches/restrict-default-supported-http-auth-schemes.patch +++ b/patches/restrict-default-supported-http-auth-schemes.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc -index e9569c4d7176e..727251964ca59 100644 +index d2acbdc28805c..bb1a23f1a77d9 100644 --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -632,7 +632,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -644,7 +644,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { // Static auth params registry->RegisterStringPref(prefs::kAuthSchemes, diff --git a/patches/set-default-secure-dns-mode-automatic.patch b/patches/set-default-secure-dns-mode-automatic.patch index e3cb18f5..28eca728 100644 --- a/patches/set-default-secure-dns-mode-automatic.patch +++ b/patches/set-default-secure-dns-mode-automatic.patch @@ -7,7 +7,7 @@ index 27526ac0c574b..0680d2912d381 100644 SecureDnsConfig::ParseMode(mode_str) ? std::string(mode_str) - : SecureDnsConfig::kModeOff); -+ : SecureDnsConfig::kModeAutomatic); ++ : SecureDnsConfig::kAutomatic); } const base::Value* templates = diff --git a/patches/set-mv3-only-by-default.patch b/patches/set-mv3-only-by-default.patch index b8fa1a04..5b3b401b 100644 --- a/patches/set-mv3-only-by-default.patch +++ b/patches/set-mv3-only-by-default.patch @@ -1,8 +1,8 @@ diff --git a/extensions/common/extension_features.cc b/extensions/common/extension_features.cc -index 2104e45b6093d..34670f90ab676 100644 +index b598c4723199a..2597912500296 100644 --- a/extensions/common/extension_features.cc +++ b/extensions/common/extension_features.cc -@@ -104,7 +104,7 @@ BASE_FEATURE(kExtensionWebFileHandlers, +@@ -100,7 +100,7 @@ BASE_FEATURE(kExtensionWebFileHandlers, BASE_FEATURE(kExtensionsManifestV3Only, "ExtensionsManifestV3Only", diff --git a/patches/set-ozone-platform-hint-auto-by-default.patch b/patches/set-ozone-platform-hint-auto-by-default.patch index dddff81e..dd080588 100644 --- a/patches/set-ozone-platform-hint-auto-by-default.patch +++ b/patches/set-ozone-platform-hint-auto-by-default.patch @@ -1,13 +1,14 @@ -diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc -index 43fd095c84767..e759031e0c91e 100644 ---- a/ui/base/ui_base_features.cc -+++ b/ui/base/ui_base_features.cc -@@ -163,7 +163,7 @@ BASE_FEATURE(kWaylandPerSurfaceScale, - COMPONENT_EXPORT(UI_BASE_FEATURES) - BASE_FEATURE(kOverrideDefaultOzonePlatformHintToAuto, - "OverrideDefaultOzonePlatformHintToAuto", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ base::FEATURE_ENABLED_BY_DEFAULT); - #endif // BUILDFLAG(IS_LINUX) - - // Update of the virtual keyboard settings UI as described in +diff --git a/ui/linux/display_server_utils.cc b/ui/linux/display_server_utils.cc +index ecc1fe400843a..1d1f4b00e629b 100644 +--- a/ui/linux/display_server_utils.cc ++++ b/ui/linux/display_server_utils.cc +@@ -115,8 +115,7 @@ void SetOzonePlatformForLinuxIfNeeded(base::CommandLine& command_line) { + // On the desktop, we fix the platform name if necessary. + // See https://crbug.com/1246928. + if (!command_line.HasSwitch(switches::kOzonePlatform)) { +- const auto ozone_platform_hint = +- command_line.GetSwitchValueASCII(switches::kOzonePlatformHint); ++ const auto ozone_platform_hint = "auto" + if (!ozone_platform_hint.empty()) { + command_line.AppendSwitchASCII(switches::kOzonePlatform, + MaybeFixPlatformName(ozone_platform_hint));