www/*chromium: update to 123.0.6312.105

Security: https://vuxml.freebsd.org/freebsd/4a026b6c-f2b8-11ee-8e76-a8a1599412c6.html (cherry picked from commit 8fcc3c4)
freebsd · Apr 4, 2024 · 3365d28 · 3365d28
1 parent c302c31
commit 3365d28
Show file tree

Hide file tree

Showing 14 changed files with 88 additions and 117 deletions.
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	chromium
-PORTVERSION=	123.0.6312.86
+PORTVERSION=	123.0.6312.105
 CATEGORIES=	www wayland
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
 		https://nerd.hu/distfiles/:external

diff --git a/www/chromium/distinfo b/www/chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1711546354
-SHA256 (chromium-123.0.6312.86.tar.xz) = f4a78c1955dac4354d57ab45e93051fcda50fc5fccd681457f8116630746dffe
-SIZE (chromium-123.0.6312.86.tar.xz) = 3472393888
-SHA256 (chrome-linux-123.0.6312.86-llvm17.profdata.tar.xz) = da2ed7c8ad49133d811df0306253fc834875e132d546528a3c342acd5007739f
-SIZE (chrome-linux-123.0.6312.86-llvm17.profdata.tar.xz) = 29847172
-SHA256 (chromium-123.0.6312.86-testdata.tar.xz) = d6b7cc20884f3f0e26b2320e4346134cfcc83549ac804ac526586f973680e831
-SIZE (chromium-123.0.6312.86-testdata.tar.xz) = 280595032
+TIMESTAMP = 1712258158
+SHA256 (chromium-123.0.6312.105.tar.xz) = 0a14fba1fb1a288d99b188160e3138295aa8604bdf492e62a94c0ec35a4e229d
+SIZE (chromium-123.0.6312.105.tar.xz) = 3481204616
+SHA256 (chrome-linux-123.0.6312.105-llvm17.profdata.tar.xz) = 0904993faf06565a538b1eaab56119642204b8ca8748ea51a436ac55a5723f8b
+SIZE (chrome-linux-123.0.6312.105-llvm17.profdata.tar.xz) = 29802596
+SHA256 (chromium-123.0.6312.105-testdata.tar.xz) = c843a48cdeb6e140cd60121b4bf94ce81a109912def7488b341244f188d8f91b
+SIZE (chromium-123.0.6312.105-testdata.tar.xz) = 279677040
 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc
@@ -1,4 +1,4 @@
---- media/base/media_switches.cc.orig	2024-03-22 08:19:40 UTC
+--- media/base/media_switches.cc.orig	2024-04-04 19:13:34 UTC
 +++ media/base/media_switches.cc
 @@ -21,7 +21,7 @@
  #include "ui/gl/gl_features.h"
@@ -20,7 +20,7 @@
  // Enables system audio mirroring using pulseaudio.
  BASE_FEATURE(kPulseaudioLoopbackForCast,
               "PulseaudioLoopbackForCast",
-@@ -608,7 +608,7 @@ BASE_FEATURE(kUseWritePixelsYUV,
+@@ -602,7 +602,7 @@ BASE_FEATURE(kUseWritePixelsYUV,
  BASE_FEATURE(kUseMultiPlaneFormatForHardwareVideo,
               "UseMultiPlaneFormatForHardwareVideo",
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || \
@@ -29,7 +29,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -721,7 +721,7 @@ BASE_FEATURE(kFallbackAfterDecodeError,
+@@ -715,7 +715,7 @@ BASE_FEATURE(kFallbackAfterDecodeError,
  // Show toolbar button that opens dialog for controlling media sessions.
  BASE_FEATURE(kGlobalMediaControls,
               "GlobalMediaControls",
@@ -38,7 +38,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -749,7 +749,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI,
+@@ -743,7 +743,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI,
  // If enabled, users can request Media Remoting without fullscreen-in-tab.
  BASE_FEATURE(kMediaRemotingWithoutFullscreen,
               "MediaRemotingWithoutFullscreen",
@@ -47,7 +47,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -761,7 +761,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
+@@ -755,7 +755,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
  BASE_FEATURE(kGlobalMediaControlsPictureInPicture,
               "GlobalMediaControlsPictureInPicture",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -56,7 +56,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -790,7 +790,7 @@ BASE_FEATURE(kUnifiedAutoplay,
+@@ -784,7 +784,7 @@ BASE_FEATURE(kUnifiedAutoplay,
               "UnifiedAutoplay",
               base::FEATURE_ENABLED_BY_DEFAULT);
 
@@ -65,7 +65,7 @@
  // Enable vaapi video decoding on linux. This is already enabled by default on
  // chromeos, but needs an experiment on linux.
  BASE_FEATURE(kVaapiVideoDecodeLinux,
-@@ -881,7 +881,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding,
+@@ -875,7 +875,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding,
               "VaapiVp9SModeHWEncoding",
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
@@ -74,7 +74,7 @@
  // Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder.
  BASE_FEATURE(kV4L2FlatStatelessVideoDecoder,
               "V4L2FlatStatelessVideoDecoder",
-@@ -1000,7 +1000,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK,
+@@ -994,7 +994,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK,
  // Live Caption can be used in multiple languages, as opposed to just English.
  BASE_FEATURE(kLiveCaptionMultiLanguage,
               "LiveCaptionMultiLanguage",
@@ -83,7 +83,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -1472,7 +1472,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding,
+@@ -1466,7 +1466,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding,
  );
  #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
 

diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ungoogled-chromium
-PORTVERSION=	123.0.6312.58
+PORTVERSION=	123.0.6312.105
 UGVERSION=	${DISTVERSION}-1
 CATEGORIES=	www wayland
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \

diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1711138219
-SHA256 (chromium-123.0.6312.58.tar.xz) = f8dae4a2ff7b00bb44fa136c2101638fea4f232e4819be3f73381ddc0d3bf718
-SIZE (chromium-123.0.6312.58.tar.xz) = 3465099244
-SHA256 (ungoogled-chromium-123.0.6312.58-1.tar.gz) = 3234f01b3918a080a3a42798fc59c88b0d0515e355ada4022c70ec314bd3b02e
-SIZE (ungoogled-chromium-123.0.6312.58-1.tar.gz) = 667470
-SHA256 (chromium-123.0.6312.58-testdata.tar.xz) = a5dbcc3dd4a7469db1a85e31739508c8919fb37ca6050a617f059329e0d45940
-SIZE (chromium-123.0.6312.58-testdata.tar.xz) = 275371844
+TIMESTAMP = 1712258253
+SHA256 (chromium-123.0.6312.105.tar.xz) = 0a14fba1fb1a288d99b188160e3138295aa8604bdf492e62a94c0ec35a4e229d
+SIZE (chromium-123.0.6312.105.tar.xz) = 3481204616
+SHA256 (ungoogled-chromium-123.0.6312.105-1.tar.gz) = 4786ed32d19a0c960ce8aa4a2c87ea80b9527d1bbcbcf6b3a18a253efe3b667b
+SIZE (ungoogled-chromium-123.0.6312.105-1.tar.gz) = 668197
+SHA256 (chromium-123.0.6312.105-testdata.tar.xz) = c843a48cdeb6e140cd60121b4bf94ce81a109912def7488b341244f188d8f91b
+SIZE (chromium-123.0.6312.105-testdata.tar.xz) = 279677040
 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,4 +1,4 @@
---- chrome/browser/about_flags.cc.orig	2024-03-22 14:16:19 UTC
+--- chrome/browser/about_flags.cc.orig	2024-04-04 19:16:34 UTC
 +++ chrome/browser/about_flags.cc
 @@ -235,7 +235,7 @@
  #include "ui/ui_features.h"
@@ -117,7 +117,7 @@
      {"enable-async-dns", flag_descriptions::kAsyncDnsName,
       flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux,
       FEATURE_VALUE_TYPE(net::features::kAsyncDns)},
-@@ -7787,7 +7787,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7794,7 +7794,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(ash::features::kPrivacyIndicators)},
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
@@ -126,7 +126,7 @@
      {"enable-network-service-sandbox",
       flag_descriptions::kEnableNetworkServiceSandboxName,
       flag_descriptions::kEnableNetworkServiceSandboxDescription,
-@@ -7820,7 +7820,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7827,7 +7827,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(
           supervised_user::kFilterWebsitesForSupervisedUsersOnDesktopAndIOS)},
 
@@ -135,7 +135,7 @@
      {"enable-family-link-extensions-permissions",
       flag_descriptions::
           kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName,
-@@ -8718,7 +8718,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8725,7 +8725,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
@@ -144,7 +144,7 @@
      {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
       flag_descriptions::kGetAllScreensMediaDescription,
       kOsCrOS | kOsLacros | kOsLinux,
-@@ -8760,7 +8760,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8767,7 +8767,7 @@ const FeatureEntry kFeatureEntries[] = {
 
  #if BUILDFLAG(IS_WIN) ||                                      \
      (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -153,7 +153,7 @@
      {
          "ui-debug-tools",
          flag_descriptions::kUIDebugToolsName,
-@@ -9049,7 +9049,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9056,7 +9056,7 @@ const FeatureEntry kFeatureEntries[] = {
  #endif
 
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -162,7 +162,7 @@
      {"policy-indication-for-managed-default-search",
       flag_descriptions::kPolicyIndicationForManagedDefaultSearchName,
       flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription,
-@@ -9353,7 +9353,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9360,7 +9360,7 @@ const FeatureEntry kFeatureEntries[] = {
  #endif
 
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -171,7 +171,7 @@
      {"media-session-enter-picture-in-picture",
       flag_descriptions::kMediaSessionEnterPictureInPictureName,
       flag_descriptions::kMediaSessionEnterPictureInPictureDescription,
-@@ -10343,7 +10343,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10350,7 +10350,7 @@ const FeatureEntry kFeatureEntries[] = {
       kOsDesktop | kOsAndroid,
       FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
 
@@ -180,7 +180,7 @@
      {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
       flag_descriptions::kCameraMicEffectsDescription,
       static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
-@@ -10374,7 +10374,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10381,7 +10381,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)},
 
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -189,7 +189,7 @@
      {"site-search-settings-policy",
       flag_descriptions::kSiteSearchSettingsPolicyName,
       flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll,
-@@ -10504,7 +10504,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10511,7 +10511,7 @@ const FeatureEntry kFeatureEntries[] = {
           password_manager::features::kFillingAcrossAffiliatedWebsitesAndroid)},
  #endif
 
@@ -198,7 +198,7 @@
      {"third-party-profile-management",
       flag_descriptions::kThirdPartyProfileManagementName,
       flag_descriptions::kThirdPartyProfileManagementDescription,
-@@ -10847,7 +10847,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10854,7 +10854,7 @@ const FeatureEntry kFeatureEntries[] = {
           trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)},
  #endif
 
@@ -207,7 +207,7 @@
      {"restart-to-gain-access-to-keychain",
       flag_descriptions::kRestartToGainAccessToKeychainName,
       flag_descriptions::kRestartToGainAccessToKeychainDescription,
-@@ -11101,7 +11101,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11108,7 +11108,7 @@ const FeatureEntry kFeatureEntries[] = {
 
  // Controls the view mode for (history) sync screen.
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \

diff --git a/...mium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc b/...mium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
@@ -1,15 +1,15 @@
---- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig	2024-03-22 14:16:19 UTC
+--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig	2024-04-04 19:16:34 UTC
 +++ chrome/browser/component_updater/widevine_cdm_component_installer.cc
-@@ -41,7 +41,7 @@
+@@ -40,7 +40,7 @@
  #include "third_party/widevine/cdm/buildflags.h"
  #include "third_party/widevine/cdm/widevine_cdm_common.h"
 
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/path_service.h"
- #include "chrome/common/chrome_paths.h"
  #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h"
-@@ -74,7 +74,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto::
+ #endif
+
+@@ -78,7 +78,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto::
  const char ImageLoaderComponentName[] = "WidevineCdm";
  #endif
 
@@ -18,16 +18,7 @@
  // On Linux and ChromeOS the Widevine CDM is loaded at startup before the
  // zygote is locked down. As a result there is no need to register the CDM
  // with Chrome as it can't be used until Chrome is restarted.
-@@ -102,7 +102,7 @@ void RegisterWidevineCdmWithChrome(const base::Version
- }
- #endif  // !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // On Linux and ChromeOS the Widevine CDM is loaded at startup before the
- // zygote is locked down. To locate the Widevine CDM at startup, a hint file
- // is used. Update the hint file with the new Widevine CDM path.
-@@ -388,7 +388,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat
+@@ -364,7 +364,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat
      return;
    }
 

diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.cc.orig	2024-03-22 14:16:19 UTC
+--- chrome/browser/flag_descriptions.cc.orig	2024-04-04 19:16:34 UTC
 +++ chrome/browser/flag_descriptions.cc
-@@ -2935,7 +2935,7 @@ const char kCbdTimeframeRequiredDescription[] =
+@@ -2940,7 +2940,7 @@ const char kCbdTimeframeRequiredDescription[] =
      "value to the list.";
 
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  const char kPolicyIndicationForManagedDefaultSearchName[] =
      "Enable policy indication for managed Default Search provider";
  const char kPolicyIndicationForManagedDefaultSearchDescription[] =
-@@ -3260,7 +3260,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[]
+@@ -3265,7 +3265,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[]
      "but in the same SiteInstanceGroup, and thus the same process.";
 
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
  const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy";
  const char kSiteSearchSettingsPolicyDescription[] =
      "Allow site search engines to be defined by the SiteSearchSettings policy.";
-@@ -7489,7 +7489,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
+@@ -7494,7 +7494,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
      "Enables sharing common areas of icudtl.dat between Ash and Lacros.";
  #endif  // #if BUILDFLAG(IS_CHROMEOS_LACROS)
 
@@ -27,7 +27,7 @@
  const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
  const char kGetAllScreensMediaDescription[] =
      "When enabled, the getAllScreensMedia API for capturing multiple screens "
-@@ -7735,7 +7735,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] 
+@@ -7740,7 +7740,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] 
 
  // Linux -----------------------------------------------------------------------
 
@@ -36,7 +36,7 @@
  const char kOzonePlatformHintChoiceDefault[] = "Default";
  const char kOzonePlatformHintChoiceAuto[] = "Auto";
  const char kOzonePlatformHintChoiceX11[] = "X11";
-@@ -7783,7 +7783,7 @@ const char kZeroCopyVideoCaptureDescription[] =
+@@ -7788,7 +7788,7 @@ const char kZeroCopyVideoCaptureDescription[] =
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -45,7 +45,7 @@
  const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
  const char kFollowingFeedSidepanelDescription[] =
      "Enables the following feed in the sidepanel.";
-@@ -7798,7 +7798,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] 
+@@ -7803,7 +7803,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] 
      "instead of JSON.";
  #endif
 
@@ -54,7 +54,7 @@
  const char kEnableNetworkServiceSandboxName[] =
      "Enable the network service sandbox.";
  const char kEnableNetworkServiceSandboxDescription[] =
-@@ -7830,7 +7830,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
+@@ -7835,7 +7835,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
      "Bluetooth";
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
 
@@ -63,7 +63,7 @@
  const char kSkipUndecryptablePasswordsName[] =
      "Skip undecryptable passwords to use the available decryptable "
      "passwords.";
-@@ -7850,7 +7850,7 @@ const char kRestartToGainAccessToKeychainDescription[]
+@@ -7855,7 +7855,7 @@ const char kRestartToGainAccessToKeychainDescription[]
      "to restart Chrome to gain access to computer's password manager.";
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 
@@ -72,7 +72,7 @@
  const char kAsyncDnsName[] = "Async DNS resolver";
  const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-@@ -7951,7 +7951,7 @@ const char kElementCaptureDescription[] =
+@@ -7956,7 +7956,7 @@ const char kElementCaptureDescription[] =
 
  #if BUILDFLAG(IS_WIN) ||                                      \
      (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -81,7 +81,7 @@
  const char kUIDebugToolsName[] = "Debugging tools for UI";
  const char kUIDebugToolsDescription[] =
      "Enables additional keyboard shortcuts to help debugging.";
-@@ -8000,7 +8000,7 @@ const char kComposeTextSelectionDescription[] =
+@@ -8005,7 +8005,7 @@ const char kComposeTextSelectionDescription[] =
      "Enables feature for different heuristics for selecting text for Compose";
  #endif  // BUILDFLAG(ENABLE_COMPOSE)