Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade from Chromium 113.0.5672.53 to Chromium 113.0.5672.63. #18271

Merged
merged 4 commits into from
Apr 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion browser/ui/window_closing_confirm_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion patches/chrome-browser-about_flags.cc.patch
Original file line number Diff line number Diff line change
@@ -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[] = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
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);
}
+ BraveToolbarLayout.class.cast(this).updateModernLocationBarColorImpl(color);
}

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);
}
}
+ BraveToolbarLayout.class.cast(this).onClickImpl(v);
}

@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() {
+ if (!BraveToolbarLayout.class.cast(this).isLocationBarValid(mLocationBar)) return;
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();
}

+ BraveToolbarLayout.class.cast(this).drawAnimationOverlay(mToolbarButtonsContainer, canvas);
// 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);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
4 changes: 2 additions & 2 deletions patches/services-network-cors-cors_url_loader.cc.patch
Original file line number Diff line number Diff line change
@@ -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))) {
Expand Down