Merge pull request #29144 from brave/137.0.7151.32_master
Upgrade from Chromium 137.0.7151.27 to Chromium 137.0.7151.32
This commit is contained in:
@@ -546,9 +546,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 15 14:39:22 2025
|
||||
# Last updated: Tue May 20 15:59:23 2025
|
||||
PinsListTimestamp
|
||||
1747334362
|
||||
1747771163
|
||||
|
||||
# =====BEGIN BRAVE ROOTS ASC=====
|
||||
#From https://www.amazontrust.com/repository/
|
||||
|
||||
+1
-1
@@ -72,7 +72,7 @@
|
||||
"projects": {
|
||||
"chrome": {
|
||||
"dir": "src",
|
||||
"tag": "137.0.7151.27",
|
||||
"tag": "137.0.7151.32",
|
||||
"repository": {
|
||||
"url": "https://github.com/brave/chromium"
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
|
||||
index 6427bd3d6ded54ccf921a8b4b229f8a03c1c7d96..a7f4fdfc2b791cef28898581eb8975affb89c431 100644
|
||||
index 4c2f7c4f75a2b4801393207469fd315f94e701d9..be1283fd26ec655f88cbb7d11f16e890ab163259 100644
|
||||
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
|
||||
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
|
||||
@@ -392,7 +392,7 @@ public class FeedSurfaceMediator
|
||||
@@ -393,7 +393,7 @@ public class FeedSurfaceMediator
|
||||
// Start is showing, update the value of Pref.ENABLE_SNIPPETS_BY_DSE here. The
|
||||
// value should be updated before adding an observer to prevent an extra call of
|
||||
// updateContent().
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
index 855d316c6a89dd783114f24ef073820b9a68670c..e68f43605897843bbc99cf1909cc8fbb3e03a72b 100644
|
||||
index c9579f87ddc11665974be6848df26aaace72c9a8..a83e5eeab2d80d1e16e7e9dfec97d70cb3ce25af 100644
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -4616,6 +4616,7 @@ const FeatureEntry::FeatureVariation
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
|
||||
index 7954c76b8f9806622a5191605578817926994670..897675ff0243622236a73902df2ecd7c1d3b7df9 100644
|
||||
index 9d6e3d0b8e7aab1e104765c052c10792b85cb0fc..ff4481d9a86b1a94e639327b98f6ac29d05c7b0c 100644
|
||||
--- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
|
||||
+++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
|
||||
@@ -399,7 +399,7 @@ void ContentAnalysisDelegate::CreateForWebContents(
|
||||
@@ -403,7 +403,7 @@ void ContentAnalysisDelegate::CreateForWebContents(
|
||||
show_fail_closed_ui ? FinalContentAnalysisResult::FAIL_CLOSED
|
||||
: FinalContentAnalysisResult::SUCCESS;
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc
|
||||
index fbeff5d5b3ffa4433f163b642d349119a6dec587..85b377cf3b89f271859cbbf16f8591db5d208bd2 100644
|
||||
index fe6547df9874f7c4e88a1256f4d93763f481cf63..fb63b9ffc8124a5c0c14c0f72f990adefaf2568d 100644
|
||||
--- a/components/omnibox/browser/omnibox_edit_model.cc
|
||||
+++ b/components/omnibox/browser/omnibox_edit_model.cc
|
||||
@@ -596,6 +596,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min,
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
|
||||
index 4c78563c29ce92c8217d288ed03f73fb482c6b49..7f79b1c5265d1382481d225a641edbd53e546d39 100644
|
||||
index a8bcc9a4731e6acb6a5fb460915f933e96e5e91a..c05320fb7de031bdb99ddfe1accb7d1d54f5b349 100644
|
||||
--- a/content/browser/renderer_host/navigation_request.cc
|
||||
+++ b/content/browser/renderer_host/navigation_request.cc
|
||||
@@ -3587,6 +3587,7 @@ void NavigationRequest::OnRequestRedirected(
|
||||
@@ -3601,6 +3601,7 @@ void NavigationRequest::OnRequestRedirected(
|
||||
common_params_->url = redirect_info.new_url;
|
||||
common_params_->method = redirect_info.new_method;
|
||||
common_params_->referrer->url = GURL(redirect_info.new_referrer);
|
||||
@@ -10,7 +10,7 @@ index 4c78563c29ce92c8217d288ed03f73fb482c6b49..7f79b1c5265d1382481d225a641edbd5
|
||||
common_params_->referrer = Referrer::SanitizeForRequest(
|
||||
common_params_->url, *common_params_->referrer);
|
||||
|
||||
@@ -5404,6 +5405,7 @@ void NavigationRequest::OnStartChecksComplete(
|
||||
@@ -5442,6 +5443,7 @@ void NavigationRequest::OnStartChecksComplete(
|
||||
headers.MergeFrom(TakeModifiedRequestHeaders());
|
||||
begin_params_->headers = headers.ToString();
|
||||
|
||||
|
||||
@@ -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 ea412eeeff02c7701e51872ad345fc399be5d768..4551e9e2b196f538da75d297133f7fd516c69b6c 100644
|
||||
index 773ed8ed9a43678d28dc7f5d86479d0f7c010a8f..58b506a12561715e8188dace51e8e36fa4c757c8 100644
|
||||
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
@@ -2120,6 +2120,7 @@
|
||||
|
||||
Reference in New Issue
Block a user