Skip to content

Commit

Permalink
Upgrade from Chromium 132.0.6834.57 to Chromium 132.0.6834.83 (1.74.x) (
Browse files Browse the repository at this point in the history
#27160)

* Upgrade from Chromium 132.0.6834.57 to Chromium 132.0.6834.83 (requires manual update)

* Update pins list timestamp

* Updated strings for Chromium 132.0.6834.83

* Disable upstream tests related to LensOverlayController

---------

Co-authored-by: brave-builds <[email protected]>
  • Loading branch information
emerick and brave-builds authored Jan 9, 2025
1 parent 4a72dda commit 99a834d
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 23 deletions.
2 changes: 1 addition & 1 deletion app/profiles_strings.grdp
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@
You can try again or contact your administrator for help
</message>
<message name="IDS_ENTERPRISE_VALUE_PROPOSITION_SUBTITLE" desc="Subtitle the value proposition dialog for creating an enterprise profile.">
Sign in to get your bookmarks, passwords, and more on all your devices
Sign in to get your passwords and more on all your devices
</message>
<message name="IDS_ENTERPRISE_WELCOME_SEPARATE_BROWSING_WORK_TITLE" desc="Title of the dialog that asks the user to either keep their browsing data in the work profile they will create or keep it separate.">
Keep existing browsing data separate from your work profile?
Expand Down
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 19 19:36:10 UTC 2024
# Last updated: Wed Jan 8 20:28:14 UTC 2025
PinsListTimestamp
1734636970
1736368094
# =====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 @@ -68,7 +68,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "132.0.6834.57",
"tag": "132.0.6834.83",
"repository": {
"url": "https://github.com/brave/chromium"
}
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-about_flags.cc.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 41583cc15dddd096ace0e5aa72d1e1828ce2cdf2..ca4d1fd0af53942ae115351ba3a2e545d7db8ace 100644
index 7613006656aaacda9a9b8cb9a54944f92d96c77d..e7224ffedbeb2aec3c2a0c7ffcdc7bb62f6de5eb 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -4333,6 +4333,7 @@ const FeatureEntry::FeatureVariation kServiceWorkerAutoPreloadVariations[] = {
@@ -4339,6 +4339,7 @@ const FeatureEntry::FeatureVariation kServiceWorkerAutoPreloadVariations[] = {
//
// When adding a new choice, add it to the end of the list.
const FeatureEntry kFeatureEntries[] = {
Expand Down
2 changes: 1 addition & 1 deletion patches/ios-chrome-browser-flags-about_flags.mm.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/about_flags.mm
index 51417d45474d283a3d8cc83e2941e2034419b25f..9e32d0a3e54fd0e5cb7b22983a2df4b651cc46f1 100644
index 3a3cfe3bf6234535fcfaff93bfe299be8db86a73..a67bb82fc7778d446203ce11c346458e9b0a8f26 100644
--- a/ios/chrome/browser/flags/about_flags.mm
+++ b/ios/chrome/browser/flags/about_flags.mm
@@ -1232,6 +1232,7 @@ const FeatureEntry::FeatureVariation kNewFeedPositioningVariations[] = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
index 00a4ed4f0625981e3bef338399957419d2cffdf0..029aa6e08be3ac50abdec36387080bc7a8e6b995 100644
index ba53e2576ff7944071fd46c2d4d8635084738cb3..47d81f057398e3d9f9532210bef5bed065f69385 100644
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
@@ -488,6 +488,7 @@ bool LocalDOMWindow::CanExecuteScripts(
Expand Down
4 changes: 2 additions & 2 deletions patches/third_party-blink-renderer-platform-BUILD.gn.patch
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 6c2e9762c94e45bd79fa1f3de7c747e57c5325fe..2a861e44cf3640e1d8fbff1b6ffa68a11aca8b15 100644
index ffb2cc23eb74da99ca5875293879659b4f171303..4b775ea34016e1930edea3bafb42b36410d9e468 100644
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1936,6 +1936,7 @@ component("platform") {
@@ -1937,6 +1937,7 @@ component("platform") {

configs -= [ "//build/config/compiler:default_symbols" ]
configs += blink_symbols_config
Expand Down

This file was deleted.

2 changes: 2 additions & 0 deletions test/filters/browser_tests.filter
Original file line number Diff line number Diff line change
Expand Up @@ -1500,8 +1500,10 @@
-All/LensOverlayControllerBrowserPDFContextualizationTest.Histograms/*
-All/LensOverlayControllerBrowserPDFContextualizationTest.LargePdfNotIncludedInRequest/*
-All/LensOverlayControllerBrowserPDFContextualizationTest.PageUrlIncludedInRequest/*
-All/LensOverlayControllerBrowserPDFContextualizationTest.PartialPdfIncludedInRequest/*
-All/LensOverlayControllerBrowserPDFContextualizationTest.PdfBytesIncludedInRequest/*
-All/LensOverlayControllerBrowserPDFContextualizationTest.PdfBytesInFollowUpRequest/*
-All/LensOverlayControllerBrowserPDFIncreaseLimitTest.PartialPdfCharacterLimitReached_IncludedInRequest/*
-All/LensOverlayControllerBrowserPDFTest.ContextMenuOpensOverlay/*
-LensOverlayControllerBrowserTest.*
-LensOverlayControllerBrowserFullscreenDisabled.*
Expand Down

0 comments on commit 99a834d

Please sign in to comment.