Skip to content

Commit

Permalink
Upgrade from Chromium 125.0.6422.112 to Chromium 125.0.6422.147 (#23924)
Browse files Browse the repository at this point in the history
* Upgrade from Chromium 125.0.6422.112 to Chromium 125.0.6422.147

* Update pins list timestamp

---------

Co-authored-by: brave-builds <brave-builds+devops@brave.com>
  • Loading branch information
emerick and brave-builds authored May 31, 2024
1 parent 1f6d94e commit 58b02d9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -550,9 +550,9 @@ bool ParseCertificatesFile(std::string_view certs_input,
Pinsets* pinsets,
base::Time* timestamp) {
constexpr std::string_view brave_certs = R"brave_certs(
# Last updated: Thu May 23 23:49:26 UTC 2024
# Last updated: Thu May 30 21:31:08 UTC 2024
PinsListTimestamp
1716508166
1717104668
# =====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 @@ -66,7 +66,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "125.0.6422.112",
"tag": "125.0.6422.147",
"repository": {
"url": "https://github.com/brave/chromium"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc
index fad24f08bb02aa102f574bd0344c859cf506a48c..07533c3bdbf9a3fef72ef2018d21e37d3970bef7 100644
index 7d2d837e5b34ca827fb2b48a5c5f3d882299d416..aa37a75195138f12f8fa77de2ed5fbe6eda6b284 100644
--- a/content/browser/renderer_host/navigation_controller_impl.cc
+++ b/content/browser/renderer_host/navigation_controller_impl.cc
@@ -3629,16 +3629,17 @@ base::WeakPtr<NavigationHandle> NavigationControllerImpl::NavigateWithoutEntry(
@@ -3632,16 +3632,17 @@ base::WeakPtr<NavigationHandle> NavigationControllerImpl::NavigateWithoutEntry(
// Note: we intentionally leave the pending entry in place for renderer debug
// URLs, unlike the cases below where we clear it if the navigation doesn't
// proceed.
Expand Down

0 comments on commit 58b02d9

Please sign in to comment.