From f1acc5a8049265ef74c26733bcb60e83de6ea2fe Mon Sep 17 00:00:00 2001
From: Max Karolinskiy <41635752+mkarolin@users.noreply.github.com>
Date: Wed, 3 Jan 2024 22:45:49 -0500
Subject: [PATCH] Upgrade from Chromium 120.0.6099.144 to Chromium
 120.0.6099.199 (1.62.x). (#21488)

* Upgrade from Chromium 120.0.6099.144 to Chromium 120.0.6099.199

* Update pins list timestamp

* Updated strings for Chromium 120.0.6099.199

* Disables failing upstream browser test.

---------

Co-authored-by: brave-builds <brave-builds+devops@brave.com>
---
 browser/ui/android/strings/android_chrome_strings.grd         | 4 ++--
 .../transport_security_state_generator/input_file_parsers.cc  | 4 ++--
 package.json                                                  | 2 +-
 .../components-search_engines-default_search_manager.cc.patch | 4 ++--
 test/filters/browser_tests.filter                             | 1 +
 5 files changed, 8 insertions(+), 7 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, <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.">
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/
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);
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