Upgrade from Chromium 118.0.5993.32 to Chromium 118.0.5993.54 (1.59.x) (

#20397)

* Upgrade from Chromium 118.0.5993.21 to Chromium 118.0.5993.54

* Upgrade patches from Chromium 118.0.5993.21 to Chromium 118.0.5993.54

* Update pins list timestamp

* Updated strings for Chromium 118.0.5993.54

* Disable relevant upstream tests

---------

Co-authored-by: brave-builds <brave-builds+devops@brave.com>

chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc

@@ -541,9 +541,9 @@ bool ParseCertificatesFile(base::StringPiece certs_input,
                            Pinsets* pinsets,
                            base::Time* timestamp) {
   constexpr base::StringPiece brave_certs = R"brave_certs(
-# Last updated: Thu Sep 28 01:19:38 UTC 2023
+# Last updated: Wed Oct  4 21:07:37 UTC 2023
 PinsListTimestamp
-1695863978
+1696453657
 
 # =====BEGIN BRAVE ROOTS ASC=====
 #From https://www.amazontrust.com/repository/

components/commerce_strings.grdp

@@ -77,11 +77,11 @@
     </message>
 
     <!-- Email consent dialog for price tracking -->
-    <message name="IDS_PRICE_TRACKING_EMAIL_CONSENT_BODY" desc="The main body text that is shown in the price drop email consent dialog offering to send an email notification when the product price drops on any site.">
-      Get emails sent to <ph name="EMAIL">$1<ex>example@example.com</ex></ph> when the price drops on any site.
+    <message name="IDS_PRICE_TRACKING_EMAIL_CONSENT_BODY" desc="The main body text that is shown in the price drop email consent dialog offering to send an email notification when the product price drops on any site." translateable="false">
+      Get emails sent to <ph name="EMAIL">$1<ex>example@example.com</ex></ph> when the price of items you track drops on any site.
     </message>
-    <message name="IDS_PRICE_TRACKING_EMAIL_CONSENT_TITLE" desc="The title of the dialog that shows after a user has tracked a product asking for consent to send price drop email notifications.">
-      Want emails when the price drops?
+    <message name="IDS_PRICE_TRACKING_EMAIL_CONSENT_TITLE" desc="The title of the dialog that shows after a user has tracked a product asking for consent to send price drop email notifications." translateable="false">
+      Want emails when prices drop?
     </message>
     <message name="IDS_PRICE_TRACKING_EMAIL_CONSENT_LEARN_MORE_LINK_TEXT" desc="The text that will link to a help article that explains price tracking shown in the price drop email consent dialog.">
       Learn more about price tracking

package.json

@@ -267,7 +267,7 @@
     "projects": {
       "chrome": {
         "dir": "src",
-        "tag": "118.0.5993.21",
+        "tag": "118.0.5993.54",
         "repository": {
           "url": "https://github.com/brave/chromium"
         }

patches/chrome-BUILD.gn.patch

@@ -32,7 +32,7 @@ index bc54ace77cade8c2e2439af6d0c18984cfdaf5c6..a63dd1fc5e762fb29f571d0123d51028
 
      if (enable_updater) {
        deps += [ ":chromium_updater_privileged_helper" ]
-@@ -601,7 +604,7 @@ if (is_win) {
+@@ -603,7 +606,7 @@ if (is_win) {
        if (is_chrome_branded) {
          _strings_file = "google_chrome_strings"
        } else {
@@ -41,7 +41,7 @@ index bc54ace77cade8c2e2439af6d0c18984cfdaf5c6..a63dd1fc5e762fb29f571d0123d51028
        }
 
        inputs += [ "$root_gen_dir/chrome/${_strings_file}_${locale}.pak" ]
-@@ -686,6 +689,7 @@ if (is_win) {
+@@ -688,6 +691,7 @@ if (is_win) {
        # this dependency directly copies the file into the framework's
        # resources directory.
        public_deps += [ ":chrome_framework_widevine_signature" ]

patches/chrome-VERSION.patch

@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index 17b8c90d10dc82c5e1c2caec58fd1af7b217c0d7..3ac21869b4a626d7ef83ecd2aee5dea0ed482a3c 100644
+index 20fb5b70fb5e61b3ea3a896571d3dfbb1937a952..60d50e98c88a518bd5010971c9091627692f3422 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=118
 -MINOR=0
 -BUILD=5993
--PATCH=21
+-PATCH=54
 +MINOR=1
 +BUILD=59
 +PATCH=111

patches/chrome-android-java-AndroidManifest.xml.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
-index e4c9f334a89237c467f5e7485d97c361bd0a4b9a..f4cef65c0ce1990112602350da22d3c61a87c1dc 100644
+index e4c9f334a89237c467f5e7485d97c361bd0a4b9a..4c8efd827ee84e07a6120c0a8c6d20acc28532b4 100644
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
 @@ -28,6 +28,7 @@ by a child template that "extends" this file.

patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-index 242926889212725eabff3db27caa8bb4827f7421..9186f3601f548b7288c1e3ec1e4b54f6902be07c 100644
+index a6013d2f2e272dd03a52338d228820ea80ae41bf..1be145a65be30c266f5d11bfe132f753fa9011c4 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 @@ -60,7 +60,7 @@ import org.chromium.ui.text.SpanApplier;

patches/chrome-android-java-src-org-chromium-chrome-browser-tabbed_mode-TabbedRootUiCoordinator.java.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-index 6558fa1debd9c27766518e818a0c50c5082f9c12..0016e08102837df80b624788791f124b496a07ac 100644
+index c5ebaf667c7793bcadd85a258c2d32e5d9422205..55b405edc99eaccf00bfbece1e81963479230229 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -700,7 +700,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -702,7 +702,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
              NotificationPermissionController.attach(
                      mWindowAndroid, mNotificationPermissionController);
 

patches/chrome-browser-extensions-BUILD.gn.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
-index 690a5ddf57d67bc39c109ee1ebf0ac0979e9fc93..f582edd32d0ca908d948032b7f70010196b4c9a6 100644
+index a58ecf9d565a69134c510d082587535b13c0c003..fbb52b59ee62c0a75a94d3482904e162ad6b2b34 100644
 --- a/chrome/browser/extensions/BUILD.gn
 +++ b/chrome/browser/extensions/BUILD.gn
-@@ -1416,6 +1416,7 @@ static_library("extensions") {
+@@ -1417,6 +1417,7 @@ static_library("extensions") {
    } else {
      sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
    }

patches/chrome-browser-prefs-browser_prefs.cc.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
-index 327282bd867852c8bb974e7ce0100df3cb44d489..bbb955d2438adf1d2f55c55ac290f5e19750809a 100644
+index 3e966e183a67f2f0db4760bf7c78fa1d361d62bc..3bea6d7af6125dc3ea7f2c3e7b6006d92dd802ef 100644
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -1521,6 +1521,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1522,6 +1522,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
    DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
  #endif
 
@@ -11,7 +11,7 @@ index 327282bd867852c8bb974e7ce0100df3cb44d489..bbb955d2438adf1d2f55c55ac290f5e1
  #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
    screen_ai::RegisterLocalStatePrefs(registry);
  #endif  // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
-@@ -1935,6 +1937,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -1937,6 +1939,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
  #endif
 
    registry->RegisterBooleanPref(prefs::kBlockTruncatedCookies, true);

patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch

@@ -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 fb518bf28000c8218c6f2b50a35f4408567a1134..dfc23a322915558ada98a43ca1e7ab96741ccffc 100644
+index 5013dafa7629eaa6c9436428e606a3feae04dc76..e2f89013f56fd124d94bed95e31fc0173abf0aeb 100644
 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
 +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -2179,6 +2179,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
+@@ -2178,6 +2178,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
    selection_navigation_url_ = match.destination_url;
    if (!selection_navigation_url_.is_valid())
      return;

patches/chrome-browser-ui-browser_navigator.cc.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
-index 3b7f96e505e0ba32837b83be5473562e3e120452..b4433a1fd9b008741a0ef9d6e9d75405d93a0287 100644
+index 3b7f96e505e0ba32837b83be5473562e3e120452..c3a842564d7fdc45397dab7f1a589db324283482 100644
 --- a/chrome/browser/ui/browser_navigator.cc
 +++ b/chrome/browser/ui/browser_navigator.cc
 @@ -585,6 +585,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
@@ -10,7 +10,9 @@ index 3b7f96e505e0ba32837b83be5473562e3e120452..b4433a1fd9b008741a0ef9d6e9d75405
 
    // Open System Apps in their standalone window if necessary.
    // TODO(crbug.com/1096345): Remove this code after we integrate with intent
-@@ -922,4 +923,5 @@ bool IsHostAllowedInIncognito(const GURL& url) {
+@@ -920,6 +921,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
+ bool IsHostAllowedInIncognito(const GURL& url) {
+   std::string scheme = url.scheme();
    base::StringPiece host = url.host_piece();
 +  if (!IsHostAllowedInIncognitoBraveImpl(host)) return false;
    if (scheme != content::kChromeUIScheme)

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

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
-index faa3c92ab2db22c4c550a2236496ac4d6b8b5d33..686bfe26fd705c8920d8e5fdbcb017a260607206 100644
+index dffad1e2edeb86577e90578afc406aba02c532d9..08cad27acef3cbec29b3df8903d752dd55b5664e 100644
 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
 +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
 @@ -1157,6 +1157,7 @@ void BookmarkBarView::Layout() {

patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
-index fb55e66b48bb018ea281333c2541fbf212c527f9..89f95ffba36bd6158c3c91e8c6b1a02249080031 100644
+index d5c32354b060badf92e1504b3e46980dca6eb740..5fe1cf31ca64b29703a30f72485bc33a7669629c 100644
 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
 +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
-@@ -752,6 +752,7 @@ void LocationBarView::Layout() {
+@@ -754,6 +754,7 @@ void LocationBarView::Layout() {
      }
    };
 

patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.cc.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc b/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc
-index 6bd96578a1adc08b8efad794302f15c107580ff8..b4ff811c4364af9217524cb64d5be3e762e0e781 100644
+index 6d6a4b9c88f61536c6dfb80bf6dfa4cdcefc72e1..699bb7809a03ab5bafdbe1228de5850640c18c58 100644
 --- a/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc
 +++ b/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc
 @@ -247,6 +247,7 @@ SidePanelRegistry* SidePanelCoordinator::GetGlobalSidePanelRegistry(

patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm
-index b7d0c1e788d05aa9794b0016863ffcbdfdd3cc68..0a831aa769b07236e5eb83460741cb52bc944615 100644
+index 672822ee180a6ec481da859dc32b50c73e6cea5b..13a143986f361a9d146a36ef6705d5c0f04bc47a 100644
 --- a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm
 +++ b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm
-@@ -1135,6 +1135,7 @@ base::FilePath GetChromeAppsFolder() {
+@@ -1118,6 +1118,7 @@ base::FilePath GetChromeAppsFolder() {
    if (path.empty())
      return path;
 

patches/chrome-common-BUILD.gn.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
-index e75d7bc0b01870f71f7a698c9620c24e66f8897c..4e7354c60e1d4948a564fdb62eb6402c141d3c4c 100644
+index e75d7bc0b01870f71f7a698c9620c24e66f8897c..93cf42f0e0da2c1c17d0b6f8f130127a14f3a7d6 100644
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
 @@ -97,6 +97,7 @@ source_set("channel_info") {

patches/chrome-installer-util-google_update_settings.cc.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc
-index 6e06ab8f05a17e167f7f5cfd7882fb50afb5e9fb..9647dbc388b7de27814e0684b1ea6c46217b1d00 100644
+index e43cc9fc2e804fae22aab1c25e59249016af8469..8e8f76b1caffce3759581b70f94d041abbe826d5 100644
 --- a/chrome/installer/util/google_update_settings.cc
 +++ b/chrome/installer/util/google_update_settings.cc
 @@ -32,7 +32,11 @@ using base::win::RegKey;

patches/chrome-test-BUILD.gn.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 8f9b476a538dd5a0e91edc725eed4463b4a92e05..8aa1cc9c68c2feaf22cb1e25f2eaefb1ba68ebb9 100644
+index 823cc89dd28ea78e12723fb3ff9389b05192b4ee..562cb4ce1d8999d40262ca83a65c0503d592a908 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
 @@ -433,6 +433,7 @@ static_library("test_support") {

patches/components-BUILD.gn.patch

@@ -1,8 +1,8 @@
 diff --git a/components/BUILD.gn b/components/BUILD.gn
-index 0f65455cfdc6f8d409b951eb9deb517a0cffe862..79d73a48dc2bf9d1be6b20f0afd6af7e9eba38df 100644
+index d8b86a56abc8409e9c0452ee671b02d1da06855d..5b6f00671345753070e4bb9541b106903f58b0c0 100644
 --- a/components/BUILD.gn
 +++ b/components/BUILD.gn
-@@ -774,7 +774,7 @@ repack("components_tests_pak") {
+@@ -775,7 +775,7 @@ repack("components_tests_pak") {
    if (is_chrome_branded) {
      sources += [ "${root_gen_dir}/components/strings/components_google_chrome_strings_en-US.pak" ]
    } else {

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

@@ -1,5 +1,5 @@
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
-index e91fb6b203b55d4937e9f4b4ed8fd5e8efb5aa10..4f468007f087ae6a042500988a82cad8326a6787 100644
+index 5cf177fc73dd2b3038754b11d23ad637e7709f88..12d8a7794339327f3436ccdee8570a5b5e224728 100644
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
 @@ -3268,6 +3268,7 @@ void NavigationRequest::OnRequestRedirected(

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

@@ -1,5 +1,5 @@
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index ad0d9cd11022f4f35e717efc088593df41d46496..03f3557f459b75da5d07e992290587448b71ff42 100644
+index a1ccfc3c3081dc267414ff0fa52cc6b3e6e06140..a56033207ce44dac0d0455865760cac57343119f 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
 @@ -8255,6 +8255,8 @@ void RenderFrameHostImpl::CreateNewWindow(

patches/headless-BUILD.gn.patch

@@ -1,5 +1,5 @@
 diff --git a/headless/BUILD.gn b/headless/BUILD.gn
-index e0ec74566e0474012ac660fc8929853219f5fcc7..67a046ea4135e74ae0e44f4e0bffc015585ec3bf 100644
+index d329d589ef552b798049e2419c98b3f2f79a837f..6415b33bf87293de315be7fc942db661978d34a0 100644
 --- a/headless/BUILD.gn
 +++ b/headless/BUILD.gn
 @@ -96,7 +96,7 @@ repack("resource_pack_strings") {

patches/v8/src-codegen-compiler.cc.patch

@@ -1,8 +1,8 @@
 diff --git a/src/codegen/compiler.cc b/src/codegen/compiler.cc
-index 972898e2a95e59c036cb8a284859cb81b5f6af71..70384ae5d9c39f2b6a9e419fa68d54f5d8a5d0e3 100644
+index 3204e37c88ee1402cd4db0b95a1734cac0acac2f..dbe8625a0a1ec1660e54af1cc38e08018ec098e7 100644
 --- a/src/codegen/compiler.cc
 +++ b/src/codegen/compiler.cc
-@@ -2961,6 +2961,7 @@ MaybeHandle<JSFunction> Compiler::GetFunctionFromEval(
+@@ -2989,6 +2989,7 @@ MaybeHandle<JSFunction> Compiler::GetFunctionFromEval(
      }
    }
    DCHECK(is_compiled_scope.is_compiled());

test/filters/browser_tests.filter

@@ -590,6 +590,8 @@
 -IpProtectionAuthTokenProviderBrowserTest.NetworkServiceCanRequestTokens
 -IpProtectionConfigProviderBrowserTest.ExpectedReceiverSetStateAfterNetworkServiceCrash
 -IpProtectionConfigProviderBrowserTest.NetworkServiceCanRequestTokens
+-PersonalizedHintsFetcherBrowserTest.NoUserSignIn
+-PersonalizedHintsFetcherBrowserTest.UserSignedIn
 -SupervisionRemovalExtensionTest.RemoveCustodianApprovalRequirement
 
 # These tests fail or time out because IdentityManager never loads refresh
@@ -690,6 +692,7 @@
 -ProfileTypeChoiceUIPixelTest.InvokeUi_default/TS
 
 # These tests fail because we are modifying the HttpsUpgrades feature.
+-HttpsUpgradesBrowserTest.AccidentalTypicallySecureUsersRemediation/*
 -HttpsUpgradesBrowserTest.AllowlistEntryExpires/*
 -HttpsUpgradesBrowserTest.EnterpriseAllowlistDisablesHttpsFirstModeForSiteEngagament/*
 -HttpsUpgradesBrowserTest.EnterpriseAllowlistDisablesUpgrades/*
@@ -904,6 +907,11 @@
 -ExtensionTelemetryServiceBrowserTest.*
 -ExtensionTelemetryServiceBrowserTestWithInterceptRemoteHostsContactedInRendererEnabled.InterceptsRemoteHostContactedSignalInRenderer
 
+# These tests fail because we disable the
+# privacy_sandbox::kEnforcePrivacySandboxAttestations feature
+-PrivacySandboxAttestationsBrowserTest.*
+-PrivacySandboxSettingsAttestPrivateAggregationInProtectedAudienceBrowserTest.*
+
 # Tests below this point have not been diagnosed or had issues created yet.
 -_/WebrtcLoggingPrivateApiStartEventLoggingTestFeatureAndPolicyEnabled.*
 -AccessCodeCastHandlerBrowserTest.*

test/filters/unit_tests.filter

@@ -223,6 +223,10 @@
 # This test fails because we disable the privacy sandbox
 -PrivacySandboxServiceTest.MetricsLoggingOccursCorrectly
 
+# These tests fail because we disable
+# privacy_sandbox::kEnforcePrivacySandboxAttestations
+-PrivacySandboxAttestationsInstallerFeatureEnabledTest.*
+
 # This test fails because we intentionally disable the Federated Credential
 # Management API via features::kFedCm
 -FederatedIdentityApiPermissionContextTest.WhitelistedSiteForThirdPartyCookies