From 63d816332be746387930345feba343ca97f51367 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Thu, 5 Aug 2021 12:04:51 +0200 Subject: [PATCH] Release 92.0.4515.134 --- CHANGELOG.md | 2 ++ build/RELEASE | 2 +- build/patches/Automated-domain-substitution.patch | 10 +++++----- .../Remove-signin-and-data-saver-integrations.patch | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index add654cd..aae328e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +# 92.0.4515.134 + # 92.0.4515.125 * replace patch for missing API keys warning * fix subresource filter not working (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1299) diff --git a/build/RELEASE b/build/RELEASE index b2ea24ef..4d3f9819 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -92.0.4515.125 +92.0.4515.134 diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index de3867fe..e417f34a 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -4573,7 +4573,7 @@ diff --git a/chrome/browser/cart/cart_discount_link_fetcher.cc b/chrome/browser/ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_service.cc --- a/chrome/browser/cart/cart_service.cc +++ b/chrome/browser/cart/cart_service.cc -@@ -449,7 +449,7 @@ void CartService::AddCartsWithFakeData() { +@@ -473,7 +473,7 @@ void CartService::AddCartsWithFakeData() { // Polulate and add some carts with fake data. double time_now = base::Time::Now().ToDoubleT(); cart_db::ChromeCartContentProto dummy_proto1; @@ -4582,7 +4582,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv dummy_proto1.set_key(std::string(kFakeDataPrefix) + eTLDPlusOne(dummy_url1)); dummy_proto1.set_merchant("Cart Foo"); dummy_proto1.set_merchant_cart_url(dummy_url1.spec()); -@@ -458,17 +458,17 @@ void CartService::AddCartsWithFakeData() { +@@ -482,17 +482,17 @@ void CartService::AddCartsWithFakeData() { l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_AMOUNT, u"15%")); dummy_proto1.add_product_image_urls( @@ -24453,7 +24453,7 @@ diff --git a/content/browser/portal/portal_navigation_throttle.cc b/content/brow diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -4346,7 +4346,7 @@ NavigationRequest::CheckCredentialedSubresource() const { +@@ -4347,7 +4347,7 @@ NavigationRequest::CheckCredentialedSubresource() const { const char* console_message = "Subresource requests whose URLs contain embedded credentials (e.g. " "`https://user:pass@host/`) are blocked. See " @@ -24462,7 +24462,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows "details."; parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning, console_message); -@@ -4374,7 +4374,7 @@ NavigationRequest::CheckLegacyProtocolInSubresource() const { +@@ -4375,7 +4375,7 @@ NavigationRequest::CheckLegacyProtocolInSubresource() const { const char* console_message = "Subresource requests using legacy protocols (like `ftp:`) are blocked. " "Please deliver web-accessible resources over modern protocols like " @@ -24471,7 +24471,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows "details."; parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning, console_message); -@@ -4606,7 +4606,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( +@@ -4607,7 +4607,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( base::StringPrintf( "Navigating a cross-origin opener to a download (%s) is " "deprecated, see " diff --git a/build/patches/Remove-signin-and-data-saver-integrations.patch b/build/patches/Remove-signin-and-data-saver-integrations.patch index 678df487..6ca370a6 100644 --- a/build/patches/Remove-signin-and-data-saver-integrations.patch +++ b/build/patches/Remove-signin-and-data-saver-integrations.patch @@ -1967,7 +1967,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe - findPreference(PREF_GOOGLE_SERVICES).setVisible(true); - } - - new AdaptiveToolbarStatePredictor().recomputeUiState(uiState -> { + new AdaptiveToolbarStatePredictor(null).recomputeUiState(uiState -> { // We don't show the toolbar shortcut settings page if disabled from finch. // Note, we can still have the old data collection experiment running for which @@ -227,9 +164,6 @@ public class MainSettings extends PreferenceFragmentCompat