Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade from Chromium 120.0.6099.144 to Chromium 120.0.6099.199 (1.62.x). #21488

Merged
merged 4 commits into from
Jan 4, 2024
Merged

Upgrade from Chromium 120.0.6099.144 to Chromium 120.0.6099.199 (1.62.x). #21488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a04bbc3
Upgrade from Chromium 120.0.6099.144 to Chromium 120.0.6099.199
brave-builds Jan 3, 2024
f6bf7f4
Update pins list timestamp
brave-builds Jan 3, 2024
a610659
Updated strings for Chromium 120.0.6099.199
brave-builds Jan 3, 2024
b5abf90
Disables failing upstream browser test.
mkarolin Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions browser/ui/android/strings/android_chrome_strings.grd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5660,10 +5660,10 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<message name="IDS_ACCOUNT_SELECTION_SHEET_CLOSED" desc="Accessibility string read when the Account Selection bottom sheet showing a list of the user's accounts is closed." is_accessibility_with_no_ui="true">
Sign in bottom sheet is closed.
</message>
<message name="IDS_IDP_SIGNIN_STATUS_MISMATCH_DIALOG_BODY" desc="Body for mismatch dialog which is shown to prompt the user to sign in to a website using an account from an identity provider." translateable="false">
<message name="IDS_IDP_SIGNIN_STATUS_MISMATCH_DIALOG_BODY" desc="Body for mismatch dialog which is shown to prompt the user to sign in to a website using an account from an identity provider.">
You can use your <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE">%1$s<ex>idp.com</ex></ph> account on this site. To continue, sign in to <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE">%1$s<ex>idp.com</ex></ph>.
</message>
<message name="IDS_IDP_SIGNIN_STATUS_MISMATCH_DIALOG_CONTINUE" desc="Title of the button that allows the user to continue with signing in to an account from an identity provider." translateable="false">
<message name="IDS_IDP_SIGNIN_STATUS_MISMATCH_DIALOG_CONTINUE" desc="Title of the button that allows the user to continue with signing in to an account from an identity provider.">
Continue
</message>
<message name="IDS_SIGNIN_ERROR_DIALOG_GOT_IT_BUTTON" desc="The button text on the error dialog for the user to acknowledge that an error has occurred in their attempt to sign in with an account from an identity provider.">
Expand Down
4 changes: 2 additions & 2 deletions chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions patches/components-search_engines-default_search_manager.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
1 change: 1 addition & 0 deletions test/filters/browser_tests.filter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,7 @@
-All/BrowsingDataModelBrowserTest.LocalStorageRemovedBasedOnPartition/*
-All/EligibilityServiceBrowserTest.EligibilityChanged_NetworkContextUpdated/*
-All/EligibilityServiceBrowserTest.OnboardingChanged_NetworkContextUpdated/*
-EligibilityServiceSilentOnboardingBrowserTest.OnboardingChanged_NetworkContextUpdated
-ReadAnythingAppControllerTest.*
-StorageAccessAPIEnterprisePolicyBrowserTest.PartitionedStorage/*
-StorageAccessAPIWithNoRequiredTopLevelInteractionBrowserTest.TopLevelUserInteractionNotRequired
Expand Down