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.

Sign up for GitHub

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 125.0.6422.60 to Chromium 125.0.6422.76 #23777

Merged
merged 2 commits into from
May 22, 2024
Merged

Upgrade from Chromium 125.0.6422.60 to Chromium 125.0.6422.76 #23777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ec6155
Upgrade from Chromium 125.0.6422.60 to Chromium 125.0.6422.76
brave-builds May 21, 2024
c03cfe9
Update pins list timestamp
brave-builds May 21, 2024
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
4 changes: 2 additions & 2 deletions chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc
View file
Open in desktop
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 16 00:25:27 UTC 2024
# Last updated: Tue May 21 21:05:22 UTC 2024
PinsListTimestamp
1715819127
1716325522

# =====BEGIN BRAVE ROOTS ASC=====
#From https://www.amazontrust.com/repository/
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "125.0.6422.60",
"tag": "125.0.6422.76",
"repository": {
"url": "https://github.com/brave/chromium"
}
Expand Down
2 changes: 1 addition & 1 deletion patches/build-config-compiler-BUILD.gn.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 973d8bcbd2f1fa714ecd6f2752efde6e6770f5d8..644a484dde2cf20dd3a11e5ba4ad476f75c57fbf 100644
index 973d8bcbd2f1fa714ecd6f2752efde6e6770f5d8..56284802ddfe359c23bc4bbb0ce366cb9027a60b 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -588,7 +588,6 @@ config("compiler") {
Expand Down
4 changes: 2 additions & 2 deletions patches/components-search_engines-default_search_manager.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/components/search_engines/default_search_manager.cc b/components/search_engines/default_search_manager.cc
index 072111586277caf22b959f471df914d59f859c1d..b377226109d29724750eff70361a3617c087173e 100644
index e1603fc8c6ce6dd7ae80973f1f6590849f0a5102..1f9217d1146327a0ab20c36c3795da54e8c52189 100644
--- a/components/search_engines/default_search_manager.cc
+++ b/components/search_engines/default_search_manager.cc
@@ -382,6 +382,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() {
@@ -398,6 +398,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() {
// Check if default search preference is overriden by extension.
if (pref->IsExtensionControlled()) {
extension_default_search_ = std::move(turl_data);
Expand Down
2 changes: 1 addition & 1 deletion patches/components-search_engines-prepopulated_engines.json.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
index 405aaff30a8031b1e79ae9d273164283831da775..ffb464f02d57b67a047cc9fabc256f0983e77f2f 100644
index 90964af3f88bcb9380e843e2bf17f899377f09f4..f101dba303aec256b921870ccf783ed6ab3517c9 100644
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -102,17 +102,6 @@
Expand Down
2 changes: 1 addition & 1 deletion patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index 394e8b7587ebabf01e874b9bf0a468a32e0a713c..1d262e1ab2afcf73305337a0169ab5cf594c8530 100644
index bed4f9bcc005416df005de7e78e08f495e5769da..6466ad90bd0065c03f108939596ffb9c2ecff387 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1713,6 +1713,7 @@
Expand Down
Loading