Skip to content

Commit 180c9d5

Browse files
Upgrade from Chromium 122.0.6261.29 to Chromium 122.0.6261.43 (1.63.x) (#22086)
* Upgrade from Chromium 122.0.6261.29 to Chromium 122.0.6261.43 * Update pins list timestamp * Update upstream unit tests filter --------- Co-authored-by: brave-builds <[email protected]>
1 parent b2be2c6 commit 180c9d5

18 files changed

+28
-28
lines changed

chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -549,9 +549,9 @@ bool ParseCertificatesFile(std::string_view certs_input,
549549
Pinsets* pinsets,
550550
base::Time* timestamp) {
551551
constexpr std::string_view brave_certs = R"brave_certs(
552-
# Last updated: Tue Feb 13 20:17:04 UTC 2024
552+
# Last updated: Thu Feb 15 10:16:17 UTC 2024
553553
PinsListTimestamp
554-
1707855424
554+
1707992177
555555
556556
# =====BEGIN BRAVE ROOTS ASC=====
557557
#From https://www.amazontrust.com/repository/

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"projects": {
7070
"chrome": {
7171
"dir": "src",
72-
"tag": "122.0.6261.29",
72+
"tag": "122.0.6261.43",
7373
"repository": {
7474
"url": "https://github.com/brave/chromium"
7575
}

patches/chrome-android-chrome_java_sources.gni.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
2-
index b532d79cf0f5722789db90de2eaf3fefbd9081e1..808210fe105f7948de93c5ee73d60329c232a557 100644
2+
index 59d850108c879c02186fbdac4884d9991ba05c9c..fd8665dcf3c9c85059152573154fa22669399dfe 100644
33
--- a/chrome/android/chrome_java_sources.gni
44
+++ b/chrome/android/chrome_java_sources.gni
5-
@@ -1221,3 +1221,4 @@ chrome_java_sources = [
5+
@@ -1222,3 +1222,4 @@ chrome_java_sources = [
66
"java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUSBActivity.java",
77
"java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java",
88
]

patches/chrome-browser-BUILD.gn.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
2-
index 0e613a31e6a429b78d7a3994ab57b86a8d75fc55..bb0f66be4d444b33838148daa4f276502b138414 100644
2+
index 0811d62fd215de0231021c88c6083493b0a6b1ca..d1daf6bd8254adee0c35f99d0929c68d84c54346 100644
33
--- a/chrome/browser/BUILD.gn
44
+++ b/chrome/browser/BUILD.gn
5-
@@ -2671,6 +2671,7 @@ static_library("browser") {
5+
@@ -2675,6 +2675,7 @@ static_library("browser") {
66
"performance_monitor/metric_evaluator_helper_posix.h",
77
]
88
}

patches/chrome-browser-about_flags.cc.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
2-
index 7c316d05b3203788ffe4e863ca40430b3b3d5000..1d506349dd01d1ef5c5ee6aa98d7da09d4184233 100644
2+
index de3be2eec25ccf745d1b8d11e7125803ca16167d..1ba529d913a0b8bdf801aa7a91b767b16d90c407 100644
33
--- a/chrome/browser/about_flags.cc
44
+++ b/chrome/browser/about_flags.cc
55
@@ -3800,6 +3800,7 @@ const FeatureEntry::FeatureVariation
@@ -10,7 +10,7 @@ index 7c316d05b3203788ffe4e863ca40430b3b3d5000..1d506349dd01d1ef5c5ee6aa98d7da09
1010
// Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
1111
// //tools/flags/generate_unexpire_flags.py.
1212
#include "build/chromeos_buildflags.h"
13-
@@ -11254,6 +11255,7 @@ void GetStorage(Profile* profile, GetStorageCallback callback) {
13+
@@ -11259,6 +11260,7 @@ void GetStorage(Profile* profile, GetStorageCallback callback) {
1414

1515
bool ShouldSkipConditionalFeatureEntry(const flags_ui::FlagsStorage* storage,
1616
const FeatureEntry& entry) {

patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_tablet.xml.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml
2-
index c8b6447965bb9a94dd7f885eda3ded77b52865ff..43be1bd28f2e5fadd67bf44f53095b0981ab280a 100644
2+
index 4cbe04e19ea2c4c48b711bd1f2a9f1682b50b99e..158c6106b004e45f8946abc831a1bc8df1196f82 100644
33
--- a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml
44
+++ b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml
55
@@ -66,6 +66,7 @@ found in the LICENSE file.

patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
2-
index 3499957f61d1080e2c5d26b5fadffee2de0b78c0..bbbf3957b38b56ed9f1aa389d9bfaabca0ff31dc 100644
2+
index 6d36a61fb8a97f142789b6bb36fe558c73e800bd..2fe3832eeb4ee4f7f9b928f62afc55a5e6f2d8a8 100644
33
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
44
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
55
@@ -409,10 +409,12 @@ public class ToolbarTablet extends ToolbarLayout

patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
2-
index 9f6b6dbc24a6d322e154097b4456e3b8fa03ee15..483047c1cdcc6aa8580e9321d59963df30336c2d 100644
2+
index 025e162e8e40b0800f25e2925cee1afa92fb3b1e..89cf800ef2a044780866147d6bbd722aadf5e3a8 100644
33
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
44
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
5-
@@ -1178,6 +1178,7 @@ void BookmarkBarView::Layout() {
5+
@@ -1180,6 +1180,7 @@ void BookmarkBarView::Layout() {
66
x = next_x;
77
}
88
}

patches/chrome-test-BUILD.gn.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
2-
index 1a827772d77694b598dba3686deac6f9e87d438d..8d48cdd0c82192961ca6c7760de54a09553a8d6c 100644
2+
index 84ea91c781a2f777461a4e99d1c8c2cdf138dc22..ca39af37e08065e1821fb5cffac92a34ec3e5e8f 100644
33
--- a/chrome/test/BUILD.gn
44
+++ b/chrome/test/BUILD.gn
55
@@ -483,6 +483,7 @@ static_library("test_support") {

patches/chrome-tools-build-win-create_installer_archive.py.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py
2-
index 01e75f7d3b5e0ffcf016315ecd2a4cebaadff7c5..dff126854b81f95c82c5e0233c32fc353ec137cc 100755
2+
index 01e75f7d3b5e0ffcf016315ecd2a4cebaadff7c5..4199340c2fff55db89c7278158df8013b67b43a9 100755
33
--- a/chrome/tools/build/win/create_installer_archive.py
44
+++ b/chrome/tools/build/win/create_installer_archive.py
55
@@ -756,6 +756,7 @@ def _ParseOptions():

patches/components-search_engines-prepopulated_engines.json.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
2-
index 9f4e01c1bf706fb20017ed40795f63fea701ec54..7878d072203b5d360e93ab53dbcaf992722e57ca 100644
2+
index 51cf3a03c6aa9085676125ce03edd6c7c38ccdd8..ceaac6bd15013307531e03e1812b0bb3114790ee 100644
33
--- a/components/search_engines/prepopulated_engines.json
44
+++ b/components/search_engines/prepopulated_engines.json
55
@@ -102,17 +102,6 @@
@@ -20,7 +20,7 @@ index 9f4e01c1bf706fb20017ed40795f63fea701ec54..7878d072203b5d360e93ab53dbcaf992
2020
"ecosia": {
2121
"name": "Ecosia",
2222
"keyword": "ecosia.org",
23-
@@ -253,16 +242,6 @@
23+
@@ -254,16 +243,6 @@
2424
"id": 108
2525
},
2626

patches/content-app_shim_remote_cocoa-render_widget_host_view_cocoa.mm.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
2-
index 81f705328efd2de0957c1ef309e20c421e0959eb..589d342594bbff3a7e3ad83626b02f94adfad3f5 100644
2+
index 6e85ff006ca89766192812351b93eed77936be80..6b5ce17673b3204be2ba99d8cf7dbac5a65fd874 100644
33
--- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
44
+++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
5-
@@ -1935,6 +1935,7 @@ void ExtractUnderlines(NSAttributedString* string,
5+
@@ -1936,6 +1936,7 @@ void ExtractUnderlines(NSAttributedString* string,
66
}
77

88
- (id)accessibilityParent {

patches/content-browser-renderer_host-render_frame_host_impl.cc.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
2-
index 17683fab4f4d8132c6a3d6741d3996c371aa77a7..9d73df17c7f5628d1859c20b5baf207b2c81504f 100644
2+
index 9b37b8a18c5c09aaf76590f53060cab3190d676f..eeee1d491543d335dfdf7ec410f97c94b01b63b0 100644
33
--- a/content/browser/renderer_host/render_frame_host_impl.cc
44
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
5-
@@ -8267,6 +8267,8 @@ void RenderFrameHostImpl::CreateNewWindow(
5+
@@ -8321,6 +8321,8 @@ void RenderFrameHostImpl::CreateNewWindow(
66
dom_storage_context, params->session_storage_namespace_id);
77
}
88

patches/ios-chrome-app-BUILD.gn.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/ios/chrome/app/BUILD.gn b/ios/chrome/app/BUILD.gn
2-
index cd7a528d4a2b81d5f12af86e865c726b526faea9..b814baaf6894e3dae953e736d1779ccf80440249 100644
2+
index 7ac6ff263b88190bc800bb337c7da82c441d3b69..352773f642bc34760a7e495291cd1a523340feb5 100644
33
--- a/ios/chrome/app/BUILD.gn
44
+++ b/ios/chrome/app/BUILD.gn
5-
@@ -799,8 +799,7 @@ chrome_app("chrome") {
5+
@@ -809,8 +809,7 @@ chrome_app("chrome") {
66
# (see https://crbug.com/1394553 for details of the build failure). This
77
# is a stop-gap solution.
88
if (target_environment == "catalyst" ||

patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/net/proxy_resolution/configured_proxy_resolution_service.cc b/net/proxy_resolution/configured_proxy_resolution_service.cc
2-
index 7468d23f9e2e92e27f9eb05b934ca2c8a5470010..aa038cd2a973e642bb1651ab26d95d49f84518d7 100644
2+
index 5f1b383606ca474813ddbd17450d60c0cd86e97f..2bcd6da2f53148e51f797d9ded9cabff845abfd0 100644
33
--- a/net/proxy_resolution/configured_proxy_resolution_service.cc
44
+++ b/net/proxy_resolution/configured_proxy_resolution_service.cc
5-
@@ -977,6 +977,7 @@ int ConfiguredProxyResolutionService::TryToCompleteSynchronously(
5+
@@ -1044,6 +1044,7 @@ int ConfiguredProxyResolutionService::TryToCompleteSynchronously(
66
config_->value().proxy_rules().Apply(url, result);
77
result->set_traffic_annotation(
88
MutableNetworkTrafficAnnotationTag(config_->traffic_annotation()));

patches/third_party-blink-renderer-bindings-scripts-bind_gen-interface.py.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py
2-
index cc5687a3b6777165021058aac5ef112f6b860021..89f66bf3ba9f83f890f857fe23445b6f4310ac9f 100644
2+
index cc5687a3b6777165021058aac5ef112f6b860021..67ea91dcd52e8ee8e49c643406b2f3093bfbd5e1 100644
33
--- a/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py
44
+++ b/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py
55
@@ -7538,3 +7538,4 @@ def generate_interfaces(task_queue):

patches/tools-json_schema_compiler-feature_compiler.py.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/tools/json_schema_compiler/feature_compiler.py b/tools/json_schema_compiler/feature_compiler.py
2-
index 3082fd16b618ba8c82ea96aa7be81565e3c04f1d..9115ba0ffa4041b51ad5a40a5c48e7c544cf641b 100644
2+
index 3082fd16b618ba8c82ea96aa7be81565e3c04f1d..eef8b171b84e902f4432c75710554ef9e3804541 100644
33
--- a/tools/json_schema_compiler/feature_compiler.py
44
+++ b/tools/json_schema_compiler/feature_compiler.py
55
@@ -972,6 +972,7 @@ class FeatureCompiler(object):

test/filters/unit_tests.filter

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
-KeywordEditorControllerManagedDSPTest.*
174174
-SearchEngineChoiceDialogServiceTest.DoNotCreateServiceIfPolicyIsSet
175175
-SearchEngineChoiceDialogServiceTest.DoNotDisplayDialogIfPolicyIsSetDynamically
176-
-SearchEngineChoiceDialogServiceTest.NotifyChoiceMade
176+
-SearchEngineChoiceDialogServiceTest.NotifyChoiceMade*
177177
-SearchEnginesHandlerParametrizedTest.ChangeInTemplateUrlDataTriggersCallback/Default
178178
-SearchEnginesHandlerParametrizedTest.ChangeInTemplateUrlDataTriggersCallback/WithSearchEngineChoiceEnabled
179179
-SearchEnginesHandlerParametrizedTest.SettingTheDefaultSearchEngineRecordsHistogram/Default

0 commit comments

Comments
 (0)