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 132.0.6834.33 to Chromium 132.0.6834.46 (1.74.x) #26984

Merged
merged 2 commits into from
Dec 12, 2024
+16 −16
Merged

Upgrade from Chromium 132.0.6834.33 to Chromium 132.0.6834.46 (1.74.x) #26984

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
f3525c2
Upgrade from Chromium 132.0.6834.33 to Chromium 132.0.6834.46
brave-builds Dec 11, 2024
4b49850
Update pins list timestamp
brave-builds Dec 11, 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 @@ -554,9 +554,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 Dec 5 14:43:43 UTC 2024
# Last updated: Wed Dec 11 20:13:22 UTC 2024
PinsListTimestamp
1733409823
1733948002

# =====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 @@ -68,7 +68,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "132.0.6834.33",
"tag": "132.0.6834.46",
"repository": {
"url": "https://github.com/brave/chromium"
}
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
index 8fc9f731879a9ac0f2948f34199c0a254242d732..ceecd3c0c5b26fba1b6220c03e209b23fe538021 100644
index 7961ea057b515532ce31c189a34440b5367331df..b56a0f838a467e3e011d6acbd6f37ce3baf45173 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -1662,6 +1662,7 @@ const char* ChromeBrowsingDataRemoverDelegate::GetHistogramSuffix(
@@ -1674,6 +1674,7 @@ const char* ChromeBrowsingDataRemoverDelegate::GetHistogramSuffix(
return "WebrtcVideoPerfHistory";
case TracingDataType::kMediaDeviceSalts:
return "MediaDeviceSalts";
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-extensions-extension_tab_util.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
index 4d2c067a060417c703466d0cbea3a0144dbfd63e..cb795f8399d706348ed7f29e1106f5ad5a02b244 100644
index d5de30544c734bc5eea2822e58fe8fc9877ad145..ac59ff300fc630a940f9a52e054729c5a23765ef 100644
--- a/chrome/browser/extensions/extension_tab_util.cc
+++ b/chrome/browser/extensions/extension_tab_util.cc
@@ -1011,6 +1011,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
@@ -1017,6 +1017,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
}

if (!url.SchemeIs(content::kChromeUIScheme)) {
Expand Down
8 changes: 4 additions & 4 deletions patches/content-browser-renderer_host-render_frame_host_impl.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 95b2ad64c83361c452f9256cf96873f2cd82b446..67506224d593d4c52a870d71d9aae520684ff283 100644
index c77216fb7f109ae198b10867ff53559c14a4a204..538c11c7ef6c4cbbc8705e401a2dedabfb65d77f 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -4817,6 +4817,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal(
@@ -4797,6 +4797,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal(
candidate_site_for_cookies = net::SiteForCookies(top_frame_site);
}

+ BRAVE_RENDER_FRAME_HOST_IMPL_COMPUTE_ISOLATION_INFO_INTERNAL
std::optional<base::UnguessableToken> nonce =
ComputeNonce(is_credentialless, fenced_frame_nonce_for_navigation);
return net::IsolationInfo::Create(request_type, top_frame_origin,
@@ -4827,6 +4828,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal(
@@ -4807,6 +4808,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal(
std::optional<base::UnguessableToken> RenderFrameHostImpl::ComputeNonce(
bool is_credentialless,
std::optional<base::UnguessableToken> fenced_frame_nonce_for_navigation) {
+ BRAVE_RENDER_FRAME_HOST_IMPL_COMPUTE_NONCE
// If it's a credentialless frame tree, use its nonce even if it's within a
// fenced frame tree to maintain the guarantee that a credentialless frame
// tree has a unique nonce.
@@ -9228,6 +9230,8 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -9208,6 +9210,8 @@ void RenderFrameHostImpl::CreateNewWindow(
dom_storage_context, params->session_storage_namespace_id);
}

Expand Down
2 changes: 1 addition & 1 deletion patches/net-http-transport_security_state.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc
index 33d3a41a65bd70125529c7bb652d024f99de5d8e..5ec97d0c7171321a112a76f4662f00312d88d090 100644
index 93b6da31d706da91986518c7ac31efc1b646d8bb..851d380bb6ec055e7575bf549662726ed4cfad74 100644
--- a/net/http/transport_security_state.cc
+++ b/net/http/transport_security_state.cc
@@ -249,6 +249,7 @@ TransportSecurityState::TransportSecurityState(
Expand Down
2 changes: 1 addition & 1 deletion patches/third_party-blink-renderer-core-probe-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/third_party/blink/renderer/core/probe/BUILD.gn b/third_party/blink/renderer/core/probe/BUILD.gn
index 3148e66bc1769cc37080ceaa6ee369e93134fa42..979e8dbd5f82024e0b6be11822c0061dc740e282 100644
index 83312a7f88fc21e290e9a321d02d8033b34d4cbe..a274c35637ff2a7565ccff18e92404b83c7d86d0 100644
--- a/third_party/blink/renderer/core/probe/BUILD.gn
+++ b/third_party/blink/renderer/core/probe/BUILD.gn
@@ -36,6 +36,7 @@ template("probe_generator") {
Expand Down
4 changes: 2 additions & 2 deletions patches/third_party-blink-renderer-platform-BUILD.gn.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
index 71ee6cff2d2800df1105c8ed7883eea92af16efb..5226101f074f697bb47258dc40531f29a0d2bda1 100644
index 6c2e9762c94e45bd79fa1f3de7c747e57c5325fe..2a861e44cf3640e1d8fbff1b6ffa68a11aca8b15 100644
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1934,6 +1934,7 @@ component("platform") {
@@ -1936,6 +1936,7 @@ component("platform") {

configs -= [ "//build/config/compiler:default_symbols" ]
configs += blink_symbols_config
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 97628214830f09d4f74e77ffe1877125aceaf637..49a9b96e84579857a42db84ea2a3daaf64018c6c 100644
index db7c64eebdf34913139d556429f2717d08f39a56..dd1624786018139b6dca63279f5803a34b972f82 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1965,6 +1965,7 @@
Expand Down
Loading