From 9640d4181ea11f70bc187e02acb6dd83e372e810 Mon Sep 17 00:00:00 2001 From: uazo <29201891+uazo@users.noreply.github.com> Date: Fri, 19 Sep 2025 15:51:51 +0000 Subject: [PATCH] [AUTO] Patches auto-rebase --- build/patches/Add-a-flag-to-disable-GamePad-API.patch | 2 +- build/patches/Add-cromite-flags-support.patch | 8 ++++---- build/patches/Add-site-engagement-flag.patch | 2 +- build/patches/Disable-fetching-of-all-field-trials.patch | 8 ++++---- .../Enable-darken-websites-checkbox-in-themes.patch | 2 +- build/patches/Enable-native-Android-autofill.patch | 8 ++++---- build/patches/Experimental-user-scripts-support.patch | 2 +- build/patches/Eyeo-Adblock-for-Cromite.patch | 4 ++-- build/patches/Internal-firewall.patch | 2 +- ...Keep-flag-to-allow-screenshots-in-Incognito-mode.patch | 2 +- build/patches/Multiple-fingerprinting-mitigations.patch | 2 +- ...vert-flags-remove-disable-pull-to-refresh-effect.patch | 2 +- .../Temp-disable-experimental-web-platform-features.patch | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/build/patches/Add-a-flag-to-disable-GamePad-API.patch b/build/patches/Add-a-flag-to-disable-GamePad-API.patch index 0cb33ff6..5d48178d 100644 --- a/build/patches/Add-a-flag-to-disable-GamePad-API.patch +++ b/build/patches/Add-a-flag-to-disable-GamePad-API.patch @@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -8685,9 +8685,9 @@ +@@ -8690,9 +8690,9 @@ "expiry_milestone": 150 }, { diff --git a/build/patches/Add-cromite-flags-support.patch b/build/patches/Add-cromite-flags-support.patch index 36a76264..28ab519e 100644 --- a/build/patches/Add-cromite-flags-support.patch +++ b/build/patches/Add-cromite-flags-support.patch @@ -642,7 +642,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/setting diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -380,6 +380,10 @@ using flags_ui::kOsLinux; +@@ -381,6 +381,10 @@ using flags_ui::kOsLinux; using flags_ui::kOsMac; using flags_ui::kOsWin; @@ -653,7 +653,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc namespace about_flags { namespace { -@@ -4902,6 +4906,10 @@ const FeatureEntry::FeatureVariation +@@ -4903,6 +4907,10 @@ const FeatureEntry::FeatureVariation constexpr char kWebiumFlag[] = "webium"; #endif // !BUILDFLAG(IS_ANDROID) @@ -664,7 +664,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc // RECORDING USER METRICS FOR FLAGS: // ----------------------------------------------------------------------------- // The first line of the entry is the internal name. -@@ -4928,6 +4936,9 @@ constexpr char kWebiumFlag[] = "webium"; +@@ -4929,6 +4937,9 @@ constexpr char kWebiumFlag[] = "webium"; const FeatureEntry kFeatureEntries[] = { // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and // //tools/flags/generate_unexpire_flags.py. @@ -746,7 +746,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h --- a/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h -@@ -331,6 +331,7 @@ constexpr base::FeatureParam kTouchToSearchCalloutSnippetAsSubtitle( +@@ -337,6 +337,7 @@ constexpr base::FeatureParam kTouchToSearchCalloutSnippetAsSubtitle( "snippet_as_subtitle", /*default_value=*/false); diff --git a/build/patches/Add-site-engagement-flag.patch b/build/patches/Add-site-engagement-flag.patch index 6e658917..ccfccada 100644 --- a/build/patches/Add-site-engagement-flag.patch +++ b/build/patches/Add-site-engagement-flag.patch @@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -165,6 +165,7 @@ +@@ -166,6 +166,7 @@ #include "components/sensitive_content/features.h" #include "components/services/heap_profiling/public/cpp/switches.h" #include "components/services/storage/public/cpp/buckets/bucket_info.h" diff --git a/build/patches/Disable-fetching-of-all-field-trials.patch b/build/patches/Disable-fetching-of-all-field-trials.patch index b616ecf5..e4501a15 100644 --- a/build/patches/Disable-fetching-of-all-field-trials.patch +++ b/build/patches/Disable-fetching-of-all-field-trials.patch @@ -284,7 +284,7 @@ diff --git a/components/variations/net/variations_http_headers.cc b/components/v diff --git a/components/variations/service/variations_field_trial_creator.cc b/components/variations/service/variations_field_trial_creator.cc --- a/components/variations/service/variations_field_trial_creator.cc +++ b/components/variations/service/variations_field_trial_creator.cc -@@ -127,6 +127,7 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() { +@@ -126,6 +126,7 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() { } #if BUILDFLAG(FIELDTRIAL_TESTING_ENABLED) @@ -292,7 +292,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c // Determines whether the field trial testing config defined in // testing/variations/fieldtrial_testing_config.json should be applied. If the // "disable_fieldtrial_testing_config" GN flag is set to true, then the testing -@@ -320,9 +321,6 @@ bool VariationsFieldTrialCreator::SetUpFieldTrials( +@@ -319,9 +320,6 @@ bool VariationsFieldTrialCreator::SetUpFieldTrials( std::move(client_filterable_state)); } @@ -302,7 +302,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c platform_field_trials->RegisterFeatureOverrides(feature_list.get()); base::FeatureList::SetInstance(std::move(feature_list)); -@@ -652,6 +650,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed( +@@ -651,6 +649,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed( base::FeatureList* feature_list, SafeSeedManagerBase* safe_seed_manager, std::unique_ptr client_state) { @@ -310,7 +310,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c // This histogram name uses "VariationsFieldTrialCreator" rather than // "VariationsFieldTrialCreator" for consistency with historical data TRACE_EVENT0("startup", "VariationsFieldTrialCreator::CreateTrialsFromSeed"); -@@ -766,6 +765,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed( +@@ -764,6 +763,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed( void VariationsFieldTrialCreator::LoadSeedFromJsonFile( const base::FilePath& json_seed_path) { diff --git a/build/patches/Enable-darken-websites-checkbox-in-themes.patch b/build/patches/Enable-darken-websites-checkbox-in-themes.patch index 490248c5..27f446ef 100644 --- a/build/patches/Enable-darken-websites-checkbox-in-themes.patch +++ b/build/patches/Enable-darken-websites-checkbox-in-themes.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -2064,9 +2064,9 @@ +@@ -2069,9 +2069,9 @@ "expiry_milestone": -1 }, { diff --git a/build/patches/Enable-native-Android-autofill.patch b/build/patches/Enable-native-Android-autofill.patch index 875b166d..7d4b78c7 100644 --- a/build/patches/Enable-native-Android-autofill.patch +++ b/build/patches/Enable-native-Android-autofill.patch @@ -285,7 +285,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3989,28 +3989,6 @@ const FeatureEntry::FeatureVariation kLinkPreviewTriggerTypeVariations[] = { +@@ -3990,28 +3990,6 @@ const FeatureEntry::FeatureVariation kLinkPreviewTriggerTypeVariations[] = { std::size(kLinkPreviewTriggerTypeLongPress), nullptr}}; #endif // !BUILDFLAG(IS_ANDROID) @@ -314,7 +314,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::FeatureParam kGroupSuggestionEnableRecentlyOpenedOnly[] = { {"group_suggestion_enable_recently_opened", "true"}, {"group_suggestion_enable_switch_between", "false"}, -@@ -6617,17 +6595,6 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6618,17 +6596,6 @@ const FeatureEntry kFeatureEntries[] = { SINGLE_VALUE_TYPE(ui_devtools::switches::kEnableUiDevTools)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -384,7 +384,7 @@ diff --git a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -984,12 +984,6 @@ const char kAutofillVcnEnrollStrikeExpiryTimeDescription[] = +@@ -988,12 +988,6 @@ const char kAutofillVcnEnrollStrikeExpiryTimeDescription[] = "When enabled, changes the amount of time required for VCN enrollment " "prompt strikes to expire."; @@ -400,7 +400,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -594,9 +594,6 @@ extern const char kAutofillUploadCardRequestTimeoutDescription[]; +@@ -597,9 +597,6 @@ extern const char kAutofillUploadCardRequestTimeoutDescription[]; extern const char kAutofillVcnEnrollStrikeExpiryTimeName[]; extern const char kAutofillVcnEnrollStrikeExpiryTimeDescription[]; diff --git a/build/patches/Experimental-user-scripts-support.patch b/build/patches/Experimental-user-scripts-support.patch index 989605b9..405dd0f7 100644 --- a/build/patches/Experimental-user-scripts-support.patch +++ b/build/patches/Experimental-user-scripts-support.patch @@ -355,7 +355,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -186,6 +186,7 @@ +@@ -187,6 +187,7 @@ #include "components/ui_devtools/switches.h" #include "components/variations/variations_switches.h" #include "components/version_info/channel.h" diff --git a/build/patches/Eyeo-Adblock-for-Cromite.patch b/build/patches/Eyeo-Adblock-for-Cromite.patch index 89cf80ef..6e76e626 100644 --- a/build/patches/Eyeo-Adblock-for-Cromite.patch +++ b/build/patches/Eyeo-Adblock-for-Cromite.patch @@ -874,7 +874,7 @@ diff --git a/chrome/browser/adblock/android/java/src/org/chromium/chrome/browser diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -6420,7 +6420,9 @@ ChromeContentBrowserClient:: +@@ -6423,7 +6423,9 @@ ChromeContentBrowserClient:: } bool ChromeContentBrowserClient::WillInterceptWebSocket( @@ -885,7 +885,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #if BUILDFLAG(ENABLE_EXTENSIONS_CORE) if (!frame) { return false; -@@ -6443,9 +6445,11 @@ bool ChromeContentBrowserClient::WillInterceptWebSocket( +@@ -6446,9 +6448,11 @@ bool ChromeContentBrowserClient::WillInterceptWebSocket( } void ChromeContentBrowserClient::CreateWebSocket( diff --git a/build/patches/Internal-firewall.patch b/build/patches/Internal-firewall.patch index 32f0a66b..28ba939e 100644 --- a/build/patches/Internal-firewall.patch +++ b/build/patches/Internal-firewall.patch @@ -70,7 +70,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -233,6 +233,7 @@ +@@ -234,6 +234,7 @@ #include "sandbox/policy/features.h" #include "sandbox/policy/switches.h" #include "services/device/public/cpp/device_features.h" diff --git a/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch b/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch index 1009f654..9492aa8b 100644 --- a/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch +++ b/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch @@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/incognito/Incog diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -5855,10 +5855,10 @@ +@@ -5860,10 +5860,10 @@ "expiry_milestone": -1 }, { diff --git a/build/patches/Multiple-fingerprinting-mitigations.patch b/build/patches/Multiple-fingerprinting-mitigations.patch index 46c8b56d..decc766a 100644 --- a/build/patches/Multiple-fingerprinting-mitigations.patch +++ b/build/patches/Multiple-fingerprinting-mitigations.patch @@ -66,7 +66,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -260,6 +260,8 @@ +@@ -261,6 +261,8 @@ #include "ui/ui_features.h" #include "url/url_features.h" diff --git a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch index 08de582a..52f173ec 100644 --- a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch +++ b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch @@ -21,7 +21,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -2344,6 +2344,10 @@ +@@ -2349,6 +2349,10 @@ "yangsharon@google.com", "alexmos@google.com", "creis@google.com" ], "expiry_milestone": 150 }, diff --git a/build/patches/Temp-disable-experimental-web-platform-features.patch b/build/patches/Temp-disable-experimental-web-platform-features.patch index f2a24156..2c5949e3 100644 --- a/build/patches/Temp-disable-experimental-web-platform-features.patch +++ b/build/patches/Temp-disable-experimental-web-platform-features.patch @@ -9,7 +9,7 @@ Subject: Temp disable experimental-web-platform-features diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -5158,10 +5158,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5159,10 +5159,10 @@ const FeatureEntry kFeatureEntries[] = { {"enable-gpu-rasterization", flag_descriptions::kGpuRasterizationName, flag_descriptions::kGpuRasterizationDescription, kOsAll, MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)},