From cf8ad483f5d8d794e94b1efe27f310e131677d9a Mon Sep 17 00:00:00 2001 From: brave-builds Date: Thu, 27 Apr 2023 01:23:38 +0000 Subject: [PATCH 1/4] Upgrade from Chromium 113.0.5672.53 to Chromium 113.0.5672.63 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3c532b1b1123..7afb6291ab17 100644 --- a/package.json +++ b/package.json @@ -265,7 +265,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "113.0.5672.53", + "tag": "113.0.5672.63", "repository": { "url": "https://github.com/chromium/chromium" } From b2ba3cf90bb3ff19bcb48566817d93a0d479bb45 Mon Sep 17 00:00:00 2001 From: brave-builds Date: Thu, 27 Apr 2023 01:23:42 +0000 Subject: [PATCH 2/4] Upgrade patches from Chromium 113.0.5672.53 to Chromium 113.0.5672.63 --- patches/chrome-VERSION.patch | 4 ++-- patches/chrome-browser-about_flags.cc.patch | 2 +- ...hrome-browser-toolbar-top-ToolbarPhone.java.patch | 12 ++++++------ ...-omnibox-browser-autocomplete_controller.cc.patch | 2 +- ...anslate-content-renderer-translate_agent.cc.patch | 2 +- ...browser-renderer_host-navigation_request.cc.patch | 2 +- .../services-network-cors-cors_url_loader.cc.patch | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 31d35e11b3ac..911878ed8778 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 7b25583e8740c7be109a1f5370d72f1005c8d577..286c78e17527766293175c84ec33a1b6b82db78f 100644 +index 16361542080471ca4f7fe5afc30c5c0879bf8c48..fe33df30a8e03225293c34d02cc0c05666fb9eb3 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=113 -MINOR=0 -BUILD=5672 --PATCH=53 +-PATCH=63 +MINOR=1 +BUILD=53 +PATCH=1 diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index 8af45dbd46e1..6768fd44c301 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 18e15e70e895de3dd9fd77e72990f2b1e044839e..9af8eb72084ac9fd986d9023b3866de131bd7ee7 100644 +index d158893700f36027c486e7f11ee664af58350458..c613a5bf9beb16605a41bc76008a68a5b21f9bef 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -3471,6 +3471,7 @@ const FeatureEntry::FeatureVariation kVcSegmentationModelVariations[] = { diff --git a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch index e95ba2c0e58a..0b0edcec8ad7 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -index 0d1c3f25edd3e58839eeec3eea3f99a4f4c91baa..7e2efd9b96845c87541b96ac08c7b93169c361e5 100644 +index 4b6dc6a6ea856ab6ba47eb0592a2dc82c88325da..1acbb1df0288dd0c6887e5b3920e0f267b5da8b8 100644 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -@@ -395,6 +395,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -398,6 +398,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC if (mOptionalButton != null) { mOptionalButton.setBackgroundColorFilter(color); } @@ -10,7 +10,7 @@ index 0d1c3f25edd3e58839eeec3eea3f99a4f4c91baa..7e2efd9b96845c87541b96ac08c7b931 } private void updateModernLocationBarCorners() { -@@ -561,6 +562,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -569,6 +570,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED); } } @@ -18,7 +18,7 @@ index 0d1c3f25edd3e58839eeec3eea3f99a4f4c91baa..7e2efd9b96845c87541b96ac08c7b931 } @Override -@@ -1012,6 +1014,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -1020,6 +1022,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC * New Tab Page. */ private void updateLocationBarLayoutForExpansionAnimation() { @@ -26,7 +26,7 @@ index 0d1c3f25edd3e58839eeec3eea3f99a4f4c91baa..7e2efd9b96845c87541b96ac08c7b931 TraceEvent.begin("ToolbarPhone.updateLocationBarLayoutForExpansionAnimation"); if (isInTabSwitcherMode()) return; -@@ -1328,6 +1331,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -1336,6 +1339,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC canvas.restore(); } @@ -34,7 +34,7 @@ index 0d1c3f25edd3e58839eeec3eea3f99a4f4c91baa..7e2efd9b96845c87541b96ac08c7b931 // Draw the tab stack button and associated text if necessary. if (mTabSwitcherAnimationTabStackDrawable != null && mToggleTabStackButton != null && mUrlExpansionFraction != 1f) { -@@ -2082,6 +2086,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -2090,6 +2094,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC } else { populateUrlClearExpansionAnimatorSet(animators); } diff --git a/patches/components-omnibox-browser-autocomplete_controller.cc.patch b/patches/components-omnibox-browser-autocomplete_controller.cc.patch index 8d7760344652..f5489f21dd2f 100644 --- a/patches/components-omnibox-browser-autocomplete_controller.cc.patch +++ b/patches/components-omnibox-browser-autocomplete_controller.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc -index 65b4882f43f3cf3dcd58a0a5e59ae86cd412171e..3cb98c0d8b727371e373936f2509d2a308739f55 100644 +index a647111c97540a479ca5d07f96fed386a5369b40..b6ed1f6c09eef4145af467dbada438e81d6101d2 100644 --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc @@ -828,6 +828,7 @@ void AutocompleteController::InitializeAsyncProviders(int provider_types) { diff --git a/patches/components-translate-content-renderer-translate_agent.cc.patch b/patches/components-translate-content-renderer-translate_agent.cc.patch index bf09c25a6dae..467ac90b642c 100644 --- a/patches/components-translate-content-renderer-translate_agent.cc.patch +++ b/patches/components-translate-content-renderer-translate_agent.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/translate/content/renderer/translate_agent.cc b/components/translate/content/renderer/translate_agent.cc -index 7b39c3cd9195ca48ccfb582e52231da2ccb47be3..3b0a0443da5ea2c9712ba3f2d554004b507c5f91 100644 +index 7c710501a4cff2d8a13b4ae0d9e9dc3b350317b4..635cb7de0067101e6b28442da42e7d93ec0acf06 100644 --- a/components/translate/content/renderer/translate_agent.cc +++ b/components/translate/content/renderer/translate_agent.cc @@ -57,7 +57,7 @@ const int kTranslateInitCheckDelayMs = 150; diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 6b15aceba542..abf852c504c5 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index 09e2e349e9e29cbb8b37eb4798c441619757834b..ba78b3f9d0d1980e32cdcd627a20340180b543d6 100644 +index 211f098c4fb7ef3162905e0550a61c60343ad515..48038e8ce4cb75d7bdacba9a46240702baca9786 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc @@ -3139,6 +3139,7 @@ void NavigationRequest::OnRequestRedirected( diff --git a/patches/services-network-cors-cors_url_loader.cc.patch b/patches/services-network-cors-cors_url_loader.cc.patch index c4ea26cf715f..3267c6c8436e 100644 --- a/patches/services-network-cors-cors_url_loader.cc.patch +++ b/patches/services-network-cors-cors_url_loader.cc.patch @@ -1,8 +1,8 @@ diff --git a/services/network/cors/cors_url_loader.cc b/services/network/cors/cors_url_loader.cc -index d49c6c673d5539ab911279cf6cb7020bc048680a..10abe6d4e5ba72307a5c78b741bb97f02e4a5cf3 100644 +index 1574159e1e426e82350bdce0c8c1de87c3f37c86..adf3d5e173489818e370d50951e898223cf0cf98 100644 --- a/services/network/cors/cors_url_loader.cc +++ b/services/network/cors/cors_url_loader.cc -@@ -687,6 +687,7 @@ void CorsURLLoader::StartRequest() { +@@ -690,6 +690,7 @@ void CorsURLLoader::StartRequest() { (fetch_cors_flag_ || (request_.method != net::HttpRequestHeaders::kGetMethod && request_.method != net::HttpRequestHeaders::kHeadMethod))) { From bf1d9bdf26d1faab17896f64e7c7e8aaf059f73b Mon Sep 17 00:00:00 2001 From: brave-builds Date: Thu, 27 Apr 2023 01:24:39 +0000 Subject: [PATCH 3/4] Update pins list timestamp --- .../transport_security_state_generator/input_file_parsers.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc index 3784be727b92..5816dcc971da 100644 --- a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc +++ b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc @@ -535,9 +535,9 @@ bool ParseCertificatesFile(base::StringPiece certs_input, Pinsets* pinsets, base::Time* timestamp) { constexpr base::StringPiece brave_certs = R"brave_certs( -# Last updated: Thu Apr 20 17:56:38 UTC 2023 +# Last updated: Thu Apr 27 01:24:37 UTC 2023 PinsListTimestamp -1682013398 +1682558677 # =====BEGIN BRAVE ROOTS ASC===== #From https://www.amazontrust.com/repository/ From 3c2e47bd283311314cfc69b302c0f2d06e8ed2a3 Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Thu, 27 Apr 2023 23:29:18 -0400 Subject: [PATCH 4/4] Temporarily disables WindowClosingConfirmBrowserTest.TestWithDownload on MacOS. The test fails because in Chromium Private/Incognito profiles now ignore the "Ask for download location" setting and always prompt for the location. We will fix that in https://github.com/brave/brave-browser/issues/29823, but until then let's disable this test on MacOS. --- browser/ui/window_closing_confirm_browsertest.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/browser/ui/window_closing_confirm_browsertest.cc b/browser/ui/window_closing_confirm_browsertest.cc index c6faccc9b924..fe07d683dab5 100644 --- a/browser/ui/window_closing_confirm_browsertest.cc +++ b/browser/ui/window_closing_confirm_browsertest.cc @@ -265,7 +265,15 @@ IN_PROC_BROWSER_TEST_F(WindowClosingConfirmBrowserTest, ui_test_utils::WaitForBrowserToClose(brave_browser); } -IN_PROC_BROWSER_TEST_F(WindowClosingConfirmBrowserTest, TestWithDownload) { +// Temporarily disable the test on MacOS until +// https://github.com/brave/brave-browser/issues/29823 is fixed. +#if BUILDFLAG(IS_MAC) +#define MAYBE_TestWithDownload DISABLED_TestWithDownload +#else +#define MAYBE_TestWithDownload TestWithDownload +#endif +IN_PROC_BROWSER_TEST_F(WindowClosingConfirmBrowserTest, + MAYBE_TestWithDownload) { // On macOS, download in-progress warning is not shown for normal profile window // closing as it can still continue after window is closed. // However, private profile window works like normal window of other platforms.