diff --git a/chromium_version.txt b/chromium_version.txt index 8dc6527f08..c61d6066cf 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -131.0.6778.69 +131.0.6778.85 diff --git a/patches/core/ungoogled-chromium/disable-mei-preload.patch b/patches/core/ungoogled-chromium/disable-mei-preload.patch index 0c52a9cbc9..567c0fb825 100644 --- a/patches/core/ungoogled-chromium/disable-mei-preload.patch +++ b/patches/core/ungoogled-chromium/disable-mei-preload.patch @@ -15,6 +15,14 @@ "//third_party/widevine/cdm", ] if (invoker.collect_inputs_only) { +@@ -1213,7 +1212,6 @@ if (is_win) { + ":optimization_guide_library", + ":swiftshader_binaries", + ":widevine_cdm_library", +- "//chrome/browser/resources/media/mei_preload:component_bundle", + ] + + if (is_chrome_branded) { --- a/chrome/browser/resources/BUILD.gn +++ b/chrome/browser/resources/BUILD.gn @@ -95,11 +95,6 @@ group("resources") { diff --git a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch index 1dcc67b392..ed99c3948e 100644 --- a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch +++ b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch @@ -20,6 +20,14 @@ # This image is used to badge the lock icon in the # authentication dialogs, such as those used for installation # from disk image and Keystone promotion (if so enabled). It +@@ -1217,7 +1214,6 @@ if (is_win) { + ":swiftshader_binaries", + ":widevine_cdm_library", + "//chrome/browser/resources/media/mei_preload:component_bundle", +- "//components/privacy_sandbox/privacy_sandbox_attestations/preload:component_bundle", + ] + + if (is_chrome_branded) { --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -759,10 +759,6 @@ static_library("browser") { diff --git a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch index 07ed92053e..f03dee0057 100644 --- a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch +++ b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch @@ -2627,7 +2627,7 @@ } // namespace safe_browsing --- a/chrome/browser/safe_browsing/url_lookup_service_factory.cc +++ b/chrome/browser/safe_browsing/url_lookup_service_factory.cc -@@ -71,27 +71,7 @@ RealTimeUrlLookupServiceFactory::~RealTi +@@ -71,29 +71,7 @@ RealTimeUrlLookupServiceFactory::~RealTi std::unique_ptr RealTimeUrlLookupServiceFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const { @@ -2648,7 +2648,9 @@ - AreSigninAndSyncSetUpForSafeBrowsingTokenFetches, - SyncServiceFactory::GetForProfile(profile), - IdentityManagerFactory::GetForProfile(profile)), -- profile->IsOffTheRecord(), g_browser_process->variations_service(), +- profile->IsOffTheRecord(), +- base::BindRepeating( +- &RealTimeUrlLookupServiceFactory::GetVariationsService), - SafeBrowsingNavigationObserverManagerFactory::GetForBrowserContext( - profile), - WebUIInfoSingleton::GetInstance()); @@ -3785,7 +3787,7 @@ void OhttpKeyService::Shutdown() { --- a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc +++ b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc -@@ -275,17 +275,6 @@ void RealTimeUrlLookupService::MaybeLogP +@@ -276,17 +276,6 @@ void RealTimeUrlLookupService::MaybeLogP bool request_had_cookie, bool was_first_request, bool sent_with_token) { diff --git a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch index c91475164f..525a1c73ab 100644 --- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch +++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch @@ -3627,7 +3627,7 @@ #include "components/saved_tab_groups/public/features.h" #include "components/search_engines/search_engine_choice/search_engine_choice_service.h" #include "components/signin/public/base/signin_buildflags.h" -@@ -3448,11 +3447,6 @@ void AddSiteSettingsStrings(content::Web +@@ -3449,11 +3448,6 @@ void AddSiteSettingsStrings(content::Web html_source->AddLocalizedStrings(kSensorsLocalizedStrings); html_source->AddBoolean( @@ -4059,6 +4059,30 @@ } void AddressDataManager::SetAutofillSelectableTypeEnabled(bool enabled) { +--- a/components/autofill/core/browser/autofill_experiments.cc ++++ b/components/autofill/core/browser/autofill_experiments.cc +@@ -35,7 +35,6 @@ + #include "components/device_reauth/device_authenticator.h" + #include "components/prefs/pref_service.h" + #include "components/signin/public/base/signin_buildflags.h" +-#include "components/signin/public/base/signin_pref_names.h" + #include "components/strings/grit/components_strings.h" + #include "components/sync/base/features.h" + #include "components/sync/base/user_selectable_type.h" +@@ -132,13 +131,6 @@ bool IsCreditCardUploadEnabled( + // from the codebase. + bool addresses_in_transport_mode = base::FeatureList::IsEnabled( + syncer::kSyncEnableContactInfoDataTypeInTransportMode); +-#if BUILDFLAG(ENABLE_DICE_SUPPORT) +- // Dice users don't have addresses in transport mode until they went through +- // the explicit signin flow. +- addresses_in_transport_mode = +- addresses_in_transport_mode && +- pref_service.GetBoolean(::prefs::kExplicitBrowserSignin); +-#endif + bool syncing_or_addresses_in_transport_mode = + sync_service->IsSyncFeatureActive() || addresses_in_transport_mode; + if (syncing_or_addresses_in_transport_mode && --- a/components/browser_sync/BUILD.gn +++ b/components/browser_sync/BUILD.gn @@ -20,8 +20,6 @@ static_library("browser_sync") { @@ -4927,8 +4951,8 @@ #include "components/safe_browsing/core/common/utils.h" #include "components/unified_consent/pref_names.h" #include "net/base/ip_address.h" -@@ -69,10 +68,6 @@ RealTimeUrlLookupService::RealTimeUrlLoo - variations_(variations_service) { +@@ -70,10 +69,6 @@ RealTimeUrlLookupService::RealTimeUrlLoo + variations_service_getter_(variations_service_getter) { pref_change_registrar_.Init(pref_service_); pref_change_registrar_.Add( - prefs::kSafeBrowsingEnhanced, @@ -4938,7 +4962,7 @@ unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled, base::BindRepeating(&RealTimeUrlLookupService::OnPrefChanged, base::Unretained(this))); -@@ -142,8 +137,7 @@ bool RealTimeUrlLookupService::CanSendPa +@@ -143,8 +138,7 @@ bool RealTimeUrlLookupService::CanSendPa } bool RealTimeUrlLookupService::CanIncludeSubframeUrlInReferrerChain() const { @@ -4948,7 +4972,7 @@ } bool RealTimeUrlLookupService::CanCheckSafeBrowsingDb() const { -@@ -160,9 +154,7 @@ bool RealTimeUrlLookupService::CanCheckS +@@ -161,9 +155,7 @@ bool RealTimeUrlLookupService::CanCheckS } bool RealTimeUrlLookupService::CanSendRTSampleRequest() const { @@ -4959,7 +4983,7 @@ } std::string RealTimeUrlLookupService::GetUserEmail() const { -@@ -261,14 +253,6 @@ RealTimeUrlLookupService::GetMinAllowedT +@@ -262,14 +254,6 @@ RealTimeUrlLookupService::GetMinAllowedT void RealTimeUrlLookupService::MaybeLogLastProtegoPingTimeToPrefs( bool sent_with_token) { diff --git a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch index f3e321f295..2d0b4d18f0 100644 --- a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch +++ b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch @@ -501,7 +501,7 @@ // Specify the maximum message and title width explicitly. --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -3466,7 +3466,7 @@ void AddSiteSettingsStrings(content::Web +@@ -3467,7 +3467,7 @@ void AddSiteSettingsStrings(content::Web base::FeatureList::IsEnabled(blink::features::kWebPrinting)); html_source->AddBoolean("enableFederatedIdentityApiContentSetting",