From a04bbc36831b6a5cd8041c612b1e56f6807629f1 Mon Sep 17 00:00:00 2001 From: brave-builds Date: Wed, 3 Jan 2024 19:48:43 +0000 Subject: [PATCH 1/4] Upgrade from Chromium 120.0.6099.144 to Chromium 120.0.6099.199 --- package.json | 2 +- .../components-search_engines-default_search_manager.cc.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 4aba9c8ab751..5977e434d62b 100644 --- a/package.json +++ b/package.json @@ -268,7 +268,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "120.0.6099.144", + "tag": "120.0.6099.199", "repository": { "url": "https://github.com/brave/chromium" } diff --git a/patches/components-search_engines-default_search_manager.cc.patch b/patches/components-search_engines-default_search_manager.cc.patch index 4278f49e41ad..df23ec9e6b17 100644 --- a/patches/components-search_engines-default_search_manager.cc.patch +++ b/patches/components-search_engines-default_search_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/search_engines/default_search_manager.cc b/components/search_engines/default_search_manager.cc -index 0b1fde46f9c442609aaa7166e37a4c799eaa7d88..b8b5d4d41280aefd016712c849bc0fe4b7db38a1 100644 +index a32fa07490d18db9fcb42522ee4298735f01d933..d2eb723979e2ec8e68c7e77c90bd24e1c83b037b 100644 --- a/components/search_engines/default_search_manager.cc +++ b/components/search_engines/default_search_manager.cc -@@ -321,6 +321,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() { +@@ -325,6 +325,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() { // Check if default search preference is overriden by extension. if (pref->IsExtensionControlled()) { extension_default_search_ = std::move(turl_data); From f6bf7f430aa907093008097e1ae5e2444372d1ec Mon Sep 17 00:00:00 2001 From: brave-builds Date: Wed, 3 Jan 2024 19:49:46 +0000 Subject: [PATCH 2/4] Update pins list timestamp --- .../transport_security_state_generator/input_file_parsers.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc index 3f17fa66bad9..6259c2b04bc3 100644 --- a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc +++ b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc @@ -549,9 +549,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 Dec 20 19:08:17 UTC 2023 +# Last updated: Wed Jan 3 19:49:43 UTC 2024 PinsListTimestamp -1703099297 +1704311383 # =====BEGIN BRAVE ROOTS ASC===== #From https://www.amazontrust.com/repository/ From a610659b5e1bd052f697efb6a477a581758672c0 Mon Sep 17 00:00:00 2001 From: brave-builds Date: Wed, 3 Jan 2024 19:50:04 +0000 Subject: [PATCH 3/4] Updated strings for Chromium 120.0.6099.199 --- browser/ui/android/strings/android_chrome_strings.grd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index 2400c686a00c..b61218994d02 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -5660,10 +5660,10 @@ To change this setting, <resetlink>reset sync

Sign in bottom sheet is closed. - + You can use your %1$sidp.com account on this site. To continue, sign in to %1$sidp.com. - + Continue From b5abf90d82cc302ecff10bcd2b3db67b2e0e46a3 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 3 Jan 2024 18:40:33 -0500 Subject: [PATCH 4/4] Disables failing upstream browser test. --- test/filters/browser_tests.filter | 1 + 1 file changed, 1 insertion(+) diff --git a/test/filters/browser_tests.filter b/test/filters/browser_tests.filter index b61db02396e6..26277851b845 100644 --- a/test/filters/browser_tests.filter +++ b/test/filters/browser_tests.filter @@ -887,6 +887,7 @@ -All/BrowsingDataModelBrowserTest.LocalStorageRemovedBasedOnPartition/* -All/EligibilityServiceBrowserTest.EligibilityChanged_NetworkContextUpdated/* -All/EligibilityServiceBrowserTest.OnboardingChanged_NetworkContextUpdated/* +-EligibilityServiceSilentOnboardingBrowserTest.OnboardingChanged_NetworkContextUpdated -ReadAnythingAppControllerTest.* -StorageAccessAPIEnterprisePolicyBrowserTest.PartitionedStorage/* -StorageAccessAPIWithNoRequiredTopLevelInteractionBrowserTest.TopLevelUserInteractionNotRequired