Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade from Chromium 127.0.6533.43 to Chromium 127.0.6533.57 (#24711)

Browse Source 
* Upgrade from Chromium 127.0.6533.43 to Chromium 127.0.6533.57

* Update pins list timestamp

* Disable upstream tests related to LensOverlay feature

---------

Co-authored-by: brave-builds <brave-builds+devops@brave.com>
This commit is contained in:
Emerick Rogul
2024-07-17 19:03:19 -04:00
committed by GitHub
co-authored by brave-builds
parent 6a558b8a3d
commit d6039c8b05
14 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc
+2 -2
View File
@@ -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: Wed Jun 26 19:08:35 UTC 2024
# Last updated: Wed Jul 17 18:33:10 UTC 2024
PinsListTimestamp
1719428915
1721241190
# =====BEGIN BRAVE ROOTS ASC=====
#From https://www.amazontrust.com/repository/
package.json
+1 -1
View File
@@ -68,7 +68,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "127.0.6533.43",
"tag": "127.0.6533.57",
"repository": {
"url": "https://github.com/brave/chromium"
}
patches/chrome-android-BUILD.gn.patch
+5 -5
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index b16077e278a8b719536473418e356be528491392..41a411fa12e9a0bafedfb36b192255c02e4242ed 100644
index 92b4bddd53412ceeb456aa32099e66654292ca2c..1d5f213522fa00a5a77283c282030603b8603ae1 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -192,6 +192,7 @@ if (current_toolchain == default_toolchain) {
@@ -42,7 +42,7 @@ index b16077e278a8b719536473418e356be528491392..41a411fa12e9a0bafedfb36b192255c0
}
action_with_pydeps("chrome_android_java_google_api_keys_srcjar") {
@@ -2256,6 +2261,7 @@ if (current_toolchain == default_toolchain) {
@@ -2258,6 +2263,7 @@ if (current_toolchain == default_toolchain) {
"java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png",
"java/res_chromium_base/values/channel_constants.xml",
]
@@ -50,7 +50,7 @@ index b16077e278a8b719536473418e356be528491392..41a411fa12e9a0bafedfb36b192255c0
# Dep needed to ensure override works properly.
deps = [ ":chrome_base_module_resources" ]
@@ -2468,6 +2474,7 @@ if (current_toolchain == default_toolchain) {
@@ -2470,6 +2476,7 @@ if (current_toolchain == default_toolchain) {
":${_variant}_locale_pak_assets",
":${_variant}_paks",
]
@@ -58,7 +58,7 @@ index b16077e278a8b719536473418e356be528491392..41a411fa12e9a0bafedfb36b192255c0
if (_is_monochrome) {
deps += [ "//android_webview:locale_pak_assets" ]
}
@@ -2742,6 +2749,7 @@ if (current_toolchain == default_toolchain) {
@@ -2744,6 +2751,7 @@ if (current_toolchain == default_toolchain) {
"//components/payments/content/android:service_java",
"//third_party/androidx:androidx_browser_browser_java",
]
@@ -66,7 +66,7 @@ index b16077e278a8b719536473418e356be528491392..41a411fa12e9a0bafedfb36b192255c0
# More deps for DFMs.
if (dfmify_dev_ui) {
@@ -3824,6 +3832,7 @@ generate_jni("chrome_jni_headers") {
@@ -3826,6 +3834,7 @@ generate_jni("chrome_jni_headers") {
"java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java",
"java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java",
]
patches/chrome-browser-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index e06cdcd322877a65763bde7e5a82c7e5c14d5414..557e23611667f0d860a8c2c9ab56f4005f058a20 100644
index db90e13763831a61959cf2afbdde45442d9ccf20..f2e2674c1d405300999b5399264db887216cd5bb 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2769,6 +2769,7 @@ static_library("browser") {
@@ -2770,6 +2770,7 @@ static_library("browser") {
"performance_monitor/metric_evaluator_helper_posix.h",
]
}
patches/chrome-browser-about_flags.cc.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 42ff5332e7610b2b626f5da820a7ae63a28a188c..73352b26bac1686356534e8f185c67f2756c8aa0 100644
index f437577c606290f3465040665b3429079b9b7160..a8cbe0509d2e642507ee5f95695c2abdf332e905 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -4069,6 +4069,7 @@ const FeatureEntry::FeatureVariation kAutofillUpstreamUpdatedUiOptions[] = {
@@ -4113,6 +4113,7 @@ const FeatureEntry::FeatureVariation kAutofillUpstreamUpdatedUiOptions[] = {
//
// When adding a new choice, add it to the end of the list.
const FeatureEntry kFeatureEntries[] = {
@@ -10,7 +10,7 @@ index 42ff5332e7610b2b626f5da820a7ae63a28a188c..73352b26bac1686356534e8f185c67f2
// Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
// //tools/flags/generate_unexpire_flags.py.
#include "build/chromeos_buildflags.h"
@@ -11848,6 +11849,7 @@ void GetStorage(Profile* profile, GetStorageCallback callback) {
@@ -11900,6 +11901,7 @@ void GetStorage(Profile* profile, GetStorageCallback callback) {
bool ShouldSkipConditionalFeatureEntry(const flags_ui::FlagsStorage* storage,
const FeatureEntry& entry) {
patches/chrome-browser-prefs-browser_prefs.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 3b6ce83dd7579c6dc985f9219f0490472c90e086..e8d2a2f6751dcbb504956270f6914a2b730e9474 100644
index c93cccc815a1496092e41b75df9a36de22043d6a..b38725a6d6f33315d5cfcb7284b1f022e4f73e82 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1962,6 +1962,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
index ee4c9427902960383a7b24bbc6ae67cfda0b93de..f0ce67acf00a851c61a198e5e18d7a1751d53cf3 100644
index 2c61092b98efdbdf957aa90439eb6b5480d23a52..faf819e40e578aa957e36c8800cf1b711b471677 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -2390,6 +2390,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
@@ -2404,6 +2404,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
if (!selection_navigation_url_.is_valid()) {
return;
}
patches/chrome-browser-ui-browser.cc.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index b4eadfdbfcfacd48185b07b4f73b1f9833466d25..86aec9af29f5637c83105e0b736bb81d41d3b134 100644
index a7a3a0722bcbeec386fa04b1064bf29264ae5dc7..64bc88dedcb875cb59fc62e25b6dd38ad3eece8c 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -529,6 +529,7 @@ Browser* Browser::Create(const CreateParams& params) {
@@ -528,6 +528,7 @@ Browser* Browser::Create(const CreateParams& params) {
// not possible, e.g. using the wrong profile or during shutdown. The caller
// should handle this; see e.g. crbug.com/1141608 and crbug.com/1261628.
CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile));
@@ -10,7 +10,7 @@ index b4eadfdbfcfacd48185b07b4f73b1f9833466d25..86aec9af29f5637c83105e0b736bb81d
return new Browser(params);
}
@@ -539,7 +540,7 @@ Browser::Browser(const CreateParams& params)
@@ -538,7 +539,7 @@ Browser::Browser(const CreateParams& params)
window_(nullptr),
tab_strip_model_delegate_(
std::make_unique<chrome::BrowserTabStripModelDelegate>(this)),
patches/chrome-browser-ui-tabs-tab_strip_prefs.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/tabs/tab_strip_prefs.cc b/chrome/browser/ui/tabs/tab_strip_prefs.cc
index e23947f898ee96e0d853ef82a43fac691b4b2428..a9237cb03162a8d911ea57388ee4ffc52a61e1f7 100644
index fc064dc9d2e8af791385c076bf55f00f2c5968b6..272708ac7d43724fcbafa93d6eb14878882c999a 100644
--- a/chrome/browser/ui/tabs/tab_strip_prefs.cc
+++ b/chrome/browser/ui/tabs/tab_strip_prefs.cc
@@ -20,6 +20,7 @@ std::optional<bool> g_tab_search_right_aligned_at_startup = std::nullopt;
@@ -19,6 +19,7 @@ std::optional<bool> g_tab_search_trailing_tabstrip_at_startup = std::nullopt;
namespace tabs {
bool GetDefaultTabSearchRightAligned() {
patches/chrome-browser-ui-views-frame-tab_strip_region_view.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/frame/tab_strip_region_view.h b/chrome/browser/ui/views/frame/tab_strip_region_view.h
index 5be7ce333f96a26dfca1926455757785eb096351..3ee937bd976de7dca0f845d0052472756a7000cc 100644
index be360dd1e41dc8d027997467fe95a6536cd33ac9..34cc56561e1b33108c7d759a9433d4847d4cb4d0 100644
--- a/chrome/browser/ui/views/frame/tab_strip_region_view.h
+++ b/chrome/browser/ui/views/frame/tab_strip_region_view.h
@@ -24,7 +24,7 @@ class ProductSpecificationsButton;
@@ -25,7 +25,7 @@ class TabSearchPositionMetricsLogger;
// Container for the tabstrip and the other views sharing space with it -
// with the exception of the caption buttons.
patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
index bd54bea2a9cf324ca11f1fdc15b6cb3ae2d6a698..779a2abcad8bb609234639fc4f9b5338b940bc93 100644
index d03cdb7991dc483c2fc726d4fb365042389909c8..f7b54642510b03e4971f10c16622e88f63dcc909 100644
--- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
+++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
@@ -720,6 +720,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const {
@@ -727,6 +727,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const {
const float corner_radius = highlight_bounds.height() / 2.f;
const SkRect rect = RectToSkRect(highlight_bounds);
patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc
index 128ddb235e434b4349c9c2fdf242336c2db82693..f7f25b3a40b2e17a24d91a016c25cb96b0be261e 100644
index 7a0629ece8b764da3ebe0c62c5faa4b5022cac45..6c6ba2379f40b9aa8ec2cabba533675c7a29a54c 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -531,6 +531,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext,
patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
index 6a937832a63965ac80ee3a6e97710e6d86d9a2fe..95ad2e0c62d2a201dc45f4ab2863be3980e70868 100644
index ac35d1bf155f1358dd5d20517bf3fbb5db3f71ed..b6e8228e9d23812b4214632a4c44bfddd410d0f0 100644
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -3707,6 +3707,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
test/filters/browser_tests.filter
+3
View File
@@ -1214,7 +1214,10 @@
# These tests fail because we provide our own override of the side panel which
# does not enable this feature
-All/LensOverlayControllerBrowserPDFTest.ContextMenuOpensOverlay/*
-LensOverlayControllerBrowserTest.*
-LensOverlayControllerBrowserFullscreenDisabled.*
-LensOverlayControllerBrowserWithPixelsTest.*
# This test fails because we don't implement an accent color for titlebars or
# tabs on Windows