BASELINE: Update Chromium to 118.0.5993.220

Change-Id: I38d4d3a1becd014663faa99e2949ab2927958a31
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/534599
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

884 files changed, 3496 insertions, 39971 deletions

diff --git a/chromium/DEPS b/chromium/DEPS
index a48257a6d3b..59a27dbdfaa 100644
--- a/chromium/DEPS
+++ b/chromium/DEPS
@@ -314,15 +314,15 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
-  'src_internal_revision': '732e44cd8932d3427734e47bb9d5850e5e995b2b',
+  'src_internal_revision': '038662e359cba381670f6b9cc47d60dfa46646aa',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
-  'skia_revision': 'bd56a010b6941116cd1900276bf5201f9a9c73da',
+  'skia_revision': '7754f9f8257ad0872b7bb04d969452b74bb0c0bc',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
-  'v8_revision': 'f0f8f4b2e7df9dc17dc0990766a65ca0489b6bdb',
+  'v8_revision': '36e4828ab658b8ad72f80974883c4c94f6e7012c',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ANGLE
   # and whatever else without interference from each other.
@@ -469,7 +469,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libavif
   # and whatever else without interference from each other.
-  'libavif_revision': 'd1c26facaf5a8a97919ceee06814d05d10e25622',
+  'libavif_revision': 'b2d36b1c3bfc806694cd4ff0cb188270823fe6d8',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libavif
   # and whatever else without interference from each other.
@@ -849,7 +849,7 @@ deps = {
 
   'src/clank': {
     'url': Var('chrome_git') + '/clank/internal/apps.git' + '@' +
-    'f3b627efe663446c694cd3143cbe6e5f697d5e99',
+    '8b1d9abb7a9581c5cdc8c89cdb02bce7efdc2b6a',
     'condition': 'checkout_android and checkout_src_internal',
   },
 
@@ -1766,7 +1766,7 @@ deps = {
     Var('chromium_git') + '/external/github.com/cisco/openh264' + '@' + '09a4f3ec842a8932341b195c5b01e141c8a16eb7',
 
   'src/third_party/openscreen/src':
-    Var('chromium_git') + '/openscreen' + '@' + 'fd0e81e558086c30fa91a4af89361cef8d1327e4',
+    Var('chromium_git') + '/openscreen' + '@' + '971d6055e7b78c474e2e734e55a2991fbb7ab665',
 
   'src/third_party/openxr/src': {
     'url': Var('chromium_git') + '/external/github.com/KhronosGroup/OpenXR-SDK' + '@' + '58a00cf85c39ad5ec4dc43a769624e420c06179a',
@@ -4109,7 +4109,7 @@ deps = {
   # grepping.
   'src/chrome/installer/mac/internal': {
       'url': Var('chrome_git') + '/chrome/installer/mac/internal.git' + '@' +
-        'd7fb448e1fc84c05c40719d83d785fe2a131e616',
+        'ed0d43308e9fa81b929468a3e651cb60744d9415',
       'condition': 'checkout_src_internal',
   },
 
@@ -4251,7 +4251,7 @@ deps = {
 
   'src/ios_internal':  {
       'url': Var('chrome_git') + '/chrome/ios_internal.git' + '@' +
-        '75fdd01ec66965420e31d00af762bc6df29cd424',
+        '5a9d5a0d36ce618402c3ac82416126d8c443656b',
       'condition': 'checkout_ios and checkout_src_internal',
   },
 
diff --git a/chromium/PRESUBMIT.py b/chromium/PRESUBMIT.py
index 0849fcf9cff..af267e7c75b 100644
--- a/chromium/PRESUBMIT.py
+++ b/chromium/PRESUBMIT.py
@@ -5450,7 +5450,7 @@ _NON_INCLUSIVE_TERMS = (
         # ...' will not. This may require some tweaking to catch these cases
         # without triggering a lot of false positives. Leaving it naive and
         # less matchy for now.
-        r'/\b(?i)((black|white)list|master|slave)\b',  # nocheck
+        r'/(?i)\b((black|white)list|master|slave)\b',  # nocheck
         (
             'Please don\'t use blacklist, whitelist, '  # nocheck
             'or slave in your',  # nocheck
diff --git a/chromium/build/android/pylib/local/emulator/avd.py b/chromium/build/android/pylib/local/emulator/avd.py
index e50e9399694..47ad6548449 100644
--- a/chromium/build/android/pylib/local/emulator/avd.py
+++ b/chromium/build/android/pylib/local/emulator/avd.py
@@ -20,6 +20,7 @@ from devil.android import apk_helper
 from devil.android import device_utils
 from devil.android import settings
 from devil.android.sdk import adb_wrapper
+from devil.android.sdk import version_codes
 from devil.android.tools import system_app
 from devil.utils import cmd_helper
 from devil.utils import timeout_retry
@@ -1179,3 +1180,25 @@ def _EnsureSystemSettings(device):
     logging.info('long_press_timeout set to %r', _LONG_PRESS_TIMEOUT)
   else:
     logging.warning('long_press_timeout is not set correctly')
+
+  # TODO(crbug.com/1488458): Move the date sync function to device_utils.py
+  if device.IsUserBuild():
+    logging.warning('Cannot sync the device date on "user" build')
+    return
+
+  logging.info('Sync the device date.')
+  timezone = device.RunShellCommand(['date', '+"%Z"'],
+                                    single_line=True,
+                                    check_return=True)
+  if timezone != 'UTC':
+    device.RunShellCommand(['setprop', 'persist.sys.timezone', '"Etc/UTC"'],
+                           check_return=True,
+                           as_root=True)
+  set_date_format = '%Y%m%d.%H%M%S'
+  set_date_command = ['date', '-s']
+  if device.build_version_sdk >= version_codes.MARSHMALLOW:
+    set_date_format = '%m%d%H%M%Y.%S'
+    set_date_command = ['date']
+  strgmtime = time.strftime(set_date_format, time.gmtime())
+  set_date_command.append(strgmtime)
+  device.RunShellCommand(set_date_command, check_return=True, as_root=True)
diff --git a/chromium/build/util/LASTCHANGE b/chromium/build/util/LASTCHANGE
index 74af6459e9d..3700d18220f 100644
--- a/chromium/build/util/LASTCHANGE
+++ b/chromium/build/util/LASTCHANGE
@@ -1,2 +1,2 @@
-LASTCHANGE=9adabcda10ae153d258101bf5c4d4188a5c1aea3-refs/branch-heads/5993@{#1449}
-LASTCHANGE_YEAR=2023
+LASTCHANGE=9ad2fa676cb2a404642791e0e4818170cb4adbd8-refs/branch-heads/5993@{#1730}
+LASTCHANGE_YEAR=2024
diff --git a/chromium/build/util/LASTCHANGE.committime b/chromium/build/util/LASTCHANGE.committime
index fa273f033d5..43be5e5ed00 100644
--- a/chromium/build/util/LASTCHANGE.committime
+++ b/chromium/build/util/LASTCHANGE.committime
@@ -1 +1 @@
-1698350050
\ No newline at end of file
+1706148292
\ No newline at end of file
diff --git a/chromium/chrome/VERSION b/chromium/chrome/VERSION
index 781be6b6c00..30c96c67fe7 100644
--- a/chromium/chrome/VERSION
+++ b/chromium/chrome/VERSION
@@ -1,4 +1,4 @@
 MAJOR=118
 MINOR=0
 BUILD=5993
-PATCH=124
+PATCH=220
diff --git a/chromium/chrome/app/resources/chromium_strings_as.xtb b/chromium/chrome/app/resources/chromium_strings_as.xtb
index 834549b2fec..a374c148f3e 100644
--- a/chromium/chrome/app/resources/chromium_strings_as.xtb
+++ b/chromium/chrome/app/resources/chromium_strings_as.xtb
@@ -182,7 +182,7 @@
 <translation id="4673151026126227699">যদি আপুনি Chromium ব্যৱহাৰ কৰাৰ ৰিপ’ৰ্টও শ্বেয়াৰ কৰে, সেই ৰিপ’ৰ্টত আপুনি চোৱা URLসমূহ অন্তৰ্ভুক্ত হয়</translation>
 <translation id="4677944499843243528">অন্য কোনো কম্পিউটাৰত (<ph name="HOST_NAME" />) অন্য Chromium প্ৰক্ৰিয়াৰ (<ph name="PROCESS_ID" />) দ্বাৰা প্ৰ'ফাইলটো ব্যৱহাৰ হৈ থকা যেন লাগিছে। প্ৰ'ফাইলটো ক্ষতিগ্ৰস্থ নহ'বলৈ Chromiumএ ইয়াক অৱৰোধ কৰিছে। যদি অন্য কোনো প্ৰক্ৰিয়াই এই প্ৰ'ফাইলটো ব্যৱহাৰ কৰি থকা নাই বুলি আপুনি নিশ্চিত হয় তেন্তে আপুনি প্ৰ'ফাইলটো আনলক কৰি Chromium পুনৰ লঞ্চ কৰিব পাৰে।</translation>
 <translation id="4680828127924988555">ইনষ্টল কৰাটো বাতিল কৰক</translation>
-<translation id="4708774505295300557">অন্য কোনো লোকে আগতে এই কম্পিউটাৰটোৰ Chromiumত <ph name="ACCOUNT_EMAIL_LAST" /> হিচাপে ছাইন ইন কৰিছিল। আপোনাৰ তথ্যখিনি পৃথক কৰি ৰাখিবলৈ অনুগ্ৰহ কৰি Chromiumত এজন নতুন ব্যৱহাৰকাৰী সৃষ্টি কৰক।</translation>
+<translation id="4708774505295300557">অন্য কোনো লোকে আগতে এই কম্পিউটাৰটোৰ Chromiumত <ph name="ACCOUNT_EMAIL_LAST" /> হিচাপে ছাইন ইন কৰিছিল। আপোনাৰ তথ্যখিনি পৃথক কৰি ৰাখিবলৈ অনুগ্ৰহ কৰি Chromiumত এগৰাকী নতুন ব্যৱহাৰকাৰী সৃষ্টি কৰক।</translation>
 <translation id="4746050847053251315">যিয়েই কি নহ’লেও Chromium বন্ধ কৰিবনে?</translation>
 <translation id="4748217263233248895">Chromiumৰ এটা বিশেষ সুৰক্ষা আপডে’ট এইমাত্ৰ প্ৰয়োগ কৰা হৈছে। এতিয়াই ৰিষ্টাৰ্ট কৰক আৰু আমি আপোনাৰ টেববোৰ পুনঃস্থাপন কৰিম।</translation>
 <translation id="4765210420921718862">আপুনি যিকোনো সময়তে Chromiumৰ ছেটিঙত নিজৰ সিদ্ধান্ত সলনি কৰিব পাৰে। ট্ৰায়েলসমূহ বৰ্তমান বিজ্ঞাপনবোৰ দেখুওৱাৰ সমান্তৰালকৈ চলে, সেয়েহে আপুনি লগে লগে সালসলনিসমূহ দেখা নাপাব।</translation>
diff --git a/chromium/chrome/app/resources/chromium_strings_eu.xtb b/chromium/chrome/app/resources/chromium_strings_eu.xtb
index 113edeb3830..aa04e75f441 100644
--- a/chromium/chrome/app/resources/chromium_strings_eu.xtb
+++ b/chromium/chrome/app/resources/chromium_strings_eu.xtb
@@ -301,7 +301,7 @@ Baliteke eginbide batzuk erabilgarri ez egotea. Adierazi beste profil-direktorio
 <translation id="6873893289264747459">"<ph name="EXTENSION_NAME" />" elementuak malwarea duela hauteman du Chromium-ek</translation>
 <translation id="6893813176749746474">Chromium eguneratu da baina ez duzu erabili 30 egunetan gutxienez.</translation>
 <translation id="691026815377248078">Chromium-ek Bluetootha erabiltzeko baimena behar du parekatzen jarraitzeko. <ph name="IDS_BLUETOOTH_DEVICE_CHOOSER_AUTHORIZE_BLUETOOTH_LINK" /></translation>
-<translation id="6929417474050522668">Probak abian diren bitartean, iragarkien neurketari esker, bisitatzen dituzun webguneek Chromium-i informazioa eska diezaiokete. Informazio horren bidez, webguneek beren iragarkien errendimendua neur dezakete. Webguneen artean ahalik eta informazio gutxien transferituta mugatzen du iragarkien neurketak webguneen arteko jarraipena.</translation>
+<translation id="6929417474050522668">Probak abian diren bitartean, iragarkien neurketari esker, bisitatzen dituzun webguneek Chromium-i informazioa eska diezaiokete. Informazio horren bidez, webguneek beren iragarkien errendimendua neur dezakete. Webguneen artean ahalik eta informazio gutxien transferituta mugatzen du iragarkien neurketak webgunearteko jarraipena.</translation>
 <translation id="6940431691900807093">Beranduago, bisitatzen duzun webgune batek zure interesak ikusteko eska diezaioke Chromium-i, agertzen zaizkizun iragarkiak pertsonalizatze aldera. Chromium-ek hiru interes parteka ditzake gehienez.</translation>
 <translation id="6964305034639999644">Ireki esteka Chromium-eko &amp;ezkutuko moduko leiho batean</translation>
 <translation id="6978145336957848883">Seguruak ez diren pasahitzak erraz asmatzen dira. Utzi Chromium-i <ph name="BEGIN_LINK" />pasahitz konplexuak sortzen eta gogoratzen<ph name="END_LINK" />.</translation>
@@ -319,7 +319,7 @@ Baliteke eginbide batzuk erabilgarri ez egotea. Adierazi beste profil-direktorio
 <translation id="7213407614656404070">Erabili Chromium mezu, dokumentu edo beste aplikazioetako estekak sakatzean</translation>
 <translation id="7223968959479464213">Ataza-kudeatzailea - Chromium</translation>
 <translation id="7246575524853130370">Chromium-ek estimatu dizkizun interesak</translation>
-<translation id="7309928523159922338">Iragarkien neurketari esker, bisitatzen dituzun webguneek Chromium-i informazioa eska diezaiokete. Informazio horren bidez, webguneek beren iragarkien errendimendua neur dezakete. Webguneen artean ahalik eta informazio gutxien transferituta mugatzen du iragarkien neurketak webguneen arteko jarraipena.</translation>
+<translation id="7309928523159922338">Iragarkien neurketari esker, bisitatzen dituzun webguneek Chromium-i informazioa eska diezaiokete. Informazio horren bidez, webguneek beren iragarkien errendimendua neur dezakete. Webguneen artean ahalik eta informazio gutxien transferituta mugatzen du iragarkien neurketak webgunearteko jarraipena.</translation>
 <translation id="731795002583552498">Chromium eguneratzen</translation>
 <translation id="7318036098707714271">Hobespenen fitxategia hondatuta dago edo ez da baliozkoa.
 
diff --git a/chromium/chrome/app/resources/chromium_strings_zh-TW.xtb b/chromium/chrome/app/resources/chromium_strings_zh-TW.xtb
index 7aece9ebf40..212f536cde4 100644
--- a/chromium/chrome/app/resources/chromium_strings_zh-TW.xtb
+++ b/chromium/chrome/app/resources/chromium_strings_zh-TW.xtb
@@ -21,7 +21,7 @@
 <translation id="1478370723027452770">查看 Chrome for Testing 相關說明</translation>
 <translation id="1524282610922162960">分享 Chromium 分頁</translation>
 <translation id="1553461853655228091">Chromium 需要取得攝影機權限，才能根據你的周遭環境建立 3D 地圖</translation>
-<translation id="1607715478322902680">{COUNT,plural, =0{系統管理員要求你重新啟動 Chromium，以套用更新}=1{系統管理員要求你重新啟動 Chromium，以套用更新。你的無痕式視窗不會重新開啟。}other{系統管理員要求你重新啟動 Chromium，以套用更新。你的 # 個無痕式視窗不會重新開啟。}}</translation>
+<translation id="1607715478322902680">{COUNT,plural, =0{系統管理員要求你重新啟動 Chromium，以套用更新}=1{系統管理員要求你重新啟動 Chromium，以套用更新。你的無痕視窗不會重新開啟。}other{系統管理員要求你重新啟動 Chromium，以套用更新。你的 # 個無痕視窗不會重新開啟。}}</translation>
 <translation id="1625909126243026060">查看 Chromium 中最重要的隱私權和安全性控制項</translation>
 <translation id="1632539827495546968">如果你只想使用這個帳戶一次，可以在 Chromium 瀏覽器中使用<ph name="GUEST_LINK_BEGIN" />訪客模式<ph name="GUEST_LINK_END" />。如要添加他人的帳戶，請<ph name="LINK_BEGIN" />將使用者新增<ph name="LINK_END" />至你的 <ph name="DEVICE_TYPE" />。
 
@@ -97,7 +97,7 @@
 <translation id="3103660991484857065">安裝程式無法解壓縮封存檔案，請重新下載 Chromium。</translation>
 <translation id="3130323860337406239">Chromium 正在使用你的麥克風。</translation>
 <translation id="3155163173539279776">重新啟動 Chromium</translation>
-<translation id="3179665906251668410">在 Chromium 無痕式視窗中開啟連結(&amp;G)</translation>
+<translation id="3179665906251668410">在 Chromium 無痕視窗中開啟連結(&amp;G)</translation>
 <translation id="3185330573522821672">自訂新的 Chromium 設定檔</translation>
 <translation id="3190315855212034486">Chromium 當機了，要立即重新啟動嗎？</translation>
 <translation id="3258596308407688501">Chromium 無法讀取及寫入資料目錄：
@@ -122,11 +122,11 @@
 <translation id="3593091352817399191">已登入另一個帳戶。如要分開保存你的瀏覽資料，建議在 Chromium 中建立專屬設定檔。</translation>
 <translation id="363078681319665186">如果之後要更新 Chromium，必須使用 macOS 10.15 以上版本。這部電腦目前的版本為 macOS 10.13。</translation>
 <translation id="3639635944603682591">這位使用者的瀏覽資料將從這個裝置上刪除。如要還原資料，請使用 <ph name="USER_EMAIL" /> 登入 Chromium。</translation>
-<translation id="364817392622123556">{COUNT,plural, =0{Chromium 有可用的更新，重新啟動後即可套用。}=1{Chromium 有可用的更新，重新啟動後即可套用。你的無痕式視窗不會重新開啟。}other{Chromium 有可用的更新，重新啟動後即可套用。你的 # 個無痕式視窗不會重新開啟。}}</translation>
+<translation id="364817392622123556">{COUNT,plural, =0{Chromium 有可用的更新，重新啟動後即可套用。}=1{Chromium 有可用的更新，重新啟動後即可套用。你的無痕視窗不會重新開啟。}other{Chromium 有可用的更新，重新啟動後即可套用。你的 # 個無痕視窗不會重新開啟。}}</translation>
 <translation id="3651803019964686660">如要將號碼從 <ph name="ORIGIN" /> 傳送到 Android 手機，請在這兩部裝置上登入 Chromium。</translation>
 <translation id="3685209450716071127">Chromium 無法檢查你的密碼，請查看你的網際網路連線狀態。</translation>
 <translation id="3702352323269013324">前往 Chromium 進一步瞭解廣告個人化</translation>
-<translation id="370962675267501463">{COUNT,plural, =0{系統管理員要求你重新啟動 Chromium，以套用這項更新}=1{系統管理員要求你重新啟動 Chromium，以套用這項更新。你的無痕式視窗不會重新開啟。}other{系統管理員要求你重新啟動 Chromium，以套用這項更新。你的 # 個無痕式視窗不會重新開啟。}}</translation>
+<translation id="370962675267501463">{COUNT,plural, =0{系統管理員要求你重新啟動 Chromium，以套用這項更新}=1{系統管理員要求你重新啟動 Chromium，以套用這項更新。你的無痕視窗不會重新開啟。}other{系統管理員要求你重新啟動 Chromium，以套用這項更新。你的 # 個無痕視窗不會重新開啟。}}</translation>
 <translation id="3713809861844741608">在新的 Chromium 分頁中開啟連結(&amp;T)</translation>
 <translation id="378917192836375108">透過 Chromium，你只要按一下網路上的電話號碼，即可用 Skype 打電話！</translation>
 <translation id="3790262771324122253">瞭解 Chromium 封鎖某些下載內容的原因</translation>
@@ -301,7 +301,7 @@
 <translation id="691026815377248078">Chromium 需要藍牙存取權才能繼續配對。<ph name="IDS_BLUETOOTH_DEVICE_CHOOSER_AUTHORIZE_BLUETOOTH_LINK" /></translation>
 <translation id="6929417474050522668">在試用期間，廣告評估功能會允許你造訪的網站向 Chromium 要求資訊，以便協助網站評估自家廣告的成效。廣告評估功能會盡可能減少網站之間分享資訊的情況，藉此限制跨網站追蹤行為。</translation>
 <translation id="6940431691900807093">在此之後，你造訪的網站就可以要求 Chromium 查看你的興趣喜好，以便向你放送個人化廣告。Chromium 最多可以分享 3 個感興趣的主題。</translation>
-<translation id="6964305034639999644">在 Chromium 無痕式視窗中開啟連結(&amp;G)</translation>
+<translation id="6964305034639999644">在 Chromium 無痕視窗中開啟連結(&amp;G)</translation>
 <translation id="6978145336957848883">低強度密碼很容易讓有心人士猜中，請讓 Chromium <ph name="BEGIN_LINK" />為你建立一組高強度密碼，並儲存在 Chromium 中<ph name="END_LINK" />。</translation>
 <translation id="6981396265751285733">這項設定開啟時，Chromium 會釋出閒置分頁占用的記憶體，為使用中的分頁和其他應用程式提供更多電腦資源，保持 Chromium 快速運作。當你切回閒置分頁時，這些分頁會自動恢復為「使用中」狀態。</translation>
 <translation id="6985329841647292029">Chromium OS 條款</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_ar.xtb b/chromium/chrome/app/resources/generated_resources_ar.xtb
index 39731437109..f7341226c2a 100644
--- a/chromium/chrome/app/resources/generated_resources_ar.xtb
+++ b/chromium/chrome/app/resources/generated_resources_ar.xtb
@@ -1015,7 +1015,8 @@
 <translation id="1796588414813960292">لن تعمل الميزات التي تحتاج إلى استخدام الصوت.</translation>
 <translation id="1797117170091578105">‏يمكنك اللعب باستخدام لوحة مفاتيح Chromebook. ويمكنك تخصيص مفاتيح لتنفيذ إجراءات محدَّدة.</translation>
 <translation id="180203835522132923">‏مفتاح البحث + O، ثم W</translation>
-<translation id="1802624026913571222">السكون عند غلق الغلاف</translation>
+<translation id="1802624026913571222">السكون عند غلق الغطاء
+</translation>
 <translation id="1802687198411089702">الصفحة لا تستجيب. يمكنك الانتظار أو الخروج منها.</translation>
 <translation id="1803531841600994172">اللغة التي تريد الترجمة إليها</translation>
 <translation id="1803545009660609783">إعادة تدريب</translation>
@@ -1103,7 +1104,7 @@
 <translation id="1859294693760125695">لم أعد مهتمًّا</translation>
 <translation id="1859339856433307593">هناك كلمة مرور لهذا الحساب (<ph name="USER_EMAIL" />) محفوظة حاليًا في "<ph name="BRAND" />".</translation>
 <translation id="1861262398884155592">هذا المجلد فارغ</translation>
-<translation id="1862311223300693744">‏هل لديك شبكة افتراضية خاصة (VPN) أو خادم وكيل أو جدار ناري أو برنامج NAS مثبت؟</translation>
+<translation id="1862311223300693744">‏هل لديك شبكة افتراضية خاصة (VPN) أو خادم وكيل أو جدار حماية أو برنامج NAS مثبت؟</translation>
 <translation id="1863182668524159459">لم يتم العثور على منافذ تسلسلية</translation>
 <translation id="1864111464094315414">تسجيل الدخول</translation>
 <translation id="1864400682872660285">أكثر برودة</translation>
@@ -2240,7 +2241,7 @@
 <translation id="2738030019664645674">عدم السماح للمواقع الإلكترونية باستخدام أشكال الخط المثبَّتة على جهازك</translation>
 <translation id="2738771556149464852">آخر يوم للصلاحية</translation>
 <translation id="2739191690716947896">تصحيح الأخطاء</translation>
-<translation id="2739240477418971307">تغيير إعدادات إمكانية الوصول</translation>
+<translation id="2739240477418971307">تغيير إعدادات تسهيل الاستخدام</translation>
 <translation id="274029851662193272">منخفضة</translation>
 <translation id="2740531572673183784">حسنًا</translation>
 <translation id="2740876196999178364">‏يتم حفظ مفاتيح المرور هذه على هذا الجهاز فقط. ولا يتم حفظها في حسابك على Google.</translation>
@@ -3339,7 +3340,7 @@
 <translation id="3653160965917900914">مشاركات ملفات الشبكة</translation>
 <translation id="3653887973853407813">‏لا يمكنك استخدام هذه الإضافة. أوقف أحد والدَيك أو الوصي عليك "الأذونات اللازمة للمواقع الإلكترونية والتطبيقات والإضافات" لمتصفِّح Chrome.</translation>
 <translation id="3653999333232393305">مواصلة السماح لـ <ph name="HOST" /> بالدخول إلى الميكروفون</translation>
-<translation id="3654045516529121250">الاطّلاع على إعدادات إمكانية الوصول</translation>
+<translation id="3654045516529121250">الاطّلاع على إعدادات تسهيل الاستخدام</translation>
 <translation id="3656328935986149999">سرعة المؤشر</translation>
 <translation id="3658871634334445293">‏تسارع TrackPoint</translation>
 <translation id="3659550105763988702">استخدام مفتاح المرور لتسجيل الدخول إلى "<ph name="APP_NAME" />"</translation>
@@ -3656,7 +3657,7 @@
 <translation id="389313931326656921">تخصيص مفتاح تحكّم للإجراء "التالي"</translation>
 <translation id="3893268973182382220">لا يمكن تحميل هذه اللوحة الآن.</translation>
 <translation id="3893295674388762059">لمحو البيانات، عليك إغلاق جميع نوافذ التصفُّح المتخفي.</translation>
-<translation id="3893536212201235195">قراءة وتغيير إعدادات إمكانية الوصول</translation>
+<translation id="3893536212201235195">قراءة وتغيير إعدادات تسهيل الاستخدام</translation>
 <translation id="3893630138897523026">‏ChromeVox (التعليق المنطوق)</translation>
 <translation id="3893764153531140319"><ph name="DOWNLOADED_SIZE" />/<ph name="DOWNLOAD_SIZE" /></translation>
 <translation id="3894123633473837029">‏تضمين سجل "مساعد Google" الأخير عبر Sherlog. قد يتضمن هذا الهوية والموقع الجغرافي ومعلومات تصحيح الأخطاء. <ph name="BEGIN_LINK" />مزيد من المعلومات<ph name="END_LINK" /></translation>
@@ -9858,7 +9859,7 @@
 <translation id="8968766641738584599">حفظ البطاقة</translation>
 <translation id="8968906873893164556">اختيار الحساب المُراد استخدامه لعملية الإعداد</translation>
 <translation id="89720367119469899">خروج</translation>
-<translation id="8972513834460200407">‏يُرجى التحقق مع مشرف الشبكة للتأكد من عدم حظر الجدار الناري للتنزيلات من خوادم Google.</translation>
+<translation id="8972513834460200407">‏يُرجى التحقق مع مشرف الشبكة للتأكد من عدم حظر جدار الحماية للتنزيلات من خوادم Google.</translation>
 <translation id="8973263196882835828">&amp;تفعيل ميزة "النسخ النصي التلقائي"</translation>
 <translation id="8973557916016709913">إزالة مستوى التكبير أو التصغير</translation>
 <translation id="8973596347849323817">يمكنك تخصيص هذا الجهاز للتوافق مع احتياجاتك. ويمكن تغيير ميزات إمكانية الوصول هذه لاحقًا من خلال الإعدادات.</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_as.xtb b/chromium/chrome/app/resources/generated_resources_as.xtb
index 59d4dbda63d..6f6d9528946 100644
--- a/chromium/chrome/app/resources/generated_resources_as.xtb
+++ b/chromium/chrome/app/resources/generated_resources_as.xtb
@@ -1453,7 +1453,7 @@
 <translation id="2121055421682309734">{COUNT,plural, =0{কুকিসমূহ অৱৰোধ কৰা হৈছে}=1{কুকিসমূহক অৱৰোধ কৰা হৈছে, ১ টা ব্যতিক্ৰম}one{কুকিসমূহ অৱৰোধ কৰা হৈছে, {COUNT} টা ব্যতিক্ৰম}other{কুকিসমূহ অৱৰোধ কৰা হৈছে, {COUNT} টা ব্যতিক্ৰম}}</translation>
 <translation id="2121825465123208577">আকাৰ সলনি কৰক</translation>
 <translation id="2123766928840368256">বেলেগ এটা ফাইল বাছনি কৰক</translation>
-<translation id="2124930039827422115">{1,plural, =1{এজন ব্যৱহাৰকাৰীয়ে <ph name="AVERAGE_RATING" /> হিচাপে মূল্যাংকন কৰিছে।}one{# জন ব্যৱহাৰকাৰীয়ে <ph name="AVERAGE_RATING" />হিচাপে মূল্যাংকন কৰিছে।}other{# জন ব্যৱহাৰকাৰীয়ে <ph name="AVERAGE_RATING" />হিচাপে মূল্যাংকন কৰিছে।}}</translation>
+<translation id="2124930039827422115">{1,plural, =1{এগৰাকী ব্যৱহাৰকাৰীয়ে <ph name="AVERAGE_RATING" /> হিচাপে মূল্যাংকন কৰিছে।}one{# জন ব্যৱহাৰকাৰীয়ে <ph name="AVERAGE_RATING" />হিচাপে মূল্যাংকন কৰিছে।}other{# জন ব্যৱহাৰকাৰীয়ে <ph name="AVERAGE_RATING" />হিচাপে মূল্যাংকন কৰিছে।}}</translation>
 <translation id="2126167708562367080">আপোনাৰ প্ৰশাসকে ছিংক অক্ষম কৰিছে।</translation>
 <translation id="2127372758936585790">কম শক্তিৰ চ্চাৰ্জাৰ</translation>
 <translation id="212862741129535676">সঘনতাৰ স্থিতি দখলৰ শতকৰা হাৰ</translation>
@@ -2209,7 +2209,7 @@
 <translation id="2715640894224696481">সুৰক্ষা সম্পৰ্কীয় চাবিৰ অনুৰোধ</translation>
 <translation id="2715751256863167692">আপগ্ৰে’ড কৰা এই কাৰ্যটোৱে আপোনাৰ Chromebook ৰিছেট কৰে আৰু ব্যৱহাৰকাৰীৰ বৰ্তমানৰ ডেটা আঁতৰ কৰে।</translation>
 <translation id="2715934493766003251">ফাইল ছিংক কৰাৰ সুবিধাটো অন হৈ থকিলে ষ্ট’ৰেজৰ স্থান খালী কৰিব নোৱাৰি</translation>
-<translation id="2716986496990888774">এই ছেটিং কোনো এজন অভিভাৱকে পৰিচালনা কৰে।</translation>
+<translation id="2716986496990888774">এই ছেটিং কোনো এগৰাকী অভিভাৱকে পৰিচালনা কৰে।</translation>
 <translation id="271749239614426244">কাৰ্ছৰৰ সৰু-সুৰা চলাচল অগ্ৰাহ্য কৰক</translation>
 <translation id="2718395828230677721">ৰাতিৰ পোহৰ</translation>
 <translation id="2718998670920917754">এণ্টি-ভাইৰাছ ছফ্টৱেৰে এটা ভাইৰাছ ধৰা পেলাইছে।</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_bs.xtb b/chromium/chrome/app/resources/generated_resources_bs.xtb
index 66c1163a56f..0f5dca8de99 100644
--- a/chromium/chrome/app/resources/generated_resources_bs.xtb
+++ b/chromium/chrome/app/resources/generated_resources_bs.xtb
@@ -1880,7 +1880,7 @@ Postavkama ovog računa možete upravljati instaliranjem aplikacije Family Link
 <translation id="244641233057214044">Povezano s vašim pretraživanjem</translation>
 <translation id="2447587550790814052">Sada možete koristiti Steam za Chromebook (beta verzija)</translation>
 <translation id="2448312741937722512">Vrsta</translation>
-<translation id="2448810255793562605">Automatsko skeniranje prekidača za pristup</translation>
+<translation id="2448810255793562605">Automatsko skeniranje Pristupa pomoću prekidača</translation>
 <translation id="2450021089947420533">Iskustva pregledanja</translation>
 <translation id="2450223707519584812">Nećete moći dodati korisnike jer nedostaju ključevi Google API-ja. Za više detalja pogledajte <ph name="DETAILS_URL" />.</translation>
 <translation id="2450849356604136918">Nema aktivnih pregleda</translation>
@@ -1988,7 +1988,7 @@ Postavkama ovog računa možete upravljati instaliranjem aplikacije Family Link
 <translation id="2526590354069164005">Radna površina</translation>
 <translation id="2526619973349913024">Provjeri je li dostupno ažuriranje</translation>
 <translation id="2527167509808613699">Bilo koja vrsta veze</translation>
-<translation id="2529887123641260401">Uvijek možete promijeniti postavke ili ponovo otvoriti vodič za postavljanje iz postavki prekidača za pristup.</translation>
+<translation id="2529887123641260401">Uvijek možete promijeniti postavke ili ponovo otvoriti vodič za postavljanje iz postavki Pristupa pomoću prekidača.</translation>
 <translation id="2530166226437958497">Rješavanje problema</translation>
 <translation id="2531530485656743109"><ph name="BEGIN_PARAGRAPH1" />Nešto nije uredu i instaliranje sistema <ph name="DEVICE_OS" /> nije uspjelo.<ph name="END_PARAGRAPH1" />
     <ph name="BEGIN_PARAGRAPH2" />Da dobijete dodatnu pomoć, posjetite: g.co/flex/InstallErrors.<ph name="END_PARAGRAPH2" /></translation>
@@ -4782,7 +4782,7 @@ Koristite Ctrl + Alt + Smanjivanje osvjetljenja da umanjite.</translation>
 <translation id="4809447465126035330">Izbriši</translation>
 <translation id="480990236307250886">Otvorite početnu stranicu</translation>
 <translation id="4809927044794281115">Svijetla tema</translation>
-<translation id="4811212958317149293">Automatsko skeniranje prekidača za pristup na tastaturi</translation>
+<translation id="4811212958317149293">Automatsko skeniranje Pristupa pomoću prekidača na tastaturi</translation>
 <translation id="4811503964269049987">Dodaj odabranu karticu u grupu</translation>
 <translation id="4813512666221746211">Greška na mreži</translation>
 <translation id="4814114628197290459">Izbrišite IBAN</translation>
@@ -9061,7 +9061,7 @@ Fajl ključa: <ph name="KEY_FILE" />
 <translation id="8314089908545021657">Upari s novim telefonom</translation>
 <translation id="8314381333424235892">Ekstenzija nedostaje ili je deinstalirana</translation>
 <translation id="831440797644402910">Nije moguće otvoriti ovaj folder</translation>
-<translation id="8314835274931377415">Pokrenuti postavljanje prekidača za pristup?</translation>
+<translation id="8314835274931377415">Pokrenuti postavljanje Pristupa pomoću prekidača?</translation>
 <translation id="8315018673856831477">Opcije uštede memorije</translation>
 <translation id="8315044115695361734">S iCloud Keychaina</translation>
 <translation id="8317671367883557781">Dodaj mrežnu vezu</translation>
@@ -9589,9 +9589,9 @@ Fajl ključa: <ph name="KEY_FILE" />
 <translation id="8740086188450289493">Koristite lozinku za Google račun</translation>
 <translation id="8740247629089392745">Ovaj Chromebook možete predati korisniku <ph name="SUPERVISED_USER_NAME" />. Postavljanje je skoro gotovo, nakon čega možete početi istraživati.</translation>
 <translation id="8740672167979365981">Potrebno je ažuriranje ChromeOS Flexa</translation>
-<translation id="8741944563400125534">Vodič za postavljanje prekidača za pristup</translation>
+<translation id="8741944563400125534">Vodič za postavljanje Pristupa pomoću prekidača</translation>
 <translation id="8742395827132970586">Instaliranje nije uspjelo. Brisanje je u toku.</translation>
-<translation id="8742998548129056176">Ovo su opće informacije o vašem uređaju i načinu korištenja (kao što su nivo napunjenosti baterije, aktivnosti sistema i aplikacija te greške). Ti podaci će se koristiti za poboljšanje Androida, a neke zbirne informacije će također pomoći Googleovim aplikacijama i partnerima, kao što su Androidovi programeri, da poboljšaju svoje aplikacije i proizvode.</translation>
+<translation id="8742998548129056176">Ovo su opće informacije o vašem uređaju i načinu korištenja (kao što su nivo napunjenosti baterije, aktivnosti sistema i aplikacija te greške). Ti podaci će se koristiti za poboljšanje Androida, a neki zbirni podaci će također pomoći Googleovim aplikacijama i partnerima, kao što su Androidovi programeri, da poboljšaju svoje aplikacije i proizvode.</translation>
 <translation id="8743357966416354615">Upravljano programersko okruženje (<ph name="GENERAL_NAME" />)</translation>
 <translation id="8744641000906923997">Romaji</translation>
 <translation id="8745034592125932220">Pohranjivanje podataka na uređaj nije dozvoljeno</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_cs.xtb b/chromium/chrome/app/resources/generated_resources_cs.xtb
index 4f523a38d5b..ee2365499b2 100644
--- a/chromium/chrome/app/resources/generated_resources_cs.xtb
+++ b/chromium/chrome/app/resources/generated_resources_cs.xtb
@@ -1247,7 +1247,7 @@ Na aplikace a obsah v jiných zařízeních tato akce nemá vliv.</translation
 <translation id="1974159333077206889">Stejný zvuk na všech reproduktorech</translation>
 <translation id="1974216844776165821">Chrome heslo uložil do tohoto zařízení, ale můžete ho místo toho uložit do svého účtu Google. Když budete přihlášeni, budou pak k dispozici i všechna hesla a přístupové klíče ve vašem účtu Google.</translation>
 <translation id="1974821797477522211">Připojení k síti</translation>
-<translation id="1975841812214822307">Odebrat...</translation>
+<translation id="1975841812214822307">Odstranit</translation>
 <translation id="1976150099241323601">Přihlášení do zabezpečeného zařízení</translation>
 <translation id="1976823515278601587">Velká úspora</translation>
 <translation id="1977965994116744507">Chcete-li odemknout své zařízení <ph name="DEVICE_TYPE" />, umístěte telefon blíže k němu.</translation>
@@ -5023,7 +5023,7 @@ Oddálení provedete stisknutím kláves Ctrl + Alt + Snížit jas.</translation
 <translation id="5026806129670917316">Zapnout Wi-Fi</translation>
 <translation id="5026874946691314267">Příště tuto zprávu nezobrazovat</translation>
 <translation id="5027550639139316293">E-mailový certifikát</translation>
-<translation id="5027562294707732951">Přidat rozšíření</translation>
+<translation id="5027562294707732951">Přidat</translation>
 <translation id="5028445315206872221">Rozšíření jsou na tomto webu blokována</translation>
 <translation id="5029568752722684782">Vymazat kopii</translation>
 <translation id="5029873138381728058">Virtuální počítače se nepodařilo zkontrolovat</translation>
@@ -7545,7 +7545,7 @@ Máte # dalších prolomených hesel. Správce hesel Google doporučuje ihned ta
 <translation id="7110684627876015299">Skupina bez názvu – <ph name="OPENED_STATE" /></translation>
 <translation id="7111822978084196600">Zadejte název okna</translation>
 <translation id="7113102733263608554"><ph name="ITEM_COUNT_ONE" /> položka</translation>
-<translation id="7113502843173351041">znalost vaší e-mailové adresy</translation>
+<translation id="7113502843173351041">Znát vaši e-mailovou adresu</translation>
 <translation id="7113974454301513811">Teď do seznamu přidejte aktuální kartu</translation>
 <translation id="7114054701490058191">Hesla nejsou shodná</translation>
 <translation id="7114648273807173152">Chcete-li se ke svému účtu Google přihlašovat pomocí funkce Smart Lock, přejděte na Nastavení &gt; Připojená zařízení &gt; Váš telefon &gt; Smart Lock.</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_da.xtb b/chromium/chrome/app/resources/generated_resources_da.xtb
index 30d084eb43a..00b7bfdeff3 100644
--- a/chromium/chrome/app/resources/generated_resources_da.xtb
+++ b/chromium/chrome/app/resources/generated_resources_da.xtb
@@ -36,7 +36,7 @@
 <translation id="1026655690966755180">Tilføj port</translation>
 <translation id="1026822031284433028">Indlæs billede</translation>
 <translation id="1026959648338730078">Windows Hello eller ekstern sikkerhedsnøgle</translation>
-<translation id="1028700151766901954">Årsag: Emulator til ældre websites forbliver i <ph name="DEFAULT_OPEN_BROWSER" /> som standard.</translation>
+<translation id="1028700151766901954">Årsag: LBS forbliver i <ph name="DEFAULT_OPEN_BROWSER" /> som standard.</translation>
 <translation id="1029317248976101138">Zoom</translation>
 <translation id="1029526375103058355">Tryk for at klikke</translation>
 <translation id="1031362278801463162">Indlæser eksempel</translation>
@@ -5061,7 +5061,7 @@ Brug Ctrl+Alt+Lysstyrke ned for at zoome ud.</translation>
 <translation id="504561833207953641">Åbner i eksisterende browsersession.</translation>
 <translation id="5049614114599109018">Brug indtastningshistorik</translation>
 <translation id="5050063070033073713">{NUM_SITES,plural, =1{Dette website har sendt en masse notifikationer for nylig. Du kan forhindre det i at sende notifikationer i fremtiden.}one{Dette website har sendt mange notifikationer for nylig. Du kan forhindre det i at sende notifikationer i fremtiden.}other{Disse websites har sendt mange notifikationer for nylig. Du kan forhindre dem i at sende notifikationer i fremtiden.}}</translation>
-<translation id="5050330054928994520">Oplæsning</translation>
+<translation id="5050330054928994520">TTS</translation>
 <translation id="5051461727068120271">Download uverificeret fil</translation>
 <translation id="5051836348807686060">Stavekontrol understøttes ikke for de sprog, du har valgt</translation>
 <translation id="5052499409147950210">Rediger website</translation>
@@ -6022,7 +6022,7 @@ De tilladelser, du har givet til websites og apps, gælder muligvis for denne ko
 <translation id="5852112051279473187">Ups!  Noget gik galt under tilmeldingen af denne enhed.  Prøv igen, eller kontakt din supportrepræsentant.</translation>
 <translation id="5852137567692933493">Genstart og Powerwash</translation>
 <translation id="5853487241227591972">Trin 4 af 4: Diagnostik-data er eksporteret</translation>
-<translation id="5854066326260337683">Emulator til ældre websites er deaktiveret i øjeblikket. Du kan aktivere Emulator til ældre websites ved at konfigurere politikken <ph name="BEGIN_LINK" />{BrowserSwitcherEnabled}<ph name="END_LINK" />.</translation>
+<translation id="5854066326260337683">LBS er deaktiveret i øjeblikket. Du kan aktivere LBS ved at konfigurere politikken <ph name="BEGIN_LINK" />{BrowserSwitcherEnabled}<ph name="END_LINK" />.</translation>
 <translation id="5854912040170951372">Pepperoni</translation>
 <translation id="5855267860608268405">Kendte Wi-Fi-netværk</translation>
 <translation id="5855643921295613558">0,6 sekunder</translation>
@@ -8609,7 +8609,7 @@ Tryk på en kontakt eller tast, der er tildelt en handling, for at fjerne tildel
 <translation id="7947962633355574091">K&amp;opiér webadressen til videoen</translation>
 <translation id="7947964080535614577">Websites viser normalt annoncer, så de kan levere indhold eller tjenester uden omkostninger. Nogle websites er dog kendt for at vise påtrængende eller vildledende annoncer.</translation>
 <translation id="7948407723851303488">Alle sider på <ph name="DOMAIN_NAME" /></translation>
-<translation id="7950629216186736592">Årsag: Emulator til ældre websites understøtter kun http://-, https://- og file://-webadresser.</translation>
+<translation id="7950629216186736592">Årsag: LBS understøtter kun http://-, https://- og file://-webadresser.</translation>
 <translation id="7951265006188088697">Gå til din <ph name="BEGIN_LINK" />Google-konto<ph name="END_LINK" /> for at tilføje eller administrere Google Pay-betalingsmetoder</translation>
 <translation id="795130320946928025">Deaktiver virtuelt kort</translation>
 <translation id="795240231873601803">Brug virksomhedstilmelding til arbejds- og skolekonti</translation>
@@ -9931,7 +9931,7 @@ De tilladelser, du har givet til websites og apps, gælder muligvis for denne ko
 <translation id="9019062154811256702">Læse og redigere indstillinger for autofyld</translation>
 <translation id="9019894137004772119">Brug lokation. Tillad, at apps og tjenester med lokationstilladelse kan bruge din enheds lokation. Google kan jævnligt indsamle lokationsdata og bruge disse data på en anonym måde for at forbedre lokationsnøjagtigheden og lokationsbaserede tjenester.</translation>
 <translation id="9019956081903586892">Ordbogen til stavekontrollen kunne ikke downloades</translation>
-<translation id="9020300839812600209">Angiv en webadresse for at se, hvad Emulator til ældre websites ville gøre ved den.</translation>
+<translation id="9020300839812600209">Angiv en webadresse for at se, hvad LBS ville gøre ved den.</translation>
 <translation id="9020362265352758658">4x</translation>
 <translation id="9021662811137657072">Der er fundet en virus</translation>
 <translation id="902236149563113779">Websites registrerer normalt din kameraposition til AR-formål såsom spil eller overlejrede rutevejledninger</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_de.xtb b/chromium/chrome/app/resources/generated_resources_de.xtb
index f69e3f0bcaa..3e717db4ef9 100644
--- a/chromium/chrome/app/resources/generated_resources_de.xtb
+++ b/chromium/chrome/app/resources/generated_resources_de.xtb
@@ -754,7 +754,7 @@ Berechtigungen, die du Apps bereits gewährt hast, gelten möglicherweise für d
 <translation id="1596780725094407793">– enthält Subdomains</translation>
 <translation id="1598163867407640634"><ph name="SITE_ETLD_PLUS_ONE" /> mit <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" /> verwenden</translation>
 <translation id="1598233202702788831">Updates sind durch deinen Administrator deaktiviert.</translation>
-<translation id="1600857548979126453">Auf das Back-End für Seiten-Debugger zugreifen</translation>
+<translation id="1600857548979126453">Auf das Backend für Seiten-Debugger zugreifen</translation>
 <translation id="1601481906560916994">Website ausschließen</translation>
 <translation id="1601560923496285236">Übernehmen</translation>
 <translation id="1602085790802918092">Virtuelle Maschine wird gestartet</translation>
@@ -1078,7 +1078,7 @@ Berechtigungen, die du Apps bereits gewährt hast, gelten möglicherweise für d
 <translation id="184183613002882946">Nein, nur 1 Schalter</translation>
 <translation id="184273675144259287">Linux-Apps und -Dateien durch eine vorherige Sicherung ersetzen</translation>
 <translation id="1842766183094193446">Möchtest du den Demomodus wirklich aktivieren?</translation>
-<translation id="1845060436536902492">Der Screenreader unter ChromeOS Flex, ChromeVox, wird vor allem von Menschen verwendet, die blind sind oder ein eingeschränktes Sehvermögen haben, um auf dem Bildschirm dargestellten Text mit einem Sprachsynthesizer oder einer Braillezeile zu lesen. Drücke die Leertaste, um ChromeVox zu aktivieren. Wenn ChromeVox aktiviert ist, erhältst du eine kurze Einführung.</translation>
+<translation id="1845060436536902492">Der Screenreader unter ChromeOS, ChromeVox, wird vor allem von Menschen mit Sehbehinderung oder eingeschränktem Sehvermögen verwendet, um auf dem Bildschirm dargestellten Text mit einem Sprachsynthesizer oder einer Braillezeile zu lesen. Drücke die Leertaste, um ChromeVox zu aktivieren. Wenn ChromeVox aktiviert ist, erhältst du eine kurze Einführung.</translation>
 <translation id="1845727111305721124">Dürfen Ton abspielen</translation>
 <translation id="1846308012215045257">Zum Ausführen von <ph name="PLUGIN_NAME" /> die Strg-Taste drücken und mit der Maus klicken</translation>
 <translation id="1848219224579402567">Beim Zuklappen abmelden</translation>
@@ -3010,7 +3010,7 @@ Servernachricht: <ph name="SERVER_MSG" /></translation>
 <translation id="3388788256054548012">Diese Datei ist verschlüsselt. Bitte den Inhaber, sie zu entschlüsseln.</translation>
 <translation id="3390013585654699824">App-Details</translation>
 <translation id="3390530051434634135">Hinweis: <ph name="NOTE" /></translation>
-<translation id="3391721320619127327">Der Screenreader unter ChromeOS Flex, ChromeVox, wird vor allem von Menschen verwendet, die blind sind oder ein eingeschränktes Sehvermögen haben, um auf dem Bildschirm dargestellten Text mit einem Sprachsynthesizer oder einer Braillezeile zu lesen. Halte beide Lautstärketasten fünf Sekunden gedrückt, um ChromeVox zu aktivieren. Wenn ChromeVox aktiviert ist, erhältst du eine kurze Einführung.</translation>
+<translation id="3391721320619127327">Der Screenreader unter ChromeOS, ChromeVox, wird vor allem von Menschen mit Sehbehinderung oder eingeschränktem Sehvermögen verwendet, um auf dem Bildschirm dargestellten Text mit einem Sprachsynthesizer oder einer Braillezeile zu lesen. Halte beide Lautstärketasten fünf Sekunden gedrückt, um ChromeVox zu aktivieren. Wenn ChromeVox aktiviert ist, erhältst du eine kurze Einführung.</translation>
 <translation id="3393554941209044235">Chrome-Dokumentenanalyse</translation>
 <translation id="3393582007140394275">Bildschirm kann nicht gestreamt werden.</translation>
 <translation id="3394850431319394743">Darf Kennungen verwenden, um geschützte Inhalte wiederzugeben</translation>
@@ -3228,7 +3228,7 @@ Servernachricht: <ph name="SERVER_MSG" /></translation>
 <translation id="3566325075220776093">Von diesem Gerät</translation>
 <translation id="3566721612727112615">Keine Websites hinzugefügt</translation>
 <translation id="3567284462585300767">Sichtbar werden, um Dateien mit Personen in der Nähe auszutauschen</translation>
-<translation id="356738834800832239">Dein Passwort wird gespeichert</translation>
+<translation id="356738834800832239">Dein Passwort wurde gespeichert</translation>
 <translation id="3569382839528428029">Soll <ph name="APP_NAME" /> deinen Bildschirm freigeben?</translation>
 <translation id="3569614820047645079">Die Dateien in „Meine Ablage“ werden automatisch mit deinem Chromebook synchronisiert, sodass du auch ohne Internetverbindung darauf zugreifen kannst.</translation>
 <translation id="3569682580018832495"><ph name="ORIGIN" /> darf die folgenden Dateien und Ordner aufrufen</translation>
@@ -3252,7 +3252,7 @@ Servernachricht: <ph name="SERVER_MSG" /></translation>
 <translation id="3590194807845837023">Profil entsperren und Chrome neu starten</translation>
 <translation id="3590295622232282437">Anmeldung in verwalteter Sitzung läuft.</translation>
 <translation id="3591057288287063271"><ph name="FILE_NAME" /> behalten</translation>
-<translation id="359177822697434450">USB-Geräte</translation>
+<translation id="359177822697434450">Informationen zu USB-Geräten</translation>
 <translation id="3592260987370335752">&amp;Weitere Informationen</translation>
 <translation id="3592344177526089979">Ein Tab wird auf „<ph name="DEVICE_NAME" />“ gestreamt</translation>
 <translation id="3593152357631900254">Fuzzy-Pinyin-Modus aktivieren</translation>
@@ -4453,7 +4453,7 @@ Dazu gehören beispielsweise installierte Software, Dateien, dein Browser und da
 <translation id="4546509872654834602"><ph name="SUPERVISED_USER_NAME" /> möchte diese Erweiterung verwenden:</translation>
 <translation id="4546692474302123343">Google Assistant-Spracheingabe</translation>
 <translation id="4547659257713117923">Keine Tabs von anderen Geräten</translation>
-<translation id="4547672827276975204">Automatisch festlegen</translation>
+<translation id="4547672827276975204">Automatische Einstellung</translation>
 <translation id="4549791035683739768">Auf deinem Sicherheitsschlüssel sind keine Fingerabdrücke gespeichert</translation>
 <translation id="4550926046134589611">Einige unterstützte Links werden weiterhin in <ph name="APP_NAME" /> geöffnet.</translation>
 <translation id="4551763574344810652">"<ph name="MODIFIER_KEY_DESCRIPTION" />" drücken, um Aktion rückgängig zu machen</translation>
@@ -5259,7 +5259,7 @@ Zum Herauszoomen drücke Strg + Alt + „Helligkeit verringern“.</translatio
 <translation id="5233231016133573565">Prozess-ID</translation>
 <translation id="5233638681132016545">Neuer Tab</translation>
 <translation id="5233736638227740678">&amp;Einfügen</translation>
-<translation id="5234523649284990414">Der Screenreader unter ChromeOS, ChromeVox, wird vor allem von Menschen verwendet, die blind sind oder ein eingeschränktes Sehvermögen haben, um auf dem Bildschirm dargestellten Text mit einem Sprachsynthesizer oder einer Braillezeile zu lesen. Drücke die Leertaste, um ChromeVox zu aktivieren. Wenn ChromeVox aktiviert ist, erhältst du eine kurze Einführung.</translation>
+<translation id="5234523649284990414">Der Screenreader unter ChromeOS, ChromeVox, wird vor allem von Menschen mit Sehbehinderung oder eingeschränktem Sehvermögen verwendet, um auf dem Bildschirm dargestellten Text mit einem Sprachsynthesizer oder einer Braillezeile zu lesen. Drücke die Leertaste, um ChromeVox zu aktivieren. Wenn ChromeVox aktiviert ist, erhältst du eine kurze Einführung.</translation>
 <translation id="5234764350956374838">Schließen</translation>
 <translation id="5235050375939235066">App deinstallieren?</translation>
 <translation id="523505283826916779">Einstellungen für Bedienungshilfen</translation>
@@ -7367,7 +7367,7 @@ Du hast # weitere gehackte Passwörter. Der Google Passwortmanager empfiehlt, d
 <translation id="6970856801391541997">Bestimmte Seiten drucken</translation>
 <translation id="6970861306198150268">Speichere dein aktuelles Passwort für diese Website</translation>
 <translation id="6971184043765343932">Dein hochgeladenes Bild</translation>
-<translation id="6972754398087986839">Erste Schritte</translation>
+<translation id="6972754398087986839">Ok</translation>
 <translation id="697312151395002334">Dürfen Pop-ups senden und Weiterleitungen verwenden</translation>
 <translation id="6973611239564315524">Ein Upgrade auf Debian 10 (Buster) ist verfügbar</translation>
 <translation id="69739764870135975">Wenn Google als Standardsuchmaschine festgelegt ist, siehst du bessere und relevantere Vorschläge</translation>
@@ -7970,7 +7970,7 @@ Du hast # weitere gehackte Passwörter. Der Google Passwortmanager empfiehlt, d
 <translation id="747459581954555080">Alle wiederherstellen</translation>
 <translation id="747507174130726364">{NUM_DAYS,plural, =1{Sofortige Rückgabe erforderlich}other{<ph name="DEVICE_TYPE" /> innerhalb von {NUM_DAYS} Tagen zurückgeben}}</translation>
 <translation id="7475671414023905704">Netscape-URL für vergessene Passwörter</translation>
-<translation id="7475742997309661417">Der Screenreader unter ChromeOS, ChromeVox, wird vor allem von Menschen verwendet, die blind sind oder ein eingeschränktes Sehvermögen haben, um auf dem Bildschirm dargestellten Text mit einem Sprachsynthesizer oder einer Braillezeile zu lesen. Halte beide Lautstärketasten fünf Sekunden gedrückt, um ChromeVox zu aktivieren. Wenn ChromeVox aktiviert ist, erhältst du eine kurze Einführung.</translation>
+<translation id="7475742997309661417">Der Screenreader unter ChromeOS, ChromeVox, wird vor allem von Menschen mit Sehbehinderung oder eingeschränktem Sehvermögen verwendet, um auf dem Bildschirm dargestellten Text mit einem Sprachsynthesizer oder einer Braillezeile zu lesen. Halte beide Lautstärketasten fünf Sekunden gedrückt, um ChromeVox zu aktivieren. Wenn ChromeVox aktiviert ist, erhältst du eine kurze Einführung.</translation>
 <translation id="7476454130948140105">Der Akku ist für ein Update zu schwach (<ph name="BATTERY_PERCENT" /> %)</translation>
 <translation id="7476989672001283112"><ph name="PERMISSION" /> und <ph name="COUNT" /> weitere automatisch blockiert</translation>
 <translation id="7477599578899108080">Hohe Arbeitsspeichernutzung: <ph name="MEMORY_USAGE" /></translation>
@@ -9711,7 +9711,7 @@ Speichere deine Schlüsseldatei an einem sicheren Ort. Du benötigst die Datei,
 <translation id="8862003515646449717">Steige auf einen schnellen Browser um</translation>
 <translation id="8863753581171631212">Link in neuem <ph name="APP" />-Fenster öffnen</translation>
 <translation id="8864055848767439877"><ph name="TAB_NAME" /> wird mit <ph name="APP_NAME" /> geteilt</translation>
-<translation id="8864104359314908853">Dein Passwort wird gespeichert</translation>
+<translation id="8864104359314908853">Dein Passwort wurde gespeichert</translation>
 <translation id="8864458770072227512"><ph name="EMAIL" /> wurde von diesem Gerät entfernt</translation>
 <translation id="8865112428068029930">Du teilst dir einen Computer? Dann kannst du ganz einfach ein Inkognitofenster nutzen.</translation>
 <translation id="8867102760244540173">Auf Tabs suchen…</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_en-GB.xtb b/chromium/chrome/app/resources/generated_resources_en-GB.xtb
index d5eded3e79f..87c32966ce9 100644
--- a/chromium/chrome/app/resources/generated_resources_en-GB.xtb
+++ b/chromium/chrome/app/resources/generated_resources_en-GB.xtb
@@ -657,7 +657,7 @@ Permissions that you've already given to apps may apply to this account. You can
 <translation id="1523279371236772909">Viewed in the past month</translation>
 <translation id="1523978563989812243">Text-to-speech engines</translation>
 <translation id="1524430321211440688">Keyboard</translation>
-<translation id="1524563461097350801">No, Thanks</translation>
+<translation id="1524563461097350801">No, thanks</translation>
 <translation id="1525740877599838384">Use only Wi-Fi to determine location</translation>
 <translation id="152629053603783244">Restart Linux</translation>
 <translation id="1526560967942511387">Untitled Document</translation>
@@ -3201,7 +3201,7 @@ You can manage this account’s settings by installing the Family Link app on yo
 <translation id="3524518036046613664">Discover devices on your local network, like printers</translation>
 <translation id="3524965460886318643">Export activities</translation>
 <translation id="3525426269008462093">Review device sync after setup</translation>
-<translation id="3526034519184079374">Can't Read or Change Site's Data</translation>
+<translation id="3526034519184079374">Can't read or change site's data</translation>
 <translation id="3527085408025491307">Folder</translation>
 <translation id="3528498924003805721">Shortcut targets</translation>
 <translation id="3529851166527095708">Addresses and more</translation>
@@ -3246,7 +3246,7 @@ You can manage this account’s settings by installing the Family Link app on yo
 <translation id="3566325075220776093">From this device</translation>
 <translation id="3566721612727112615">No sites added</translation>
 <translation id="3567284462585300767">To receive and accept files with people around you, become visible</translation>
-<translation id="356738834800832239">Your Password Is Saved</translation>
+<translation id="356738834800832239">Your password is saved</translation>
 <translation id="3569382839528428029">Do you want <ph name="APP_NAME" /> to share your screen?</translation>
 <translation id="3569614820047645079">Your files in My Drive sync to your Chromebook automatically so that you can access them without an Internet connection.</translation>
 <translation id="3569682580018832495"><ph name="ORIGIN" /> can view the following files and folders</translation>
@@ -6449,7 +6449,7 @@ Permissions that you've already given to websites and apps may apply to this acc
 <translation id="6198223452299275399">Swipe between pages</translation>
 <translation id="6198252989419008588">Change PIN</translation>
 <translation id="6200047250927636406">Discard file</translation>
-<translation id="6200151268994853226">Manage Extension</translation>
+<translation id="6200151268994853226">Manage extension</translation>
 <translation id="6201608810045805374">Remove this account?</translation>
 <translation id="6202304368170870640">You can use your PIN to sign in to or unlock your device.</translation>
 <translation id="6203247599828309566">You saved a note for a password on this site. To view it, click the key icon.</translation>
@@ -7359,7 +7359,7 @@ You have # more compromised passwords. Google Password Manager recommends checki
 <translation id="6950627417367801484">Restore apps</translation>
 <translation id="6954910832698269894">Turn on device sync to restore your apps, settings, Wi-Fi networks and wallpaper from your previous Chromebook. Make changes at any time in Settings &gt; Accounts.</translation>
 <translation id="6954936693361896459">Cast this tab instead</translation>
-<translation id="6955446738988643816">Inspect Pop-up</translation>
+<translation id="6955446738988643816">Inspect pop-up</translation>
 <translation id="6955535239952325894">This setting is disabled on managed browsers</translation>
 <translation id="6955698182324067397">You are enabling Chrome OS debugging features, which will set up sshd daemon and enable booting from USB drives.</translation>
 <translation id="6955893174999506273">Assign 1 more switch</translation>
@@ -7988,7 +7988,7 @@ You have # more compromised passwords. Google Password Manager recommends checki
 <translation id="747114903913869239">Error: Unable to decode extension</translation>
 <translation id="7471520329163184433">Slower</translation>
 <translation id="747312361841682912">Delete displayed data</translation>
-<translation id="7473891865547856676">No, Thanks</translation>
+<translation id="7473891865547856676">No, thanks</translation>
 <translation id="747459581954555080">Restore all</translation>
 <translation id="747507174130726364">{NUM_DAYS,plural, =1{Immediate return required}other{Return <ph name="DEVICE_TYPE" /> within {NUM_DAYS} days}}</translation>
 <translation id="7475671414023905704">Netscape Lost Password URL</translation>
@@ -9443,7 +9443,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
 <translation id="8638719155236856752">ChromeOS Network Health</translation>
 <translation id="8639635302972078117">Send usage and diagnostic data. This device is currently automatically sending diagnostic, device and app usage data to Google. This won't be used to identify your child, and will help system and app stability and other improvements. Some aggregate data will also help Google apps and partners, such as Android developers. If additional Web &amp; App Activity setting is turned on for your child, this data may be saved to their Google Account.</translation>
 <translation id="8640575194957831802">Last opened</translation>
-<translation id="8641946446576357115">Use Your Passwords on Your iOS Devices</translation>
+<translation id="8641946446576357115">Use your passwords on your iOS devices</translation>
 <translation id="8642900771896232685">2 seconds</translation>
 <translation id="8642947597466641025">Make Text Larger</translation>
 <translation id="8643403533759285912">Delete group</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_es-419.xtb b/chromium/chrome/app/resources/generated_resources_es-419.xtb
index 7a39a37440e..faa0713a5b8 100644
--- a/chromium/chrome/app/resources/generated_resources_es-419.xtb
+++ b/chromium/chrome/app/resources/generated_resources_es-419.xtb
@@ -4875,7 +4875,7 @@ Usa Ctrl + Alt + Disminuir brillo para alejarte.</translation>
 <translation id="4891089016822695758">Foro de la versión Beta</translation>
 <translation id="4892229439761351791">El sitio puede usar la conexión Bluetooth</translation>
 <translation id="489258173289528622">Acción de inactividad mientras se usa la batería</translation>
-<translation id="4892811427319351753">No se puede habilitar <ph name="EXTENSION_TYPE_PARAMETER" /></translation>
+<translation id="4892811427319351753">No se puede habilitar la <ph name="EXTENSION_TYPE_PARAMETER" /></translation>
 <translation id="4893073099212494043">Activar la predicción de palabra siguiente</translation>
 <translation id="4893336867552636863">Esta acción borrará permanentemente los datos de navegación de este dispositivo.</translation>
 <translation id="4893454800196085005">Buena (DVD)</translation>
@@ -5823,7 +5823,7 @@ Es posible que se apliquen a esta cuenta los permisos que otorgaste a sitios web
 <translation id="5697832193891326782">Selector de emojis</translation>
 <translation id="5698462638680260399">Accede para usar las contraseñas</translation>
 <translation id="570043786759263127">Apps y servicios de Google Play</translation>
-<translation id="5700761515355162635">Se permiten cookies de terceros</translation>
+<translation id="5700761515355162635">Se permiten las cookies de terceros</translation>
 <translation id="5700836101007545240">Tu administrador inhabilitó la opción Agregar conexión</translation>
 <translation id="5701080607174488915">Hubo un error cuando se intentaba recuperar la política del servidor.</translation>
 <translation id="5701212929149679556">Roaming con red móvil</translation>
@@ -6922,7 +6922,7 @@ Tienes # contraseñas hackeadas más. El Administrador de contraseñas de Go
 <translation id="6602956230557165253">Utiliza las teclas de flecha hacia la izquierda y derecha para navegar.</translation>
 <translation id="6603185457265641428">Elige si quieres sincronizar el historial</translation>
 <translation id="6605847144724004692">Todavía no tiene una calificación de los usuarios.</translation>
-<translation id="6606671997164410857">Al parecer, ya configuraste Asistente de Google en otro dispositivo. Activa el contexto de la pantalla en este dispositivo para sacarle incluso más provecho a Asistente.</translation>
+<translation id="6606671997164410857">Al parecer, ya configuraste Asistente de Google en otro dispositivo. Activa el contexto en pantalla en este dispositivo para sacarle incluso más provecho a Asistente.</translation>
 <translation id="6607831829715835317">Más herramientas</translation>
 <translation id="6607890859198268021"><ph name="DOMAIN" /> ya administra <ph name="USER_EMAIL" />. Para usar los controles parentales con otra Cuenta de Google, sal de tu cuenta después de finalizar la configuración y, luego, selecciona "Agregar persona" en la pantalla de acceso.</translation>
 <translation id="6608166463665411119">Restablecer eSIM</translation>
@@ -8408,7 +8408,7 @@ Presiona un interruptor o tecla que ya esté asignado para quitar la asignación
 <translation id="7805768142964895445">Estado</translation>
 <translation id="7805906048382884326">Cerrar la sugerencia</translation>
 <translation id="7807067443225230855">Búsqueda y Asistente</translation>
-<translation id="7807117920154132308">Al parecer, <ph name="SUPERVISED_USER_NAME" /> ya configuró Asistente de Google en otro dispositivo. <ph name="SUPERVISED_USER_NAME" /> puede activar el contexto de la pantalla de este dispositivo para sacarle incluso más provecho a Asistente.</translation>
+<translation id="7807117920154132308">Al parecer, <ph name="SUPERVISED_USER_NAME" /> ya configuró Asistente de Google en otro dispositivo. <ph name="SUPERVISED_USER_NAME" /> puede activar el contexto en pantalla de este dispositivo para sacarle incluso más provecho a Asistente.</translation>
 <translation id="7807711621188256451">Permitir siempre que <ph name="HOST" /> acceda a la cámara</translation>
 <translation id="7810202088502699111">Se bloquearon las ventanas emergentes en esta página.</translation>
 <translation id="7814458197256864873">&amp;Copiar</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_es.xtb b/chromium/chrome/app/resources/generated_resources_es.xtb
index 70db03b1c87..1cf48f64ac2 100644
--- a/chromium/chrome/app/resources/generated_resources_es.xtb
+++ b/chromium/chrome/app/resources/generated_resources_es.xtb
@@ -6,7 +6,7 @@
 <translation id="1003088604756913841">Abrir enlace en una ventana nueva de <ph name="APP" /></translation>
 <translation id="100323615638474026">Dispositivo USB (<ph name="VENDOR_ID" />:<ph name="PRODUCT_ID" />)</translation>
 <translation id="1003917207516838287">Historial de descargas recientes</translation>
-<translation id="1004218526896219317">Acceso al sitio web</translation>
+<translation id="1004218526896219317">Acceso a sitios</translation>
 <translation id="1005274289863221750">Utilizar el micrófono y la cámara</translation>
 <translation id="1005333234656240382">¿Quieres habilitar la depuración ADB?</translation>
 <translation id="1005671386794704751">Rosa</translation>
@@ -279,7 +279,7 @@ Comprueba tus contraseñas en cualquier momento en el <ph name="GOOGLE_PASSWORD_
 <translation id="1203942045716040624">SharedWorker: <ph name="SCRIPT_URL" /></translation>
 <translation id="1210678701920254279">Mira o añade impresoras y consulta los trabajos de impresión activos</translation>
 <translation id="1211769675100312947">Tú gestionas los accesos directos</translation>
-<translation id="1213254615020057352">Envía datos de uso y diagnóstico. Contribuye a mejorar la experiencia de Android de tu hijo enviando automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos no se usarán para identificar a tu hijo, sino para aumentar la estabilidad de las aplicaciones y del sistema, y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y a los partners de Google, como los desarrolladores de Android. El propietario ha aplicado este ajuste. El propietario puede elegir si se envían a Google datos de uso y diagnóstico de este dispositivo. Si la opción Actividad en la Web y en Aplicaciones Adicional está activada, es posible que estos datos se guarden en la cuenta de Google de tu hijo.</translation>
+<translation id="1213254615020057352">Envía datos de uso y diagnóstico. Contribuye a mejorar la experiencia de Android de tu hijo enviando automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos no se usarán para identificar a tu hijo, sino para aumentar la estabilidad de las aplicaciones y del sistema, y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y a los partners de Google, como los desarrolladores de Android. El propietario ha aplicado este ajuste. El propietario puede elegir si se envían a Google datos de uso y diagnóstico de este dispositivo. Si la opción Actividad en la Web y en Aplicaciones adicional está activada, es posible que estos datos se guarden en la cuenta de Google de tu hijo.</translation>
 <translation id="1213726621272705156">No volverás a ver tarjetas en esta página</translation>
 <translation id="121384500095351701">Este archivo no se puede descargar de forma segura</translation>
 <translation id="1214004433265298541">Certificado proporcionado por tu administrador, que puede ver las credenciales de <ph name="DOMAIN" /></translation>
@@ -1744,7 +1744,7 @@ Puedes gestionar la configuración de esta cuenta instalando la aplicación Fami
 <translation id="234889437187286781">Error al cargar los datos</translation>
 <translation id="2348939752188770364">Borrar datos de personalización...</translation>
 <translation id="2349610121459545414">Seguir permitiendo que este sitio web acceda a tu ubicación</translation>
-<translation id="2349896577940037438">Si la opción Actividad en la Web y en Aplicaciones Adicional está activada, es posible que estos datos se guarden en tu cuenta de Google. Puedes ver, eliminar y cambiar la configuración de tu cuenta en account.google.com.</translation>
+<translation id="2349896577940037438">Si la opción Actividad en la Web y en Aplicaciones adicional está activada, es posible que estos datos se guarden en tu cuenta de Google. Puedes ver, eliminar y cambiar la configuración de tu cuenta en account.google.com.</translation>
 <translation id="2350133097354918058">Recargada</translation>
 <translation id="2350182423316644347">Iniciando aplicación...</translation>
 <translation id="235028206512346451">Si te alejas de tu dispositivo, la pantalla se bloqueará automáticamente. Mientras estés enfrente del dispositivo, la pantalla se mantendrá activa durante más tiempo. Si no usas una pantalla de bloqueo, el dispositivo se suspenderá en lugar de bloquearse.</translation>
@@ -2504,7 +2504,7 @@ Puedes gestionar la configuración de esta cuenta instalando la aplicación Fami
 <translation id="2942581856830209953">Personalizar esta página</translation>
 <translation id="2942707801577151363">Abre, edita y guarda archivos de Word, Excel y PowerPoint. Es posible que se requiera una suscripción para acceder a algunas funciones.</translation>
 <translation id="2943268899142471972">Seleccionar un playbook de Ansible o un archivo de copia de seguridad de Crostini</translation>
-<translation id="2944060181911631861">Enviar datos de uso y diagnóstico. Contribuye a mejorar tu experiencia de Android enviando automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos servirán para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y los colaboradores de Google, como los desarrolladores de Android. Si la opción Actividad en la Web y en Aplicaciones Adicional está activada, es posible que estos datos se guarden en tu cuenta de Google. <ph name="BEGIN_LINK1" />Más información<ph name="END_LINK1" /></translation>
+<translation id="2944060181911631861">Enviar datos de uso y diagnóstico. Contribuye a mejorar tu experiencia de Android enviando automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos servirán para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y los colaboradores de Google, como los desarrolladores de Android. Si la opción Actividad en la Web y en Aplicaciones adicional está activada, es posible que estos datos se guarden en tu cuenta de Google. <ph name="BEGIN_LINK1" />Más información<ph name="END_LINK1" /></translation>
 <translation id="2946054015403765210">Ir a archivos</translation>
 <translation id="2946119680249604491">Añadir conexión</translation>
 <translation id="2946190589196900944">Límites de visualización</translation>
@@ -3061,7 +3061,7 @@ Puedes gestionar la configuración de esta cuenta instalando la aplicación Fami
 <translation id="3433507769937235446">Bloqueo en ausencia</translation>
 <translation id="3433621910545056227">¡Vaya! El sistema no ha podido establecer el bloqueo de atributos del tiempo de instalación del dispositivo.</translation>
 <translation id="3434107140712555581"><ph name="BATTERY_PERCENTAGE" />%</translation>
-<translation id="3434272557872943250">Si la opción Actividad en la Web y en Aplicaciones Adicional está activada, es posible que estos datos se guarden en la cuenta de Google de tu hijo. Consulta más información sobre estos ajustes y cómo configurarlos en families.google.com.</translation>
+<translation id="3434272557872943250">Si la opción Actividad en la Web y en Aplicaciones adicional está activada, es posible que estos datos se guarden en la cuenta de Google de tu hijo. Consulta más información sobre estos ajustes y cómo configurarlos en families.google.com.</translation>
 <translation id="3434475275396485144">Este ajuste lo gestiona el administrador de tu teléfono</translation>
 <translation id="3434512374684753970">Audio y vídeo</translation>
 <translation id="3435688026795609344"><ph name="EXTENSION_NAME" /> está solicitando tu <ph name="CODE_TYPE" /></translation>
@@ -3127,7 +3127,7 @@ Puedes gestionar la configuración de esta cuenta instalando la aplicación Fami
 <translation id="3474218480460386727">Las palabras nuevas deben tener 99 letras o menos</translation>
 <translation id="3474624961160222204">Continuar como <ph name="NAME" /></translation>
 <translation id="3475843873335999118">Sigue sin reconocerse tu huella digital. Introduce la contraseña.</translation>
-<translation id="3476303763173086583">Enviar datos de uso y diagnóstico. Contribuye a mejorar la experiencia de Android de tu hijo enviando automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos no se usarán para identificar a tu hijo, sino para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y los colaboradores de Google, como los desarrolladores de Android. El propietario ha aplicado este <ph name="BEGIN_LINK1" />ajuste<ph name="END_LINK1" />. El propietario puede elegir si se envían a Google datos de uso y diagnóstico de este dispositivo. Si la opción Actividad en la Web y en Aplicaciones Adicional está activada, es posible que estos datos se guarden en la cuenta de Google de tu hijo. <ph name="BEGIN_LINK2" />Más información<ph name="END_LINK2" /></translation>
+<translation id="3476303763173086583">Enviar datos de uso y diagnóstico. Contribuye a mejorar la experiencia de Android de tu hijo enviando automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos no se usarán para identificar a tu hijo, sino para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y los colaboradores de Google, como los desarrolladores de Android. El propietario ha aplicado este <ph name="BEGIN_LINK1" />ajuste<ph name="END_LINK1" />. El propietario puede elegir si se envían a Google datos de uso y diagnóstico de este dispositivo. Si la opción Actividad en la Web y en Aplicaciones adicional está activada, es posible que estos datos se guarden en la cuenta de Google de tu hijo. <ph name="BEGIN_LINK2" />Más información<ph name="END_LINK2" /></translation>
 <translation id="347670947055184738">¡Vaya! El sistema no ha podido recuperar la política para tu dispositivo.</translation>
 <translation id="347785443197175480">Seguir permitiendo que <ph name="HOST" /> acceda a la cámara y al micrófono</translation>
 <translation id="3479357084663933762">Deuteronomalía</translation>
@@ -4049,7 +4049,7 @@ Puede tratarse de información sobre el software instalado, los archivos, tu nav
 <translation id="4210048056321123003">Descargando la máquina virtual</translation>
 <translation id="4210380525132844778">Motivo: <ph name="RULE" /> se ha encontrado en la lista "<ph name="LIST_NAME" />".</translation>
 <translation id="421182450098841253">&amp;Mostrar barra de marcadores</translation>
-<translation id="4211851069413100178">Enviar datos de uso y diagnóstico. Contribuye a mejorar tu experiencia de Android enviando automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos servirán para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y los colaboradores de Google, como los desarrolladores de Android. El propietario ha aplicado este <ph name="BEGIN_LINK1" />ajuste<ph name="END_LINK1" />. El propietario puede elegir si se envían a Google datos de uso y diagnóstico de este dispositivo. Si la opción Actividad en la Web y en Aplicaciones Adicional está activada, es posible que estos datos se guarden en tu cuenta de Google. <ph name="BEGIN_LINK2" />Más información<ph name="END_LINK2" /></translation>
+<translation id="4211851069413100178">Enviar datos de uso y diagnóstico. Contribuye a mejorar tu experiencia de Android enviando automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos servirán para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y los colaboradores de Google, como los desarrolladores de Android. El propietario ha aplicado este <ph name="BEGIN_LINK1" />ajuste<ph name="END_LINK1" />. El propietario puede elegir si se envían a Google datos de uso y diagnóstico de este dispositivo. Si la opción Actividad en la Web y en Aplicaciones adicional está activada, es posible que estos datos se guarden en tu cuenta de Google. <ph name="BEGIN_LINK2" />Más información<ph name="END_LINK2" /></translation>
 <translation id="4211904048067111541">Dejar de usar con aplicaciones Android</translation>
 <translation id="42126664696688958">Exportar</translation>
 <translation id="42137655013211669">El servidor ha prohibido el acceso a este recurso.</translation>
@@ -4674,7 +4674,7 @@ Usa Ctrl + Alt + Reducir el brillo para reducir la pantalla.</translation>
 <translation id="4728558894243024398">Plataforma</translation>
 <translation id="4730492586225682674">Última nota tomada con lápiz óptico en la pantalla de bloqueo</translation>
 <translation id="4730888769809690665"><ph name="SITE" /> tiene permiso para enviar notificaciones</translation>
-<translation id="4731306954230393087">Tiene permiso para usar la información que ha guardado sobre ti</translation>
+<translation id="4731306954230393087">Tienen permiso para usar la información que han guardado sobre ti</translation>
 <translation id="473140019006744096">No hay suficiente espacio en este dispositivo para completar la actualización. Libera <ph name="NECESSARY_SPACE" /> en tu dispositivo y vuelve a intentarlo.</translation>
 <translation id="4733161265940833579"><ph name="BATTERY_PERCENTAGE" /> % (izquierdo)</translation>
 <translation id="4733793249294335256">Ubicación</translation>
@@ -5013,7 +5013,7 @@ Usa Ctrl + Alt + Reducir el brillo para reducir la pantalla.</translation>
 <translation id="5016983299133677671">Prueba una contraseña nueva</translation>
 <translation id="5017643436812738274">Puedes desplazarte por las páginas con un cursor de texto. Pulsa Ctrl + tecla de búsqueda + 7 para desactivar esta función.</translation>
 <translation id="5018207570537526145">Abrir sitio web de la extensión</translation>
-<translation id="5018526990965779848">Envía datos de uso y diagnóstico. Contribuye a mejorar tu experiencia de Android enviando automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos servirán para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y a los partners de Google, como los desarrolladores de Android. Si la opción Actividad en la Web y en Aplicaciones Adicional está activada, es posible que estos datos se guarden en tu cuenta de Google.</translation>
+<translation id="5018526990965779848">Envía datos de uso y diagnóstico. Contribuye a mejorar tu experiencia de Android enviando automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos servirán para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y a los partners de Google, como los desarrolladores de Android. Si la opción Actividad en la Web y en Aplicaciones adicional está activada, es posible que estos datos se guarden en tu cuenta de Google.</translation>
 <translation id="5020008942039547742">Elige otra ventana</translation>
 <translation id="5020651427400641814">Habilitar registro de voz</translation>
 <translation id="5021750053540820849">Aún no se ha actualizado</translation>
@@ -5225,7 +5225,7 @@ Usa Ctrl + Alt + Reducir el brillo para reducir la pantalla.</translation>
 <translation id="5195863934285556588"><ph name="BEGIN_PARAGRAPH1" />El servicio de ubicación de Google usa fuentes como redes Wi‑Fi o móviles y sensores para determinar la ubicación de este dispositivo.<ph name="END_PARAGRAPH1" />
     <ph name="BEGIN_PARAGRAPH2" />Puedes desactivar la ubicación de Android en este dispositivo cuando quieras si vas a Ajustes &gt; Aplicaciones &gt; Google Play Store &gt; Gestionar preferencias de Android &gt; Seguridad y ubicación &gt; Ubicación. También puedes desactivar el uso de redes Wi‑Fi o móviles y sensores para determinar la ubicación de Android si desactivas Precisión de la ubicación de Google en el mismo menú.<ph name="END_PARAGRAPH2" /></translation>
 <translation id="5197255632782567636">Internet</translation>
-<translation id="5198430103906431024">Envía datos de uso y diagnóstico. Este dispositivo envía automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos servirán para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y a los partners de Google, como los desarrolladores de Android. Si la opción Actividad en la Web y en Aplicaciones Adicional está activada, es posible que estos datos se guarden en tu cuenta de Google.</translation>
+<translation id="5198430103906431024">Envía datos de uso y diagnóstico. Este dispositivo envía automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos servirán para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y a los partners de Google, como los desarrolladores de Android. Si la opción Actividad en la Web y en Aplicaciones adicional está activada, es posible que estos datos se guarden en tu cuenta de Google.</translation>
 <translation id="5199729219167945352">Experimentos</translation>
 <translation id="5203920255089865054">{NUM_EXTENSIONS,plural, =1{Haz clic para ver la extensión}other{Haz clic para ver las extensiones}}</translation>
 <translation id="5204673965307125349">Realiza un powerwash e inténtalo de nuevo.</translation>
@@ -5444,7 +5444,7 @@ Usa Ctrl + Alt + Reducir el brillo para reducir la pantalla.</translation>
 <translation id="5383740867328871413">Grupo sin nombre - <ph name="GROUP_CONTENTS" /> - <ph name="COLLAPSED_STATE" /></translation>
 <translation id="538822246583124912">La política de Enterprise ha cambiado. Se ha añadido el botón Experimentos a la barra de herramientas. Haz clic en el botón para abrir un cuadro de diálogo donde habilitar los experimentos.</translation>
 <translation id="5388885445722491159">Sincronizado</translation>
-<translation id="5389626883706033615">Los sitios no pueden pedirte permiso para usar información que hayan guardado sobre ti</translation>
+<translation id="5389626883706033615">Los sitios no pueden solicitarte permiso para usar la información que hayan guardado sobre ti</translation>
 <translation id="5390112241331447203">Incluye el archivo system_logs.txt enviado en los informes de comentarios.</translation>
 <translation id="5390677308841849479">Rojo oscuro y naranja</translation>
 <translation id="5390743329570580756">Enviar para</translation>
@@ -5696,7 +5696,7 @@ Los permisos que hayas dado a sitios web y aplicaciones se pueden aplicar a esta
 <translation id="5584915726528712820"><ph name="BEGIN_PARAGRAPH1" />Estos datos incluyen información general sobre tu dispositivo y sobre cómo lo usas (como el nivel de batería, la actividad de las aplicaciones y del sistema, y los errores). Sirven para mejorar Android, y parte de los datos agregados también ayudan a las aplicaciones y partners de Google, como los desarrolladores de Android, a mejorar sus productos y aplicaciones.<ph name="END_PARAGRAPH1" />
     <ph name="BEGIN_PARAGRAPH2" />Si la opción se desactiva, esto no afectará a la capacidad del dispositivo de enviar la información necesaria para recibir servicios esenciales, como actualizaciones del sistema y funciones de seguridad.<ph name="END_PARAGRAPH2" />
     <ph name="BEGIN_PARAGRAPH3" />El propietario puede controlar esta función en Ajustes &gt; Configuración avanzada &gt; Enviar automáticamente los datos de uso y diagnóstico a Google.<ph name="END_PARAGRAPH3" />
-    <ph name="BEGIN_PARAGRAPH4" />Si has activado la opción Actividad en la Web y en Aplicaciones, es posible que estos datos se guarden en tu cuenta de Google. Puedes consultar tus datos, eliminarlos y cambiar la configuración de tu cuenta en la página account.google.com.<ph name="END_PARAGRAPH4" /></translation>
+    <ph name="BEGIN_PARAGRAPH4" />Si has activado la opción Actividad en la Web y en Aplicaciones adicional, es posible que estos datos se guarden en tu cuenta de Google. Puedes consultar tus datos, eliminarlos y cambiar la configuración de tu cuenta en la página account.google.com.<ph name="END_PARAGRAPH4" /></translation>
 <translation id="5585019845078534178">Tarjetas</translation>
 <translation id="5585118885427931890">No se ha podido crear una carpeta de marcadores.</translation>
 <translation id="558563010977877295">Abrir una página específica o un conjunto de páginas</translation>
@@ -7064,7 +7064,7 @@ Tienes # contraseñas vulneradas más. El Gestor de contraseñas de Google te re
 <translation id="6725970970008349185">Número de candidatos por página</translation>
 <translation id="672609503628871915">Consultar las novedades</translation>
 <translation id="6726800386221816228">Caracteres especiales</translation>
-<translation id="67269783048918309">Enviar datos de uso y diagnóstico. Este dispositivo envía automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos no se usarán para identificar a tu hijo, sino para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos recogidos también ayudarán a las aplicaciones y los colaboradores de Google, como los desarrolladores de Android. El propietario ha aplicado este <ph name="BEGIN_LINK1" />ajuste<ph name="END_LINK1" />. Si la opción Actividad en la Web y en Aplicaciones Adicional está activada, es posible que estos datos se guarden en la cuenta de Google de tu hijo. <ph name="BEGIN_LINK2" />Más información<ph name="END_LINK2" /></translation>
+<translation id="67269783048918309">Enviar datos de uso y diagnóstico. Este dispositivo envía automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos no se usarán para identificar a tu hijo, sino para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos recogidos también ayudarán a las aplicaciones y los colaboradores de Google, como los desarrolladores de Android. El propietario ha aplicado este <ph name="BEGIN_LINK1" />ajuste<ph name="END_LINK1" />. Si la opción Actividad en la Web y en Aplicaciones adicional está activada, es posible que estos datos se guarden en la cuenta de Google de tu hijo. <ph name="BEGIN_LINK2" />Más información<ph name="END_LINK2" /></translation>
 <translation id="6728528977475057549">IBAN terminado en <ph name="LAST_FOUR_DIGITS" /></translation>
 <translation id="6729192290958770680">Introduce tu nombre de usuario</translation>
 <translation id="6731320427842222405">Esta tarea puede tardar algunos minutos.</translation>
@@ -7228,7 +7228,7 @@ Tienes # contraseñas vulneradas más. El Gestor de contraseñas de Google te re
 <translation id="6848388270925200958">Tienes algunas tarjetas que solo se pueden utilizar en este dispositivo</translation>
 <translation id="6848716236260083778">Para configurar la huella digital, pídele a tu hijo/a que toque el sensor de huellas digitales. Los datos de la huella digital de tu hijo/a se almacenarán de forma segura y nunca saldrán de este <ph name="DEVICE_TYPE" />.</translation>
 <translation id="6850286078059909152">Color del texto</translation>
-<translation id="6851181413209322061">Envía datos de uso y diagnóstico. Este dispositivo envía automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos no se usarán para identificar a tu hijo, sino para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y a los partners de Google, como los desarrolladores de Android. El propietario ha aplicado este ajuste. Si la opción Actividad en la Web y en Aplicaciones Adicional está activada, es posible que estos datos se guarden en la cuenta de Google de tu hijo.</translation>
+<translation id="6851181413209322061">Envía datos de uso y diagnóstico. Este dispositivo envía automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos no se usarán para identificar a tu hijo, sino para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y a los partners de Google, como los desarrolladores de Android. El propietario ha aplicado este ajuste. Si la opción Actividad en la Web y en Aplicaciones adicional está activada, es posible que estos datos se guarden en la cuenta de Google de tu hijo.</translation>
 <translation id="6851497530878285708">Aplicación habilitada</translation>
 <translation id="6852290167968069627">ChromeOS no puede reanudar tu sesión anterior debido a un problema con la red. Conéctate a una red estable y vuelve a intentarlo.</translation>
 <translation id="6852529053326738838">Pregunta a tu organización o regístrate con tu correo del trabajo para comprobar si tu cuenta cumple los requisitos.</translation>
@@ -7639,7 +7639,7 @@ Tienes # contraseñas vulneradas más. El Gestor de contraseñas de Google te re
 <translation id="7201420661433230412">Ver archivos</translation>
 <translation id="7203150201908454328">Ampliado</translation>
 <translation id="720715819012336933">{NUM_PAGES,plural, =1{Salir de la página}other{Salir de las páginas}}</translation>
-<translation id="7207457272187520234">Envía datos de uso y diagnóstico. Este dispositivo envía automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos servirán para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y a los partners de Google, como los desarrolladores de Android. El propietario ha aplicado este ajuste. Si la opción Actividad en la Web y en Aplicaciones Adicional está activada, es posible que estos datos se guarden en tu cuenta de Google.</translation>
+<translation id="7207457272187520234">Envía datos de uso y diagnóstico. Este dispositivo envía automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos servirán para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y a los partners de Google, como los desarrolladores de Android. El propietario ha aplicado este ajuste. Si la opción Actividad en la Web y en Aplicaciones adicional está activada, es posible que estos datos se guarden en tu cuenta de Google.</translation>
 <translation id="7207631048330366454">Buscar aplicaciones</translation>
 <translation id="7210257969463271891">Las aplicaciones web que instales se mostrarán aquí</translation>
 <translation id="7210432570808024354">Tocar y arrastrar para mover elementos</translation>
@@ -8350,7 +8350,7 @@ Pulsa un interruptor o una tecla con una acción asignada para quitársela.</tra
 <translation id="7766838926148951335">Aceptar permisos</translation>
 <translation id="7767554953520855281">Los detalles se ocultan mientras compartes tu pantalla</translation>
 <translation id="7767972280546034736">Crea una clave de acceso para <ph name="APP_NAME" /></translation>
-<translation id="7768507955883790804">Los sitios usan esta opción automáticamente cuando los visitas.</translation>
+<translation id="7768507955883790804">Los sitios usan esta opción automáticamente cuando los visitas</translation>
 <translation id="7768526219335215384"><ph name="ORIGIN" /> podrá ver los archivos de <ph name="FOLDERNAME" /></translation>
 <translation id="7768770796815395237">Cambiar</translation>
 <translation id="7768784765476638775">Enunciar selección</translation>
@@ -8985,7 +8985,7 @@ Guarda tu archivo de clave en un lugar seguro, ya que lo necesitarás para crear
 <translation id="8267961145111171918"><ph name="BEGIN_PARAGRAPH1" />Estos datos incluyen información general sobre tu dispositivo y sobre cómo lo usas (como el nivel de batería, la actividad de las aplicaciones y del sistema, y los errores). Sirven para mejorar Android, y parte de los datos agregados también ayudan a las aplicaciones y partners de Google, como los desarrolladores de Android, a mejorar sus productos y aplicaciones.<ph name="END_PARAGRAPH1" />
     <ph name="BEGIN_PARAGRAPH2" />Si la opción se desactiva, esto no afectará a la capacidad del dispositivo de enviar la información necesaria para recibir servicios esenciales, como actualizaciones del sistema y funciones de seguridad.<ph name="END_PARAGRAPH2" />
     <ph name="BEGIN_PARAGRAPH3" />El propietario puede controlar esta función en Ajustes &gt; Configuración avanzada &gt; Enviar automáticamente los datos de uso y diagnóstico a Google.<ph name="END_PARAGRAPH3" />
-    <ph name="BEGIN_PARAGRAPH4" />Si has activado la opción Actividad en la Web y en Aplicaciones, es posible que estos datos se guarden en la cuenta de Google de tu hijo. Consulta más información sobre estos ajustes y sobre cómo configurarlos en families.google.com.<ph name="END_PARAGRAPH4" /></translation>
+    <ph name="BEGIN_PARAGRAPH4" />Si has activado la opción Actividad en la Web y en Aplicaciones adicional, es posible que estos datos se guarden en la cuenta de Google de tu hijo. Consulta más información sobre estos ajustes y sobre cómo configurarlos en families.google.com.<ph name="END_PARAGRAPH4" /></translation>
 <translation id="826905130698769948">Certificado de cliente no válido</translation>
 <translation id="8270320981823560179">Drive</translation>
 <translation id="82706708334564640">Historial de descargas recientes</translation>
@@ -9370,7 +9370,7 @@ Guarda tu archivo de clave en un lugar seguro, ya que lo necesitarás para crear
 <translation id="8591783563402255548">1 segundo</translation>
 <translation id="8592141010104017453">No mostrar ninguna notificación</translation>
 <translation id="859246725979739260">Este sitio web no tiene permiso para acceder a tu ubicación.</translation>
-<translation id="8593121833493516339">Enviar datos de uso y diagnóstico. Contribuye a mejorar la experiencia de Android de tu hijo enviando automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos no se usarán para identificar a tu hijo, sino para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos recogidos también ayudarán a las aplicaciones y los colaboradores de Google, como los desarrolladores de Android. Si la opción Actividad en la Web y en Aplicaciones Adicional está activada, es posible que estos datos se guarden en la cuenta de Google de tu hijo. <ph name="BEGIN_LINK1" />Más información<ph name="END_LINK1" /></translation>
+<translation id="8593121833493516339">Enviar datos de uso y diagnóstico. Contribuye a mejorar la experiencia de Android de tu hijo enviando automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos no se usarán para identificar a tu hijo, sino para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos recogidos también ayudarán a las aplicaciones y los colaboradores de Google, como los desarrolladores de Android. Si la opción Actividad en la Web y en Aplicaciones adicional está activada, es posible que estos datos se guarden en la cuenta de Google de tu hijo. <ph name="BEGIN_LINK1" />Más información<ph name="END_LINK1" /></translation>
 <translation id="8593450223647418235">No podrás abrir archivos en Microsoft 365 hasta que se haya completado la configuración.</translation>
 <translation id="8594585498253980290">{COUNT,plural, =1{1 sitio bloqueado}other{# sitios bloqueados}}</translation>
 <translation id="8596540852772265699">Archivos personalizados</translation>
@@ -9425,7 +9425,7 @@ Guarda tu archivo de clave en un lugar seguro, ya que lo necesitarás para crear
 <translation id="8636500887554457830">No permitir que los sitios envíen ventanas emergentes ni utilicen redirecciones</translation>
 <translation id="8637688295594795546">Hay disponible una actualización del sistema. Preparando para descargar…</translation>
 <translation id="8638719155236856752">Estado de red de ChromeOS</translation>
-<translation id="8639635302972078117">Envía datos de uso y diagnóstico. Este dispositivo envía automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos no se usarán para identificar a tu hijo, sino para aumentar la estabilidad de las aplicaciones y del sistema, y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y a los partners de Google, como los desarrolladores de Android. Si la opción Actividad en la Web y en Aplicaciones Adicional está activada, es posible que estos datos se guarden en la cuenta de Google de tu hijo.</translation>
+<translation id="8639635302972078117">Envía datos de uso y diagnóstico. Este dispositivo envía automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos no se usarán para identificar a tu hijo, sino para aumentar la estabilidad de las aplicaciones y del sistema, y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y a los partners de Google, como los desarrolladores de Android. Si la opción Actividad en la Web y en Aplicaciones adicional está activada, es posible que estos datos se guarden en la cuenta de Google de tu hijo.</translation>
 <translation id="8640575194957831802">Abiertos por última vez</translation>
 <translation id="8641946446576357115">Usa tus contraseñas en tus dispositivos iOS</translation>
 <translation id="8642900771896232685">2 segundos</translation>
@@ -9542,7 +9542,7 @@ Guarda tu archivo de clave en un lugar seguro, ya que lo necesitarás para crear
 <translation id="8720200012906404956">Se está buscando una red móvil. <ph name="BEGIN_LINK" />Más información<ph name="END_LINK" /></translation>
 <translation id="8720816553731218127">Se ha agotado el tiempo de la inicialización de los atributos de tiempo de instalación.</translation>
 <translation id="8721093493695533465">Esta acción eliminará <ph name="TOTAL_USAGE" /> de datos almacenados por sitios mostrados y aplicaciones instaladas</translation>
-<translation id="8722912030556880711">Enviar datos de uso y diagnóstico. Este dispositivo envía automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos servirán para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos recogidos también ayudarán a las aplicaciones y los colaboradores de Google, como los desarrolladores de Android. Si la opción Actividad en la Web y en Aplicaciones Adicional está activada, es posible que estos datos se guarden en tu cuenta de Google. <ph name="BEGIN_LINK2" />Más información<ph name="END_LINK2" /></translation>
+<translation id="8722912030556880711">Enviar datos de uso y diagnóstico. Este dispositivo envía automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos servirán para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos recogidos también ayudarán a las aplicaciones y los colaboradores de Google, como los desarrolladores de Android. Si la opción Actividad en la Web y en Aplicaciones adicional está activada, es posible que estos datos se guarden en tu cuenta de Google. <ph name="BEGIN_LINK2" />Más información<ph name="END_LINK2" /></translation>
 <translation id="8724405322205516354">Cuando veas este icono, utiliza tu huella digital para identificarte o aprobar compras.</translation>
 <translation id="8724409975248965964">Huella digital añadida</translation>
 <translation id="8724859055372736596">&amp;Mostrar en carpeta</translation>
@@ -9793,7 +9793,7 @@ Guarda tu archivo de clave en un lugar seguro, ya que lo necesitarás para crear
 <translation id="8929696694736010839">Solo a la sesión de Incógnito actual</translation>
 <translation id="8930351635855238750">La nueva configuración de cookies se aplicará al volver a cargar la página</translation>
 <translation id="8930622219860340959">Conexión inalámbrica</translation>
-<translation id="8931076093143205651">Envía datos de uso y diagnóstico. Contribuye a mejorar tu experiencia de Android enviando automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos servirán para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y a los partners de Google, como los desarrolladores de Android. El propietario ha aplicado este ajuste. El propietario puede elegir si se envían a Google datos de uso y diagnóstico de este dispositivo. Si la opción Actividad en la Web y en Aplicaciones Adicional está activada, es posible que estos datos se guarden en tu cuenta de Google.</translation>
+<translation id="8931076093143205651">Envía datos de uso y diagnóstico. Contribuye a mejorar tu experiencia de Android enviando automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos servirán para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y a los partners de Google, como los desarrolladores de Android. El propietario ha aplicado este ajuste. El propietario puede elegir si se envían a Google datos de uso y diagnóstico de este dispositivo. Si la opción Actividad en la Web y en Aplicaciones adicional está activada, es posible que estos datos se guarden en tu cuenta de Google.</translation>
 <translation id="8931475688782629595">Gestionar qué sincronizas</translation>
 <translation id="8931713990831679796">Estas impresoras están conectadas y listas para usarse. Guárdalas en tu perfil para acceder a ellas más fácilmente.</translation>
 <translation id="8932654652795262306">Detalles de la conexión compartida instantánea</translation>
@@ -10120,8 +10120,8 @@ Los permisos que hayas dado a sitios web y aplicaciones se pueden aplicar a esta
 <translation id="9170884462774788842">Otro programa de tu ordenador ha añadido un tema que puede cambiar el funcionamiento de Chrome.</translation>
 <translation id="9173063514323762371">&amp;Ocultar barra de marcadores</translation>
 <translation id="917350715406657904">Has llegado al límite de tiempo de uso de <ph name="APP_NAME" /> que ha establecido tu padre o madre. Podrás usar esta aplicación mañana durante <ph name="TIME_LIMIT" />.</translation>
-<translation id="9174401638287877180">Envía datos de uso y diagnóstico. Contribuye a mejorar la experiencia de Android de tu hijo enviando automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos no se usarán para identificar a tu hijo, sino para aumentar la estabilidad de las aplicaciones y del sistema, y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y a los partners de Google, como los desarrolladores de Android. Si la opción Actividad en la Web y en Aplicaciones Adicional está activada, es posible que estos datos se guarden en la cuenta de Google de tu hijo.</translation>
-<translation id="9176476835295860688">Enviar datos de uso y diagnóstico. Este dispositivo envía automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos servirán para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos recogidos también ayudarán a las aplicaciones y los colaboradores de Google, como los desarrolladores de Android. El propietario ha aplicado este <ph name="BEGIN_LINK1" />ajuste<ph name="END_LINK1" />. Si la opción Actividad en la Web y en Aplicaciones Adicional está activada, es posible que estos datos se guarden en tu cuenta de Google. <ph name="BEGIN_LINK2" />Más información<ph name="END_LINK2" /></translation>
+<translation id="9174401638287877180">Envía datos de uso y diagnóstico. Contribuye a mejorar la experiencia de Android de tu hijo enviando automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos no se usarán para identificar a tu hijo, sino para aumentar la estabilidad de las aplicaciones y del sistema, y realizar otras mejoras. Parte de los datos agregados también ayudarán a las aplicaciones y a los partners de Google, como los desarrolladores de Android. Si la opción Actividad en la Web y en Aplicaciones adicional está activada, es posible que estos datos se guarden en la cuenta de Google de tu hijo.</translation>
+<translation id="9176476835295860688">Enviar datos de uso y diagnóstico. Este dispositivo envía automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos servirán para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos recogidos también ayudarán a las aplicaciones y los colaboradores de Google, como los desarrolladores de Android. El propietario ha aplicado este <ph name="BEGIN_LINK1" />ajuste<ph name="END_LINK1" />. Si la opción Actividad en la Web y en Aplicaciones adicional está activada, es posible que estos datos se guarden en tu cuenta de Google. <ph name="BEGIN_LINK2" />Más información<ph name="END_LINK2" /></translation>
 <translation id="9176611096776448349"><ph name="WINDOW_TITLE" />: dispositivo Bluetooth conectado</translation>
 <translation id="9178061802301856367">Eliminar datos de inicio de sesión</translation>
 <translation id="9179524979050048593">Nombre de usuario de la pantalla de inicio de sesión</translation>
@@ -10133,7 +10133,7 @@ Los permisos que hayas dado a sitios web y aplicaciones se pueden aplicar a esta
 <translation id="918352324374649435">{COUNT,plural, =1{Aplicación}other{# aplicaciones}}</translation>
 <translation id="9186963452600581158">Iniciar sesión con la cuenta de Google de un niño/a</translation>
 <translation id="9187967020623675250">Las teclas no coinciden. Pulsa cualquier tecla para <ph name="RESPONSE" />.</translation>
-<translation id="9188732951356337132">Enviar datos de uso y diagnóstico. Este dispositivo envía automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos no se usarán para identificar a tu hijo, sino para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos recogidos también ayudarán a las aplicaciones y los colaboradores de Google, como los desarrolladores de Android. Si la opción Actividad en la Web y en Aplicaciones Adicional está activada, es posible que estos datos se guarden en la cuenta de Google de tu hijo. <ph name="BEGIN_LINK2" />Más información<ph name="END_LINK2" /></translation>
+<translation id="9188732951356337132">Enviar datos de uso y diagnóstico. Este dispositivo envía automáticamente a Google datos de diagnóstico, del dispositivo y del uso de las aplicaciones. Los datos no se usarán para identificar a tu hijo, sino para aumentar la estabilidad de las aplicaciones y del sistema y realizar otras mejoras. Parte de los datos recogidos también ayudarán a las aplicaciones y los colaboradores de Google, como los desarrolladores de Android. Si la opción Actividad en la Web y en Aplicaciones adicional está activada, es posible que estos datos se guarden en la cuenta de Google de tu hijo. <ph name="BEGIN_LINK2" />Más información<ph name="END_LINK2" /></translation>
 <translation id="9192019773545828776">Escucha mensajes de voz para poder usar el dispositivo sin mirar la pantalla. Se pueden recibir mensajes en braille con un dispositivo conectado. Pulsa Ctrl + Alt + Z para activar o desactivar ChromeVox. Usa la tecla de búsqueda + flecha hacia la izquierda o hacia la derecha para desplazarte. Pulsa la tecla de búsqueda y la barra espaciadora para seleccionar (activar).</translation>
 <translation id="919686179725692564">Más información sobre cómo crear una copia de seguridad de tus aplicaciones</translation>
 <translation id="9199503643457729322">Haz clic para salir de la guía de privacidad.</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_eu.xtb b/chromium/chrome/app/resources/generated_resources_eu.xtb
index e8fc8ce5c5d..27414e96851 100644
--- a/chromium/chrome/app/resources/generated_resources_eu.xtb
+++ b/chromium/chrome/app/resources/generated_resources_eu.xtb
@@ -402,7 +402,7 @@ Txartel adimenduna sartuta edukitzea eskatzen du <ph name="DOMAIN" /> domeinuak.
 <translation id="13130607084115184">Gordetako pasahitzak hemen agertuko dira. Pasahitzak <ph name="BRAND" /> zerbitzura inportatzeko gailu honetan, <ph name="BEGIN_LINK" /> hautatu CSV fitxategi bat.<ph name="END_LINK" /></translation>
 <translation id="1313264149528821971">Hauek kendu dira: <ph name="PERMISSION_1" />, <ph name="PERMISSION_2" />, <ph name="PERMISSION_3" /></translation>
 <translation id="1313405956111467313">Proxy-konfigurazio automatikoa</translation>
-<translation id="131364520783682672">Maiuskula-blokeoa</translation>
+<translation id="131364520783682672">Maiuskulen blokeoa</translation>
 <translation id="1313660246522271310">Webgune guztietan amaituko da saioa, baita irekita dauden fitxetan ere</translation>
 <translation id="1313705515580255288">Laster-markak, historia eta bestelako ezarpenak Google-ko kontuarekin sinkronizatuko dira.</translation>
 <translation id="1315184295353569363">Ezabatu taldea</translation>
@@ -867,7 +867,7 @@ Baliteke aplikazioei emandako baimenak kontu honi aplikatzea. <ph name="APPS_LIN
 <translation id="1677306805708094828">Ezin da gehitu <ph name="EXTENSION_TYPE_PARAMETER" /></translation>
 <translation id="1677472565718498478"><ph name="TIME" /> geratzen dira</translation>
 <translation id="1678849866171627536">Ezin izan da aztertu. Baliteke fitxategi hau birusa edo malwarea izatea.</translation>
-<translation id="1679068421605151609">Garatzaileen tresnak</translation>
+<translation id="1679068421605151609">Garatzaileentzako tresnak</translation>
 <translation id="1679810534535368772">Ziur irten nahi duzula?</translation>
 <translation id="167983332380191032">HTTParen errore bat bidali du kudeaketa-zerbitzuak.</translation>
 <translation id="167997285881077031">Testua ahots bihurtzeko eginbidearen ahots-ezarpenak</translation>
@@ -1435,7 +1435,7 @@ Kontu honen ezarpenak kudeatzeko, instalatu Family Link aplikazioa zure gailuan.
 <translation id="2114820389966440614">Ikusi "Azkenaldiko aipagarriak" eta beste oroitzapen batzuk hemen</translation>
 <translation id="2114896190328250491">Argazkiaren egilea: <ph name="NAME" /></translation>
 <translation id="2114995631896158695">Ez da sartu SIM txartelik</translation>
-<translation id="2116619964159595185">Webguneak Bluetooth bidezko gailuetara konektatu ohi dira kontsumo txikiko kokapen-adierazle bat, osasunaren edo fitnessaren jarraipena egiteko gailu bat, edo bonbilla adimendun bat konfiguratzeko edo sinkronizatzeko, eta antzeko eginbideak eskaintzeko</translation>
+<translation id="2116619964159595185">Webguneak Bluetooth bidezko gailuetara konektatu ohi dira kontsumo txikiko kokapen-adierazle bat, osasunaren edo fitnessaren jarraipen-gailu bat, edo bonbilla adimendun bat konfiguratzeko edo sinkronizatzeko, eta antzeko eginbideak eskaintzeko</translation>
 <translation id="2117655453726830283">Hurrengo diapositiba</translation>
 <translation id="2119461801241504254">Arakatze segurua aktibatuta dago, eta webgune eta deskarga kaltegarrietatik babesten zaitu</translation>
 <translation id="2120297377148151361">Jarduerak eta interakzioak</translation>
@@ -3588,7 +3588,7 @@ Besteak beste, instalatutako softwareari, fitxategiei, arakatzaileari eta sistem
 <translation id="3834728400518755610">Mikrofonoaren ezarpenean egindako aldaketa aplikatzeko, itxi egin behar da Linux. Aurrera egiteko, itxi Linux.</translation>
 <translation id="3834775135533257713">Ezin izan da gehitu "<ph name="TO_INSTALL_APP_NAME" />" aplikazioa, "<ph name="INSTALLED_APP_NAME" />" aplikazioarekin gatazkan dagoelako.</translation>
 <translation id="3835904559946595746">Ezin izan da leheneratu Linux-en babeskopia</translation>
-<translation id="383669374481694771">Gailu honi eta hura erabiltzeko moduari buruzko informazio orokorra da hau (adibidez, bateria-maila, sistemako eta aplikazioetako jarduerak, eta erroreak). Android hobetzeko erabiliko dira datuok. Gainera, multzokatutako datu batzuk oso baliagarriak dira Google-ren aplikazioak hobetzeko eta bazkideei (adibidez, Android-en garatzaileei) euren aplikazio eta produktuak hobetzen laguntzeko.</translation>
+<translation id="383669374481694771">Gailu honi eta hura erabiltzeko moduari buruzko informazio orokorra da hau (adibidez, bateria-maila, sistemako eta aplikazioetako jarduerak, eta erroreak). Android hobetzeko erabiliko dira datuok. Gainera, datu bateratu batzuk oso baliagarriak dira Google-ren aplikazioak hobetzeko eta bazkideei (adibidez, Android-en garatzaileei) euren aplikazio eta produktuak hobetzen laguntzeko.</translation>
 <translation id="3837569373891539515">Dagozkion guztiak hauta ditzakezu. <ph name="DEVICE_TYPE" /> gailua konfiguratzen amaitzean, Ezarpenak atalean aurkituko dituzu aukera hauek.</translation>
 <translation id="3838085852053358637">Ezin izan da kargatu luzapena</translation>
 <translation id="3838486795898716504"><ph name="PAGE_TITLE" /> orriaren jarraipena</translation>
@@ -5693,7 +5693,7 @@ Baliteke webguneei eta aplikazioei emandako baimenak kontu honi aplikatzea. Goog
 <translation id="5583640892426849032">Atzera tekla</translation>
 <translation id="5584088138253955452">Erabiltzaile-izena gorde nahi duzu?</translation>
 <translation id="5584091888252706332">Abioan</translation>
-<translation id="5584915726528712820"><ph name="BEGIN_PARAGRAPH1" />Gailuari eta hura erabiltzeko moduari buruzko informazio orokorra da (adibidez, bateria-maila, sistemako eta aplikazioetako jarduerak, eta erroreak). Android hobetzeko erabiliko dira datuok. Gainera, multzokatutako datu batzuk oso baliagarriak dira Google-ren aplikazioak hobetzeko eta bazkideei (adibidez, Android garatzaileei) euren aplikazio eta produktuak hobetzen laguntzeko.<ph name="END_PARAGRAPH1" />
+<translation id="5584915726528712820"><ph name="BEGIN_PARAGRAPH1" />Gailuari eta hura erabiltzeko moduari buruzko informazio orokorra da (adibidez, bateria-maila, sistemako eta aplikazioetako jarduerak, eta erroreak). Android hobetzeko erabiliko dira datuok. Gainera, datu bateratu batzuk oso baliagarriak dira Google-ren aplikazioak hobetzeko eta bazkideei (adibidez, Android garatzaileei) euren aplikazio eta produktuak hobetzen laguntzeko.<ph name="END_PARAGRAPH1" />
     <ph name="BEGIN_PARAGRAPH2" />Eginbidea desaktibatuta ere, gailuak beharrezko informazioa bidaltzen jarraitu ahal izango du funtsezko zerbitzuak jasotzeko, hala nola sistemaren eguneratzeak eta segurtasun-neurriak.<ph name="END_PARAGRAPH2" />
     <ph name="BEGIN_PARAGRAPH3" />Jabeak kontrolatu nahi badu, atal honetara joan beharko du: Ezarpenak &gt; Aurreratuak &gt; Bidali Google-ri diagnostiko- eta erabilera-datuak automatikoki.<ph name="END_PARAGRAPH3" />
     <ph name="BEGIN_PARAGRAPH4" />Sareko eta aplikazioetako jarduera gehigarriak ezarpena aktibatuta badago, baliteke datu horiek Google-ko kontuan gordetzea. Zure datuak ikusi edo ezabatzeko eta kontuaren ezarpenak aldatzeko, joan account.google.com helbidera.<ph name="END_PARAGRAPH4" /></translation>
@@ -5823,7 +5823,7 @@ Baliteke webguneei eta aplikazioei emandako baimenak kontu honi aplikatzea. Goog
 <translation id="5696679855467848181">Oraingo PPD fitxategia: <ph name="PPD_NAME" /></translation>
 <translation id="5697832193891326782">Emoji-hautatzailea</translation>
 <translation id="5698462638680260399">Hasi saioa pasahitzak erabiltzeko</translation>
-<translation id="570043786759263127">Google Play aplikazioak eta zerbitzuak</translation>
+<translation id="570043786759263127">Google Play-ko aplikazioak eta zerbitzuak</translation>
 <translation id="5700761515355162635">Hirugarrenen cookieak erabil daitezke</translation>
 <translation id="5700836101007545240">Administratzaileak desgaitu du konexioak gehitzeko aukera</translation>
 <translation id="5701080607174488915">Errore bat gertatu da gidalerroa eskuratzean zerbitzaritik.</translation>
@@ -6521,7 +6521,7 @@ Baliteke webguneei eta aplikazioei emandako baimenak kontu honi aplikatzea. Goog
 <translation id="6266532094411434237"><ph name="DEVICE" /> gailura konektatzen</translation>
 <translation id="6267166720438879315">Hautatu ziurtagiria zeure burua <ph name="HOST_NAME" /> ostalarian egiaztatzeko</translation>
 <translation id="6268252012308737255">Ireki <ph name="APP" /> aplikazioan</translation>
-<translation id="6270309713620950855">Audioa desaktibatuta edukitzearen abisua</translation>
+<translation id="6270309713620950855">Audioa desaktibatuaren abisua</translation>
 <translation id="6270391203985052864">Webguneek jakinarazpenak bidaltzea eska dezakete</translation>
 <translation id="6270486800167535228">Luzapena ainguratuta dago. Aukera gehiago ikusteko, hautatu hau</translation>
 <translation id="6270770586500173387">Bidali <ph name="BEGIN_LINK1" />sistemari eta aplikazioei buruzko informazioa<ph name="END_LINK1" /> eta <ph name="BEGIN_LINK2" />estatistikak<ph name="END_LINK2" /></translation>
@@ -7142,7 +7142,7 @@ Arriskuan dauden # pasahitz gehiago dauzkazu. Google-ren Pasahitz-kudeatzailea z
 <translation id="6798420440063423019">Segurtasun-giltza blokeatuta dago PINa gehiegitan idatzi delako oker. Segurtasun-giltza berrezarri beharko duzu.</translation>
 <translation id="679845623837196966">Erakutsi irakurketa-zerrenda</translation>
 <translation id="6798578729981748444">Inportazioa amaitzeko, itxi Firefox-eko leiho guztiak.</translation>
-<translation id="6798780071646309401">maiuskulak aktibatuta daude</translation>
+<translation id="6798780071646309401">maiuskulen blokeoa aktibatuta dago</translation>
 <translation id="6798954102094737107"><ph name="PLUGIN_NAME" /> plugina</translation>
 <translation id="6801129617625983991">Ezarpen orokorrak</translation>
 <translation id="6801308659697002152">{NUM_EXTENSIONS,plural, =1{Aukeratu luzapenak webgunea irakurri edo aldatu ahal duen}other{Aukeratu luzapenek webgunea irakurri edo aldatu ahal duten}}</translation>
@@ -7555,7 +7555,7 @@ Inoiz Voice Match erabiltzeari utzi nahi badiozu, ken ezazu Laguntzailea zerbitz
 <translation id="7123302939607518173">Gehitu interes edo webgune bat harekin erlazionatutako iragarkiak zuretzat erabilgarriak izango direla uste baduzu;</translation>
 <translation id="7124013154139278147">Esleitu erabilerraztasun-etengailu bat "Aurrekoa" ekintzari</translation>
 <translation id="7124712201233930202">Ez dira gordetzen erakundearen gidalerroak</translation>
-<translation id="7125029162161377569">Privacy Sandbox-aren probei esker, berdin arakatu ahalko dituzu webguneak datu gutxiago erabilita. Pribatutasun handiagoa izango duzula eta webguneen arteko jarraipena mugatuko dela esan nahi du horrek. Proba berriak gehituko ditugu kaleratzeko prest egon ahala.</translation>
+<translation id="7125029162161377569">Privacy Sandbox-aren probei esker, berdin arakatu ahalko dituzu webguneak datu gutxiago erabilita. Pribatutasun handiagoa izango duzula eta webgunearteko jarraipena mugatuko dela esan nahi du horrek. Proba berriak gehituko ditugu kaleratzeko prest egon ahala.</translation>
 <translation id="7125148293026877011">Ezabatu Crostini</translation>
 <translation id="7125932261198019860">Ziurtatu inprimagailua Chromebook-aren wifi-sare berera konektatuta dagoela, edo erabili USB kable bat. <ph name="LINK_BEGIN" />Lortu bateragarritasunari buruzko informazio gehiago<ph name="LINK_END" /></translation>
 <translation id="7127980134843952133">Deskargen historia</translation>
@@ -8146,7 +8146,7 @@ Inoiz Voice Match erabiltzeari utzi nahi badiozu, ken ezazu Laguntzailea zerbitz
 <translation id="7622114377921274169">Kargatzen.</translation>
 <translation id="7622768823216805500">Webguneek ordainketa-kudeatzaileak instalatu ohi dituzte ordainketa erraza eta antzeko erosketa-eginbideak eskaintzeko</translation>
 <translation id="7622966771025050155">Aldatu grabatutako fitxara</translation>
-<translation id="7624337243375417909">maiuskulak desaktibatuta daude</translation>
+<translation id="7624337243375417909">maiuskulen blokeoa desaktibatuta dago</translation>
 <translation id="7625568159987162309">Ikusi webguneetan gordetako baimenak eta datuak</translation>
 <translation id="7625823789272218216">Fitxa berria ezkerrean</translation>
 <translation id="7628201176665550262">Freskatze-abiadura</translation>
@@ -8976,7 +8976,7 @@ Gorde gakoen fitxategia leku seguru batean. Zure luzapenaren bertsio berriak sor
 <translation id="8265671588726449108">{COUNT,plural, =1{Berriro exekutatu ondoren, ezkutuko moduko leihoa ez da irekiko}other{Berriro exekutatu ondoren, ezkutuko moduko {COUNT} leihoak ez dira irekiko}}</translation>
 <translation id="8266947622852630193">Idazketa-metodo guztiak</translation>
 <translation id="8267539814046467575">Gehitu inprimagailu bat</translation>
-<translation id="8267961145111171918"><ph name="BEGIN_PARAGRAPH1" />Gailuari eta hura erabiltzeko moduari buruzko informazio orokorra da (adibidez, bateria-maila, sistemako eta aplikazioetako jarduerak, eta erroreak). Android hobetzeko erabiliko dira datuok. Gainera, multzokatutako datu batzuk oso baliagarriak dira Google-ren aplikazioak hobetzeko eta bazkideei (adibidez, Android garatzaileei) euren aplikazio eta produktuak hobetzen laguntzeko.<ph name="END_PARAGRAPH1" />
+<translation id="8267961145111171918"><ph name="BEGIN_PARAGRAPH1" />Gailuari eta hura erabiltzeko moduari buruzko informazio orokorra da (adibidez, bateria-maila, sistemako eta aplikazioetako jarduerak, eta erroreak). Android hobetzeko erabiliko dira datuok. Gainera, datu bateratu batzuk oso baliagarriak dira Google-ren aplikazioak hobetzeko eta bazkideei (adibidez, Android garatzaileei) euren aplikazio eta produktuak hobetzen laguntzeko.<ph name="END_PARAGRAPH1" />
     <ph name="BEGIN_PARAGRAPH2" />Eginbidea desaktibatuta ere, gailuak beharrezko informazioa bidaltzen jarraitu ahal izango du funtsezko zerbitzuak jasotzeko, hala nola sistemaren eguneratzeak eta segurtasun-neurriak.<ph name="END_PARAGRAPH2" />
     <ph name="BEGIN_PARAGRAPH3" />Jabeak kontrolatu nahi badu, atal honetara joan beharko du: Ezarpenak &gt; Aurreratuak &gt; Bidali Google-ri diagnostiko- eta erabilera-datuak automatikoki.<ph name="END_PARAGRAPH3" />
     <ph name="BEGIN_PARAGRAPH4" />Sareko eta aplikazioetako jarduera gehigarriak ezarpena aktibatuta badago haurrarentzat, baliteke datu horiek haren Google-ko kontuan gordetzea. Lortu informazio gehiago ezarpenei eta haiek doitzeko moduari buruz families.google.com helbidean.<ph name="END_PARAGRAPH4" /></translation>
@@ -9464,7 +9464,7 @@ Gorde gakoen fitxategia leku seguru batean. Zure luzapenaren bertsio berriak sor
 <translation id="8666759526542103597">Iragarkiak arakatzailean oinarrituta pertsonalizatzeari buruz</translation>
 <translation id="8667261224612332309">Hobe daitezkeen pasahitzak dituzu</translation>
 <translation id="8667328578593601900"><ph name="FULLSCREEN_ORIGIN" /> pantaila osoan dago eta saguaren kurtsorea desgaitu du.</translation>
-<translation id="8667760277771450375">Webguneei spama eta iruzurrak saihesteko aukera gaitu bitartean webguneen arteko jarraipenak mugatzeko moduak arakatzen ari gara.</translation>
+<translation id="8667760277771450375">Webguneei spama eta iruzurrak saihesteko aukera gaitu bitartean webgunearteko jarraipenak mugatzeko moduak arakatzen ari gara.</translation>
 <translation id="8668378421690365723">Baliteke gailuak behar bezala funtzionatzeari uztea eta segurtasun- eta errendimendu-arazoak izatea.</translation>
 <translation id="8669284339312441707">Beroagoa</translation>
 <translation id="8670537393737592796">Hona bizkor itzuli ahal izateko, instalatu <ph name="APP_NAME" /> instalatzeko botoia sakatuta</translation>
@@ -9566,7 +9566,7 @@ Gorde gakoen fitxategia leku seguru batean. Zure luzapenaren bertsio berriak sor
 <translation id="8740672167979365981">ChromeOS Flex eguneratu egin behar da</translation>
 <translation id="8741944563400125534">Erabilerraztasun-osagarria konfiguratzeko gida</translation>
 <translation id="8742395827132970586">Instalazioak huts egin du, garbitzen</translation>
-<translation id="8742998548129056176">Gailuari eta hura erabiltzeko moduari buruzko informazio orokorra da hau (adibidez, bateria-maila, sistemako eta aplikazioetako jarduerak, eta erroreak). Android hobetzeko erabiliko dira datuok. Gainera, multzokatutako datu batzuk oso baliagarriak dira Google-ren aplikazioak hobetzeko eta bazkideei (adibidez, Android-en garatzaileei) euren aplikazio eta produktuak hobetzen laguntzeko.</translation>
+<translation id="8742998548129056176">Gailuari eta hura erabiltzeko moduari buruzko informazio orokorra da hau (adibidez, bateria-maila, sistemako eta aplikazioetako jarduerak, eta erroreak). Android hobetzeko erabiliko dira datuok. Gainera, datu bateratu batzuk oso baliagarriak dira Google-ren aplikazioak hobetzeko eta bazkideei (adibidez, Android-en garatzaileei) euren aplikazio eta produktuak hobetzen laguntzeko.</translation>
 <translation id="8743357966416354615">Garapen-ingurune kudeatua (<ph name="GENERAL_NAME" />)</translation>
 <translation id="8744641000906923997">Romaji</translation>
 <translation id="8745034592125932220">Ez du gailu honetan datuak gordetzeko baimenik</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_fa.xtb b/chromium/chrome/app/resources/generated_resources_fa.xtb
index 8c01ab34018..298813a7cd9 100644
--- a/chromium/chrome/app/resources/generated_resources_fa.xtb
+++ b/chromium/chrome/app/resources/generated_resources_fa.xtb
@@ -1734,7 +1734,7 @@
 <translation id="2332515770639153015">«مرور ایمن پیشرفته» روشن است</translation>
 <translation id="2332742915001411729">بازنشانی روی موارد پیش‌فرض</translation>
 <translation id="2332948465534020594">«مزاحم نشوید» فعال است</translation>
-<translation id="2333166365943957309">سلسله‌مراتب میانای کاربری</translation>
+<translation id="2333166365943957309">سلسله‌مراتب واسط کاربر</translation>
 <translation id="233471714539944337">محتوای حساس</translation>
 <translation id="2335111415680198280">{0,plural, =1{بستن # پنجره}one{بستن # پنجره}other{بستن # پنجره}}</translation>
 <translation id="2335122562899522968">این صفحه کوکی‌ها را تنظیم می‌کند.</translation>
@@ -2338,7 +2338,7 @@
 <translation id="2804043232879091219">مرورگر جایگزین باز نشد</translation>
 <translation id="2804667941345577550">از سیستم این سایت (ازجمله در برگه‌های باز) خارج خواهید شد</translation>
 <translation id="2804680522274557040">دوربین خاموش است</translation>
-<translation id="2804742109948581745">پهلو به پهلو</translation>
+<translation id="2804742109948581745">پهلوبه‌پهلو</translation>
 <translation id="2805539617243680210">همه چیز آماده است!</translation>
 <translation id="2805646850212350655">‏سیستم فایل رمزگذاری Microsoft</translation>
 <translation id="2805756323405976993">برنامه‌ها</translation>
@@ -2594,7 +2594,7 @@
 <translation id="3007410324195400631">درباره این صفحه، یادداشت اضافه کنید</translation>
 <translation id="3007771295016901659">کپی کردن برگه</translation>
 <translation id="3008232374986381779">‏ابزارها، ویرایشگرها و محیط‌های یکپارچه توسعه نرم‌افزار (IDEs) ‏Linux را در <ph name="DEVICE_TYPE" /> اجرا کنید. <ph name="LINK_BEGIN" />بیشتر بدانید<ph name="LINK_END" /></translation>
-<translation id="3008272652534848354">بازنشانی مجوزها</translation>
+<translation id="3008272652534848354">بازنشانی اجازه‌ها</translation>
 <translation id="3008694618228964140">{NUM_DAYS,plural, =1{‏<ph name="MANAGER" /> از شما می‌خواهد امروز به Wi-Fi متصل شوید و به‌روزرسانی را بارگیری کنید. یا آن را ازطریق اتصال محدود بارگیری کنید (ممکن است هزینه اعمال شود).}one{‏<ph name="MANAGER" /> از شما می‌خواهد به Wi-Fi متصل شوید و به‌روزرسانی را پیش‌از مهلت تعیین‌شده بارگیری کنید. یا آن را ازطریق اتصال محدود بارگیری کنید (ممکن است هزینه اعمال شود).}other{‏<ph name="MANAGER" /> از شما می‌خواهد به Wi-Fi متصل شوید و به‌روزرسانی را پیش‌از مهلت تعیین‌شده بارگیری کنید. یا آن را ازطریق اتصال محدود بارگیری کنید (ممکن است هزینه اعمال شود).}}</translation>
 <translation id="3009178788565917040">خروجی</translation>
 <translation id="3009300415590184725">آیا مطمئن هستید که می‌خواهید مرحله تنظیم سرویس داده تلفن همراه را لغو کنید؟</translation>
@@ -2699,7 +2699,7 @@
 <translation id="3088325635286126843">&amp;تغییر‌نام...</translation>
 <translation id="3089137131053189723">جستجو پاک شد</translation>
 <translation id="3089941350495701096">&amp;فهرست خواندن</translation>
-<translation id="3089948625237571254">کپی کردن قاب ویدیو</translation>
+<translation id="3089948625237571254">کپی کردن فریم ویدیو</translation>
 <translation id="3090227230165225418">اعلام اعلان‌های بارگیری</translation>
 <translation id="3090819949319990166">‏فایل خارجی crx در <ph name="TEMP_CRX_FILE" /> کپی نمی‌شود.</translation>
 <translation id="3090871774332213558">«<ph name="DEVICE_NAME" />» مرتبط شد</translation>
@@ -2887,7 +2887,7 @@
 <translation id="3269093882174072735">بارگیری تصویر</translation>
 <translation id="326911502853238749"><ph name="MODULE_NAME" /> نشان داده نشود</translation>
 <translation id="3269175001434213183">همگام‌سازی را روشن کنید تا از داده‌هایتان پشتیبان بگیرید و در هر دستگاهی از آن‌ها استفاده کنید</translation>
-<translation id="3269612321104318480">سبز دودی روشن و سفید</translation>
+<translation id="3269612321104318480">سبزآبی روشن و سفید</translation>
 <translation id="3269689705184377744">{COUNT,plural, =1{فایل}one{# فایل}other{# فایل}}</translation>
 <translation id="326999365752735949">در حال بارگیری تفاوت</translation>
 <translation id="3270965368676314374">خواندن، تغییر و حذف عکس‌ها، موسیقی و سایر رسانه‌ها از رایانه‌تان</translation>
@@ -3478,7 +3478,7 @@
 <translation id="375636864092143889">سایت درحال استفاده از میکروفون شما است</translation>
 <translation id="3756485814916578707">درحال ارسال محتوای صفحه</translation>
 <translation id="3756578970075173856">تنظیم پین</translation>
-<translation id="3756795331760037744">‏به «دستیار Google» اجازه دهید برای کمک کردن، از اطلاعات روی صفحه <ph name="SUPERVISED_USER_NAME" /> استفاده کند</translation>
+<translation id="3756795331760037744">‏به «دستیار Google» اجازه دهید برای کمک کردن، از بافت صفحه <ph name="SUPERVISED_USER_NAME" /> استفاده کند</translation>
 <translation id="3756806135608816820">سایت‌ها می‌توانند برای جستجوی دستگاه‌های بلوتوث درخواست دهند</translation>
 <translation id="3757567010566591880">برداشتن سنجاق از «نوارابزار»</translation>
 <translation id="3757733214359997190">سایتی یافت نشد</translation>
@@ -3997,7 +3997,7 @@
 <translation id="414800391140809654">می‌تواند از اطلاعاتتان درحین مرور استفاده کند</translation>
 <translation id="4148195018520464922">می‌توانید ورود به سیستم را برای کاربران خاصی محدود کنید. با این کار، گزینه «افزودن شخص» در صفحه ورود به سیستم برداشته می‌شود. همچنین می‌توانید کاربران فعلی را نیز بردارید.</translation>
 <translation id="4150201353443180367">صفحه‌نمایش</translation>
-<translation id="4150569944729499860">اطلاعات روی صفحه</translation>
+<translation id="4150569944729499860">بافت صفحه</translation>
 <translation id="4151449637210235443">درباره تجربه بازی اخیرتان به ما بگویید</translation>
 <translation id="4152011295694446843">نشانک‌ها را اینجا خواهید دید</translation>
 <translation id="4152670763139331043">{NUM_TABS,plural, =1{‏۱ برگه}one{‏# برگه}other{‏# برگه}}</translation>
@@ -4587,7 +4587,7 @@
 <translation id="4647090755847581616">&amp;بستن برگه </translation>
 <translation id="4647283074445570750">مرحله <ph name="CURRENT_STEP" /> از <ph name="TOTAL_STEPS" /></translation>
 <translation id="4647836961514597010">انتخابگر رنگ</translation>
-<translation id="4648491805942548247">مجوزها کافی نیستند</translation>
+<translation id="4648491805942548247">اجازه‌ها کافی نیستند</translation>
 <translation id="4650037136970677721">حافظه ذخیره شد</translation>
 <translation id="4650591383426000695">اتصال تلفنتان را از <ph name="DEVICE_TYPE" /> قطع کنید</translation>
 <translation id="4651484272688821107">بااستفاده از منابع حالت نمایشی، مؤلفه آنلاین بار نشد.</translation>
@@ -5154,7 +5154,7 @@
 <translation id="5125967981703109366">درباره این کارت</translation>
 <translation id="512642543295077915">جستجو + پس‌بَر</translation>
 <translation id="5126611267288187364">مشاهده تغییرات</translation>
-<translation id="5127620150973591153">شناسه اتصال امن: <ph name="TOKEN" /></translation>
+<translation id="5127620150973591153">شناسه اتصال ایمن: <ph name="TOKEN" /></translation>
 <translation id="5127805178023152808">همگام‌سازی خاموش است</translation>
 <translation id="5127881134400491887">مدیریت اتصالات شبکه</translation>
 <translation id="5127986747308934633">دستگاهتان تحت کنترل سرپرست است</translation>
@@ -5209,7 +5209,7 @@
 <translation id="5173668317844998239">اثرانگشت به کلید امنیتی اضافه کنید یا اثرهای انگشت ذخیره‌شده در آن را حذف کنید</translation>
 <translation id="5174169235862638850">گذرواژه در بریده‌دان کپی شد</translation>
 <translation id="5175379009094579629">نام دستگاه نامعتبر است. برای امتحان مجدد نام دستگاه معتبری وارد کنید.</translation>
-<translation id="5176787661653201403">کپی کردن قاب ویدیو</translation>
+<translation id="5176787661653201403">کپی کردن فریم ویدیو</translation>
 <translation id="5177479852722101802">ادامه مسدود کردن دسترسی به دوربین و میکروفن</translation>
 <translation id="5177549709747445269">از داده تلفن همراه استفاده می‌کنید</translation>
 <translation id="5178106147333214179">رفتن به «مرکز ایمنی»</translation>
@@ -5961,7 +5961,7 @@
 <translation id="5801051031414037185">راه‌اندازی تلفن</translation>
 <translation id="5801568494490449797">اولویت‌ها</translation>
 <translation id="5803689677801500549">‏گذرواژه‌های ذخیره‌شده در اینجا نشان داده خواهد شد. برای وارد کردن گذرواژه‌های <ph name="USER_EMAIL" /> به <ph name="BRAND" />، <ph name="BEGIN_LINK" />فایل CSV موردنظر را انتخاب کنید.<ph name="END_LINK" /></translation>
-<translation id="5804241973901381774">مجوزها</translation>
+<translation id="5804241973901381774">اجازه‌ها</translation>
 <translation id="5804259315582798390">بازیابی داده محلی فعال نشد</translation>
 <translation id="5805268472388605531">برای دیدن نشانه‌های تکیه و نویسه‌های خاص، کلیدهای صفحه‌کلید را فشار دهید و نگه دارید</translation>
 <translation id="5805354171420804923">ازطریق پانل کناری جدید، نتایج جستجو را سریع‌تر مقایسه کنید</translation>
@@ -6312,7 +6312,7 @@
 <translation id="6080689532560039067">بررسی زمان سیستم</translation>
 <translation id="6082877069782862752">نگاشتن کلید</translation>
 <translation id="608531959444400877"><ph name="WINDOW_TITLE" /> - بخشی از گروه بدون نام</translation>
-<translation id="6085886413119427067">تعیین چگونگی اتصال به وب‌سایت‌ها ازطریق اتصالی ایمن</translation>
+<translation id="6085886413119427067">تعیین چگونگی اتصال به وب‌سایت‌ها ازطریق اتصال ایمن</translation>
 <translation id="6086004606538989567">حسابی که به‌تأیید رساندید اجازه ندارد به این دستگاه دسترسی پیدا کند.</translation>
 <translation id="6086846494333236931">سرپرست سیستم شما نصب کرده است.</translation>
 <translation id="6087746524533454243">به‌دنبال صفحه درباره مرورگر هستید؟ از این پیوند استفاده کنید:</translation>
@@ -6811,7 +6811,7 @@
 <translation id="6508248480704296122">مرتبط با <ph name="NAME_PH" /></translation>
 <translation id="6508261954199872201">برنامه: <ph name="APP_NAME" /></translation>
 <translation id="6509207748479174212">گواهینامه رسانه</translation>
-<translation id="6511279028091289182">نحوه اتصال به وب‌سایت‌ها ازطریق اتصالی ایمن را مشخص می‌کند. این ویژگی از رساننده خدمات تحت مدیریت <ph name="DNS_SERVER_TEMPLATE_WITH_IDENTIFIER" /> استفاده می‌کند</translation>
+<translation id="6511279028091289182">نحوه اتصال به وب‌سایت‌ها ازطریق اتصال ایمن را مشخص می‌کند. این ویژگی از رساننده خدمات تحت مدیریت <ph name="DNS_SERVER_TEMPLATE_WITH_IDENTIFIER" /> استفاده می‌کند</translation>
 <translation id="6511607461419653612">‏Chromebook را بازراه‌اندازی کنید و دوباره امتحان کنید</translation>
 <translation id="6511827214781912955">توصیه می‌کنیم <ph name="FILENAME" /> را حذف کنید تا افراد دیگری که از این دستگاه استفاده می‌کنند نتوانند گذرواژه‌هایتان را ببینند</translation>
 <translation id="6513247462497316522">‏اگر به شبکه دیگری وصل نباشید Google Chrome از داده‌های تلفن همراه استفاده خواهد کرد.</translation>
@@ -6940,7 +6940,7 @@
 <translation id="6602956230557165253">از کلیدهای پیکان سمت راست و چپ برای پیمایش استفاده کنید.</translation>
 <translation id="6603185457265641428">انتخاب کنید سابقه همگام‌سازی شود یا نه</translation>
 <translation id="6605847144724004692">قبلاً هیچ کاربری رده‌بندی نکرده است.</translation>
-<translation id="6606671997164410857">به‌نظر می‌رسد قبلاً «دستیار» را در دستگاه دیگری راه‌اندازی کرده‌اید. با روشن کردن «اطلاعات روی صفحه» در این دستگاه، بهره بیشتری از «دستیار» ببرید.</translation>
+<translation id="6606671997164410857">به‌نظر می‌رسد قبلاً «دستیار» را در دستگاه دیگری راه‌اندازی کرده‌اید. با روشن کردن «بافت صفحه» در این دستگاه، بهره بیشتری از «دستیار» ببرید.</translation>
 <translation id="6607831829715835317">ا&amp;بزارهای بیشتر</translation>
 <translation id="6607890859198268021">‏درحال‌حاضر <ph name="DOMAIN" /> <ph name="USER_EMAIL" /> را مدیریت می‌کند. برای استفاده از کنترل‌های والدین با «حساب Google» دیگر، بعد از راه‌اندازی از سیستم خارج شوید و سپس «افزودن فرد» را در صفحه ورود به سیستم انتخاب کنید.</translation>
 <translation id="6608166463665411119">بازنشانی سیم‌کارت داخلی</translation>
@@ -7505,7 +7505,7 @@
 <translation id="7059858479264779982">تنظیم روی اجرای خودکار</translation>
 <translation id="7063129466199351735">در حال پردازش میان‌برها...</translation>
 <translation id="7063311912041006059">نشانی وب با <ph name="SPECIAL_SYMBOL" /> به‌جای پرسش</translation>
-<translation id="706342288220489463">به «دستیار» اجازه دهید برای ارائه کمک از اطلاعات روی صفحه استفاده کند</translation>
+<translation id="706342288220489463">به «دستیار» اجازه دهید برای ارائه کمک از بافت صفحه استفاده کند</translation>
 <translation id="70641621694466590">رفتن به صفحه «گذرواژه‌ها»</translation>
 <translation id="7064734931812204395">‏درحال پیکربندی محتوی Linux. این کار ممکن است تا ۳۰ دقیقه طول بکشد.</translation>
 <translation id="7065223852455347715">این دستگاه در حالتی قفل شده است که از ثبت‌نام شرکتی جلوگیری می‌کند. اگر می‌خواهید دستگاه را ثبت‌نام کنید ابتدا باید دستگاه را بازیابی کنید.</translation>
@@ -8167,7 +8167,7 @@
 <translation id="7622768823216805500">سایت‌ها معمولاً کنترل‌کننده‌های پرداخت را برای ارائه ویژگی‌های خرید، مانند تسویه‌حساب آسان‌تر، نصب می‌کنند</translation>
 <translation id="7622966771025050155">رفتن به برگه ضبط‌شده</translation>
 <translation id="7624337243375417909">‏caps lock غیرفعال</translation>
-<translation id="7625568159987162309">مشاهده مجوزها و داده‌های ذخیره‌شده در همه سایت‌ها</translation>
+<translation id="7625568159987162309">مشاهده اجازه‌ها و داده‌های ذخیره‌شده در همه سایت‌ها</translation>
 <translation id="7625823789272218216">برگه جدید در سمت چپ</translation>
 <translation id="7628201176665550262">نرخ بازآوری</translation>
 <translation id="7628392600831846024">سبک نماد</translation>
@@ -8323,7 +8323,7 @@
 <translation id="773511996612364297">نشانه‌های تکیه</translation>
 <translation id="7737115349420013392">درحال جفت کردن با «<ph name="DEVICE_NAME" />» …</translation>
 <translation id="7737203573077018777">دستورالعمل <ph name="PROOF_OF_POSSESSION_INSTRUCTION_NAME" /> دریافت شده است</translation>
-<translation id="7737846262459425222">‏هر زمان خواستید می‌توانید این گزینه را در «تنظیمات &gt; دستیار Google &gt; اطلاعات روی صفحه» تغییر دهید.</translation>
+<translation id="7737846262459425222">‏هر زمان خواستید می‌توانید این گزینه را در «تنظیمات &gt; دستیار Google &gt; بافت صفحه» تغییر دهید.</translation>
 <translation id="7737948071472253612">اجازه ندارد از دوربین استفاده کند</translation>
 <translation id="77381465218432215">نمایش نشانه‌های تکیه (اِعراب) و نویسه‌های خاص</translation>
 <translation id="7740996059027112821">استاندارد</translation>
@@ -8362,7 +8362,7 @@
 <translation id="7765507180157272835">‏بلوتوث و Wi-Fi لازم است</translation>
 <translation id="7766082757934713382">با متوقف کردن موقت به‌روزرسانی‌های خودکار سیستم و برنامه‌ها، مصرف داده شبکه را کاهش دهید</translation>
 <translation id="7766807826975222231">گشت زدن</translation>
-<translation id="7766838926148951335">پذیرفتن مجوزها</translation>
+<translation id="7766838926148951335">پذیرفتن اجازه‌ها</translation>
 <translation id="7767554953520855281">درحین هم‌رسانی صفحه، جزئیات پنهان می‌شود</translation>
 <translation id="7767972280546034736">ایجاد گذرکلید برای <ph name="APP_NAME" /></translation>
 <translation id="7768507955883790804">وقتی از سایت‌ها بازدید می‌کنید، آن‌ها به‌طور خودکار این تنظیم را دنبال می‌کنند</translation>
@@ -8425,7 +8425,7 @@
 <translation id="7805768142964895445">وضعیت</translation>
 <translation id="7805906048382884326">بستن نکته</translation>
 <translation id="7807067443225230855">جستجو و دستیار</translation>
-<translation id="7807117920154132308">‏به‌نظر می‌رسد <ph name="SUPERVISED_USER_NAME" /> ازقبل «دستیار Google» را در دستگاه دیگری راه‌اندازی کرده است. <ph name="SUPERVISED_USER_NAME" /> می‌تواند با روشن کردن «اطلاعات روی صفحه» در این دستگاه، بهره بیشتری از «دستیار» ببرد.</translation>
+<translation id="7807117920154132308">‏به‌نظر می‌رسد <ph name="SUPERVISED_USER_NAME" /> ازقبل «دستیار Google» را در دستگاه دیگری راه‌اندازی کرده است. <ph name="SUPERVISED_USER_NAME" /> می‌تواند با روشن کردن «بافت صفحه» در این دستگاه، بهره بیشتری از «دستیار» ببرد.</translation>
 <translation id="7807711621188256451">دسترسی <ph name="HOST" /> به دوربین شما همیشه مجاز باشد</translation>
 <translation id="7810202088502699111">پنجره‌های بازشو در این صفحه مسدود شده‌اند.</translation>
 <translation id="7814458197256864873">&amp;کپی</translation>
@@ -8601,7 +8601,7 @@
 <translation id="7944772052836377867">همگام‌سازی باید هویتتان را تأیید کند</translation>
 <translation id="7945703887991230167">صدای برگزیده</translation>
 <translation id="7946586320617670168">مبدأ باید امن باشد</translation>
-<translation id="794676567536738329">تأیید مجوزها</translation>
+<translation id="794676567536738329">تأیید اجازه‌ها</translation>
 <translation id="7947962633355574091">کپی آدرس ویدیو</translation>
 <translation id="7947964080535614577">سایت‌ها معمولاً آگهی نشان می‌دهند تا بتوانند محتوا یا سرویس‌ها را به‌طور رایگان ارائه دهند. اما برخی‌از سایت‌ها به‌عنوان سایت‌هایی شناخته شده‌اند که آگهی‌های مزاحم یا گمراه‌کننده نمایش می‌دهند.</translation>
 <translation id="7948407723851303488">همه صفحه‌های <ph name="DOMAIN_NAME" /></translation>
@@ -8775,7 +8775,7 @@
 <translation id="8082390128630131497">‏غیرفعال کردن اشکال‌زدایی ADB (پل اشکال‌زدایی Android)، <ph name="DEVICE_TYPE" /> را به تنظیمات کارخانه بازنشانی می‌کند. همه حساب‌های کاربر و داده‌های محلی حذف می‌شوند.</translation>
 <translation id="8084114998886531721">گذرواژه ذخیره‌شده</translation>
 <translation id="8084510406207562688">بازیابی همه برگه‌ها</translation>
-<translation id="8084628902026812045">این سایت از اتصال امن استفاده نمی‌کند و ممکن است فایل دستکاری شده باشد</translation>
+<translation id="8084628902026812045">این سایت از اتصال ایمن استفاده نمی‌کند و ممکن است فایل دستکاری شده باشد</translation>
 <translation id="8086015605808120405">درحال پیکربندی <ph name="PRINTER_NAME" />…</translation>
 <translation id="8086121155774250556">این برگه درحال هم‌رسانی صفحه‌نمایش شما است</translation>
 <translation id="8086610718778464681">‏برنامه‌ها و فایل‌های Linux پشتیبان‌گیری نشدند</translation>
@@ -9409,7 +9409,7 @@
 <translation id="8615618338313291042">برنامه ناشناس: <ph name="APP_NAME" /></translation>
 <translation id="8616441548384109662">افزودن <ph name="CONTACT_NAME" /> به مخاطبین</translation>
 <translation id="8617601976406256334">داده‌ها و اجازه‌های سایت <ph name="SITE_NAME" /> حذف شود؟</translation>
-<translation id="8617748779076050570">شناسه اتصال امن: <ph name="CONNECTION_ID" /></translation>
+<translation id="8617748779076050570">شناسه اتصال ایمن: <ph name="CONNECTION_ID" /></translation>
 <translation id="8619000641825875669">OneDrive</translation>
 <translation id="8619803522055190423">سایه‌دار</translation>
 <translation id="8619892228487928601"><ph name="CERTIFICATE_NAME" />: <ph name="ERROR" /></translation>
@@ -9661,7 +9661,7 @@
 <translation id="8807632654848257479">پایدار</translation>
 <translation id="8808478386290700967">Web Store</translation>
 <translation id="8808686172382650546">گربه</translation>
-<translation id="8809147117840417135">سبز دودی روشن</translation>
+<translation id="8809147117840417135">سبزآبی روشن</translation>
 <translation id="8811862054141704416">‏دسترسی به میکروفون Crostini</translation>
 <translation id="8811923271770626905">این افزونه ممکن است در پس‌زمینه اجرا شود</translation>
 <translation id="8812593354822910461">داده‌های محصول مرور (<ph name="URL" />) را نیز پاک می‌کند که این کار شما را از سیستم <ph name="DOMAIN" /> خارج خواهد کرد. <ph name="LEARN_MORE" /></translation>
@@ -9799,7 +9799,7 @@
 <translation id="8918637186205009138"><ph name="DEVICE_TYPE" /> <ph name="GIVEN_NAME" /></translation>
 <translation id="891931289445130855">حذف داده‌ها و اجازه‌ها</translation>
 <translation id="8922624386829239660">حرکت صفحه زمانی که موشواره به لبه‌های صفحه می‌رسد</translation>
-<translation id="8923880975836399332">سبز دودی تیره</translation>
+<translation id="8923880975836399332">سبزآبی تیره</translation>
 <translation id="8925124370124776087">اکنون نوار عنوان پنهان است</translation>
 <translation id="8925458182817574960">&amp;تنظیمات</translation>
 <translation id="8926389886865778422">دوباره سؤال نشود</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_fr-CA.xtb b/chromium/chrome/app/resources/generated_resources_fr-CA.xtb
index df962587ad5..cd950ffd2f2 100644
--- a/chromium/chrome/app/resources/generated_resources_fr-CA.xtb
+++ b/chromium/chrome/app/resources/generated_resources_fr-CA.xtb
@@ -1854,7 +1854,7 @@ Vous pouvez gérer les paramètres de ce compte en installant l'application Fami
 <translation id="2438853563451647815">Aucune imprimante connectée</translation>
 <translation id="2439626940657133600"><ph name="WINDOW_TITLE" /> en cours de chargement…</translation>
 <translation id="2440604414813129000">Afficher le code s&amp;ource</translation>
-<translation id="2440823041667407902">Accès à la position</translation>
+<translation id="2440823041667407902">Accès à la localisation</translation>
 <translation id="2441719842399509963">Rétablir les valeurs par défaut</translation>
 <translation id="244231003699905658">Adresse incorrecte. Veuillez vérifier l'adresse, puis réessayez.</translation>
 <translation id="2442916515643169563">Ombre du texte</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_fr.xtb b/chromium/chrome/app/resources/generated_resources_fr.xtb
index b543395e8f1..b96e9705549 100644
--- a/chromium/chrome/app/resources/generated_resources_fr.xtb
+++ b/chromium/chrome/app/resources/generated_resources_fr.xtb
@@ -6,7 +6,7 @@
 <translation id="1003088604756913841">Ouvrir le lien dans une nouvelle fenêtre <ph name="APP" /></translation>
 <translation id="100323615638474026">Appareil USB (<ph name="VENDOR_ID" />:<ph name="PRODUCT_ID" />)</translation>
 <translation id="1003917207516838287">Historique des téléchargements récents</translation>
-<translation id="1004218526896219317">Accès au site</translation>
+<translation id="1004218526896219317">Accès aux sites</translation>
 <translation id="1005274289863221750">Utiliser votre micro et votre caméra</translation>
 <translation id="1005333234656240382">Activer le débogage ADB ?</translation>
 <translation id="1005671386794704751">Rose</translation>
@@ -661,7 +661,7 @@ Les autorisations que vous avez déjà accordées aux applis peuvent s'appliquer
 <translation id="1526560967942511387">Document sans titre</translation>
 <translation id="1527336312600375509">Fréquence d'actualisation du moniteur</translation>
 <translation id="152913213824448541">Contacts pour le Partage à proximité</translation>
-<translation id="1529769834253316556">Hauteur des lignes</translation>
+<translation id="1529769834253316556">Interligne</translation>
 <translation id="1529891865407786369">Source d'alimentation</translation>
 <translation id="1531275250079031713">Afficher la boîte de dialogue "Ajouter un réseau Wi-Fi"</translation>
 <translation id="1531734061664070992"><ph name="FIRST_SWITCH" />, <ph name="SECOND_SWITCH" />, <ph name="THIRD_SWITCH" /></translation>
@@ -2688,7 +2688,7 @@ Vous pouvez gérer les paramètres de ce compte en installant l'application Fami
 <translation id="3088325635286126843">&amp;Renommer...</translation>
 <translation id="3089137131053189723">Recherche effacée</translation>
 <translation id="3089941350495701096">Liste de lecture</translation>
-<translation id="3089948625237571254">C&amp;opier le cadre de la vidéo</translation>
+<translation id="3089948625237571254">C&amp;opier l'image vidéo</translation>
 <translation id="3090227230165225418">Annoncer les notifications de téléchargement</translation>
 <translation id="3090819949319990166">Impossible de copier le fichier crx externe dans <ph name="TEMP_CRX_FILE" />.</translation>
 <translation id="3090871774332213558">"<ph name="DEVICE_NAME" />" associé.</translation>
@@ -3256,7 +3256,7 @@ Vous pouvez gérer les paramètres de ce compte en installant l'application Fami
 <translation id="3590194807845837023">Déverrouiller le profil et relancer</translation>
 <translation id="3590295622232282437">Ouverture d'une session gérée.</translation>
 <translation id="3591057288287063271">Conserver <ph name="FILE_NAME" /></translation>
-<translation id="359177822697434450">À propos des périphériques USB</translation>
+<translation id="359177822697434450">À propos des appareils USB</translation>
 <translation id="3592260987370335752">&amp;En savoir plus</translation>
 <translation id="3592344177526089979">Caster un onglet sur <ph name="DEVICE_NAME" /></translation>
 <translation id="3593152357631900254">Activer le mode Pinyin fuzzy</translation>
@@ -3712,7 +3712,7 @@ Cela peut inclure des informations sur les logiciels installés, les fichiers, v
 <translation id="3929426037718431833">Ces extensions peuvent voir et modifier des informations sur ce site.</translation>
 <translation id="3930155420525972941">Déplacer le groupe vers une nouvelle fenêtre</translation>
 <translation id="3930602610362250897">Pour lire du contenu protégé par des droits d'auteur, les sites peuvent avoir besoin d'utiliser un service de protection du contenu</translation>
-<translation id="3930737994424905957">Recherche d'appareils</translation>
+<translation id="3930737994424905957">Recherche d'appareils…</translation>
 <translation id="3930968231047618417">Couleur de l'arrière-plan</translation>
 <translation id="3932356525934356570">Épingler <ph name="EXTENSION_NAME" /></translation>
 <translation id="3936260554100916852"><ph name="DEVICE_NAME" /> partage un réseau Wi-Fi avec vous</translation>
@@ -4001,7 +4001,7 @@ Cela peut inclure des informations sur les logiciels installés, les fichiers, v
 <translation id="4159784952369912983">Violet</translation>
 <translation id="4163560723127662357">Clavier inconnu</translation>
 <translation id="4165942112764990069"><ph name="USER_EMAIL" /> n'appartient pas à une organisation valide. Contactez votre administrateur. Si vous avez ce rôle, vous pouvez configurer votre organisation sur g.co/ChromeEnterpriseAccount</translation>
-<translation id="4165986682804962316">Paramètres du site</translation>
+<translation id="4165986682804962316">Paramètres des sites</translation>
 <translation id="4167212649627589331"><ph name="APP_NAME" /> tente d'accéder à la <ph name="DEVICE_NAME" />. Désactivez l'option de confidentialité de la <ph name="DEVICE_NAME" /> pour accorder l'accès.</translation>
 <translation id="4167393659000039775">Google n'est pas responsable des pertes de données. <ph name="DEVICE_OS" /> peut ne pas fonctionner sur les modèles non certifiés. En savoir plus : g.co/flex/InstallGuide.</translation>
 <translation id="4167924027691268367">Plus d'actions pour le raccourci <ph name="SHORTCUT_TITLE" /></translation>
@@ -5197,7 +5197,7 @@ Appuyez sur Ctrl+Alt+Baisser la luminosité pour faire un zoom arrière.</transl
 <translation id="5173668317844998239">Ajouter et supprimer les empreintes enregistrées sur votre clé de sécurité</translation>
 <translation id="5174169235862638850">Mot de passe copié dans le presse-papiers</translation>
 <translation id="5175379009094579629">Le nom de l'appareil n'est pas valide. Saisissez-en un qui le soit.</translation>
-<translation id="5176787661653201403">C&amp;opier le cadre de la vidéo</translation>
+<translation id="5176787661653201403">C&amp;opier l'image vidéo</translation>
 <translation id="5177479852722101802">Continuer à bloquer l'accès à la caméra et au micro</translation>
 <translation id="5177549709747445269">Vous utilisez des données mobiles</translation>
 <translation id="5178106147333214179">Accéder au centre de sécurité</translation>
@@ -8150,7 +8150,7 @@ Vous avez # autres mots de passe compromis. Le Gestionnaire de mots de passe Go
 <translation id="7617263010641145920">Activer le Play Store</translation>
 <translation id="7617648809369507487">Activer les notifications discrètes</translation>
 <translation id="7621382409404463535">Échec de l'enregistrement de la configuration de l'appareil.</translation>
-<translation id="7621480263311228380">Non autorisé à utiliser des informations qu'il a enregistrées vous concernant</translation>
+<translation id="7621480263311228380">Non autorisé à utiliser les informations qu'il a enregistrées vous concernant</translation>
 <translation id="7621595347123595643">Vous ne pourrez pas récupérer de données locales si vous oubliez votre mot de passe ou votre code.</translation>
 <translation id="7622114377921274169">En charge.</translation>
 <translation id="7622768823216805500">Les sites installent généralement des gestionnaires de paiement pour proposer certaines fonctionnalités d'achat, comme un règlement plus simple</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_gl.xtb b/chromium/chrome/app/resources/generated_resources_gl.xtb
index d7b2c4ccce7..3a22c24eab4 100644
--- a/chromium/chrome/app/resources/generated_resources_gl.xtb
+++ b/chromium/chrome/app/resources/generated_resources_gl.xtb
@@ -4238,7 +4238,7 @@ Podes xestionar a configuración desde o menú da tarxeta ou ver máis opcións
 <translation id="436926121798828366">Podes cambiar esta opción cando queiras na <ph name="SETTINGS_LINK" /></translation>
 <translation id="4369735607080757018">Compártense tipos de datos limitados entre os sitios para medir o rendemento dos seus anuncios (por exemplo, a hora do día na que se che mostrou un anuncio)</translation>
 <translation id="4370975561335139969">O correo electrónico e o contrasinal inseridos non coinciden</translation>
-<translation id="4373418556073552953">Iniciar sesión co teu teléfono Android</translation>
+<translation id="4373418556073552953">Inicia sesión co teu teléfono Android</translation>
 <translation id="4374805630006466253">Usar un teléfono ou unha tableta diferente</translation>
 <translation id="4374831787438678295">Instalador de Linux</translation>
 <translation id="4375035964737468845">Abrir ficheiros descargados</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_hi.xtb b/chromium/chrome/app/resources/generated_resources_hi.xtb
index 7efe6fe4d97..f3acc93e12d 100644
--- a/chromium/chrome/app/resources/generated_resources_hi.xtb
+++ b/chromium/chrome/app/resources/generated_resources_hi.xtb
@@ -14,7 +14,7 @@
 <translation id="1006873397406093306">यह एक्सटेंशन साइटों पर आपका डेटा पढ़ सकता है और बदल सकता है. यह नियंत्रित किया जा सकता है कि एक्सटेंशन किन साइटों को ऐक्सेस करे.</translation>
 <translation id="1007057452468855774">Google Play Store चालू करें</translation>
 <translation id="1008186147501209563">बुकमार्क निर्यात करें</translation>
-<translation id="1008261151167010035"><ph name="BRAND" /> याद रखता है कि आपने कैसे साइन इन किया था और जब भी संभव होता है, वह आपको अपने-आप साइन कर देता है. इस सुविधा के बंद होने पर, आपसे हर बार पुष्टि करने के लिए कहा जाएगा.</translation>
+<translation id="1008261151167010035"><ph name="BRAND" /> याद रखता है कि आपने कैसे साइन इन किया था और जब भी संभव होता है,यह आपको अपने-आप साइन कर देता है. अगर यह सुविधा बंद है, तो आपसे हर बार पुष्टि करने के लिए कहा जाएगा.</translation>
 <translation id="1008544602823861396">को ब्लॉक किया गया है, इसलिए यह आपकी जानकारी का इस्तेमाल इन पर नहीं कर सकता</translation>
 <translation id="1008557486741366299">अभी नहीं</translation>
 <translation id="1009454959501038262">{NUM_SITES,plural, =1{आपने पिछले दो महीने से इस साइट का इस्तेमाल नहीं किया है, इसलिए इस साइट को दी गई अनुमतियां हटा दी गई हैं. ऐसा आपके डेटा को सुरक्षित रखने के लिए किया गया है}one{आपने पिछले दो महीने से इस साइट का इस्तेमाल नहीं किया है, इसलिए इस साइट को दी गई अनुमतियां हटा दी गई हैं. ऐसा आपके डेटा को सुरक्षित रखने के लिए किया गया है}other{आपने पिछले दो महीने से इन साइटों का इस्तेमाल नहीं किया है, इसलिए इन साइटों को दी गई अनुमतियां हटा दी गई हैं. ऐसा आपके डेटा को सुरक्षित रखने के लिए किया गया है}}</translation>
@@ -1241,7 +1241,7 @@
 <translation id="1956390763342388273">यह "<ph name="FOLDER_PATH" />" से सभी फ़ाइलों को अपलोड कर देगा. ऐसा तभी करें जब आपको साइट पर विश्वास हो.</translation>
 <translation id="1959421829481337178">कृपया मोबाइल और इंटरनेट सेवा देने वाली कंपनी से मिला ऐक्टिवेशन कोड डालें.</translation>
 <translation id="1962233722219655970">यह पेज एक ऐसे नेटिव क्लाइंट का उपयोग करता है जो आपके कंप्यूटर पर काम नहीं करता.</translation>
-<translation id="1963976881984600709">मानक सुरक्षा मोड</translation>
+<translation id="1963976881984600709">स्टैंडर्ड सुरक्षा मोड</translation>
 <translation id="1966649499058910679">जैसे-जैसे हर शब्द बोला जाए, उसे हाइलाइट करें</translation>
 <translation id="1967970931040389207">हॉटस्पॉट चालू करें</translation>
 <translation id="1969011864782743497"><ph name="DEVICE_NAME" /> (USB)</translation>
@@ -2315,7 +2315,7 @@
 <translation id="2783298271312924866">डाउनलोड किए गए</translation>
 <translation id="2783829359200813069">सुरक्षा करने के तरीकों के प्रकार चुनें</translation>
 <translation id="2783952358106015700"><ph name="APP_NAME" /> के ज़रिए अपनी 'सुरक्षा चाबी' का इस्तेमाल करें</translation>
-<translation id="2785267875302712148">पासवर्ड चेकअप</translation>
+<translation id="2785267875302712148">पासवर्ड जांच करने की सुविधा</translation>
 <translation id="2785873697295365461">फ़ाइल वर्णनकर्ता</translation>
 <translation id="2785975315093449168">GTK</translation>
 <translation id="2787354132612937472">—</translation>
@@ -2605,7 +2605,7 @@
 <translation id="3009352964623081324">Search + O, फिर S. इस शॉर्टकट का इस्तेमाल इंस्टॉल करने, प्रबंधित करने, और आवाज़ को अपनी पसंद के मुताबिक बनाने के लिए करें.</translation>
 <translation id="3009779501245596802">अनुक्रमित डेटाबेस</translation>
 <translation id="3010234549896186761">{COUNT,plural, =0{आपका पासवर्ड मज़बूत लग रहा है}=1{{COUNT} कमज़ोर पासवर्ड मौजूद है}one{{COUNT} कमज़ोर पासवर्ड मौजूद है}other{{COUNT} कमज़ोर पासवर्ड मौजूद है}}</translation>
-<translation id="3010279545267083280">पासवर्ड हटा दिया गया</translation>
+<translation id="3010279545267083280">पासवर्ड मिटाया गया</translation>
 <translation id="3010389206479238935">इस ब्राउज़र में ही खोलें</translation>
 <translation id="3010961843303056486">सभी बुकमार्क दिखाएं</translation>
 <translation id="3011384993885886186">चमकीला स्लेटी</translation>
@@ -3447,7 +3447,7 @@
 <translation id="3727144509609414201">उपलब्ध वाई-फ़ाई नेटवर्क</translation>
 <translation id="3727187387656390258">पॉपअप का निरीक्षण करें</translation>
 <translation id="372722114124766626">बस एक बार</translation>
-<translation id="3727332897090187514">कोई नोट उपलब्ध नहीं है</translation>
+<translation id="3727332897090187514">कोई नोट नहीं जोड़ा गया है</translation>
 <translation id="3727473233247516571">बैक/फ़ॉरवर्ड कैश मेमोरी का सबफ़्रेम: <ph name="BACK_FORWARD_CACHE_PAGE_URL" /></translation>
 <translation id="3728188878314831180">फ़ोन और Chromebook पर एक-साथ मिलने वाली सूचनाओं को अपने फ़ोन से Chromebook पर शेयर करें</translation>
 <translation id="3728681439294129328">नेटवर्क का आईपी पता कॉन्फ़िगर करें</translation>
@@ -3717,7 +3717,7 @@
 <translation id="3923676227229836009">इस पेज को फ़ाइलें देखने की अनुमति है</translation>
 <translation id="3924145049010392604">Meta</translation>
 <translation id="3924259174674732591">डिसप्ले और टेक्स्ट का साइज़ <ph name="DISPLAY_ZOOM" />%</translation>
-<translation id="3924487862883651986">सुरक्षित ब्राउज़िंग की सेवा को जांच के लिए यूआरएल भेजता है नए खतरों का पता लगाने के लिए पेज के नमूने, डाउनलोड, एक्सटेंशन की गतिविधि, और सिस्टम की जानकारी भी भेजता है. आपके साइन इन होने पर, थोड़ी देर के लिए इस डेटा को आपके Google खाते से जो़ड़ता है. ऐसा सभी Google ऐप्लिकेशन पर आपको सुरक्षित रखने के लिए किया जाता है.</translation>
+<translation id="3924487862883651986">सुरक्षित ब्राउज़िंग को जांच के लिए यूआरएल भेजता है. साथ ही, नए खतरों का पता लगाने के लिए कुछ पेजों के नमूने, डाउनलोड, एक्सटेंशन की गतिविधि, और सिस्टम की जानकारी भी भेजता है. आपके साइन इन होने पर, थोड़ी देर के लिए इस डेटा को आपके Google खाते से जो़ड़ता है. ऐसा सभी Google ऐप्लिकेशन पर आपको सुरक्षित रखने के लिए किया जाता है.</translation>
 <translation id="3925573269917483990">कैमरा:</translation>
 <translation id="3925926055063465902">इस डिवाइस को इस्तेमाल करने वाले दूसरे लोग भी इस नेटवर्क का इस्तेमाल कर सकते हैं</translation>
 <translation id="3926002189479431949">Smart Lock फ़ोन बदला गया</translation>
@@ -4865,7 +4865,7 @@
 <translation id="4871568871368204250">सिंक बंद करें</translation>
 <translation id="4871719318659334896">ग्रुप बंद करें</translation>
 <translation id="4872192066608821120">पासवर्ड इंपोर्ट करने के लिए, कोई CSV फ़ाइल चुनें</translation>
-<translation id="4872212987539553601">डिवाइस पर एन्क्रिप्ट (सुरक्षित) करने का तरीका सेट अप करें</translation>
+<translation id="4872212987539553601">डिवाइस पर एन्क्रिप्ट करने का तरीका सेट अप करें</translation>
 <translation id="4873312501243535625">मीडिया फ़ाइल चेकर</translation>
 <translation id="4876273079589074638">इस क्रैश की जाँच-पड़ताल करने और इसे ठीक करने में हमारे इंजीनियरों की सहायता करें. अगर हो सके तो सटीक चरणों की सूची बनाएं. कोई भी विवरण छोटा नहीं है!</translation>
 <translation id="4876305945144899064">कोई उपयोगकर्ता नाम नहीं</translation>
@@ -4979,7 +4979,7 @@
 <translation id="4967227914555989138">नोट जोड़ें</translation>
 <translation id="496742804571665842">ई-सिम प्रोफ़ाइलों को बंद करें</translation>
 <translation id="4971412780836297815">पू्र्ण होने पर खोलें</translation>
-<translation id="4971735654804503942">नुकसान पहुंचाने वाली वेबसाइटों, डाउनलोड, और एक्सटेंशन से तेज़ और प्रोऐक्टिव (बिना मांगे मिलने वाली) सुरक्षा. पासवर्ड हैक होने के बारे में आपको चेतावनी देता है. Google को ब्राउज़िंग डेटा भेजने की ज़रूरत पड़ती है.</translation>
+<translation id="4971735654804503942">नुकसान पहुंचाने वाली वेबसाइटों, डाउनलोड, और एक्सटेंशन के ख़िलाफ़ तेज़ और अपने-आप मिलने वाली सुरक्षा. पासवर्ड हैक होने के बारे में आपको चेतावनी देता है. Google को ब्राउज़िंग डेटा भेजना ज़रूरी होता है.</translation>
 <translation id="4972129977812092092">प्रिंटर में बदलाव करें</translation>
 <translation id="4972164225939028131">दर्ज किया गया पासवर्ड गलत है</translation>
 <translation id="4972737347717125191">साइटें, वर्चुअल रियलिटी डिवाइस और डेटा का इस्तेमाल करने के लिए पूछ सकती हैं</translation>
@@ -5869,7 +5869,7 @@
 <translation id="5722086096420375088">हरा और सफ़ेद</translation>
 <translation id="572328651809341494">हाल ही के टैब</translation>
 <translation id="5723508132121499792">कोई पृष्ठभूमि ऐप्स  संचालित नहीं हैं</translation>
-<translation id="5723967018671998714">गुप्त मोड में तीसरे पक्ष की कुकी ब्लॉक हैं</translation>
+<translation id="5723967018671998714">गुप्त मोड में तीसरे पक्ष की कुकी ब्लॉक रहती हैं</translation>
 <translation id="5727728807527375859">एक्सटेंशन, ऐप्स , और थीम आपके कंप्यूटर को हानि पहुंचा सकते हैं. क्या आप वाकई जारी रखना चाहते हैं?</translation>
 <translation id="5728290366864286776">यह एक्सटेंशन, साइट की जानकारी को पढ़ सकता है और उसमें बदलाव कर सकता है. इसके अलावा, यह बैकग्राउंड में भी चल सकता है</translation>
 <translation id="5728450728039149624">लॉक स्क्रीन के लिए स्मार्ट लॉक के विकल्प</translation>
@@ -5963,7 +5963,7 @@
 <translation id="5800703268655655701">हल्के या गहरे रंग वाली थीम चुनें</translation>
 <translation id="5801051031414037185">फ़ोन को सेट अप करें</translation>
 <translation id="5801568494490449797">प्राथमिकताएं</translation>
-<translation id="5803689677801500549">सेव किए गए पासवर्ड यहां दिखेंगे. <ph name="USER_EMAIL" /> से <ph name="BRAND" /> में पासवर्ड इंपोर्ट करने के लिए, <ph name="BEGIN_LINK" />कोई CSV फ़ाइल चुनें.<ph name="END_LINK" /></translation>
+<translation id="5803689677801500549">सेव किए गए पासवर्ड यहां दिखेंगे. <ph name="USER_EMAIL" /> के लिए <ph name="BRAND" /> में पासवर्ड इंपोर्ट करने के लिए, <ph name="BEGIN_LINK" />कोई CSV फ़ाइल चुनें.<ph name="END_LINK" /></translation>
 <translation id="5804241973901381774">अनुमतियां</translation>
 <translation id="5804259315582798390">स्थानीय डेटा वापस पाने की सुविधा चालू नहीं की जा सकी</translation>
 <translation id="5805268472388605531">उच्चारण के चिह्न और विशेष वर्णों को देखने के लिए, कीबोर्ड के बटन दबाकर रखें</translation>
@@ -6437,7 +6437,7 @@
 <translation id="6184099524311454384">टैब खोजें</translation>
 <translation id="6185132558746749656">डिवाइस स्थान</translation>
 <translation id="6190953336330058278">फ़ोन हब से जुड़े ऐप्लिकेशन</translation>
-<translation id="6192333916571137726">डाउनलोड फ़ाइल कहां सेव करें</translation>
+<translation id="6192333916571137726">फ़ाइल डाउनलोड करें</translation>
 <translation id="6192413564913825901">सभी बुकमार्क पर ले जाएं</translation>
 <translation id="6194333736420234626">पैसे चुकाने के तरीके</translation>
 <translation id="6195005504600220730">अपने ब्राउज़र, ओएस, और डिवाइस की जानकारी पढ़ें</translation>
@@ -6472,7 +6472,7 @@
 <translation id="6215039389782910006">{1,plural, =1{आपके पासवर्ड को सुरक्षित रखने के लिए, 1 मिनट तक कोई गतिविधि न होने पर <ph name="BRAND" /> लॉक हो जाता है}one{आपके पासवर्ड को सुरक्षित रखने के लिए, # मिनट तक कोई गतिविधि न होने पर <ph name="BRAND" /> लॉक हो जाता है}other{आपके पासवर्ड को सुरक्षित रखने के लिए, # मिनट तक कोई गतिविधि न होने पर <ph name="BRAND" /> लॉक हो जाता है}}</translation>
 <translation id="6216239400972191926">ऐसी साइटें या ऐप्लिकेशन जिन्हें मंज़ूरी नहीं मिली है</translation>
 <translation id="6216601812881225442">आपके कंटेनर में साइज़ बदलने की सुविधा नहीं है. Linux के लिए पहले से तय की गई जगह में बदलाव करने के लिए, उसका बैक अप लें. इसके बाद, उसे नए कंटेनर में फिर से सेव करें.</translation>
-<translation id="6216696360484424239">अपने आप साइन इन करें</translation>
+<translation id="6216696360484424239">अपने-आप साइन इन होने की सुविधा</translation>
 <translation id="6217806119082621377">शेयर किए गए फ़ोल्डर, <ph name="SPECIFIC_NAME" /> में <ph name="BASE_DIR" /> पर उपलब्ध हैं.</translation>
 <translation id="6218058416316985984"><ph name="DEVICE_TYPE" /> ऑफ़लाइन है. इंटरनेट से कनेक्ट करें और फिर से कोशिश करें.</translation>
 <translation id="6220413761270491930">एक्सटेंशन लोड करने में गड़बड़ी</translation>
@@ -7267,7 +7267,7 @@
 <translation id="6862472520095266519">नाम में 32 से ज़्यादा वर्ण नहीं होने चाहिए</translation>
 <translation id="6863496016067551393">सभी एक्सटेंशन इस्तेमाल किए जा सकते हैं</translation>
 <translation id="686366188661646310">क्या आप पासवर्ड मिटाना चाहते हैं?</translation>
-<translation id="6865313869410766144">ऑटोमैटिक भरने वाले फ़ॉर्म का डेटा</translation>
+<translation id="6865313869410766144">फ़ॉर्म में अपने-आप भरने वाला डेटा</translation>
 <translation id="6865598234501509159">पेज <ph name="LANGUAGE" /> भाषा में नहीं है</translation>
 <translation id="6865708901122695652">WebRTC इवेंट लॉग (<ph name="WEBRTC_EVENT_LOG_COUNT" />)</translation>
 <translation id="686609795364435700">शांत</translation>
@@ -7389,7 +7389,7 @@
 <translation id="6970480684834282392">स्टार्टअप प्रकार</translation>
 <translation id="6970543303783413625">पासवर्ड इंपोर्ट नहीं किए जा सके. एक बार में सिर्फ़ <ph name="COUNT" /> पासवर्ड इंपोर्ट किए जा सकते हैं.</translation>
 <translation id="6970856801391541997">विशेष पेज प्रिंट करें</translation>
-<translation id="6970861306198150268">पक्का करें कि आप इस साइट के लिए अपना मौजूदा पासवर्ड सेव कर रहे हैं</translation>
+<translation id="6970861306198150268">पक्का करें कि इस साइट के लिए आपका मौजूदा पासवर्ड सेव किया जा रहा हो</translation>
 <translation id="6971184043765343932">अपलोड की गई आपकी इमेज</translation>
 <translation id="6972754398087986839">शुरू करें</translation>
 <translation id="697312151395002334">पॉप-अप भेजने और दूसरे वेबलिंक पर भेजने वाले यूआरएल का इस्तेमाल करने की अनुमति है</translation>
@@ -7420,7 +7420,7 @@
 <translation id="6992554835374084304">'बेहतर स्पेलिंग जाँच' चालू करें</translation>
 <translation id="6993000214273684335">टैब को बिना नाम वाले ग्रुप से हटाया गया - <ph name="GROUP_CONTENTS" /></translation>
 <translation id="6993050154661569036">Chrome ब्राउज़र अपडेट हो रहा है</translation>
-<translation id="6995899638241819463">डेटा का उल्लंघन होने पर अगर आपके पासवर्ड बिना अनुमति के सार्वजनिक हो जाते हैं, तो आपको चेतावनी मिलती है</translation>
+<translation id="6995899638241819463">डेटा का गलत इस्तेमाल होने की वजह से, आपके पासवर्ड सार्वजनिक हो जाने पर चेतावनी दी जाए</translation>
 <translation id="6995984090981858039">ChromeOS डिवाइस की जानकारी और डेटा ऐक्सेस करें</translation>
 <translation id="6996438701394974959">डिसप्ले और टेक्स्ट का साइज़ बढ़ाएं</translation>
 <translation id="6997553674029032185">साइट पर जाएं</translation>
@@ -7592,7 +7592,7 @@
 <translation id="7138678301420049075">अन्य</translation>
 <translation id="7139627972753429585"><ph name="APP_NAME" /> आपके माइक्रोफ़ोन का इस्तेमाल कर रहा है</translation>
 <translation id="7141105143012495934">साइन इन नहीं हो पाया क्योंकि आपके खाते की जानकारी फिर से नहीं पाई जा सकी. कृपया अपने एडमिन से संपर्क करें या फिर से कोशिश करें.</translation>
-<translation id="7141844554192012199">जांच</translation>
+<translation id="7141844554192012199">पासवर्ड जांच</translation>
 <translation id="714301620504747562">पहले से लोड करने की एक्सटेंडेड सुविधा की मदद से, ज़्यादा तेज़ी से खोजा और ब्राउज़ किया जा सकता है. खोजने और ब्राउज़ करने का यह काम, स्टैंडर्ड सुविधा में उतना तेज़ नहीं होता</translation>
 <translation id="7143207342074048698">कनेक्‍टिंग</translation>
 <translation id="7143409552554575716">ChromeOS के फ़्लैग</translation>
@@ -8328,7 +8328,7 @@
 <translation id="7737846262459425222">आप जब चाहें, सेटिंग &gt; Google Assistant &gt; स्क्रीन पर दिखने वाली सामग्री इस्तेमाल करें, में जाकर बदलाव कर सकते हैं.</translation>
 <translation id="7737948071472253612">कैमरा इस्तेमाल करने की अनुमति नहीं है</translation>
 <translation id="77381465218432215">उच्चारण के चिह्न और विशेष वर्ण दिखाएं</translation>
-<translation id="7740996059027112821">मानक</translation>
+<translation id="7740996059027112821">स्टैंडर्ड</translation>
 <translation id="7742706086992565332">आप तय कर सकते हैं कि कुछ वेबसाइटों पर आप कितना ज़ूम इन या ज़ूम आउट करेंगे</translation>
 <translation id="7742879569460013116">लिंक शेयर करें</translation>
 <translation id="774377079771918250">सेव करने की जगह चुनें</translation>
@@ -8675,7 +8675,7 @@
 अपनी मुख्य फ़ाइल को किसी सुरक्षित स्थान पर रखें. आपको अपने एक्सटेंशन के नए वर्शन बनाने के लिए इसकी आवश्यकता होगी.</translation>
 <translation id="8002274832045662704">प्रिंटर के लिए बेहतर सेटिंग तय करें</translation>
 <translation id="8002670234429879764"><ph name="PRINTER_NAME" /> अब उपलब्ध नहीं है</translation>
-<translation id="8004092996156083991">अगर आपके पासवर्ड हैक हुए हैं या चोरी हुए हैं, तो हम आपको इसकी जानकारी देंगे.</translation>
+<translation id="8004092996156083991">अगर आपके पासवर्ड हैक या चोरी हुए होंगे, तो हम आपको इसकी जानकारी देंगे.</translation>
 <translation id="8004507136466386272">शब्द</translation>
 <translation id="8004582292198964060">ब्राउज़र</translation>
 <translation id="8005600846065423578"><ph name="HOST" /> को हमेशा क्‍लिपबोर्ड देखने दें</translation>
@@ -9781,7 +9781,7 @@
 <translation id="8898140163781851592">प्राइमरी माउस बटन</translation>
 <translation id="8898786835233784856">अगले टैब को चुनें</translation>
 <translation id="8898790559170352647">अपना Microsoft खाता जोड़ें</translation>
-<translation id="8898822736010347272">आप जिन पेजों पर जाते हैं उनमें से कुछ के यूआरएल, सिस्टम की सीमित जानकारी, और पेज की कुछ सामग्री को यह Google को भेजता है. ऐसा इसलिए जिससे कि नए खतरों को खोजा जा सके और वेब पर सभी सुरक्षित रहें.</translation>
+<translation id="8898822736010347272">आपने जिन पेजों को विज़िट किया है उनमें से कुछ के यूआरएल, सिस्टम की सीमित जानकारी, और पेज का कुछ कॉन्टेंट Google को भेजा जाता है. ऐसा इसलिए, ताकि नए खतरों को खोजा जा सके और वेब पर सबको सुरक्षित रखा जा सके.</translation>
 <translation id="8899851313684471736">लिंक को नई &amp;विंडो में खोलें</translation>
 <translation id="8900413463156971200">सेल्युलर नेटवर्क चालू करें</translation>
 <translation id="8902059453911237649">{NUM_DAYS,plural, =1{<ph name="MANAGER" /> का इस्तेमाल करने के लिए ज़रूरी है कि आप अपने डेटा का बैक अप लें और यह <ph name="DEVICE_TYPE" /> आज ही लौटा दें.}one{<ph name="MANAGER" /> का इस्तेमाल करने के लिए ज़रूरी है कि आप अपने डेटा का बैक अप लें और यह <ph name="DEVICE_TYPE" /> तय समय से पहले लौटा दें.}other{<ph name="MANAGER" /> का इस्तेमाल करने के लिए ज़रूरी है कि आप अपने डेटा का बैक अप लें और यह <ph name="DEVICE_TYPE" /> तय समय से पहले लौटा दें.}}</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_hr.xtb b/chromium/chrome/app/resources/generated_resources_hr.xtb
index 9d196b19402..aad529bfc99 100644
--- a/chromium/chrome/app/resources/generated_resources_hr.xtb
+++ b/chromium/chrome/app/resources/generated_resources_hr.xtb
@@ -3079,7 +3079,7 @@ Postavkama računa možete upravljati tako da instalirate aplikaciju Family Link
 <translation id="3442674350323953953">Omogućite Googleu da koristi podatke o hardveru kako bi poboljšao <ph name="DEVICE_OS" />. Ako odbijete, ti se podaci svejedno šalju Googleu kako bi se utvrdila odgovarajuća ažuriranja, no ti se podaci ni u kojem drugom slučaju ne pohranjuju niti koriste.</translation>
 <translation id="3443744348829035122">Isteklo je vrijeme za <ph name="BRAND" /></translation>
 <translation id="3443754338602062261">Već imate zaporke za te račune na usluzi <ph name="BRAND" />. Ako odlučite uvesti jednu od zaporki u nastavku, ona će zamijeniti postojeću.</translation>
-<translation id="344449859752187052">Blokirani su kolačići treće strane</translation>
+<translation id="344449859752187052">Blokirani su kolačići trećih strana</translation>
 <translation id="3444726579402183581"><ph name="ORIGIN" /> će moći pregledavati datoteku <ph name="FILENAME" /></translation>
 <translation id="3445047461171030979">Brzi odgovori Google asistenta</translation>
 <translation id="3445288400492335833"><ph name="MINUTES" /> min</translation>
@@ -4999,7 +4999,7 @@ Upotrijebite Ctrl + Alt + Smanjivanje svjetline za smanjivanje prikaza.</transla
 <translation id="4997086284911172121">Nema internetske veze.</translation>
 <translation id="4998430619171209993">Uključeno</translation>
 <translation id="4999804342505941663">Uključi opciju Ne uznemiravaj</translation>
-<translation id="5001526427543320409">Kolačići treće strane</translation>
+<translation id="5001526427543320409">Kolačići trećih strana</translation>
 <translation id="5005498671520578047">Kopiranje zaporke</translation>
 <translation id="5006118752738286774">Prije dvije godine</translation>
 <translation id="5006218871145547804">Crostinijev ADB za Android aplikacije</translation>
@@ -8604,7 +8604,7 @@ Pritisnite dodijeljeni prekidač ili tipku da biste uklonili dodjelu.</translati
 <translation id="7952904276017482715">Očekivan je ID "<ph name="EXPECTED_ID" />", no ID je bio "<ph name="NEW_ID" />".</translation>
 <translation id="7953669802889559161">Unosi</translation>
 <translation id="7953955868932471628">Upravljanje prečacima</translation>
-<translation id="7955105108888461311">Zamoli osobno</translation>
+<translation id="7955105108888461311">Pitaj osobno</translation>
 <translation id="7955177647836564772">Ako je Smart Lock uključen, a telefon otključan, ne trebate unijeti zaporku ili PIN</translation>
 <translation id="7956373551960864128">Spremljeni pisači</translation>
 <translation id="7957074856830851026">Pregled informacija uređaja, kao što su serijski broj ili ID uređaja</translation>
@@ -8817,7 +8817,7 @@ Ključnu datoteku čuvajte na sigurnom mjestu. Trebat će vam za stvaranje novih
 <translation id="8123975449645947908">Pomicanje unatrag</translation>
 <translation id="8124313775439841391">Upravljani ONC</translation>
 <translation id="8129265306888404830">Da biste upotrebljavali e-adresu svoje organizacije (<ph name="EMAIL_DOMAIN" />), trebate upotrijebiti prijavu organizacije. Ako je ovaj uređaj za vašu osobnu upotrebu, prijavite se osobnim Google računom.</translation>
-<translation id="813082847718468539">Prikaz informacija o web-mjestu</translation>
+<translation id="813082847718468539">Prikaz informacija o web-lokaciji</translation>
 <translation id="8131740175452115882">Potvrdi</translation>
 <translation id="8133297578569873332">Prihvatljiva – FM</translation>
 <translation id="8133676275609324831">&amp;Prikaži u mapi</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_id.xtb b/chromium/chrome/app/resources/generated_resources_id.xtb
index 538f73d8be0..ba431cadfd4 100644
--- a/chromium/chrome/app/resources/generated_resources_id.xtb
+++ b/chromium/chrome/app/resources/generated_resources_id.xtb
@@ -592,7 +592,7 @@ Izin yang telah Anda berikan ke aplikasi dapat berlaku untuk akun ini. Anda dapa
 <translation id="1470350905258700113">Gunakan perangkat ini</translation>
 <translation id="1470946456740188591">Untuk mengaktifkan atau menonaktifkan penjelajahan dengan keyboard, gunakan Ctrl+Search+7</translation>
 <translation id="1471034383866732283">Mode baca tidak dapat menemukan konten utama di halaman ini</translation>
-<translation id="1472675084647422956">Tampilkan lainnya</translation>
+<translation id="1472675084647422956">Tampilkan lebih banyak</translation>
 <translation id="1473223074251193484">Setel Konfigurasi Tethering</translation>
 <translation id="1474785664565228650">Perubahan pada setelan mikrofon mengharuskan Parallels Desktop diluncurkan kembali. Luncurkan kembali Parallels Desktop untuk melanjutkan.</translation>
 <translation id="1474893630593443211">Lebih banyak kontrol atas iklan yang Anda lihat</translation>
@@ -870,7 +870,7 @@ Izin yang telah Anda berikan ke aplikasi dapat berlaku untuk akun ini. Anda dapa
 <translation id="1677306805708094828">Tidak dapat menambahkan <ph name="EXTENSION_TYPE_PARAMETER" /></translation>
 <translation id="1677472565718498478">Sisa waktu <ph name="TIME" /></translation>
 <translation id="1678849866171627536">Pemindaian gagal. File ini mungkin adalah virus atau malware.</translation>
-<translation id="1679068421605151609">Alat Developer</translation>
+<translation id="1679068421605151609">Developer Tools</translation>
 <translation id="1679810534535368772">Yakin ingin keluar?</translation>
 <translation id="167983332380191032">Layanan pengelolaan mengirim error HTTP.</translation>
 <translation id="167997285881077031">Setelan suara text-to-speech</translation>
@@ -7559,7 +7559,7 @@ Anda memiliki # sandi lainnya yang telah dibobol. Pengelola Sandi Google merekom
 <translation id="7110684627876015299">Grup tanpa nama - <ph name="OPENED_STATE" /></translation>
 <translation id="7111822978084196600">Namai jendela ini</translation>
 <translation id="7113102733263608554"><ph name="ITEM_COUNT_ONE" /> item</translation>
-<translation id="7113502843173351041">Ketahui alamat email Anda</translation>
+<translation id="7113502843173351041">Mengetahui alamat email Anda</translation>
 <translation id="7113974454301513811">Sekarang tambahkan tab saat ini ke daftar Anda</translation>
 <translation id="7114054701490058191">Sandi tidak cocok</translation>
 <translation id="7114648273807173152">Agar dapat menggunakan Smart Lock untuk login ke akun Google Anda, buka Setelan &gt; Perangkat terhubung &gt; Ponsel Anda &gt; Smart Lock.</translation>
@@ -7821,7 +7821,7 @@ Anda memiliki # sandi lainnya yang telah dibobol. Pengelola Sandi Google merekom
 <translation id="7347943691222276892">Klik untuk keluar dari <ph name="SUBPAGE_TITLE" />.</translation>
 <translation id="7348093485538360975">Keyboard di layar</translation>
 <translation id="7349010927677336670">Kelancaran Video</translation>
-<translation id="7352651011704765696">Ada yang tidak beres</translation>
+<translation id="7352651011704765696">Terjadi error</translation>
 <translation id="7352664183151911163">Di seluruh aplikasi dan browser Chrome Anda</translation>
 <translation id="7353261921908507769">Kontak dapat berbagi dengan Anda saat mereka berada di sekitar. Transfer tidak akan dimulai sampai Anda menerimanya.</translation>
 <translation id="735361434055555355">Menginstal Linux...</translation>
@@ -8302,7 +8302,7 @@ Anda memiliki # sandi lainnya yang telah dibobol. Pengelola Sandi Google merekom
 <translation id="7716781361494605745">URL Kebijakan Otoritas Sertifikasi Netscape</translation>
 <translation id="7717014941119698257">Mendownload: <ph name="STATUS" /></translation>
 <translation id="771721654176725387">Tindakan ini akan menghapus data penjelajahan Anda dari perangkat ini secara permanen. Untuk memulihkan data, aktifkan sinkronisasi sebagai</translation>
-<translation id="7717845620320228976">Periksa pembaruan</translation>
+<translation id="7717845620320228976">Periksa update</translation>
 <translation id="7718490543420739837">Keyboard virtual, dikte, Tombol Akses, dan lainnya</translation>
 <translation id="7719367874908701697">Perkecil/perbesar halaman</translation>
 <translation id="7719588063158526969">Nama perangkat terlalu panjang</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_it.xtb b/chromium/chrome/app/resources/generated_resources_it.xtb
index ab00d6bc2f4..23deb65ad95 100644
--- a/chromium/chrome/app/resources/generated_resources_it.xtb
+++ b/chromium/chrome/app/resources/generated_resources_it.xtb
@@ -1435,7 +1435,7 @@ Puoi gestire le impostazioni dell'account installando l'app Family Link su quest
 <translation id="2114820389966440614">Vedi "Foto recenti in evidenza" e altri ricordi presenti qui</translation>
 <translation id="2114896190328250491">Foto di <ph name="NAME" /></translation>
 <translation id="2114995631896158695">Nessuna scheda SIM inserita</translation>
-<translation id="2116619964159595185">Solitamente i siti si connettono ai dispositivi Bluetooth per funzionalità quali la configurazione o la sincronizzazione di beacon a bassa energia, di tracker per il monitoraggio dell'attività fisica o dello stato di salute oppure di lampadine smart</translation>
+<translation id="2116619964159595185">Solitamente i siti si connettono ai dispositivi Bluetooth per funzionalità come la configurazione o la sincronizzazione di beacon a bassa energia, tracker per fitness e benessere o lampadine smart</translation>
 <translation id="2117655453726830283">Diapositiva successiva</translation>
 <translation id="2119461801241504254">La funzionalità Navigazione sicura è attiva e ti protegge da siti e download pericolosi</translation>
 <translation id="2120297377148151361">Attività e interazioni</translation>
@@ -3598,7 +3598,7 @@ Potrebbero essere incluse informazioni su software installati, file, browser e s
 <translation id="3841319830220785495">Voce naturale predefinita</translation>
 <translation id="3841964634449506551">Password non valida</translation>
 <translation id="3842552989725514455">Carattere serif</translation>
-<translation id="3843464315703645664">Consentita internamente</translation>
+<translation id="3843464315703645664">Nella lista consentita interna</translation>
 <translation id="3844888638014364087">Emoji inserita</translation>
 <translation id="3846116211488856547">Scarica strumenti per sviluppare siti web, app Android e non solo. Se installi Linux verranno scaricati <ph name="DOWNLOAD_SIZE" /> di dati.</translation>
 <translation id="3847319713229060696">Contribuisci ad aumentare la sicurezza sul Web per tutti gli utenti</translation>
@@ -3765,7 +3765,7 @@ Potrebbero essere incluse informazioni su software installati, file, browser e s
 <translation id="3971764089670057203">Impronte registrate con questo token di sicurezza</translation>
 <translation id="3973005893595042880">L'utente non è consentito</translation>
 <translation id="3973660817924297510">Verifica delle password (<ph name="CHECKED_PASSWORDS" /> di <ph name="TOTAL_PASSWORDS" />)…</translation>
-<translation id="3974105241379491420">I siti possono chiedere l'autorizzazione a usare le informazioni su di te che hanno salvato</translation>
+<translation id="3974105241379491420">I siti possono chiedere l'autorizzazione a usare le informazioni salvate su di te</translation>
 <translation id="3974514184580396500">Usa "Avanti" per spostare lo stato attivo in avanti sullo schermo</translation>
 <translation id="3975201861340929143">Spiegazione</translation>
 <translation id="3975565978598857337">Tentativo di contatto del server per area di autenticazione non riuscito</translation>
@@ -5444,7 +5444,7 @@ Premi Ctrl + Alt + Diminuisci luminosità per diminuire lo zoom.</translation>
 <translation id="5383740867328871413">Gruppo senza nome - <ph name="GROUP_CONTENTS" /> - <ph name="COLLAPSED_STATE" /></translation>
 <translation id="538822246583124912">Criterio aziendale modificato. Pulsante Esperimenti aggiunto alla barra degli strumenti. Fai clic sul pulsante per aprire una finestra di dialogo in cui puoi attivare esperimenti.</translation>
 <translation id="5388885445722491159">Accoppiato</translation>
-<translation id="5389626883706033615">I siti non possono chiederti l'autorizzazione a usare le informazioni su di te che hanno salvato</translation>
+<translation id="5389626883706033615">I siti non possono chiederti l'autorizzazione a usare le informazioni salvate su di te</translation>
 <translation id="5390112241331447203">Includi il file system_logs.txt inviato nei rapporti di feedback.</translation>
 <translation id="5390677308841849479">Rosso scuro e arancione</translation>
 <translation id="5390743329570580756">Invia per</translation>
@@ -7349,7 +7349,7 @@ Hai altre # password compromesse. Gestore delle password di Google consiglia di
 <translation id="6960507406838246615">Aggiornamento di Linux necessario</translation>
 <translation id="6960648667961844909">Impossibile scaricare i file di contenuti vocali per la lingua <ph name="LANGUAGE" />. Verrà effettuato un tentativo di download in un secondo tempo. Ciò che dici viene inviato a Google per l'elaborazione fino al completamento del download.</translation>
 <translation id="696103774840402661">Tutti i file e i dati locali di tutti gli utenti su questo <ph name="DEVICE_TYPE" /> sono stati eliminati in modo permanente.</translation>
-<translation id="6961327401577924850">Solitamente i siti cercano dispositivi Bluetooth per funzionalità quali la configurazione o la sincronizzazione di beacon a bassa energia, di tracker per il monitoraggio dell'attività fisica o dello stato di salute oppure di lampadine smart</translation>
+<translation id="6961327401577924850">Solitamente i siti cercano dispositivi Bluetooth per funzionalità come la configurazione o la sincronizzazione di beacon a bassa energia, tracker per fitness e benessere o lampadine smart</translation>
 <translation id="6963872466817251924">Evidenziazione del cursore di testo</translation>
 <translation id="6964390816189577014">Eroe</translation>
 <translation id="6964760285928603117">Rimuovi dal gruppo</translation>
@@ -9138,7 +9138,7 @@ Conserva il file di chiave in un luogo sicuro. Ti servirà per creare nuove vers
 <translation id="8386091599636877289">Norme non trovate.</translation>
 <translation id="8387361103813440603">Non possono accedere alla tua posizione</translation>
 <translation id="8388770971141403598">I profili secondari non sono supportati</translation>
-<translation id="8389492867173948260">Permetti a questa estensione di leggere e modificare tutti i dati relativi ai siti web che hai visitato:</translation>
+<translation id="8389492867173948260">Permetti a questa estensione di leggere e modificare tutti i dati relativi ai siti web che visiti:</translation>
 <translation id="8390449457866780408">Server non disponibile.</translation>
 <translation id="8391218455464584335">Vinile</translation>
 <translation id="8392726714909453725">Impostazioni Seleziona per ascoltare</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_iw.xtb b/chromium/chrome/app/resources/generated_resources_iw.xtb
index 31bc00af3c7..51fe0391f33 100644
--- a/chromium/chrome/app/resources/generated_resources_iw.xtb
+++ b/chromium/chrome/app/resources/generated_resources_iw.xtb
@@ -2819,7 +2819,7 @@
         <ph name="BREAK" />
         תמיד אפשר לנהל את ההגדרות בכרטיס הזה, או לראות עוד אפשרויות ב'התאמה אישית של Chrome'.</translation>
 <translation id="3207960819495026254">מסומן בסימנייה</translation>
-<translation id="3208584281581115441">בדיקה עכשיו</translation>
+<translation id="3208584281581115441">לבדיקה</translation>
 <translation id="3208703785962634733">לא מאושר</translation>
 <translation id="32101887417650595">לא ניתן להתחבר למדפסת</translation>
 <translation id="3210736980143419785">לא ניתן היה לסיים את ההורדה</translation>
@@ -2923,7 +2923,7 @@
 <translation id="3293644607209440645">שליחת הדף הזה</translation>
 <translation id="32939749466444286">‏הקונטיינר של Linux לא הופעל. צריך לנסות שוב.</translation>
 <translation id="3294437725009624529">אורח</translation>
-<translation id="3294686910656423119">סטטיסטיקות שימוש ודוחות קריסה</translation>
+<translation id="3294686910656423119">נתוני שימוש ודוחות קריסה</translation>
 <translation id="3295241308788901889">מתבצעת העברה של כרטיסייה</translation>
 <translation id="3297105622164376095">מורשים להציג בקשות כניסה של צד שלישי</translation>
 <translation id="3297536526040732495">‏כדי להגן עליך בכל האפליקציות של Google, במהלך הכניסה לחשבון, מתבצע קישור זמני של הנתונים האלה לחשבון Google.</translation>
@@ -4308,7 +4308,8 @@
 <translation id="4412547955014928315">למחוק את הנתונים ואת ההרשאות לאתר <ph name="SITE_NAME" /> ולכל האתרים שתחתיו?</translation>
 <translation id="4412632005703201014">‏אפליקציות Chrome עוברות לאפליקציות מסוג Progressive Web App. אפליקציית Chrome הזו הותקנה בדפדפן על ידי הארגון שלך. כדי לפתוח Progressive Web App מרשימת האפליקציות, קודם צריך לפנות לאדמין ולבקש להסיר את אפליקציית Chrome. בינתיים אפשר להיכנס אל <ph name="EXTENSION_LAUNCH_URL" /> כדי לפתוח את <ph name="EXTENSION_NAME" /> באינטרנט.</translation>
 <translation id="4412698727486357573">מרכז העזרה</translation>
-<translation id="4412992751769744546">‏התר קובצי Cookie של צד שלישי</translation>
+<translation id="4412992751769744546">‏אישור לקובצי Cookie של צד שלישי
+</translation>
 <translation id="4413087696295876280">‏קריאת נתונים ומידע ממכשיר ChromeOS Flex</translation>
 <translation id="44141919652824029">‏רוצה להעניק לאפליקציה "<ph name="APP_NAME" />" גישה לרשימת ההתקנים המחוברים ב-USB?</translation>
 <translation id="4414232939543644979">חלון &amp;אנונימי חדש</translation>
@@ -8164,7 +8165,7 @@
 <translation id="7615365294369022248">אירעה שגיאה בהוספת חשבון</translation>
 <translation id="7616214729753637086">רישום המכשיר מתבצע...</translation>
 <translation id="7617263010641145920">‏הפעלה של חנות Play</translation>
-<translation id="7617648809369507487">שימוש במצב שקט יותר של התראות</translation>
+<translation id="7617648809369507487">שימוש בהצגת התראות שקטה יותר</translation>
 <translation id="7621382409404463535">המערכת לא הצליחה לשמור את תצורת המכשיר.</translation>
 <translation id="7621480263311228380">לאתר אין הרשאה להשתמש במידע עליך שנשמר בו</translation>
 <translation id="7621595347123595643">לא תהיה אפשרות לשחזר נתונים מקומיים אם שוכחים את הסיסמה או קוד האימות.</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_ja.xtb b/chromium/chrome/app/resources/generated_resources_ja.xtb
index 5beb20e27c7..1263da0cf3c 100644
--- a/chromium/chrome/app/resources/generated_resources_ja.xtb
+++ b/chromium/chrome/app/resources/generated_resources_ja.xtb
@@ -654,7 +654,7 @@
 <translation id="1523279371236772909">過去 1 か月以内に表示</translation>
 <translation id="1523978563989812243">テキスト読み上げエンジン</translation>
 <translation id="1524430321211440688">キーボード</translation>
-<translation id="1524563461097350801">自動チェックアウトしない</translation>
+<translation id="1524563461097350801">スキップ</translation>
 <translation id="1525740877599838384">Wi-Fi のみを使用して現在地を特定する</translation>
 <translation id="152629053603783244">Linux を再起動</translation>
 <translation id="1526560967942511387">無題のドキュメント</translation>
@@ -4286,7 +4286,7 @@
 <translation id="4412547955014928315"><ph name="SITE_NAME" /> とその下にあるすべてのサイトのサイトデータと権限を削除しますか？</translation>
 <translation id="4412632005703201014">Chrome アプリはプログレッシブ ウェブアプリに移行しています。この Chrome アプリは組織によりブラウザにインストールされたものです。アプリのリストからプログレッシブ ウェブアプリを開くには、まず Chrome アプリをアンインストールするよう管理者に依頼します。その間は、<ph name="EXTENSION_LAUNCH_URL" /> にアクセスして、ウェブで <ph name="EXTENSION_NAME" /> を開いてください。</translation>
 <translation id="4412698727486357573">ヘルプセンター</translation>
-<translation id="4412992751769744546">サードパーティの Cookie を許可</translation>
+<translation id="4412992751769744546">サードパーティの Cookie を許可する</translation>
 <translation id="4413087696295876280">ChromeOS Flex のデバイス情報とデータを読み取る</translation>
 <translation id="44141919652824029">接続された USB デバイスのリストを「<ph name="APP_NAME" />」が取得することを許可しますか？</translation>
 <translation id="4414232939543644979">新しいシークレット ウインドウ(&amp;I)</translation>
@@ -6722,7 +6722,7 @@
 <translation id="6451591602925140504">{NUM_PAGES,plural, =0{<ph name="PAGE_TITLE" />}=1{<ph name="PAGE_TITLE" />、他 1 個のタブ}other{<ph name="PAGE_TITLE" />、他 # 個のタブ}}</translation>
 <translation id="6451689256222386810">パスフレーズを忘れた場合や、この設定を変更する場合は、<ph name="BEGIN_LINK" />同期をリセット<ph name="END_LINK" />します。</translation>
 <translation id="6452181791372256707">拒否</translation>
-<translation id="6452251728599530347"><ph name="PERCENT" />% 完了</translation>
+<translation id="6452251728599530347"><ph name="PERCENT" /> 完了</translation>
 <translation id="645286928527869380">レシピ</translation>
 <translation id="6452961788130242735">ネットワークに問題があるか、レルムが正しくありません</translation>
 <translation id="6453191633103419909">タブや画面投影の品質</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_kk.xtb b/chromium/chrome/app/resources/generated_resources_kk.xtb
index f349e1bc437..ee870458074 100644
--- a/chromium/chrome/app/resources/generated_resources_kk.xtb
+++ b/chromium/chrome/app/resources/generated_resources_kk.xtb
@@ -872,7 +872,7 @@
 <translation id="1682548588986054654">Жаңа жасырын терезе</translation>
 <translation id="1682696837763999627">Үлкен тінтуір курсоры</translation>
 <translation id="1682867089915960590">Белсенді курсор режимі қосылсын ба?</translation>
-<translation id="1686550358074589746">Қимыл арқылы теруді қосу</translation>
+<translation id="1686550358074589746">Сипап теруді қосу</translation>
 <translation id="168715261339224929">Бетбелгілерге барлық құрылғылардан кіру үшін синхрондауды қосыңыз.</translation>
 <translation id="1688935057616748272">Әріп енгізіңіз</translation>
 <translation id="1689333818294560261">Лақап ат</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_kn.xtb b/chromium/chrome/app/resources/generated_resources_kn.xtb
index d9b460a071e..835c8eef7d4 100644
--- a/chromium/chrome/app/resources/generated_resources_kn.xtb
+++ b/chromium/chrome/app/resources/generated_resources_kn.xtb
@@ -113,7 +113,7 @@
 <translation id="1079766198702302550">ಯಾವಾಗಲೂ ಕ್ಯಾಮರಾ ಪ್ರವೇಶವನ್ನು ನಿರ್ಬಂಧಿಸಿ</translation>
 <translation id="1081956462909987459">{NUM_TABS,plural, =1{<ph name="GROUP_TITLE" /> - 1 ಟ್ಯಾಬ್}one{<ph name="GROUP_TITLE" /> - # ಟ್ಯಾಬ್‌ಗಳು}other{<ph name="GROUP_TITLE" /> - # ಟ್ಯಾಬ್‌ಗಳು}}</translation>
 <translation id="1082214733466244292">ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಈ ಸಾಧನದಲ್ಲಿ ಕೆಲವು ಕಾರ್ಯಚಟುವಟಿಕೆಯನ್ನು ನಿರ್ಬಂಧಿಸಿದ್ದಾರೆ</translation>
-<translation id="1082398631555931481"><ph name="THIRD_PARTY_TOOL_NAME" /> ನಿಮ್ಮ Chrome ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಅದರ ಮೂಲ ಡೀಫಾಲ್ಟ್‌ಗಳಿಗೆ ಪುನಃ ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಲು ಬಯಸುತ್ತದೆ. ಇದು ನಿಮ್ಮ ಮುಖಪುಟ, ಹೊಸ ಟ್ಯಾಬ್ ಪುಟ, ಮತ್ತು ಹುಡುಕಾಟ ಇಂಜಿನ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸುತ್ತದೆ, ನಿಮ್ಮ ವಿಸ್ತರಣೆಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ ಮತ್ತು ಎಲ್ಲ ಟ್ಯಾಬ್‌ಗಳನ್ನು ಅನ್‌ಪಿನ್ ಮಾಡುತ್ತದೆ. ಇದು ಕುಕೀಗಳು, ವಿಷಯ ಹಾಗೂ ಸೈಟ್‌ ಡೇಟಾದಂತಹ ಇತರೆ ತಾತ್ಕಾಲಿಕ ಮತ್ತು ಕ್ಯಾಷ್ ಡೇಟಾವನ್ನು ಸಹ ತೆರವುಗೊಳಿಸುತ್ತದೆ.</translation>
+<translation id="1082398631555931481"><ph name="THIRD_PARTY_TOOL_NAME" /> ನಿಮ್ಮ Chrome ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಅದರ ಮೂಲ ಡೀಫಾಲ್ಟ್‌ಗಳಿಗೆ ಪುನಃ ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಲು ಬಯಸುತ್ತದೆ. ಇದು ನಿಮ್ಮ ಮುಖಪುಟ, ಹೊಸ ಟ್ಯಾಬ್ ಪುಟ, ಮತ್ತು ಹುಡುಕಾಟ ಇಂಜಿನ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸುತ್ತದೆ, ನಿಮ್ಮ ವಿಸ್ತರಣೆಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ ಮತ್ತು ಎಲ್ಲ ಟ್ಯಾಬ್‌ಗಳನ್ನು ಅನ್‌ಪಿನ್ ಮಾಡುತ್ತದೆ. ಇದು ಕುಕೀಗಳು, ಕಂಟೆಂಟ್‍ ಹಾಗೂ ಸೈಟ್‌ ಡೇಟಾದಂತಹ ಇತರೆ ತಾತ್ಕಾಲಿಕ ಮತ್ತು ಕ್ಯಾಷ್ ಡೇಟಾವನ್ನು ಸಹ ತೆರವುಗೊಳಿಸುತ್ತದೆ.</translation>
 <translation id="1082725763867769612">ಆಫ್‌ಲೈನ್ ಫೈಲ್‌ಗಳು</translation>
 <translation id="1084096383128641877">ಈ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ತೆಗೆದುಹಾಕುವುದರಿಂದ <ph name="DOMAIN" /> ನಲ್ಲಿ ನಿಮ್ಮ ಖಾತೆಯನ್ನು ಅಳಿಸಲಾಗುವುದಿಲ್ಲ. <ph name="DOMAIN_LINK" /> ನಲ್ಲಿ ನಿಮ್ಮ ಖಾತೆಯನ್ನು ಇತರರು ಬಳಸದಂತೆ ರಕ್ಷಿಸಲು, ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಬದಲಾಯಿಸಿ ಅಥವಾ ಖಾತೆಯನ್ನು ಅಳಿಸಿ.</translation>
 <translation id="1084288067399862432">ಅಪಾಯಕ್ಕೀಡಾದ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಬದಲಾಯಿಸಲಾಗಿದೆ.
@@ -8870,7 +8870,7 @@
 <translation id="8163708146810922598">ತುಂಬಾ ಹಳೆಯದು</translation>
 <translation id="8165997195302308593">Crostini ಪೋರ್ಟ್ ಫಾರ್ವರ್ಡ್ ಮಾಡುವಿಕೆ</translation>
 <translation id="816704878106051517">{COUNT,plural, =1{ಒಂದು ಫೋನ್ ಸಂಖ್ಯೆ}one{# ಫೋನ್ ಸಂಖ್ಯೆಗಳು}other{# ಫೋನ್ ಸಂಖ್ಯೆಗಳು}}</translation>
-<translation id="8168435359814927499">ವಿಷಯ</translation>
+<translation id="8168435359814927499">ಕಂಟೆಂಟ್‍</translation>
 <translation id="8169165065843881617">{NUM_TABS,plural, =1{ಓದುವ ಪಟ್ಟಿಗೆ ಟ್ಯಾಬ್ ಅನ್ನು ಸೇರಿಸಿ}one{ಓದುವ ಪಟ್ಟಿಗೆ ಟ್ಯಾಬ್‌ಗಳನ್ನು ಸೇರಿಸಿ}other{ಓದುವ ಪಟ್ಟಿಗೆ ಟ್ಯಾಬ್‌ಗಳನ್ನು ಸೇರಿಸಿ}}</translation>
 <translation id="8171334254070436367">ಎಲ್ಲಾ ಕಾರ್ಡ್‌ಗಳನ್ನು ಮರೆಮಾಡಿ</translation>
 <translation id="8172192489606308982">ಇತರೆ ಸೈಟ್‌ಗಳಿಂದ</translation>
@@ -9739,7 +9739,7 @@
 <translation id="8871043459130124414">ನೀವು ವಿಸ್ತರಣೆಯನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿದ ನಂತರ ಮಾತ್ರ ರನ್ ಆಗುತ್ತದೆ</translation>
 <translation id="8871551568777368300">ನಿರ್ವಾಹಕರಿಂದ ಪಿನ್ ಮಾಡಲಾಗಿದೆ</translation>
 <translation id="8871696467337989339">ನೀವು ಬೆಂಬಲಿತವಲ್ಲದ ಕಮಾಂಡ್-ಲೈನ್ ಫ್ಲ್ಯಾಗ್ ಅನ್ನು ಬಳಸುತ್ತಿರುವಿರಿ: <ph name="BAD_FLAG" />. ಸ್ಥಿರತೆ ಮತ್ತು ಸುರಕ್ಷತೆಯು ಹಾನಿಯಾಗುತ್ತದೆ.</translation>
-<translation id="8871974300055371298">ವಿಷಯ ಸೆಟ್ಟಿಂಗ್‌ಗಳು</translation>
+<translation id="8871974300055371298">ಕಂಟೆಂಟ್‍ ಸೆಟ್ಟಿಂಗ್‌ಗಳು</translation>
 <translation id="8872155268274985541">ಅಮಾನ್ಯ ಕಿಯೋಸ್ಕ್ ಬಾಹ್ಯ ಅಪ್‌ಡೇಟ್‌‌ ಮ್ಯಾನಿಫೆಸ್ಟ್ ಫೈಲ್ ಕಂಡುಬಂದಿದೆ. ಕಿಯೋಸ್ಕ್ ಅಪ್ಲಿಕೇಶನ್ ಅಪ್‌ಡೇಟ್‌ ಮಾಡಲು ವಿಫಲವಾಗಿದೆ. ದಯವಿಟ್ಟು USB ಸ್ಟಿಕ್ ಅನ್ನು ತೆಗೆದುಹಾಕಿ.</translation>
 <translation id="8872506776304248286">ಆಪ್‌ನಲ್ಲಿ ತೆರೆಯಿರಿ</translation>
 <translation id="8872774989979382243">ವಾಲ್ಯೂಮ್ ಆಫ್ ಆಗಿದೆ. ವಾಲ್ಯೂಮ್ ಆನ್ ಮಾಡಿ.</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_ko.xtb b/chromium/chrome/app/resources/generated_resources_ko.xtb
index 927e29718c2..04e2a1dff1e 100644
--- a/chromium/chrome/app/resources/generated_resources_ko.xtb
+++ b/chromium/chrome/app/resources/generated_resources_ko.xtb
@@ -657,7 +657,7 @@
 <translation id="1523279371236772909">지난달에 확인함</translation>
 <translation id="1523978563989812243">텍스트 음성 변환 엔진</translation>
 <translation id="1524430321211440688">키보드</translation>
-<translation id="1524563461097350801">아니요</translation>
+<translation id="1524563461097350801">나중에</translation>
 <translation id="1525740877599838384">위치 파악에 Wi-Fi만 사용</translation>
 <translation id="152629053603783244">Linux 다시 시작</translation>
 <translation id="1526560967942511387">제목 없는 문서</translation>
@@ -1357,7 +1357,7 @@
 <translation id="2048554637254265991">컨테이너 관리자 시작 중에 오류가 발생했습니다. 다시 시도해 주세요.</translation>
 <translation id="2048653237708779538">실행할 수 없는 작업</translation>
 <translation id="204914487372604757">바로가기 만들기</translation>
-<translation id="2050339315714019657">인물 사진</translation>
+<translation id="2050339315714019657">세로 방향</translation>
 <translation id="2051555741181591333">핫스팟 자동 사용 중지</translation>
 <translation id="2052572566310583903">다른 기기에서 설치됨</translation>
 <translation id="2053105195397337973">Google은 추적을 제한하고 사이트에서 광고 스팸과 사기를 방지하도록 돕는 방안을 모색하고 있습니다.</translation>
@@ -3997,7 +3997,7 @@
 <translation id="4146785383423576110">재설정 및 정리하기</translation>
 <translation id="4147099377280085053">점자표 선택</translation>
 <translation id="4147911968024186208">다시 시도해 주세요. 이 오류가 다시 표시되면 지원 담당자에게 문의하시기 바랍니다.</translation>
-<translation id="414800391140809654">인터넷을 사용하는 동안 내 정보를 사용할 수 있습니다.</translation>
+<translation id="414800391140809654">의 경우 인터넷을 사용하는 동안 내 정보를 사용할 수 있음</translation>
 <translation id="4148195018520464922">특정 사용자만 로그인할 수 있도록 제한할 수 있습니다. 이렇게 하면 로그인 화면에서 '사용자 추가' 옵션이 삭제됩니다. 현재 사용자를 삭제할 수도 있습니다.</translation>
 <translation id="4150201353443180367">디스플레이</translation>
 <translation id="4150569944729499860">화면 컨텍스트</translation>
@@ -8161,7 +8161,7 @@ https://support.google.com/chromebook/?p=tpm</translation>
 <translation id="7617263010641145920">Play 스토어 사용 설정</translation>
 <translation id="7617648809369507487">조용한 메시지 전송 사용</translation>
 <translation id="7621382409404463535">시스템에서 기기 설정을 저장하지 못했습니다.</translation>
-<translation id="7621480263311228380">다른 사람이 나에 관해 저장한 정보를 사용하도록 허용하지 않음</translation>
+<translation id="7621480263311228380">나에 관해 저장한 정보를 사용하도록 허용되지 않음</translation>
 <translation id="7621595347123595643">비밀번호 또는 PIN을 잊어버린 경우 로컬 데이터를 복구할 수 없습니다.</translation>
 <translation id="7622114377921274169">충전 중</translation>
 <translation id="7622768823216805500">사이트에서는 일반적으로 간편 결제와 같은 쇼핑 기능을 사용하기 위해 결제 핸들러를 설치합니다.</translation>
@@ -10175,7 +10175,7 @@ https://support.google.com/chromebook/?p=sm</translation>
 <translation id="9219582468404818260">더 나은 웹 환경을 만드는 데 함께해 주세요</translation>
 <translation id="9219741625496141320">인터넷 사용 기록이 자동으로 삭제되었습니다</translation>
 <translation id="9220525904950070496">계정 삭제</translation>
-<translation id="9220723036554088545">파일을 업로드하세요.</translation>
+<translation id="9220723036554088545">파일을 업로드하세요</translation>
 <translation id="9220820413868316583">손가락을 뗀 뒤 다시 시도하세요.</translation>
 <translation id="922152298093051471">Chrome 맞춤설정</translation>
 <translation id="923467487918828349">모두 보기</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_ky.xtb b/chromium/chrome/app/resources/generated_resources_ky.xtb
index 7b003de3868..d6abd34ba47 100644
--- a/chromium/chrome/app/resources/generated_resources_ky.xtb
+++ b/chromium/chrome/app/resources/generated_resources_ky.xtb
@@ -113,7 +113,7 @@
 <translation id="1079766198702302550">Камераны колдонуу мүмкүнчүлүгү ар дайым бөгөттөлсүн</translation>
 <translation id="1081956462909987459">{NUM_TABS,plural, =1{<ph name="GROUP_TITLE" /> – 1 өтмөк}other{<ph name="GROUP_TITLE" /> – # өтмөк}}</translation>
 <translation id="1082214733466244292">Администраторуңуз бул түзмөктөгү айрым функцияларды бөгөттөп койду</translation>
-<translation id="1082398631555931481"><ph name="THIRD_PARTY_TOOL_NAME" /> Chrome параметрлериңизди демейки параметрлерге кайтарайын деп жатат. Ушуну менен башкы барагыңыз, жаңы өтмөк барагыңыз жана издөө каражатыңыз кайра коюлуп, кеңейтүүлөрүңүз өчүрүлөт жана өтмөктөрдүн баары бошотулат. Мындан тышкары, кукилер, мазмун жана сайт дайындары сыяктуу убактылуу жана кештелген дайындардын баары тазаланат.</translation>
+<translation id="1082398631555931481"><ph name="THIRD_PARTY_TOOL_NAME" /> Chrome параметрлериңизди демейки параметрлерге кайтарайын деп жатат. Ушуну менен башкы барагыңыз, жаңы өтмөк барагыңыз жана издөө куралыңыз кайра коюлуп, кеңейтүүлөрүңүз өчүрүлөт жана өтмөктөрдүн баары бошотулат. Мындан тышкары, кукилер, мазмун жана сайт дайындары сыяктуу убактылуу жана кештелген дайындардын баары тазаланат.</translation>
 <translation id="1082725763867769612">Оффлайн файлдар</translation>
 <translation id="1084096383128641877">Бул сырсөздү өзгөртүү менен <ph name="DOMAIN" /> аккаунтуңуз өчпөйт. <ph name="DOMAIN_LINK" /> аккаунтуңузду башкалардан коргоо үчүн сырсөздү өзгөртүңүз же аккаунтуңузду жок кылыңыз.</translation>
 <translation id="1084288067399862432">Уурдалган сырсөз ийгиликтүү өзгөртүлдү.
@@ -543,7 +543,7 @@
 <translation id="1431188203598586230">Программаны акыркы жолу жаңыртуу</translation>
 <translation id="1432581352905426595">Издөө каражаттарын башкаруу</translation>
 <translation id="1433478348197382180">Окуу режими</translation>
-<translation id="1434696352799406980">Бул сиздин баштоо бетиңизди, жаңы өтмөк бетин, издөө каражатын жана кадалган өтмөктөрдү баштапкы абалга келтирет.Ушуну менен бардык кеңейтүүлөр жана кукилер сыяктуу убактылуу маалыматтар өчүрүлөт. Сиз сактаган веб-баракчалардын даректери, таржымалыңыз жана сакталган сырсөздөрүңүз өчпөйт.</translation>
+<translation id="1434696352799406980">Бул сиздин баштоо бетиңизди, жаңы өтмөк бетин, издөө куралын жана кадалган өтмөктөрдү баштапкы абалга келтирет.Ушуну менен бардык кеңейтүүлөр жана кукилер сыяктуу убактылуу маалыматтар өчүрүлөт. Сиз сактаган веб-баракчалардын даректери, таржымалыңыз жана сакталган сырсөздөрүңүз өчпөйт.</translation>
 <translation id="1434886155212424586">Башкы бет - Жаңы өтмөк бети</translation>
 <translation id="1435940442311036198">Мүмкүндүк алуу ачкычын башка түзмөктө колдонуу</translation>
 <translation id="1436390408194692385">Жарамдуулук мөөнөтү: <ph name="TICKET_TIME_LEFT" /></translation>
@@ -1930,7 +1930,7 @@ Family Link колдонмосун түзмөгүңүзгө орнотуп, бу
 <translation id="2480868415629598489">Көчүрүлүп, коюла турган дайындарды өзгөртүү</translation>
 <translation id="2482878487686419369">Билдирмелер</translation>
 <translation id="2482895651873876648">Өтмөк төмөнкү топко жылды: <ph name="GROUP_NAME" /> - <ph name="GROUP_CONTENTS" /></translation>
-<translation id="2483627560139625913">Chrome cерепчисинин параметрлеринде издөө каражатын коюу</translation>
+<translation id="2483627560139625913">Chrome cерепчисинин параметрлеринде издөө куралын коюу</translation>
 <translation id="2484743711056182585">Уруксатты өчүрүү</translation>
 <translation id="2484909293434545162">Эгер сайтта cookie файлдары колдонулса, ал ушул жерде көрүнөт</translation>
 <translation id="2484959914739448251">Бардык шайкештирилген түзмөктөрүңүздөгү жана Google аккаунтуңуздагы серептөө дайындарын тазалоо үчүн <ph name="BEGIN_LINK" />өткөрүүчү сүйлөмдү киргизиңиз<ph name="END_LINK" />.</translation>
@@ -3869,7 +3869,7 @@ Family Link колдонмосун түзмөгүңүзгө орнотуп, бу
 <translation id="4043620984511647481">Принтерди кол менен кошуу</translation>
 <translation id="4044612648082411741">Тастыктамаңыздын сырсөзүн киргизиңиз</translation>
 <translation id="4044708573046946214">Экранды кулпулоо сырсөзү</translation>
-<translation id="404493185430269859">Демейки издөө каражаты</translation>
+<translation id="404493185430269859">Демейки издөө куралы</translation>
 <translation id="4044964245574571633">Microsoft OneDrive сактагычын колдонот</translation>
 <translation id="4045196801416070837">Түзмөктөгү сигналдар</translation>
 <translation id="4046013316139505482">Бул кеңейтүүлөр ушул сайттагы маалыматты көрүп, өзгөртө алышпайт.</translation>
@@ -3937,7 +3937,7 @@ Family Link колдонмосун түзмөгүңүзгө орнотуп, бу
 <translation id="409742781329613461">Chrome үчүн кеңештер</translation>
 <translation id="4097560579602855702">Google'да издөө</translation>
 <translation id="4098667039111970300">Стилус куралдарын тилкеде көрсөтүү</translation>
-<translation id="4099060993766194518">Демейки издөө каражаты калыбына келтирилсинби?</translation>
+<translation id="4099060993766194518">Демейки издөө куралы калыбына келтирилсинби?</translation>
 <translation id="4099874310852108874">Тармакта ката кетти.</translation>
 <translation id="4100020874626534113">Ийкемдүү диакритикалык дайындоолорго уруксат бериңиз. Мисалы, "anhs" же "asnh" деп терип, "ánh" сөзүн алууга болот.</translation>
 <translation id="4100733287846229632">Түзмөктө бош орун өтө аз</translation>
@@ -5637,7 +5637,7 @@ Family Link колдонмосун түзмөгүңүзгө орнотуп, бу
 <translation id="5519900055135507385">Бул аккаунттун коопсуздугун ишенимдүү сырсөз менен жогорулатыңыз. Ал <ph name="EMAIL" /> аккаунту үчүн <ph name="GOOGLE_PASSWORD_MANAGER" /> кызматына сакталат.</translation>
 <translation id="5521078259930077036">Бул сиз күтүп жаткан башкы бетпи?</translation>
 <translation id="5522156646677899028">Бул кеңейтүүдө коопсуздукту бузган олуттуу көйгөй бар.</translation>
-<translation id="5522403133543437426">Дарек тилкесинде колдонулган издөө каражаты.</translation>
+<translation id="5522403133543437426">Дарек тилкесинде колдонулган издөө куралы.</translation>
 <translation id="5523149538118225875">{NUM_EXTENSIONS,plural, =1{Кеңейтүүнү администраторуңуз орноткон}other{# кеңейтүүнү администраторуңуз орноткон}}</translation>
 <translation id="5523532775593636291">Сиз кошкон сайттар ар дайым активдүү бойдон калып, эстутумдан өчүрүлбөйт</translation>
 <translation id="5523558474028191231">Аталыш <ph name="MAX_CHARACTER_COUNT" /> символдон ашпашы керек. Анда тамгаларды, сандарды жана атайын символдорду колдонууга болот</translation>
@@ -6349,7 +6349,7 @@ Family Link колдонмосун түзмөгүңүзгө орнотуп, бу
 <translation id="6112294629795967147">Өлчөмүн өзгөртүү үчүн басуу</translation>
 <translation id="6112727384379533756">Билет кошуу</translation>
 <translation id="6112931163620622315">Телефонуңузду текшериңиз</translation>
-<translation id="6113434369102685411">Chrome серепчиси менен <ph name="DEVICE_TYPE" /> Жүргүзгүчү үчүн демейки издөө каражатын жөндөңүз</translation>
+<translation id="6113434369102685411">Chrome серепчиси менен <ph name="DEVICE_TYPE" /> Жүргүзгүчү үчүн демейки издөө куралын жөндөңүз</translation>
 <translation id="6113832060210023016">жүргүзгүч + чыкылдатуу</translation>
 <translation id="6113942107547980621">Smart Lock'ту колдонуу үчүн телефонуңуздагы негизги колдонуучунун профилин которуштуруңуз</translation>
 <translation id="6116921718742659598">Тил жана текст киргизүү параметрлерин өзгөртүү</translation>
@@ -7301,7 +7301,7 @@ Family Link колдонмосун түзмөгүңүзгө орнотуп, бу
 <translation id="6900284862687837908">Фондук колдонмо: <ph name="BACKGROUND_APP_URL" /></translation>
 <translation id="6900532703269623216">Жакшыртылган коргоо</translation>
 <translation id="6900651018461749106"><ph name="USER_EMAIL" /> аккаунтун жаңыртуу үчүн аккаунтуңузга кайра кириңиз</translation>
-<translation id="6900654715912436255">Ушул издөө каражатын чын эле өчүрөсүзбү?</translation>
+<translation id="6900654715912436255">Ушул издөө куралын чын эле өчүрөсүзбү?</translation>
 <translation id="6901024547292737736"><ph name="ACTUAL_CHAR_COUNT" />/<ph name="MAX_CHAR_COUNT" /></translation>
 <translation id="6902066522699286937">Үндү алдын ала угуп көрүү</translation>
 <translation id="6902336033320348843">Бөлүм колдоого алынбайт: <ph name="ERROR_LINE" /></translation>
@@ -7392,7 +7392,7 @@ Family Link колдонмосун түзмөгүңүзгө орнотуп, бу
 <translation id="6972754398087986839">Баштоо</translation>
 <translation id="697312151395002334">Калкыма терезелерди жөнөтүп, багыттоолорду колдоно алат</translation>
 <translation id="6973611239564315524">Debian 10 (Buster) версиясы жеткиликтүү</translation>
-<translation id="69739764870135975">Эгер Google демейки издөө каражатыңыз да болсо, сизге жакшыраак жана ылайыктуу сунуштар көрсөтүлөт</translation>
+<translation id="69739764870135975">Эгер Google демейки издөө куралыңыз да болсо, сизге жакшыраак жана ылайыктуу сунуштар көрсөтүлөт</translation>
 <translation id="697508444536771064">Linux'ту жабуу</translation>
 <translation id="6978121630131642226">Издөө каражаттары</translation>
 <translation id="6978717888677691380">Сиз бөгөттөгөн сайттар</translation>
@@ -7873,7 +7873,7 @@ Family Link колдонмосун түзмөгүңүзгө орнотуп, бу
 <translation id="7385490373498027129">Бул түзмөктөгү (<ph name="DEVICE_TYPE" />) бардык колдонуучуларга тиешелүү файлдар жана жергиликтүү дайын-даректер биротоло өчүрүлөт.</translation>
 <translation id="7385854874724088939">Басып чыгарайын дегенде бир жерден ката кетти. Принтериңизди текшерип туруп кайталап көрүңүз.</translation>
 <translation id="7387273928653486359">Канааттандыраарлык</translation>
-<translation id="7387951778417998929">Демейкиден башка издөө каражатын колдонуу үчүн дарек тилкесине анын ыкчам баскычын, андан соң артыкчылыктуу ыкчам баскычты териңиз. Мындан тышкары, бул жерден демейки издөө каражатын өзгөртө аласыз.</translation>
+<translation id="7387951778417998929">Демейкиден башка издөө куралын колдонуу үчүн дарек тилкесине анын ыкчам баскычын, андан соң артыкчылыктуу ыкчам баскычты териңиз. Мындан тышкары, бул жерден демейки издөө куралын өзгөртө аласыз.</translation>
 <translation id="7388209873137778229">Колдоого алынган түзмөктөр гана көрсөтүлдү.</translation>
 <translation id="7388615499319468910">Сайттар менен жарнамачылар жарнамалардын майнаптуулугун талдай алышат. Бул параметр өчүк.</translation>
 <translation id="738903649531469042">Өтмөктү окуу тизмесине кошуу</translation>
@@ -9936,7 +9936,7 @@ Family Link колдонмосун түзмөгүңүзгө орнотуп, бу
 <translation id="9023909777842748145">Бул функциянын өчүрүлүшү түзмөктүн тутумунун жаңыртылышына жана коопсуздугуна таасирин тийгизбейт.</translation>
 <translation id="9024127637873500333">Жаңы өтмөктө &amp;ачуу</translation>
 <translation id="9024158959543687197">Түзмөктү кошууда ката кетти. Файлды бөлүшүү URL'ин текшерип, кайталап көрүңүз.</translation>
-<translation id="9024692527554990034">Дарек тилкесинде ыкчам баскычтарды колдонуу менен, белгилүү бир сайтты тез издеп же башка издөө каражатын колдоно аласыз</translation>
+<translation id="9024692527554990034">Дарек тилкесинде ыкчам баскычтарды колдонуу менен, белгилүү бир сайтты тез издеп же башка издөө куралын колдоно аласыз</translation>
 <translation id="902638246363752736">Баскычтоп параметрлери</translation>
 <translation id="9026731007018893674">жүктөп алуу</translation>
 <translation id="9026852570893462412">Бир нече мүнөткө созулушу мүмкүн. Виртуалдык машина жүктөлүп алынууда.</translation>
@@ -10085,7 +10085,7 @@ Family Link колдонмосун түзмөгүңүзгө орнотуп, бу
 <translation id="9134066738478820307">Сайттар корголгон мазмунду ойнотуу үчүн идентификаторлорду колдоно алат</translation>
 <translation id="913411432238655354">Колдонмолорду башында калыбына келтирүү</translation>
 <translation id="9137013805542155359">Түпверсиясын көрсөтүү</translation>
-<translation id="9137157311132182254">Артыкчылыктуу издөө каражаты</translation>
+<translation id="9137157311132182254">Артыкчылыктуу издөө куралы</translation>
 <translation id="9137916601698928395">Шилтемени <ph name="USER" /> катары ачуу</translation>
 <translation id="9138978632494473300">Төмөнкү жерлерге кыска жолдор кошулсун:</translation>
 <translation id="9139988741193276691">Linux конфигурацияланууда</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_lv.xtb b/chromium/chrome/app/resources/generated_resources_lv.xtb
index f9d8cf52d72..ebe866e46b5 100644
--- a/chromium/chrome/app/resources/generated_resources_lv.xtb
+++ b/chromium/chrome/app/resources/generated_resources_lv.xtb
@@ -8960,7 +8960,7 @@ Glabājiet atslēgas failu drošā vietā. Tas būs vajadzīgs, lai izveidotu ja
 <translation id="8248050856337841185">&amp;Ielīmēt</translation>
 <translation id="8248381369318572865">Piekļuve jūsu mikrofonam un jūsu runas analīze</translation>
 <translation id="8248887045858762645">Chrome padoms</translation>
-<translation id="8249048954461686687">OEM mape</translation>
+<translation id="8249048954461686687">OAR mape</translation>
 <translation id="8249239468199142122">Akumulatora enerģijas taupīšanas režīms</translation>
 <translation id="8250210000648910632">Krātuvē vairs nav vietas</translation>
 <translation id="8251441930213048644">Atsvaidzināt tūlīt</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_mk.xtb b/chromium/chrome/app/resources/generated_resources_mk.xtb
index 15e539f4464..77861dd2f9e 100644
--- a/chromium/chrome/app/resources/generated_resources_mk.xtb
+++ b/chromium/chrome/app/resources/generated_resources_mk.xtb
@@ -2183,7 +2183,7 @@
 <translation id="2691385045260836588">Модел</translation>
 <translation id="2691440343905273290">Изменете ги поставките за внесување</translation>
 <translation id="2692503699962701720">Смени ја висината на гласот кога изговараш типови елементи и форматиран текст</translation>
-<translation id="2692901429679246677">Aqua</translation>
+<translation id="2692901429679246677">Вода</translation>
 <translation id="2693134906590795721">Звуци на полнење</translation>
 <translation id="2693176596243495071">Упс!  Настана непозната грешка. Обидете се повторно подоцна. Ако и понатаму се соочувате со истиот проблем, контактирајте со вашиот администратор.</translation>
 <translation id="2698147581454716013">Ова е уред од група и не може да се регистрира со надградба за киоск или уред за сигнализација.</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_ms.xtb b/chromium/chrome/app/resources/generated_resources_ms.xtb
index 45a2bba3b62..a05cda1c1ef 100644
--- a/chromium/chrome/app/resources/generated_resources_ms.xtb
+++ b/chromium/chrome/app/resources/generated_resources_ms.xtb
@@ -250,7 +250,7 @@ Semak kata laluan anda pada bila-bila masa dalam <ph name="GOOGLE_PASSWORD_MANAG
 <translation id="1187692277738768150">Apabila anda menggunakan dan menyimpan kata laluan ini:</translation>
 <translation id="1187722533808055681">Bangkit daripada melahu</translation>
 <translation id="1188807932851744811">Log belum dimuat naik.</translation>
-<translation id="1190086046506744802">Terlalu besar</translation>
+<translation id="1190086046506744802">Sangat jarang</translation>
 <translation id="11901918071949011">{NUM_FILES,plural, =1{Akses fail yang disimpan pada komputer anda}other{Akses # fail yang disimpan pada komputer anda}}</translation>
 <translation id="1190706173655543975">Dasar Aplikasi Microsoft</translation>
 <translation id="119092896208640858">Untuk mengosongkan data semakan imbas daripada peranti ini sahaja dan menyimpannya dalam Akaun Google anda, <ph name="BEGIN_LINK" />log keluar<ph name="END_LINK" />.</translation>
@@ -1244,7 +1244,7 @@ Kebenaran yang telah anda berikan kepada apl mungkin dikenakan pada akaun ini. A
 <translation id="1966649499058910679">Serlahkan setiap perkataan seperti yang dituturkan</translation>
 <translation id="1967970931040389207">Hidupkan tempat liputan</translation>
 <translation id="1969011864782743497"><ph name="DEVICE_NAME" /> (USB)</translation>
-<translation id="1969550816138571473">Bersiap sedia</translation>
+<translation id="1969550816138571473">Menyediakan</translation>
 <translation id="1969654639948595766">Log teks WebRTC (<ph name="WEBRTC_TEXT_LOG_COUNT" />)</translation>
 <translation id="1972313920920745320">Laman yang anda tambahkan akan sentiasa aktif dan memori tidak akan dikosongkan daripada laman tersebut. <ph name="BEGIN_LINK" />Ketahui lebih lanjut tentang memastikan laman tertentu aktif<ph name="END_LINK" /></translation>
 <translation id="1972325230031091483">Anda akan menyemak imbas dengan lebih pantas kerana kandungan dimuatkan secara proaktif berdasarkan lawatan halaman web semasa anda</translation>
@@ -5722,7 +5722,7 @@ Kebenaran yang telah anda berikan kepada laman web dan apl mungkin dikenakan pad
 <translation id="5588033542900357244">(<ph name="RATING_COUNT" />)</translation>
 <translation id="558918721941304263">Memuatkan apl...</translation>
 <translation id="5590418976913374224">Mainkan bunyi pada permulaan peranti</translation>
-<translation id="5591465468509111843">Terlalu besar</translation>
+<translation id="5591465468509111843">Sangat lebar</translation>
 <translation id="5592595402373377407">Data yang mencukupi belum tersedia lagi.</translation>
 <translation id="5594899180331219722">Pilih fail</translation>
 <translation id="5595307023264033512">Jumlah storan yang digunakan oleh laman: <ph name="TOTAL_USAGE" /></translation>
@@ -6655,7 +6655,7 @@ Kebenaran yang telah anda berikan kepada laman web dan apl mungkin dikenakan pad
 <translation id="636850387210749493">Pendaftaran perusahaan</translation>
 <translation id="6370021412472292592">Tidak dapat memuatkan manifes.</translation>
 <translation id="6370551072524410110">Search + Shift + undur ruang</translation>
-<translation id="637135143619858508">Agak besar</translation>
+<translation id="637135143619858508">Jarang</translation>
 <translation id="6374077068638737855">Iceweasel</translation>
 <translation id="6374469231428023295">Cuba Lagi</translation>
 <translation id="6374635887697228982">Dapatkan diskaun?</translation>
@@ -7998,7 +7998,7 @@ Anda mempunyai # lagi kata laluan yang terjejas. Google Password Manager mengesy
 <translation id="7477599578899108080">Penggunaan memori tinggi: <ph name="MEMORY_USAGE" /></translation>
 <translation id="7477748600276493962">Buat Kod QR untuk halaman ini</translation>
 <translation id="7477793887173910789">Kawal muzik, video anda dan banyak lagi</translation>
-<translation id="7478069565037869084">Besar</translation>
+<translation id="7478069565037869084">Lebar</translation>
 <translation id="7478485216301680444">Aplikasi kios tidak dapat dipasang.</translation>
 <translation id="7478658909253570368">Jangan benarkan laman menyambung kepada port bersiri</translation>
 <translation id="7479221278376295180">Ikhtisar Penggunaan Storan</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_my.xtb b/chromium/chrome/app/resources/generated_resources_my.xtb
index e7e3bae5221..9f73479bea3 100644
--- a/chromium/chrome/app/resources/generated_resources_my.xtb
+++ b/chromium/chrome/app/resources/generated_resources_my.xtb
@@ -4238,7 +4238,7 @@
 <translation id="4362675504017386626"><ph name="ACCOUNT_EMAIL" /> သည် <ph name="DEVICE_TYPE" /> ၏ မူလအကောင့်ဖြစ်သည်</translation>
 <translation id="4363262124589131906">‘ကျွန်ုပ်၏ Drive’ ရှိ ဖိုင်အသစ်များကို ဤ Chromebook သို့ အလိုအလျောက် စင့်ခ်လုပ်ခြင်း ရပ်ပါမည်</translation>
 <translation id="4363771538994847871">ကာစ်လုပ်ရမည့်စက်ပစ္စည်းတစ်ခုမျှ မတွေ့ပါ။ အကူအညီလိုအပ်ပါသလား။</translation>
-<translation id="4364327530094270451">ဖရဲသီး</translation>
+<translation id="4364327530094270451">သခွားမ</translation>
 <translation id="4364567974334641491"><ph name="APP_NAME" /> သည်ဝင်းဒိုးတစ်ခုကို မျှဝေနေပါသည်။</translation>
 <translation id="4364830672918311045">ပြသမှု သတိပေးချက်များ</translation>
 <translation id="4366138410738374926">ပုံနှိပ်ခြင်း စတင်ပါပြီ</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_nl.xtb b/chromium/chrome/app/resources/generated_resources_nl.xtb
index a72329a7754..24d31fb5d7f 100644
--- a/chromium/chrome/app/resources/generated_resources_nl.xtb
+++ b/chromium/chrome/app/resources/generated_resources_nl.xtb
@@ -1258,7 +1258,7 @@ Rechten die je al hebt gegeven aan apps, kunnen van toepassing zijn op dit accou
 <ph name="BEGIN_DESCRIPTION3" />De organisatie kan op afstand toegang krijgen tot een apparaatsessie om problemen op te lossen.<ph name="END_DESCRIPTION3" />
     <ph name="BEGIN_SUBTITLE4" /><ph name="BEGIN_BOLD" />Toegang aanzetten<ph name="END_BOLD" /><ph name="END_SUBTITLE4" />
 <ph name="BEGIN_DESCRIPTION4" />Apps, services en netwerken van de organisatie zijn misschien alleen beschikbaar op ingeschreven apparaten.<ph name="END_DESCRIPTION4" /></translation>
-<translation id="1979095679518582070">Als je deze functie uitzet, heeft dit geen gevolgen voor de mogelijkheid van dit apparaat om de informatie te sturen die nodig is voor essentiële services zoals systeemupdates en beveiliging.</translation>
+<translation id="1979095679518582070">Als je deze functie uitzet, kan je apparaat nog steeds de informatie sturen die nodig is voor essentiële services, zoals systeemupdates en beveiliging.</translation>
 <translation id="1979280758666859181">Je wijzigt naar een kanaal met een oudere versie van <ph name="PRODUCT_NAME" />. De wijziging van kanaal wordt toegepast wanneer de versie van het kanaal overeenkomt met de versie die momenteel op het apparaat is geïnstalleerd.</translation>
 <translation id="1979582938184524893">Handmatig de persoonlijke informatie selecteren die je wilt opnemen</translation>
 <translation id="197989455406964291">KDC ondersteunt versleutelingstype niet</translation>
@@ -3744,7 +3744,7 @@ Dit kan informatie zijn over de geïnstalleerde software, bestanden, je browser
 <translation id="3955896417885489542">Google Play-opties bekijken na instellen</translation>
 <translation id="3957079323242030166">Back-upgegevens tellen niet mee voor de opslaglimiet van Drive.</translation>
 <translation id="3957663711862465084">USB-instellingen</translation>
-<translation id="3957844511978444971">Tik op Accepteren om je keuze van deze service-instellingen van Google te bevestigen.</translation>
+<translation id="3957844511978444971">Tik op Accepteren om je keuze van deze instellingen voor Google-services te bevestigen.</translation>
 <translation id="3958088479270651626">Bookmarks en instellingen importeren</translation>
 <translation id="3958110062351175311">Toestemming om verzoeken in de werkbalk te tonen</translation>
 <translation id="3959747296451923142">Verwijdering van abonnement bevestigen</translation>
@@ -9910,7 +9910,7 @@ Rechten die je al hebt gegeven aan websites en apps, kunnen van toepassing zijn
 <translation id="9022871169049522985">Sites en adverteerders kunnen de prestaties van hun advertenties meten</translation>
 <translation id="9023015617655685412">Bookmark toevoegen voor dit tabblad…</translation>
 <translation id="902319268551617004">Scan een QR-code met de camera van je apparaat of geef de activatiecode op die je van je provider hebt gekregen.</translation>
-<translation id="9023909777842748145">Als je deze functie uitzet, heeft dit geen gevolgen voor de mogelijkheid van je apparaat om de informatie te sturen die nodig is voor essentiële services zoals systeemupdates en beveiliging.</translation>
+<translation id="9023909777842748145">Als je deze functie uitzet, kan je apparaat nog steeds de informatie sturen die nodig is voor essentiële services, zoals systeemupdates en beveiliging.</translation>
 <translation id="9024127637873500333">&amp;Openen op nieuw tabblad</translation>
 <translation id="9024158959543687197">Fout bij het activeren van de fileshare. Controleer de fileshare-URL en probeer het opnieuw.</translation>
 <translation id="9024692527554990034">Met snelkoppelingen in de adresbalk kun je snel zoeken op een specifieke site of een andere zoekmachine gebruiken.</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_no.xtb b/chromium/chrome/app/resources/generated_resources_no.xtb
index 7dc18bdde41..ea36c1b8b3c 100644
--- a/chromium/chrome/app/resources/generated_resources_no.xtb
+++ b/chromium/chrome/app/resources/generated_resources_no.xtb
@@ -302,7 +302,7 @@ Du kan når som helst sjekke passordene dine i <ph name="GOOGLE_PASSWORD_MANAGER
 <translation id="1223484782328004593"><ph name="APP_NAME" /> krever en lisens</translation>
 <translation id="1223853788495130632">Administratoren din anbefaler en spesifikk verdi for denne innstillingen.</translation>
 <translation id="1225177025209879837">Forespørselen behandles...</translation>
-<translation id="1227660082540388410">Rediger tilgangsnøkkel</translation>
+<translation id="1227660082540388410">Rediger passnøkkel</translation>
 <translation id="1227993798763400520">Kunne ikke caste. Prøv på nytt.</translation>
 <translation id="1230417814058465809">Standardbeskyttelse er på. Bruk økt beskyttelse om du vil ha enda mer sikkerhet.</translation>
 <translation id="1232569758102978740">Uten tittel</translation>
@@ -545,7 +545,7 @@ Du kan når som helst sjekke passordene dine i <ph name="GOOGLE_PASSWORD_MANAGER
 <translation id="1433478348197382180">Lesemodus</translation>
 <translation id="1434696352799406980">Dette tilbakestiller oppstartssiden, nye faner, søkemotoren og eventuelle festede faner. I tillegg slår det av alle utvidelser og fjerner midlertidige data, for eksempel informasjonskapsler. Bokmerker, loggoppføringer og lagrede passord slettes ikke.</translation>
 <translation id="1434886155212424586">Startsiden er Ny fane-siden</translation>
-<translation id="1435940442311036198">Bruk en tilgangsnøkkel på en annen enhet</translation>
+<translation id="1435940442311036198">Bruk en passnøkkel på en annen enhet</translation>
 <translation id="1436390408194692385">Gyldig i <ph name="TICKET_TIME_LEFT" /></translation>
 <translation id="1436671784520050284">Fortsett konfigureringen</translation>
 <translation id="1436784010935106834">Fjernet</translation>
@@ -617,7 +617,7 @@ Tillatelser du allerede har gitt apper, kan gjelde for denne kontoen. Du kan sty
 <translation id="1485141095922496924">Versjon <ph name="PRODUCT_VERSION" /> (<ph name="PRODUCT_CHANNEL" />) <ph name="PRODUCT_MODIFIER" /> <ph name="PRODUCT_VERSION_BITS" /></translation>
 <translation id="1485197926103629489">Microsoft 365 krever at filer lagres i OneDrive. Lokale filer blir flyttet, og filer fra andre steder blir kopiert. Du finner filene dine i Microsoft OneDrive-mappen i Filer-appen.</translation>
 <translation id="1486096554574027028">Søk i passord</translation>
-<translation id="1486486872607808064">Skann denne QR-koden med et kamera på enheten der du vil opprette en tilgangsnøkkel for <ph name="APP_NAME" /></translation>
+<translation id="1486486872607808064">Skann denne QR-koden med et kamera på enheten der du vil opprette en passnøkkel for <ph name="APP_NAME" /></translation>
 <translation id="1487335504823219454">På – egendefinerte innstillinger</translation>
 <translation id="1493892686965953381">Venter på <ph name="LOAD_STATE_PARAMETER" /> …</translation>
 <translation id="1494349716233667318">Nettsteder kan be om å få bruke skrifttyper som er installert på enheten</translation>
@@ -951,7 +951,7 @@ Tillatelser du allerede har gitt apper, kan gjelde for denne kontoen. Du kan sty
 <translation id="1744108098763830590">bakgrunnsside</translation>
 <translation id="1745732479023874451">Administrer kontakter</translation>
 <translation id="1748283190377208783">{0,plural, =1{unused plural form}other{Vil du åpne og redigere # filer i denne nettappen?}}</translation>
-<translation id="1748329107062243374">Bruk en tilgangsnøkkel fra <ph name="DEVICE_NAME" /> for å logge på <ph name="WEBSITE" /></translation>
+<translation id="1748329107062243374">Bruk en passnøkkel fra <ph name="DEVICE_NAME" /> for å logge på <ph name="WEBSITE" /></translation>
 <translation id="1748563609363301860">Du kan lagre dette passordet i Google-kontoen din eller bare på denne enheten</translation>
 <translation id="1749733017156547309">Et passord kreves</translation>
 <translation id="1750172676754093297">Sikkerhetsnøkkelen din kan ikke lagre fingeravtrykk</translation>
@@ -1220,7 +1220,7 @@ Tillatelser du allerede har gitt apper, kan gjelde for denne kontoen. Du kan sty
 <translation id="1941995177877935582">Vis tastetilordninger</translation>
 <translation id="1942128823046546853">lese og endre alle dataene dine på alle nettsteder</translation>
 <translation id="1944528062465413897">Bluetooth-sammenkoblingskode</translation>
-<translation id="1944535645109964458">Ingen tilgangsnøkler er tilgjengelige</translation>
+<translation id="1944535645109964458">Ingen passnøkler er tilgjengelige</translation>
 <translation id="1944921356641260203">En oppdatering ble funnet</translation>
 <translation id="1947136734041527201">Lar deg logge på nettsteder med kontoer du har hos identitetstjenester</translation>
 <translation id="1949332606889020901">Programstopp-ID-er</translation>
@@ -2498,7 +2498,7 @@ Du kan administrere innstillingene for denne kontoen ved å installere Family Li
 <translation id="2931157624143513983">Tilpass til det utskrivbare området</translation>
 <translation id="2932085390869194046">Foreslå passord</translation>
 <translation id="2932483646085333864">Logg av og på igjen for å starte synkroniseringen</translation>
-<translation id="2932883381142163287">Rapportér uriktig bruk</translation>
+<translation id="2932883381142163287">Rapporter uriktig bruk</translation>
 <translation id="2933632078076743449">Siste oppdatering</translation>
 <translation id="2934999512438267372">Full kontroll over MIDI-enheter tillates</translation>
 <translation id="2935225303485967257">Administrer profiler</translation>
@@ -3679,7 +3679,7 @@ Dette kan omfatte informasjon om installert programvare, filer, nettleseren og e
 <translation id="3898768766145818464">Spill av videoen eller sett den på pause</translation>
 <translation id="389901847090970821">Velg tastatur</translation>
 <translation id="3900966090527141178">Eksportér passord</translation>
-<translation id="3902789559055749153">Velg hvordan du vil opprette en tilgangsnøkkel for <ph name="APP_NAME" /></translation>
+<translation id="3902789559055749153">Velg hvordan du vil opprette en passnøkkel for <ph name="APP_NAME" /></translation>
 <translation id="3903187154317825986">Innebygd tastatur</translation>
 <translation id="3904326018476041253">Stedstjenester</translation>
 <translation id="3905218345729976782">Koble til wifi med Android-telefon</translation>
@@ -4523,7 +4523,7 @@ Dette kan omfatte informasjon om installert programvare, filer, nettleseren og e
 <translation id="4594577641390224176">Ser du etter systemets Om-side? Gå til</translation>
 <translation id="4595560905247879544">Apper og utvidelser kan bare endres av administratoren (<ph name="CUSTODIAN_NAME" />).</translation>
 <translation id="4596295440756783523">Du har registrerte sertifikater som identifiserer disse tjenerne</translation>
-<translation id="4598345735110653698">Administrer tilgangsnøkler</translation>
+<translation id="4598345735110653698">Administrer passnøkler</translation>
 <translation id="4598549027014564149">Når du er i inkognitomodus, kan ikke nettsteder bruke informasjonskapsler for å se nettleseraktiviteten din på andre nettsteder – heller ikke relaterte nettsteder. Nettleseraktiviteten din brukes ikke til ting som personlig tilpasning av annonser. Det kan hende at funksjoner på noen nettsteder ikke fungerer.</translation>
 <translation id="4598556348158889687">Lagringsbehandling</translation>
 <translation id="4598776695426288251">Wifi er tilgjengelig via flere enheter</translation>
@@ -4785,7 +4785,7 @@ Bruk Ctrl + Alt + lysstyrke ned for å zoome ut.</translation>
 <translation id="4816097470512964351"><ph name="DEVICE" />, detaljer</translation>
 <translation id="4816336393325437908">{COUNT,plural, =1{1 bokmerke er slettet}other{{COUNT} bokmerker er slettet}}</translation>
 <translation id="481689174647911539">Denne filen kan være et virus eller skadelig programvare.<ph name="LINE_BREAK" />Du kan sende den til Google Safe Browsing for å sjekke om den er utrygg. Skanninger tar vanligvis noen sekunder.</translation>
-<translation id="4816900689218414104">Opprett en tilgangsnøkkel på en telefon eller et nettbrett</translation>
+<translation id="4816900689218414104">Opprett en passnøkkel på en telefon eller et nettbrett</translation>
 <translation id="4819323978093861656">{0,plural, =0{Lukkes nå.}=1{Lukkes om 1 sekund.}other{Lukkes om # sekunder.}}</translation>
 <translation id="4819607494758673676">Google Assistent-varsler</translation>
 <translation id="4819818293886748542">Få en link til støtteverktøyet</translation>
@@ -5129,7 +5129,7 @@ Bruk Ctrl + Alt + lysstyrke ned for å zoome ut.</translation>
 <translation id="5111326646107464148">Åpne gruppen i et nytt vindu</translation>
 <translation id="5111646998522066203">Avslutt inkognitomodus</translation>
 <translation id="5111692334209731439">&amp;Bokmerkebehandling</translation>
-<translation id="5111794652433847656">Det finnes ingen tilgangsnøkler for <ph name="APP_NAME" /> på denne enheten</translation>
+<translation id="5111794652433847656">Det finnes ingen passnøkler for <ph name="APP_NAME" /> på denne enheten</translation>
 <translation id="5112577000029535889">&amp;Utviklerverktøy</translation>
 <translation id="5112686815928391420">{NUM_OF_FILES,plural, =1{1 fil er flyttet}other{{NUM_OF_FILES} filer er flyttet}}</translation>
 <translation id="511313294362309725">Slå på rask sammenkobling</translation>
@@ -5337,7 +5337,7 @@ Bruk Ctrl + Alt + lysstyrke ned for å zoome ut.</translation>
 <translation id="5285635972691565180">Skjerm <ph name="DISPLAY_ID" /></translation>
 <translation id="5286194356314741248">Skanning</translation>
 <translation id="5287425679749926365">Dine kontoer</translation>
-<translation id="5288106344236929384">Flere handlinger og alternativer for tilgangsnøkler for <ph name="USERNAME" /> på <ph name="DOMAIN" /></translation>
+<translation id="5288106344236929384">Flere handlinger og alternativer for passnøkler for <ph name="USERNAME" /> på <ph name="DOMAIN" /></translation>
 <translation id="5288678174502918605">Gj&amp;enåpne den lukkede fanen</translation>
 <translation id="52895863590846877">Siden er ikke på <ph name="LANGUAGE" /></translation>
 <translation id="52912272896845572">Den private nøkkelfilen er ugyldig.</translation>
@@ -5828,7 +5828,7 @@ Tillatelser du allerede har gitt nettsteder og apper, kan gjelde for denne konto
 <translation id="5691772641933328258">Gjenkjenner ikke fingeravtrykket</translation>
 <translation id="5692183275898619210">Utskriften er fullført</translation>
 <translation id="5695184138696833495">Android-app-ADB for Linux</translation>
-<translation id="5696143504434933566">Rapportér uriktig bruk fra «<ph name="EXTENSION_NAME" />»</translation>
+<translation id="5696143504434933566">Rapporter uriktig bruk fra «<ph name="EXTENSION_NAME" />»</translation>
 <translation id="5696679855467848181">Gjeldende PPD-fil i bruk: <ph name="PPD_NAME" /></translation>
 <translation id="5697832193891326782">Emojivelger</translation>
 <translation id="5698462638680260399">Logg på for å bruke passord</translation>
@@ -6423,7 +6423,7 @@ Tillatelser du allerede har gitt nettsteder og apper, kan gjelde for denne konto
 <translation id="6178682841350631965">Påloggingsinformasjonen ble oppdatert</translation>
 <translation id="6180389074227570449">{NUM_EXTENSIONS,plural, =1{Vil du fjerne utvidelsen?}other{Vil du fjerne # utvidelser?}}</translation>
 <translation id="6180510783007738939">Linjeverktøy</translation>
-<translation id="6180550893222597997">Hvilken tilgangsnøkkel vil du bruke for <ph name="APP_NAME" />?</translation>
+<translation id="6180550893222597997">Hvilken passnøkkel vil du bruke for <ph name="APP_NAME" />?</translation>
 <translation id="6181431612547969857">Nedlastingen ble blokkert</translation>
 <translation id="6184099524311454384">Søk i faner</translation>
 <translation id="6185132558746749656">Enhetsposisjon</translation>
@@ -6766,7 +6766,7 @@ Tillatelser du allerede har gitt nettsteder og apper, kan gjelde for denne konto
 <translation id="6468485451923838994">Skrifter</translation>
 <translation id="6468773105221177474"><ph name="FILE_COUNT" /> filer</translation>
 <translation id="6469557521904094793">Slå på mobildata</translation>
-<translation id="6469702164109431067">Passord og tilgangsnøkler</translation>
+<translation id="6469702164109431067">Passord og passnøkler</translation>
 <translation id="6470823736074966819">Ignorer varsler</translation>
 <translation id="6472893788822429178">Vis startsideknapp</translation>
 <translation id="6474352027343282094">{COUNT,plural, =1{{COUNT} passord er bare lagret på denne enheten. For å bruke det på andre enheter, &lt;a target='_blank' href='chrome://password-manager/'&gt;lagre det i Google-kontoen din&lt;/a&gt;.}other{{COUNT} passord lagres bare på denne enheten. For å bruke dem på de andre enhetene dine, &lt;a target='_blank' href='chrome://password-manager/'&gt;lagre dem i Google-kontoen din&lt;/a&gt;.}}</translation>
@@ -6781,7 +6781,7 @@ Tillatelser du allerede har gitt nettsteder og apper, kan gjelde for denne konto
 <translation id="6482559668224714696">Lupe for hele skjermen</translation>
 <translation id="6483485061007832714">Åpne nedlasting</translation>
 <translation id="6483805311199035658">Åpner <ph name="FILE" /> ...</translation>
-<translation id="6486301003991593638">For å administrere tilgangsnøkler, bruk en nyere versjon av Windows</translation>
+<translation id="6486301003991593638">For å administrere passnøkler, bruk en nyere versjon av Windows</translation>
 <translation id="6488266788670893993"><ph name="BRAND" /> kan ikke sjekke passordene dine mot databrudd. Se om du er koblet til internett.</translation>
 <translation id="6488384360522318064">Velg språk</translation>
 <translation id="648927581764831596">Ikke tilgjengelig</translation>
@@ -7144,7 +7144,7 @@ Du har # passord til som er utsatt for sikkerhetsbrudd. Google Passordlagring an
 <translation id="6790820461102226165">Legg til person …</translation>
 <translation id="6793879402816827484">↓ <ph name="STATUS" /></translation>
 <translation id="6794511157503068">Hvis passnøkkelen for <ph name="APP_NAME" /> ligger på en USB-sikkerhetsnøkkel, setter du den inn og trykker på den nå</translation>
-<translation id="679486139907144816">For å logge på dette nettstedet med en tilgangsnøkkel må du slå på Windows Hello i innstillingene. Gå deretter tilbake til dette nettstedet, og prøv igjen.</translation>
+<translation id="679486139907144816">For å logge på dette nettstedet med en passnøkkel må du slå på Windows Hello i innstillingene. Gå deretter tilbake til dette nettstedet, og prøv igjen.</translation>
 <translation id="6795371939514004514">Med automatisk skanning kan du gå gjennom elementer på skjermen automatisk. Når et element er fremhevet, trykker du på «Velg» for å aktivere det.</translation>
 <translation id="6795884519221689054">Panda</translation>
 <translation id="6796509790850723820">Gjengi</translation>
@@ -7633,7 +7633,7 @@ Du har # passord til som er utsatt for sikkerhetsbrudd. Google Passordlagring an
 <translation id="7193374945610105795">Ingen passord er lagret for <ph name="ORIGIN" /></translation>
 <translation id="7194873994243265344">Organisasjonen din har blokkert denne filen fordi den er kryptert. Be eieren om å dekryptere den.</translation>
 <translation id="7196107899576756066">{COUNT,plural, =1{1 nedlasting pågår}other{# nedlastinger pågår}}</translation>
-<translation id="7196272782924897510">Vil du bruke en tilgangsnøkkel fra en annen enhet?</translation>
+<translation id="7196272782924897510">Vil du bruke en passnøkkel fra en annen enhet?</translation>
 <translation id="7196913789568937443">Sikkerhetskopiér til Google Disk. Gjenopprett data eller bytt enhet når som helst – helt enkelt. Sikkerhetskopiene dine lastes opp til Google og krypteres med passordet for Google-kontoen din. <ph name="BEGIN_LINK1" />Finn ut mer<ph name="END_LINK1" /></translation>
 <translation id="7197190419934240522">Få Google Søk og smarte funksjoner fra Google hver gang du surfer på nettet</translation>
 <translation id="719791532916917144">Hurtigtast</translation>
@@ -8356,7 +8356,7 @@ Trykk på en tilordnet bryter eller tast for å fjerne tilordningen.</translatio
 <translation id="7766807826975222231">Få en innføring</translation>
 <translation id="7766838926148951335">Godta tillatelsene</translation>
 <translation id="7767554953520855281">Detaljene skjules mens du deler skjermen</translation>
-<translation id="7767972280546034736">Opprett en tilgangsnøkkel for <ph name="APP_NAME" /></translation>
+<translation id="7767972280546034736">Opprett en passnøkkel for <ph name="APP_NAME" /></translation>
 <translation id="7768507955883790804">Nettsteder følger automatisk denne innstillingen når du besøker dem</translation>
 <translation id="7768526219335215384"><ph name="ORIGIN" /> får tilgang til å lese filer i <ph name="FOLDERNAME" /></translation>
 <translation id="7768770796815395237">Endre</translation>
@@ -8796,7 +8796,7 @@ Oppbevar nøkkelfilen på et trygt sted. Du får bruk for den når du skal oppre
 <translation id="810185532889603849">Egendefinert farge</translation>
 <translation id="8101987792947961127">Powerwash kreves ved neste omstart</translation>
 <translation id="8102139037507939978">Fjern personlig identifiserende informasjon fra system_logs.txt.</translation>
-<translation id="810362914482827094">Søk blant tilgangsnøkler</translation>
+<translation id="810362914482827094">Søk blant passnøkler</translation>
 <translation id="8104088837833760645">Last ned eSIM-profilen</translation>
 <translation id="8107015733319732394">Installerer Google Play-butikken på <ph name="DEVICE_TYPE" />-enheten din. Dette kan ta noen minutter.</translation>
 <translation id="810728361871746125">Skjermoppløsning</translation>
@@ -8918,7 +8918,7 @@ Oppbevar nøkkelfilen på et trygt sted. Du får bruk for den når du skal oppre
 <translation id="8206267832882844324">Endre notat</translation>
 <translation id="8206745257863499010">Plystre</translation>
 <translation id="8206859287963243715">Mobil</translation>
-<translation id="8207404892907560325">Velg en tilgangsnøkkel</translation>
+<translation id="8207404892907560325">Velg en passnøkkel</translation>
 <translation id="8207794858944505786">VM-en «<ph name="DEFAULT_VM_NAME" />» finnes, men ser ikke ut til å være en gyldig <ph name="VM_TYPE" />-VM. Kontakt administratoren din.</translation>
 <translation id="8208188204689616705">Disse nettstedene er med i en gruppe som er definert av <ph name="FPS_OWNER" />. Nettsteder i grupper kan se aktiviteten din i gruppen.</translation>
 <translation id="8208216423136871611">Ikke lagre</translation>
@@ -9345,7 +9345,7 @@ Oppbevar nøkkelfilen på et trygt sted. Du får bruk for den når du skal oppre
 <translation id="8557180006508471423">Slå på «Google Chrome» i Stedstjenester på Macen</translation>
 <translation id="8557856025359704738">Neste nedlasting utføres <ph name="NEXT_DATE_DOWNLOAD" />.</translation>
 <translation id="8558281414737757274">Google-kontopassord</translation>
-<translation id="8559858985063901027">Tilgangsnøkler</translation>
+<translation id="8559858985063901027">Passnøkler</translation>
 <translation id="8559961053328923750">Chrome begrenser den totale mengden data nettsteder kan dele via nettleseren for å måle annonseresultater</translation>
 <translation id="8560327176991673955">{COUNT,plural, =0{Åpne alle i &amp;nytt vindu}=1{Åpne i &amp;nytt vindu}other{Åpne alle ({COUNT}) i &amp;nytt vindu}}</translation>
 <translation id="8561206103590473338">Elefant</translation>
@@ -9555,7 +9555,7 @@ Oppbevar nøkkelfilen på et trygt sted. Du får bruk for den når du skal oppre
 <translation id="8724859055372736596">&amp;Vis i mappe</translation>
 <translation id="8725066075913043281">Prøv på nytt</translation>
 <translation id="8725178340343806893">Favoritter/bokmerker</translation>
-<translation id="87254326763805752">Bekreft tilgangsnøkkel</translation>
+<translation id="87254326763805752">Bekreft passnøkkel</translation>
 <translation id="8726206820263995930">Feil under henting av innstillingsangivelser fra tjeneren: <ph name="CLIENT_ERROR" />.</translation>
 <translation id="8727043961453758442">Få mest mulig ut av Chrome</translation>
 <translation id="8727751378406387165">Send <ph name="BEGIN_LINK1" />autofyll-metadata<ph name="END_LINK1" />
diff --git a/chromium/chrome/app/resources/generated_resources_or.xtb b/chromium/chrome/app/resources/generated_resources_or.xtb
index 975a9feaacc..e6552fbf8af 100644
--- a/chromium/chrome/app/resources/generated_resources_or.xtb
+++ b/chromium/chrome/app/resources/generated_resources_or.xtb
@@ -927,7 +927,7 @@
 <translation id="1730917990259790240"><ph name="BEGIN_PARAGRAPH1" />ଆପ୍‍ଗୁଡ଼ିକୁ କାଢ଼ିବା ପାଇଁ, ସେଟିଂସ୍ &gt; Google Play ଷ୍ଟୋର୍ &gt; Android ଅଗ୍ରାଧିକାରଗୁଡ଼ିକ ପରିଚାଳନା କରନ୍ତୁ &gt; ଆପ୍ସ କିମ୍ବା ଆପ୍ଲିକେସନ୍ ପରିଚାଳକକୁ ଯାଆନ୍ତୁ। ତା’ପରେ, ଆପଣ ଅନ୍‍ଇନ୍‍ଷ୍ଟଲ୍ କରିବାକୁ ଚାହୁଁଥିବା ଆପ୍ ଉପରେ ଟାପ୍ କରନ୍ତୁ (ଆପ୍‍ଟିକୁ ଖୋଜି ପାଇବା ପାଇଁ ଆପଣଙ୍କୁ ଡାହାଣ ବା ବାମକୁ ସ୍ଵାଇପ୍ କରିବାକୁ ପଡ଼ିପାରେ)। ତା’ପରେ, ଅନ୍-ଇନ୍‍ଷ୍ଟଲ୍ କିମ୍ବା 'ଅକ୍ଷମ କରନ୍ତୁ' ଉପରେ ଟାପ୍ କରନ୍ତୁ।<ph name="END_PARAGRAPH1" /></translation>
 <translation id="1730989807608739928">ଶେଷ ଟାବ ଆଡ଼କୁ ସ୍କ୍ରୋଲ କରନ୍ତୁ</translation>
 <translation id="1731520826054843792">Microsoft ସାର୍ଟିଫିକେଟ ଟେମ୍ପଲେଟ</translation>
-<translation id="1731911755844941020">ପ୍ରେରଣ ଅନୁରୋଧ...</translation>
+<translation id="1731911755844941020">ପଠାଇବା ଅନୁରୋଧ...</translation>
 <translation id="1733383495376208985">ଆପଣ ନିଜର <ph name="BEGIN_LINK" />ସିଙ୍କ୍ ପାସ୍‌ଫ୍ରେଜ୍<ph name="END_LINK" /> ସହିତ ସିଙ୍କ୍ କରାଯାଇଥିବା ଡାଟାକୁ ଏନ୍‌କ୍ରିପ୍ଟ କରନ୍ତୁ। ଏଥିରେ Google Payରୁ ପେମେଣ୍ଟ୍ ପଦ୍ଧତି ଓ ଠିକଣା ଅନ୍ତର୍ଭୁକ୍ତ ନାହିଁ।</translation>
 <translation id="1734212868489994726">ହାଲୁକା ନୀଳ</translation>
 <translation id="1734230530703461088">ସମୟ ସୀମା ଭିତରେ ଏକ୍ସଟେନସନଗୁଡ଼ିକୁ ଲୋଡ୍ କରିବାରେ ବିଫଳ ହୋଇଛି। ଦୟାକରି ଆପଣଙ୍କ ଆଡମିନିଷ୍ଟ୍ରେଟରଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।</translation>
@@ -1144,7 +1144,7 @@
 <translation id="189035593835762169">ଚୁକ୍ତି ଓ ସର୍ତ୍ତାବଳୀ</translation>
 <translation id="1891362123137972260">ଡିସ୍କ ସ୍ପେସ୍ ଅତ୍ୟନ୍ତ କମ୍ ଅଛି। ଦୟାକରି ଡିସ୍କ ସ୍ପେସ୍ ଖାଲି କରନ୍ତୁ।</translation>
 <translation id="189210018541388520">ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନ୍‌ ଖୋଲନ୍ତୁ</translation>
-<translation id="1892341345406963517">ନମସ୍କାର <ph name="PARENT_NAME" /></translation>
+<translation id="1892341345406963517">ହାଏ <ph name="PARENT_NAME" /></translation>
 <translation id="189358972401248634">ଅନ୍ୟ ଭାଷାଗୁଡ଼ିକ</translation>
 <translation id="1895658205118569222">ବନ୍ଦ କରନ୍ତୁ</translation>
 <translation id="1896043844785689584">ଟିପଚିହ୍ନ ସେଟ ଅପ କରିବା ପାଇଁ ଆପଣଙ୍କ ପିଲାକୁ କୀବୋର୍ଡର ନିମ୍ନ ଡାହାଣ କୋଣରେ ଥିବା ଟିପଚିହ୍ନ ସେନ୍ସରକୁ ସ୍ପର୍ଶ କରିବା ପାଇଁ ଦିଅନ୍ତୁ। ଆପଣଙ୍କ ପିଲାର ଟିପଚିହ୍ନ ଡାଟାକୁ ସୁରକ୍ଷିତ ଭାବେ ଷ୍ଟୋର କରାଯାଇଛି ଏବଂ ଏହାକୁ କେବେ ବି ଏହି <ph name="DEVICE_TYPE" />ରୁ କାଢ଼ି ଦିଆଯାଏ ନାହିଁ।</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_pa.xtb b/chromium/chrome/app/resources/generated_resources_pa.xtb
index 71f5bb1d215..cd5d1700769 100644
--- a/chromium/chrome/app/resources/generated_resources_pa.xtb
+++ b/chromium/chrome/app/resources/generated_resources_pa.xtb
@@ -1121,7 +1121,7 @@
 <translation id="1864454756846565995">USB-C ਡੀਵਾਈਸ (ਪਿਛਲਾ ਪੋਰਟ)</translation>
 <translation id="1865769994591826607">ਸਿਰਫ਼ ਸਮਰੂਪ-ਸਾਈਟ ਕਨੈਕਸ਼ਨ</translation>
 <translation id="186594096341696655">ਸੈਂਪਲ ਰੇਟ ਘਟਾਓ</translation>
-<translation id="186612162884103683">"<ph name="EXTENSION" />" ਸਹੀ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਏ ਹੋਏ ਨਿਰਧਾਰਿਤ ਸਥਾਨਾਂ ਵਿੱਚ ਚਿੱਤਰ, ਵੀਡਿਓ ਅਤੇ ਅਵਾਜ਼ ਫਾਈਲਾਂ ਪੜ੍ਹ ਅਤੇ ਲਿਖ ਸਕਦਾ ਹੈ।</translation>
+<translation id="186612162884103683">"<ph name="EXTENSION" />" ਸਹੀ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਏ ਹੋਏ ਨਿਰਧਾਰਿਤ ਸਥਾਨਾਂ ਵਿੱਚ ਚਿੱਤਰ, ਵੀਡੀਓ ਅਤੇ ਅਵਾਜ਼ ਫਾਈਲਾਂ ਪੜ੍ਹ ਅਤੇ ਲਿਖ ਸਕਦਾ ਹੈ।</translation>
 <translation id="1867780286110144690"><ph name="PRODUCT_NAME" /> ਆਪਣੀ ਇੰਸਟੌਲੇਸ਼ਨ ਪੂਰੀ ਕਰਨ ਲਈ ਤਿਆਰ ਹੈ</translation>
 <translation id="1868553836791672080">Chromium ਵਿੱਚ ਪਾਸਵਰਡ ਜਾਂਚ ਉਪਲਬਧ ਨਹੀਂ ਹੈ</translation>
 <translation id="1868617395637139709">Android ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਲਈ ਟਿਕਾਣੇ ਦੀ ਵਰਤੋਂ ਕਰੋ।</translation>
@@ -3505,7 +3505,7 @@
 <translation id="3766811143887729231"><ph name="REFRESH_RATE" /> Hz</translation>
 <translation id="377050016711188788">ਆਈਸਕ੍ਰੀਮ</translation>
 <translation id="3771290962915251154">ਮਾਪਿਆਂ ਦੇ ਕੰਟਰੋਲ ਚਾਲੂ ਹੋਣ ਕਰਕੇ ਇਹ ਸੈਟਿੰਗ ਬੰਦ ਹੈ</translation>
-<translation id="3771294271822695279">ਵੀਡਿਓ ਫਾਈਲਾਂ</translation>
+<translation id="3771294271822695279">ਵੀਡੀਓ ਫ਼ਾਈਲਾਂ</translation>
 <translation id="3771851622616482156">ਖੁੱਲ੍ਹੀਆਂ ਟੈਬਾਂ ਸਮੇਤ, ਤੁਹਾਨੂੰ ਇਸ ਸਾਈਟ ਤੋਂ ਸਾਈਨ-ਆਊਟ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ</translation>
 <translation id="3772046291955677288">ਮੈਂ <ph name="BEGIN_LINK1" />Google ਦੇ ਸੇਵਾ ਦੇ ਨਿਯਮਾਂ<ph name="END_LINK1" /> ਅਤੇ <ph name="BEGIN_LINK2" />Chrome ਅਤੇ ChromeOS ਦੇ ਵਧੀਕ ਸੇਵਾ ਦੇ ਨਿਯਮਾਂ<ph name="END_LINK2" /> ਨੂੰ ਪੜ੍ਹ ਲਿਆ ਹੈ ਅਤੇ ਉਨ੍ਹਾਂ ਨਾਲ ਸਹਿਮਤ ਹਾਂ।</translation>
 <translation id="3774166835015494435">ਹਾਲੀਆ ਫ਼ੋਟੋਆਂ ਅਤੇ ਸੂਚਨਾਵਾਂ</translation>
@@ -4581,7 +4581,7 @@
 <translation id="4638930039313743000">ADB ਡੀਬੱਗਿੰਗ ਨੂੰ ਚਾਲੂ ਕਰੋ</translation>
 <translation id="4641539339823703554">Chrome ਸਿਸਟਮ ਸਮਾਂ ਸੈੱਟ ਨਹੀਂ ਕਰ ਸਕਿਆ। ਕਿਰਪਾ ਕਰਕੇ ਹੇਠਾਂ ਦਿੱਤਾ ਸਮਾਂ ਦੇਖੋ ਅਤੇ ਜੇਕਰ ਲੋੜ ਹੋਵੇ ਤਾਂ ਇਸਨੂੰ ਠੀਕ ਕਰੋ।</translation>
 <translation id="4642587497923912728">Steam for Chromebook (ਬੀਟਾ) ਸਿਰਫ਼ ਉਨ੍ਹਾਂ ਖਾਤਿਆਂ ਲਈ ਹੀ ਉਪਲਬਧ ਹੈ, ਜਿਨ੍ਹਾਂ ਨਾਲ ਪਹਿਲਾਂ ਇਸ Chromebook 'ਤੇ ਸਾਈਨ-ਇਨ ਕੀਤਾ ਗਿਆ ਹੈ।</translation>
-<translation id="4643612240819915418">&amp;ਨਵੀਂ ਟੈਬ ਵਿੱਚ ਵੀਡਿਓ ਖੋਲ੍ਹੋ</translation>
+<translation id="4643612240819915418">&amp;ਨਵੀਂ ਟੈਬ ਵਿੱਚ ਵੀਡੀਓ ਖੋਲ੍ਹੋ</translation>
 <translation id="4643833688073835173">ਤੁਹਾਡੀ Chromebook ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦੇ ਸਾਹਮਣੇ ਮੌਜੂਦ ਲੋਕਾਂ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ ਬਿਲਟ-ਇਨ ਸੈਂਸਰ ਦੀ ਵਰਤੋਂ ਕਰਦੀ ਹੈ। ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਵਿਚਲੇ ਸਾਰੇ ਡਾਟੇ 'ਤੇ ਤੁਰੰਤ ਪ੍ਰਕਿਰਿਆ ਕੀਤੀ ਜਾਂਦੀ ਹੈ ਅਤੇ ਫਿਰ ਇਸਨੂੰ ਮਿਟਾ ਦਿੱਤਾ ਜਾਂਦਾ ਹੈ। ਸੈਂਸਰ ਡਾਟਾ ਕਦੇ ਵੀ Google ਨੂੰ ਨਹੀਂ ਭੇਜਿਆ ਜਾਂਦਾ।</translation>
 <translation id="4644205769234414680">ਇਨਕੋਗਨਿਟੋ ਵਿੱਚ ਆਗਿਆ ਦਿਓ</translation>
 <translation id="4645575059429386691">ਤੁਹਾਡੇ ਮਾਤਾ ਜਾਂ ਪਿਤਾ ਵੱਲੋਂ ਵਿਵਸਥਿਤ</translation>
@@ -4822,7 +4822,7 @@
 <translation id="4838836835474292213">ਕਲਿੱਪਬੋਰਡ ਪੜ੍ਹਨ ਦੀ ਪਹੁੰਚ ਦਿੱਤੀ ਗਈ</translation>
 <translation id="4838907349371614303">ਪਾਸਵਰਡ ਅੱਪਡੇਟ ਕੀਤਾ ਗਿਆ</translation>
 <translation id="4838958829619609362">ਚੋਣ <ph name="LANGUAGE" /> ਵਿੱਚ ਉਪਲਬਧ ਨਹੀਂ ਹੈ</translation>
-<translation id="4839303808932127586">ਦੇ ਤੌਰ 'ਤੇ ਵੀਡਿਓ ਰੱ&amp;ਖਿਅਤ ਕਰੋ...</translation>
+<translation id="4839303808932127586">...ਦੇ ਤੌਰ 'ਤੇ ਵੀਡੀਓ ਰੱਖਿਅਤ ਕਰੋ</translation>
 <translation id="4839910546484524995">ਆਪਣੇ ਡੀਵਾਈਸ ਦੀ ਜਾਂਚ ਕਰੋ</translation>
 <translation id="4840096453115567876">ਕੀ ਫਿਰ ਵੀ ਇਨਕੋਗਨਿਟੋ ਮੋਡ ਛੱਡਣਾ ਹੈ?</translation>
 <translation id="4841741146571978176">ਲੋੜੀਂਦੀ ਆਭਾਸੀ ਮਸ਼ੀਨ ਮੌਜੂਦ ਨਹੀਂ ਹੈ। ਜਾਰੀ ਰੱਖਣ ਲਈ ਕਿਰਪਾ ਕਰਕੇ <ph name="VM_TYPE" /> ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ</translation>
@@ -6286,7 +6286,7 @@
 <translation id="6061408389284235459"><ph name="DEVICE_NAME" /> ਨੂੰ ਸੂਚਨਾ ਭੇਜੀ ਗਈ</translation>
 <translation id="6063284707309177505">QR ਕੋਡ ਬਣਾਓ</translation>
 <translation id="6063847492705284550"><ph name="BEGIN_BOLD" />ਨੋਟ ਕਰੋ<ph name="END_BOLD" />: ਕਿਸੇ ਮਿਲਦੀ-ਜੁਲਦੀ ਅਵਾਜ਼ ਜਾਂ ਅਵਾਜ਼ ਦੀ ਰਿਕਾਰਡਿੰਗ ਨਾਲ <ph name="SUPERVISED_USER_NAME" /> ਦੇ ਨਿੱਜੀ ਨਤੀਜਿਆਂ ਤੱਕ ਪਹੁੰਚ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ। ਬੈਟਰੀ ਬਚਾਉਣ ਲਈ, ਤੁਸੀਂ <ph name="SUPERVISED_USER_NAME" /> ਦੀਆਂ Assistant ਸੈਟਿੰਗਾਂ ਵਿੱਚ "Ok Google" ਨੂੰ ਸਿਰਫ਼ ਉਦੋਂ ਚਾਲੂ ਰੱਖਣ ਦੀ ਚੋਣ ਕਰ ਸਕਦੇ ਹੋ ਜਦੋਂ ਇਹ ਡੀਵਾਈਸ ਕਿਸੇ ਪਾਵਰ ਦੇ ਸਰੋਤ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ ਹੋਵੇ।</translation>
-<translation id="6064217302520318294">ਸਕ੍ਰੀਨ ਲੌਕ</translation>
+<translation id="6064217302520318294">ਸਕ੍ਰੀਨ ਲਾਕ</translation>
 <translation id="6065145031947216733">ਕੀ ਆਪਣੀ ਬ੍ਰਾਊਜ਼ਿੰਗ ਨੂੰ ਵੱਖ ਕਰਨਾ ਹੈ?</translation>
 <translation id="6065289257230303064">ਪ੍ਰਮਾਣ-ਪੱਤਰ ਵਿਸ਼ਾ ਡਾਇਰੈਕਟਰੀ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ</translation>
 <translation id="6066794465984119824">ਚਿੱਤਰ ਹੈਸ਼ ਸੈੱਟ ਨਹੀਂ ਹੈ</translation>
@@ -7610,7 +7610,7 @@
 <translation id="7160182524506337403">ਤੁਸੀਂ ਹੁਣ ਆਪਣੇ ਫ਼ੋਨ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਦੇਖ ਸਕਦੇ ਹੋ</translation>
 <translation id="7163202347044721291">ਕਿਰਿਆਸ਼ੀਲ ਕਰਨ ਲਈ ਕੋਡ ਦੀ ਪੁਸ਼ਟੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ...</translation>
 <translation id="7165263843655074092">ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ 'ਤੇ ਮਿਆਰੀ ਸੁਰੱਖਿਆ ਪ੍ਰਾਪਤ ਕਰ ਰਹੇ ਹੋ</translation>
-<translation id="716640248772308851">"<ph name="EXTENSION" />" ਸਹੀ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਏ ਹੋਏ ਨਿਰਧਾਰਿਤ ਸਥਾਨਾਂ ਵਿੱਚ ਚਿੱਤਰ, ਵੀਡਿਓ ਅਤੇ ਅਵਾਜ਼ ਫਾਈਲਾਂ ਪੜ੍ਹ ਸਕਦਾ ਹੈ।</translation>
+<translation id="716640248772308851">"<ph name="EXTENSION" />" ਸਹੀ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਏ ਹੋਏ ਨਿਰਧਾਰਿਤ ਸਥਾਨਾਂ ਵਿੱਚ ਚਿੱਤਰ, ਵੀਡੀਓ ਅਤੇ ਅਵਾਜ਼ ਫਾਈਲਾਂ ਪੜ੍ਹ ਸਕਦਾ ਹੈ।</translation>
 <translation id="7166815366658507447">ਹੌਟਸਪੌਟ ਚਾਲੂ ਹੈ</translation>
 <translation id="7167327771183668296">ਸਵੈ ਕਲਿੱਕਾਂ</translation>
 <translation id="7167486101654761064">&amp;ਹਮੇਸ਼ਾਂ ਇਸ ਪ੍ਰਕਾਰ ਦੀਆਂ ਫਾਈਲਾਂ ਖੋਲ੍ਹੋ</translation>
@@ -8891,7 +8891,7 @@
 <translation id="8179976553408161302">ਦਰਜ ਕਰੋ</translation>
 <translation id="8180295062887074137"><ph name="PRINTER_NAME" /> <ph name="PRINTER_STATUS" />। <ph name="NUM_PRINTERS" /> ਵਿੱਚੋਂ <ph name="ITEM_POSITION" /> ਪ੍ਰਿੰਟਰ।</translation>
 <translation id="8180785270975217276">ਊਰਜਾ ਸੇਵਰ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਗਿਆ</translation>
-<translation id="8180786512391440389">"<ph name="EXTENSION" />" ਸਹੀ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਏ ਹੋਏ ਨਿਰਧਾਰਿਤ ਸਥਾਨਾਂ ਵਿੱਚ ਚਿੱਤਰ, ਵੀਡਿਓ ਅਤੇ ਅਵਾਜ਼ ਫਾਈਲਾਂ ਪੜ੍ਹ ਸਕਦਾ ਹੈ।</translation>
+<translation id="8180786512391440389">"<ph name="EXTENSION" />" ਸਹੀ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਏ ਹੋਏ ਨਿਰਧਾਰਿਤ ਸਥਾਨਾਂ ਵਿੱਚ ਚਿੱਤਰ, ਵੀਡੀਓ ਅਤੇ ਅਵਾਜ਼ ਫਾਈਲਾਂ ਪੜ੍ਹ ਸਕਦਾ ਹੈ।</translation>
 <translation id="8180826593917851025"><ph name="DEVICE_TYPE" /> ਹੌਟਸਪੌਟ ਦਾ ਸੰਰੂਪਣ ਕਰੋ</translation>
 <translation id="8181215761849004992">ਡੋਮੇਨ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਇਹ ਦੇਖਣ ਲਈ ਆਪਣੇ ਖਾਤੇ ਦੀ ਜਾਂਚ ਕਰੋ ਕਿ ਤੁਹਾਡੇ ਕੋਲ ਡੀਵਾਈਸਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰਨ ਦੇ ਵਿਸ਼ੇਸ਼-ਅਧਿਕਾਰ ਹਨ।</translation>
 <translation id="8182105986296479640">ਐਪਲੀਕੇਸ਼ਨ ਪ੍ਰਤੀਕਿਰਿਆ ਨਹੀਂ ਦੇ ਰਹੀ ਹੈ।</translation>
@@ -9375,7 +9375,7 @@
 <translation id="8577052309681449949">ਸਵੈਚਲਿਤ ਕਲਿੱਕਾਂ, ਕਰਸਰ ਦਾ ਆਕਾਰ, ਕਰਸਰ ਦਾ ਰੰਗ ਅਤੇ ਹੋਰ ਬਹੁਤ ਕੁਝ</translation>
 <translation id="8578639784464423491">99 ਤੋਂ ਜ਼ਿਆਦਾ ਅੱਖਰ ਨਹੀਂ ਹੋ ਸਕਦੇ</translation>
 <translation id="8581809080475256101">ਇਤਿਹਾਸ ਦੇਖਣ ਲਈ ਅੱਗੇ ਜਾਓ, ਸੰਦਰਭੀ ਮੀਨੂ ਦਬਾਓ</translation>
-<translation id="8584280235376696778">&amp;ਨਵੀਂ ਟੈਬ ਵਿੱਚ ਵੀਡਿਓ ਖੋਲ੍ਹੋ</translation>
+<translation id="8584280235376696778">&amp;ਨਵੀਂ ਟੈਬ ਵਿੱਚ ਵੀਡੀਓ ਖੋਲ੍ਹੋ</translation>
 <translation id="858451212965845553">ਆਪਣੇ ਡੀ&amp;ਵਾਈਸਾਂ 'ਤੇ ਭੇਜੋ</translation>
 <translation id="8584843865238667486">ਵਰਤੋਂ ਪੰਨੇ <ph name="USAGE_PAGE" /> ਤੋਂ <ph name="USAGE" /> ਵਰਤੋਂ ਵਾਲੇ HID ਡੀਵਾਈਸ</translation>
 <translation id="8585480574870650651">Crostini ਹਟਾਓ</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_pl.xtb b/chromium/chrome/app/resources/generated_resources_pl.xtb
index 82e5eb8977a..72c525500a8 100644
--- a/chromium/chrome/app/resources/generated_resources_pl.xtb
+++ b/chromium/chrome/app/resources/generated_resources_pl.xtb
@@ -9778,7 +9778,7 @@ Domena <ph name="DOMAIN" /> wymaga, by karta inteligentna pozostała w gnieźdz
 <translation id="8930351635855238750">Nowe ustawienia plików cookie zostaną zastosowane po ponownym załadowaniu strony</translation>
 <translation id="8930622219860340959">Sieć bezprzewodowa</translation>
 <translation id="8931076093143205651">Wysyłaj dane diagnostyczne oraz informacje o użytkowaniu. Pomóż ulepszyć działanie Androida, wysyłając automatycznie do Google dane diagnostyczne oraz informacje o używaniu urządzenia i aplikacji. Dzięki temu będziemy mogli poprawić stabilność systemu i aplikacji oraz wprowadzić inne ulepszenia. Niektóre dane zbiorcze pomogą nam też udoskonalić aplikacje Google lub zostaną wykorzystane przez naszych partnerów, na przykład deweloperów aplikacji na Androida. To ustawienie jest wymuszone przez właściciela. Właściciel może zezwolić na wysyłanie do Google danych diagnostycznych i informacji o używaniu tego urządzenia. Jeśli włączysz ustawienie Dodatkowa aktywność w internecie i aplikacjach, te dane mogą być zapisywane na Twoim koncie Google.</translation>
-<translation id="8931475688782629595">Zarządzanie synchronizacją</translation>
+<translation id="8931475688782629595">Zarządzaj synchronizacją</translation>
 <translation id="8931713990831679796">Te drukarki są podłączone i gotowe do użycia. Zapisz je w swoim profilu, aby mieć do nich łatwiejszy dostęp.</translation>
 <translation id="8932654652795262306">Szczegóły błyskawicznego połączenia w tetheringu</translation>
 <translation id="893298445929867520">Koszyki zostały ukryte. Pojawią się z powrotem, gdy wprowadzisz zmiany.</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_pt-BR.xtb b/chromium/chrome/app/resources/generated_resources_pt-BR.xtb
index 2155434bda8..6a5154a2e7e 100644
--- a/chromium/chrome/app/resources/generated_resources_pt-BR.xtb
+++ b/chromium/chrome/app/resources/generated_resources_pt-BR.xtb
@@ -1043,7 +1043,7 @@ As permissões que você já concedeu a apps podem ser aplicadas a essa conta. V
     <ph name="LINE_BREAKS2" />
     Isso não afetará apps ou conteúdo em outros dispositivos.</translation>
 <translation id="1809734401532861917">Adicionar meus favoritos, histórico, senhas e outras configurações a <ph name="USER_EMAIL_ADDRESS" /></translation>
-<translation id="1810070166657251157">Para usar as senhas salvas no smartphone, siga o código QR, faça o download do Chrome para iOS e faça login na sua Conta do Google.</translation>
+<translation id="1810070166657251157">Para usar as senhas salvas no smartphone, faça o download do Chrome para iOS usando o código QR e entre na sua Conta do Google.</translation>
 <translation id="1810366086647840386">Servidor da imagem</translation>
 <translation id="1811908311154949291">Frame isolado em modo de navegação anônima: <ph name="FENCEDFRAME_SITE" /></translation>
 <translation id="1812284620455788548">Transmitindo <ph name="TAB_NAME" /></translation>
@@ -1245,7 +1245,7 @@ As permissões que você já concedeu a apps podem ser aplicadas a essa conta. V
 <translation id="1966649499058910679">Destaque cada palavra à medida que for falada</translation>
 <translation id="1967970931040389207">Ativar o ponto de acesso</translation>
 <translation id="1969011864782743497"><ph name="DEVICE_NAME" /> (USB)</translation>
-<translation id="1969550816138571473">Como se preparar</translation>
+<translation id="1969550816138571473">Só um momento...</translation>
 <translation id="1969654639948595766">Registros de texto WebRTC (<ph name="WEBRTC_TEXT_LOG_COUNT" />)</translation>
 <translation id="1972313920920745320">Os sites adicionados sempre ficam ativos e a memória não é liberada. <ph name="BEGIN_LINK" />Saiba mais sobre como deixar sites específicos ativos<ph name="END_LINK" /></translation>
 <translation id="1972325230031091483">Como o conteúdo é carregado proativamente com base na página da Web atual, você navega com mais rapidez</translation>
@@ -6513,7 +6513,7 @@ Não exponha nenhuma informação confidencial.</translation>
 <translation id="6242852299490624841">Focar esta guia</translation>
 <translation id="6243774244933267674">Servidor não disponível</translation>
 <translation id="6244245036423700521">Importar arquivo ONC</translation>
-<translation id="6245523954602476652">Você pode acessá-lo no Gerenciador de senhas do Google.</translation>
+<translation id="6245523954602476652">Você pode acessá-la no Gerenciador de senhas do Google.</translation>
 <translation id="6246790815526961700">Upload do dispositivo</translation>
 <translation id="6247557882553405851">Gerenciador de senhas do Google</translation>
 <translation id="6247620186971210352">Nenhum app encontrado</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_ro.xtb b/chromium/chrome/app/resources/generated_resources_ro.xtb
index 08a67512add..06148d41e66 100644
--- a/chromium/chrome/app/resources/generated_resources_ro.xtb
+++ b/chromium/chrome/app/resources/generated_resources_ro.xtb
@@ -7431,7 +7431,7 @@ Mai ai # de parole compromise. Managerul de parole Google recomandă să verific
 <translation id="7005812687360380971">Eroare</translation>
 <translation id="7005848115657603926">Interval de pagini nevalid, utilizează <ph name="EXAMPLE_PAGE_RANGE" /></translation>
 <translation id="7006438259896942210">Acest cont (<ph name="USER_EMAIL_ADDRESS" />) este gestionat de<ph name="PROFILE_NAME" /></translation>
-<translation id="700651317925502808">Reinițializezi setările?</translation>
+<translation id="700651317925502808">Resetezi browserul?</translation>
 <translation id="7006634003215061422">Margine jos</translation>
 <translation id="7007648447224463482">Deschide totul într-o fereastră nouă</translation>
 <translation id="7008815993384338777">Nu se folosește roamingul</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_ru.xtb b/chromium/chrome/app/resources/generated_resources_ru.xtb
index 70c6f9eb759..d86a48500a0 100644
--- a/chromium/chrome/app/resources/generated_resources_ru.xtb
+++ b/chromium/chrome/app/resources/generated_resources_ru.xtb
@@ -1033,7 +1033,7 @@
     <ph name="LINE_BREAKS2" />
     Контент и приложения на других устройствах сохранятся.</translation>
 <translation id="1809734401532861917">Добавить мои закладки, историю, пароли и другие настройки в <ph name="USER_EMAIL_ADDRESS" /></translation>
-<translation id="1810070166657251157">Чтобы использовать сохраненные пароли на телефоне, отсканируйте QR-код, скачайте Chrome для iOS и войдите в свой аккаунт Google.</translation>
+<translation id="1810070166657251157">Чтобы использовать сохраненные пароли на телефоне, перейдите по ссылке в QR-коде, установите Chrome для iOS и войдите в свой аккаунт Google.</translation>
 <translation id="1810366086647840386">Сервер с образом</translation>
 <translation id="1811908311154949291">Элемент Fenced Frame в режиме инкогнито: <ph name="FENCEDFRAME_SITE" /></translation>
 <translation id="1812284620455788548">Транслируется: <ph name="TAB_NAME" /></translation>
@@ -2287,7 +2287,7 @@
 <translation id="2773288106548584039">Поддержка альтернативного браузера</translation>
 <translation id="2773802008104670137">Файлы этого типа могут нанести вред вашему компьютеру.</translation>
 <translation id="2775104091073479743">Настроить отпечатки</translation>
-<translation id="2775420101802644975">{NUM_CONNECTION,plural, =0{Расширение "<ph name="EXTENSION" />" получало доступ к устройствам}=1{Расширение "<ph name="EXTENSION" />" получает доступ к {0} устройству}one{Расширение "<ph name="EXTENSION" />" получает доступ к {0} устройству}few{Расширение "<ph name="EXTENSION" />" получает доступ к {0} устройствам}many{Расширение "<ph name="EXTENSION" />" получает доступ к {0} устройствам}other{Расширение "<ph name="EXTENSION" />" получает доступ к {0} устройства}}</translation>
+<translation id="2775420101802644975">{NUM_CONNECTION,plural, =0{Расширение "<ph name="EXTENSION" />" обращалось к устройствам}=1{Расширение "<ph name="EXTENSION" />" обращается к {0} устройству}one{Расширение "<ph name="EXTENSION" />" обращается к {0} устройству}few{Расширение "<ph name="EXTENSION" />" обращается к {0} устройствам}many{Расширение "<ph name="EXTENSION" />" обращается к {0} устройствам}other{Расширение "<ph name="EXTENSION" />" обращается к {0} устройства}}</translation>
 <translation id="2775858145769350417">{NUM_APPS,plural, =1{Удалить 1 неподдерживаемое приложение}one{Удалить # неподдерживаемое приложение}few{Удалить # неподдерживаемых приложения}many{Удалить # неподдерживаемых приложений}other{Удалить # неподдерживаемого приложения}}</translation>
 <translation id="2776515114087183002">Показать сайты</translation>
 <translation id="2776560192867872731">Изменить название устройства "<ph name="DEVICE_NAME" />"</translation>
@@ -2584,7 +2584,7 @@
 <translation id="3007410324195400631">Добавьте заметки об этой странице</translation>
 <translation id="3007771295016901659">Дублировать вкладку</translation>
 <translation id="3008232374986381779">Запускать инструменты, редакторы и интегрированные среды разработки Linux на своем устройстве <ph name="DEVICE_TYPE" />. <ph name="LINK_BEGIN" />Подробнее…<ph name="LINK_END" /></translation>
-<translation id="3008272652534848354">Сбросить все разрешения</translation>
+<translation id="3008272652534848354">Сбросить разрешения</translation>
 <translation id="3008694618228964140">{NUM_DAYS,plural, =1{Согласно действующему правилу (источник правила: <ph name="MANAGER" />), вам нужно сегодня скачать обновление по Wi-Fi. Вам также доступно подключение с тарификацией, но в этом случае может взиматься плата за передачу данных.}one{Согласно действующему правилу (источник правила <ph name="MANAGER" />), вам до истечения срока нужно скачать обновление по Wi-Fi. Вам также доступно подключение с тарификацией, но в этом случае может взиматься плата за передачу данных.}few{Согласно действующему правилу (источник правила <ph name="MANAGER" />), вам до истечения срока нужно скачать обновление по Wi-Fi. Вам также доступно подключение с тарификацией, но в этом случае может взиматься плата за передачу данных.}many{Согласно действующему правилу (источник правила <ph name="MANAGER" />), вам до истечения срока нужно скачать обновление по Wi-Fi. Вам также доступно подключение с тарификацией, но в этом случае может взиматься плата за передачу данных.}other{Согласно действующему правилу (источник правила <ph name="MANAGER" />), вам до истечения срока нужно скачать обновление по Wi-Fi. Вам также доступно подключение с тарификацией, но в этом случае может взиматься плата за передачу данных.}}</translation>
 <translation id="3009178788565917040">Выход</translation>
 <translation id="3009300415590184725">Отменить настройку мобильной передачи данных?</translation>
@@ -4002,7 +4002,7 @@
 <translation id="4159784952369912983">Фиолетовый</translation>
 <translation id="4163560723127662357">Неизвестная клавиатура</translation>
 <translation id="4165942112764990069">Адрес <ph name="USER_EMAIL" /> не принадлежит действительной организации. Обратитесь к администратору. Если вы администратор, перейдите на страницу g.co/ChromeEnterpriseAccount и настройте аккаунт организации.</translation>
-<translation id="4165986682804962316">Настройки сайтов</translation>
+<translation id="4165986682804962316">Настройки сайта</translation>
 <translation id="4167212649627589331">Приложение "<ph name="APP_NAME" />" пытается получить доступ к устройству "<ph name="DEVICE_NAME" />". Чтобы предоставить его, переведите в выключенное положение переключатель, позволяющий управлять настройками конфиденциальности устройства "<ph name="DEVICE_NAME" />".</translation>
 <translation id="4167393659000039775">Google не несет ответственности за потерю данных. Операционная система <ph name="DEVICE_OS" /> может не работать на несертифицированных моделях устройств. Подробная информация доступна на странице g.co/flex/InstallGuide.</translation>
 <translation id="4167924027691268367">Другие действия для быстрой команды "<ph name="SHORTCUT_TITLE" />"</translation>
@@ -4331,7 +4331,7 @@
 <translation id="4441147046941420429">Чтобы продолжить, извлеките электронный ключ и снова вставьте его в устройство. Затем нажмите кнопку на электронном ключе.</translation>
 <translation id="444134486829715816">Развернуть...</translation>
 <translation id="4441928470323187829">Закреплено администратором</translation>
-<translation id="4442863809158514979">Посмотреть интернет-разрешения</translation>
+<translation id="4442863809158514979">Посмотреть разрешения для сайта</translation>
 <translation id="4442937638623063085">Профили не найдены. Введите код активации, предоставленный вашим оператором связи.</translation>
 <translation id="4443536555189480885">&amp;Справка</translation>
 <translation id="4444304522807523469">Доступ к сканерам, подключенным через USB-порт или локальную сеть</translation>
@@ -4676,7 +4676,7 @@
 <translation id="4728558894243024398">Платформа</translation>
 <translation id="4730492586225682674">Последняя заметка, созданная на заблокированном экране с помощью стилуса</translation>
 <translation id="4730888769809690665">Сайту <ph name="SITE" /> разрешено отправлять уведомления</translation>
-<translation id="4731306954230393087">Сайтам разрешено использовать сохраненную информацию о вас.</translation>
+<translation id="4731306954230393087">Сайтам разрешено использовать сохраненную информацию о вас</translation>
 <translation id="473140019006744096">На устройстве недостаточно места для установки обновления. Освободите <ph name="NECESSARY_SPACE" /> и повторите попытку.</translation>
 <translation id="4733161265940833579"><ph name="BATTERY_PERCENTAGE" /> % (левый)</translation>
 <translation id="4733793249294335256">Папка</translation>
@@ -8406,7 +8406,7 @@
 <translation id="7793098747275782155">Темно-синий</translation>
 <translation id="7796453472368605346">Диакритические знаки</translation>
 <translation id="7797571222998226653">ВЫКЛ</translation>
-<translation id="7798504574384119986">Посмотреть интернет-разрешения</translation>
+<translation id="7798504574384119986">Посмотреть разрешения для сайта</translation>
 <translation id="7798844538707273832">Автоматически отключено разрешение "<ph name="PERMISSION" />"</translation>
 <translation id="7799650166313181433">Только устройства, на которых выполнен вход в аккаунт <ph name="USER_EMAIL" />, могут обмениваться контентом с этим устройством. Вам не нужно будет давать разрешение на обмен контентом между своими устройствами.</translation>
 <translation id="7800485561443537737">Используется мобильный интернет устройства <ph name="DEVICE_TYPE" />. Оператор связи может взимать дополнительную плату. Также может увеличиться расход заряда батареи. <ph name="BEGIN_LINK_LEARN_MORE" />Подробнее…<ph name="END_LINK_LEARN_MORE" /></translation>
@@ -8485,7 +8485,7 @@
 <translation id="7861846108263890455">Язык аккаунта Google</translation>
 <translation id="7864539943188674973">Отключить Bluetooth</translation>
 <translation id="7865127013871431856">Параметры перевода</translation>
-<translation id="786957569166715433">Подключено устройство: <ph name="DEVICE_NAME" /></translation>
+<translation id="786957569166715433"><ph name="DEVICE_NAME" /> – подключено</translation>
 <translation id="7869655448736341731">Все</translation>
 <translation id="787069710204604994">Например, вы перешли на сайт, где продаются кроссовки для бега на длинные дистанции. Он может определить, что вам интересны марафоны. Затем, когда вы перейдете на другой сайт, там может появиться реклама беговых кроссовок, рекомендованная первым сайтом.</translation>
 <translation id="7870730066603611552">Проверять параметры синхронизации после начала сеанса</translation>
@@ -9019,7 +9019,7 @@
 <translation id="828642162569365647">Этот пароль или PIN-код будет защищать ваши данные на текущем устройстве <ph name="DEVICE_TYPE" />, а также информацию, получаемую с телефона. Чтобы выйти из спящего режима, потребуется разблокировать устройство <ph name="DEVICE_TYPE" />.</translation>
 <translation id="8287902281644548111">Поиск по URL или запросу к API</translation>
 <translation id="8288032458496410887">Удалить приложение "<ph name="APP" />"...</translation>
-<translation id="8288553158681886528">Извлекать текст из файлов PDF</translation>
+<translation id="8288553158681886528">Извлечь текст из PDF-файла</translation>
 <translation id="8289128870594824098">Размер диска</translation>
 <translation id="8289509909262565712">Представляем <ph name="DEVICE_OS" /></translation>
 <translation id="8291415872436043161">Скачать Chrome</translation>
@@ -9370,7 +9370,7 @@
 <translation id="858451212965845553">Отправить на &amp;свои устройства</translation>
 <translation id="8584843865238667486">HID-устройства с использованием <ph name="USAGE" /> на странице <ph name="USAGE_PAGE" /></translation>
 <translation id="8585480574870650651">Удалить Crostini</translation>
-<translation id="8585841788766257444">Для указанных ниже сайтов действуют специальные настройки</translation>
+<translation id="8585841788766257444">Для указанных ниже сайтов действуют специальные настройки.</translation>
 <translation id="8588866096426746242">Показать статистику профиля</translation>
 <translation id="8588868914509452556">VR-контент с вкладки "<ph name="WINDOW_TITLE" />" сейчас транслируется на очки</translation>
 <translation id="8590375307970699841">Настройка автоматических обновлений</translation>
@@ -9588,7 +9588,7 @@
 <translation id="8749805710397399240">Не удается выполнить трансляцию экрана. Откройте системные настройки и предоставьте разрешение "Запись экрана".</translation>
 <translation id="8749826920799243530">Устройство не зарегистрировано.</translation>
 <translation id="8749863574775030885">Доступ к USB-устройствам от неизвестного поставщика</translation>
-<translation id="8750155211039279868">Сайт <ph name="ORIGIN" /> запрашивает разрешение подключиться к последовательному порту</translation>
+<translation id="8750155211039279868"><ph name="ORIGIN" /> запрашивает разрешение на подключение к последовательному порту</translation>
 <translation id="8750346984209549530">Мобильная точка доступа</translation>
 <translation id="8752451679755290210">Перемещайтесь между объектами автоматически</translation>
 <translation id="8753948258138515839">С помощью приложения "Файлы" можно быстро открывать документы, сохраненные на Google Диске, внешнем накопителе или устройстве с Chrome OS Flex.</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_sk.xtb b/chromium/chrome/app/resources/generated_resources_sk.xtb
index c8aa06b6fe4..47044d7fe1d 100644
--- a/chromium/chrome/app/resources/generated_resources_sk.xtb
+++ b/chromium/chrome/app/resources/generated_resources_sk.xtb
@@ -6734,7 +6734,7 @@ Na tento účet sa môžu vzťahovať povolenia, ktoré ste už udelili webom a�
 <translation id="6451591602925140504">{NUM_PAGES,plural, =0{<ph name="PAGE_TITLE" />}=1{<ph name="PAGE_TITLE" /> a 1 ďalšia karta}few{<ph name="PAGE_TITLE" /> a # ďalšie karty}many{<ph name="PAGE_TITLE" /> and # other tabs}other{<ph name="PAGE_TITLE" /> a # ďalších kariet}}</translation>
 <translation id="6451689256222386810">Ak ste zabudli prístupovú frázu alebo chcete toto nastavenie zmeniť, <ph name="BEGIN_LINK" />resetujte synchronizáciu<ph name="END_LINK" />.</translation>
 <translation id="6452181791372256707">Odmietnuť</translation>
-<translation id="6452251728599530347">Dokončené na <ph name="PERCENT" /> %</translation>
+<translation id="6452251728599530347">Dokončené na <ph name="PERCENT" /></translation>
 <translation id="645286928527869380">Nápady na recepty</translation>
 <translation id="6452961788130242735">Problém siete alebo nesprávna oblasť</translation>
 <translation id="6453191633103419909">Kvalita projekcie karty alebo obrazovky</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_sq.xtb b/chromium/chrome/app/resources/generated_resources_sq.xtb
index 272166d7883..c49f121d588 100644
--- a/chromium/chrome/app/resources/generated_resources_sq.xtb
+++ b/chromium/chrome/app/resources/generated_resources_sq.xtb
@@ -151,7 +151,7 @@ Kontrolloji fjalëkalimet e tua në çdo kohë te <ph name="GOOGLE_PASSWORD_MANA
 <translation id="1114202307280046356">Diamant</translation>
 <translation id="1114525161406758033">Vendose në gjumë kur kapaku mbyllet</translation>
 <translation id="1116639326869298217">Identiteti yt nuk mund të verifikohej</translation>
-<translation id="1116694919640316211">Rreth</translation>
+<translation id="1116694919640316211">Informacione</translation>
 <translation id="1116779635164066733">Ky cilësim zbatohet nga shtesa "<ph name="NAME" />".</translation>
 <translation id="1118428905044642028">Fjalëkalimet dhe plotësimi automatik</translation>
 <translation id="1118738876271697201">Sistemi nuk arriti të përcaktonte modelin e pajisjes ose numrin e serisë.</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_sv.xtb b/chromium/chrome/app/resources/generated_resources_sv.xtb
index 3c50495702f..97365026c16 100644
--- a/chromium/chrome/app/resources/generated_resources_sv.xtb
+++ b/chromium/chrome/app/resources/generated_resources_sv.xtb
@@ -3091,7 +3091,7 @@ Du kan hantera inställningarna för det här kontot genom att installera Family
 <translation id="3442674350323953953">Låt Google använda din maskinvarudata för att förbättra <ph name="DEVICE_OS" />. Om du nekar skickas denna data ändå till Google i syfte att fastställa lämpliga uppdateringar, men den varken lagras eller används på andra sätt.</translation>
 <translation id="3443744348829035122"><ph name="BRAND" /> överskred tidsgränsen</translation>
 <translation id="3443754338602062261">Du har redan lösenord för dessa konton på <ph name="BRAND" />. Om du väljer att importera ett av lösenorden nedan ersätts det befintliga.</translation>
-<translation id="344449859752187052">Cookies från tredje part har blockerats</translation>
+<translation id="344449859752187052">Tredjepartscookies har blockerats</translation>
 <translation id="3444726579402183581"><ph name="ORIGIN" /> får läsbehörighet till <ph name="FILENAME" /></translation>
 <translation id="3445047461171030979">Snabba svar från Google Assistent</translation>
 <translation id="3445288400492335833"><ph name="MINUTES" /> min</translation>
@@ -4000,7 +4000,7 @@ Detta kan omfatta information om installerad programvara, filer, webbläsaren oc
 <translation id="414800391140809654">kan använda dina uppgifter när du surfar</translation>
 <translation id="4148195018520464922">Du kan begränsa inloggning så att det bara är tillgängligt för vissa användare. Då tas alternativet Lägg till person bort från inloggningsskärmen. Du kan även ta bort befintliga användare.</translation>
 <translation id="4150201353443180367">Skärm</translation>
-<translation id="4150569944729499860">Innehållet på skärmen</translation>
+<translation id="4150569944729499860">Skärmkontext</translation>
 <translation id="4151449637210235443">Berätta om din senaste spelupplevelse</translation>
 <translation id="4152011295694446843">Du hittar dina bokmärken här</translation>
 <translation id="4152670763139331043">{NUM_TABS,plural, =1{1 flik}other{# flikar}}</translation>
@@ -5459,7 +5459,7 @@ Zooma ut med Ctrl + Alt + Minska ljusstyrkan.</translation>
 <translation id="5383377866517186886">Kamera har inaktiverats i systeminställningarna för Mac.</translation>
 <translation id="5383740867328871413">Namnlös grupp – <ph name="GROUP_CONTENTS" /> – <ph name="COLLAPSED_STATE" /></translation>
 <translation id="538822246583124912">Företagets policy har ändrats. En knapp för experiment har lagts till i verktygsfältet. Om du klickar på den öppnas en dialogruta där du kan aktivera experiment.</translation>
-<translation id="5388885445722491159">Kopplad</translation>
+<translation id="5388885445722491159">Parkopplad</translation>
 <translation id="5389626883706033615">Webbplatser hindras från att be dig använda information som de har sparat om dig</translation>
 <translation id="5390112241331447203">Ta med filen system_logs.txt som skickas i feedbackrapporter.</translation>
 <translation id="5390677308841849479">Mörkröd och orange</translation>
@@ -6443,7 +6443,7 @@ Behörigheter som du redan har gett webbplatser och appar kan gälla för det h�
 <translation id="6195005504600220730">Läsa information om webbläsaren, operativsystemet och enheten</translation>
 <translation id="6195155925303302899">Centrera</translation>
 <translation id="6195693561221576702">Den här enheten kan inte konfigureras i offlinedemoläge.</translation>
-<translation id="6196640612572343990">Blockera cookies från tredje part</translation>
+<translation id="6196640612572343990">Blockera tredjepartscookies</translation>
 <translation id="6196854373336333322">Tillägget <ph name="EXTENSION_NAME" /> har tagit kontroll över dina proxyinställningar, vilket innebär att det kan ändra, knäcka eller tjuvlyssna på allt du gör på webben. Om du inte vet varför den här ändringen inträffade är den troligen inte önskvärd.</translation>
 <translation id="6197128521826316819">Skapa QR-kod för den här sidan</translation>
 <translation id="6198223452299275399">Svep mellan sidor</translation>
@@ -6941,7 +6941,7 @@ Det finns # utsatta lösenord till. Du rekommenderas av Google Lösenordshanteri
 <translation id="6602956230557165253">Navigera med hjälp av piltangenterna till höger och vänster.</translation>
 <translation id="6603185457265641428">Välj om historiken ska synkroniseras</translation>
 <translation id="6605847144724004692">Inga användare har betygsatt detta ännu.</translation>
-<translation id="6606671997164410857">Du verkar redan ha konfigurerat Google Assistent på en annan enhet. Få ut ännu mer av assistenten genom att aktivera Innehållet på skärmen på den här enheten.</translation>
+<translation id="6606671997164410857">Du verkar redan ha konfigurerat Google Assistent på en annan enhet. Få ut ännu mer av assistenten genom att aktivera Skärmkontext på den här enheten.</translation>
 <translation id="6607831829715835317">Fler verkt&amp;yg</translation>
 <translation id="6607890859198268021"><ph name="USER_EMAIL" /> hanteras redan av <ph name="DOMAIN" />. Om du vill använda föräldrakontroller med ett annat Google-konto loggar du ut efter konfigureringen och väljer Lägg till person på inloggningsskärmen.</translation>
 <translation id="6608166463665411119">Återställ eSIM-kortet</translation>
@@ -7389,7 +7389,7 @@ Det finns # utsatta lösenord till. Du rekommenderas av Google Lösenordshanteri
 <translation id="6970856801391541997">Skriv ut vissa sidor</translation>
 <translation id="6970861306198150268">Se till att spara ditt nuvarande lösenord för den här webbplatsen</translation>
 <translation id="6971184043765343932">Din uppladdade bild</translation>
-<translation id="6972754398087986839">Komma igång</translation>
+<translation id="6972754398087986839">Kom igång</translation>
 <translation id="697312151395002334">Får öppna popup-fönster och använda omdirigering</translation>
 <translation id="6973611239564315524">En uppgradering till Debian 10 (Buster) är tillgänglig</translation>
 <translation id="69739764870135975">Om du även använder Google som standardsökmotor får du bättre förslag som är relevanta i sammanhanget</translation>
@@ -7559,7 +7559,7 @@ Det finns # utsatta lösenord till. Du rekommenderas av Google Lösenordshanteri
 <translation id="7110684627876015299">Namnlös grupp – <ph name="OPENED_STATE" /></translation>
 <translation id="7111822978084196600">Namnge fönstret</translation>
 <translation id="7113102733263608554"><ph name="ITEM_COUNT_ONE" /> objekt</translation>
-<translation id="7113502843173351041">Känn till din e-postadress</translation>
+<translation id="7113502843173351041">Känna till din e-postadress</translation>
 <translation id="7113974454301513811">Lägg till den aktuella fliken i listan</translation>
 <translation id="7114054701490058191">Lösenorden matchar inte</translation>
 <translation id="7114648273807173152">Öppna Inställningar &gt; Anslutna enheter &gt; Din mobil &gt; Smart Lock om du vill kunna logga in på Google-kontot med Smart Lock.</translation>
@@ -8324,7 +8324,7 @@ Det finns # utsatta lösenord till. Du rekommenderas av Google Lösenordshanteri
 <translation id="773511996612364297">Accenttecken</translation>
 <translation id="7737115349420013392">Parkopplas med <ph name="DEVICE_NAME" /> …</translation>
 <translation id="7737203573077018777"><ph name="PROOF_OF_POSSESSION_INSTRUCTION_NAME" />-instruktionen har tagits emot</translation>
-<translation id="7737846262459425222">Du kan när som helst ändra detta i Inställningar &gt; Google Assistent &gt; Innehållet på skärmen.</translation>
+<translation id="7737846262459425222">Du kan när som helst ändra detta i Inställningar &gt; Google Assistent &gt; Skärmkontext.</translation>
 <translation id="7737948071472253612">Får inte använda kameran</translation>
 <translation id="77381465218432215">Visa accenttecken och specialtecken</translation>
 <translation id="7740996059027112821">Standard</translation>
@@ -8427,7 +8427,7 @@ Tryck på en brytare eller tangent som redan tilldelats en åtgärd om du vill t
 <translation id="7805768142964895445">Status</translation>
 <translation id="7805906048382884326">Stäng tips</translation>
 <translation id="7807067443225230855">Sök och Assistent</translation>
-<translation id="7807117920154132308"><ph name="SUPERVISED_USER_NAME" /> verkar redan ha konfigurerat Google Assistent på en annan enhet. <ph name="SUPERVISED_USER_NAME" /> kan få ut ännu mer av assistenten genom att aktivera Innehållet på skärmen på den här enheten.</translation>
+<translation id="7807117920154132308"><ph name="SUPERVISED_USER_NAME" /> verkar redan ha konfigurerat Google Assistent på en annan enhet. <ph name="SUPERVISED_USER_NAME" /> kan få ut ännu mer av assistenten genom att aktivera Skärmkontext på den här enheten.</translation>
 <translation id="7807711621188256451">Låt alltid <ph name="HOST" /> använda din kamera</translation>
 <translation id="7810202088502699111">Popup-fönster är blockerade på den här sidan.</translation>
 <translation id="7814458197256864873">&amp;Kopiera</translation>
@@ -8494,7 +8494,7 @@ Tryck på en brytare eller tangent som redan tilldelats en åtgärd om du vill t
 <translation id="7861846108263890455">Språk för Google-konto</translation>
 <translation id="7864539943188674973">Inaktivera Bluetooth</translation>
 <translation id="7865127013871431856">Översättningsalternativ</translation>
-<translation id="786957569166715433"><ph name="DEVICE_NAME" /> – kopplad</translation>
+<translation id="786957569166715433"><ph name="DEVICE_NAME" /> – parkopplad</translation>
 <translation id="7869655448736341731">Alla</translation>
 <translation id="787069710204604994">Om du till exempel besöker en webbplats som säljer löparskor kan webbplatsen göra bedömningen att du är intresserad av löpning. Om du senare besöker en annan webbplats kan den webbplatsen visa en annons för löparskor utifrån den första webbplatsens förslag.</translation>
 <translation id="7870730066603611552">Granska synkroniseringsalternativen efter konfigureringen</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_sw.xtb b/chromium/chrome/app/resources/generated_resources_sw.xtb
index 6c42ceffae4..bb05502fbbe 100644
--- a/chromium/chrome/app/resources/generated_resources_sw.xtb
+++ b/chromium/chrome/app/resources/generated_resources_sw.xtb
@@ -4042,7 +4042,7 @@ Hii inaweza kujumuisha maelezo kuhusu programu zilizosakinishwa, faili, kivinjar
 <translation id="4195001808989442226">Imeshindwa kufungua Steam katika Chromebook (Beta)</translation>
 <translation id="4195378859392041564">Bofya kitufe chochote ukitumia kipanya chako kisha bonyeza kitufe cha kibodi ili uweke mapendeleo</translation>
 <translation id="4195643157523330669">Fungua katika kichupo kipya</translation>
-<translation id="4195814663415092787">Endelea kutoka mahali ulipoachia</translation>
+<translation id="4195814663415092787">Endelea kutoka ulipoachia</translation>
 <translation id="4198268995694216131">Tovuti za ziada</translation>
 <translation id="4200689466366162458">Maneno maalum</translation>
 <translation id="4200983522494130825">&amp;Kichupo kipya</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_ta.xtb b/chromium/chrome/app/resources/generated_resources_ta.xtb
index 067730a75d5..83cad8d7bdc 100644
--- a/chromium/chrome/app/resources/generated_resources_ta.xtb
+++ b/chromium/chrome/app/resources/generated_resources_ta.xtb
@@ -3683,7 +3683,7 @@
 <translation id="3898743717925399322"><ph name="WEBSITE" /> தளத்திற்கான கடவுச்சொல் இந்தச் சாதனத்திலும் உங்கள் Google கணக்கிலும் சேமிக்கப்பட்டுள்ளது. ஏதாவது ஒன்றை நீக்க விரும்புகிறீர்களா?</translation>
 <translation id="3898768766145818464">வீடியோவைப் பிளே செய்யும் அல்லது இடைநிறுத்தும்</translation>
 <translation id="389901847090970821">கீபோர்டைத் தேர்ந்தெடுக்கவும்</translation>
-<translation id="3900966090527141178">கடவுச்சொற்களை ஏற்று</translation>
+<translation id="3900966090527141178">கடவுச்சொற்களைப் பதிவிறக்கு</translation>
 <translation id="3902789559055749153"><ph name="APP_NAME" />க்கான கடவுச்சாவியை உருவாக்க நீங்கள் விரும்பும் முறையைத் தேர்வுசெய்யவும்</translation>
 <translation id="3903187154317825986">உள்ளமைந்த கீபோர்டு</translation>
 <translation id="3904326018476041253">இருப்பிடச் சேவைகள்</translation>
@@ -7388,7 +7388,7 @@
 <translation id="6970480684834282392">தொடங்கப்படும் வகை</translation>
 <translation id="6970543303783413625">கடவுச்சொற்களை ஏற்ற முடியவில்லை. ஒரே சமயத்தில் அதிகபட்சம் <ph name="COUNT" /> கடவுச்சொற்களை மட்டுமே ஏற்ற முடியும்.</translation>
 <translation id="6970856801391541997">குறிப்பிட்ட பக்கங்களை அச்சிடு</translation>
-<translation id="6970861306198150268">இந்தத் தளத்திற்கான புதிய கடவுச்சொல்லை மறக்காமல் சேமிக்கவும்</translation>
+<translation id="6970861306198150268">இந்தத் தளத்திற்கான தற்போதைய கடவுச்சொல்லையே சேமிக்கிறீர்கள் என்பதை உறுதிப்படுத்திக் கொள்ளவும்</translation>
 <translation id="6971184043765343932">நீங்கள் பதிவேற்றிய படம்</translation>
 <translation id="6972754398087986839">தொடங்குக</translation>
 <translation id="697312151395002334">பாப்-அப்களை அனுப்புவதற்கும் திசைதிருப்புதல்களைப் பயன்படுத்துவதற்கும் அனுமதிக்கப்பட்டுள்ள தளங்கள்</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_te.xtb b/chromium/chrome/app/resources/generated_resources_te.xtb
index 563e00b6236..ffcb1244835 100644
--- a/chromium/chrome/app/resources/generated_resources_te.xtb
+++ b/chromium/chrome/app/resources/generated_resources_te.xtb
@@ -951,7 +951,7 @@
 <translation id="1741314857973421784">కొనసాగించండి</translation>
 <translation id="1743970419083351269">డౌన్‌లోడ్‌ల బార్‌ను మూసివేయండి</translation>
 <translation id="1744060673522309905">పరికరాన్ని డొమైన్‌కు చేర్చడం సాధ్యపడలేదు. మీరు జోడించగల పరికరాల గరిష్ట సంఖ్యను మించిపోలేదని నిర్ధారించుకోండి.</translation>
-<translation id="1744108098763830590">నేపథ్య పేజీ</translation>
+<translation id="1744108098763830590">బ్యాక్‌గ్రౌండ్ పేజీ</translation>
 <translation id="1745732479023874451">కాంటాక్ట్‌లను మేనేజ్ చేయండి</translation>
 <translation id="1748283190377208783">{0,plural, =1{unused plural form}other{# ఫైల్స్‌ని ఈ వెబ్ యాప్‌లో తెరిచి, ఎడిట్ చేయాలా?}}</translation>
 <translation id="1748329107062243374"><ph name="WEBSITE" /> వెబ్‌సైట్‌కు సైన్ ఇన్ చేయడానికి <ph name="DEVICE_NAME" /> పరికరానికి వచ్చిన పాస్-కీని ఉపయోగించండి</translation>
@@ -1000,7 +1000,7 @@
 <translation id="1780273119488802839">బుక్‌మార్క్‌లను దిగుమతి చేస్తోంది...</translation>
 <translation id="178092663238929451">మీ చుట్టూ ఉన్న వ్యక్తులతో ఫైళ్లను అందుకోవడానికి, ఇంకా పంపడానికి 'సమీప షేరింగ్'ను సెటప్ చేయండి</translation>
 <translation id="1781291988450150470">ప్రస్తుత పిన్‌</translation>
-<translation id="1781502536226964113">కొత్త‌ ట్యాబ్ పేజీని తెరువు</translation>
+<translation id="1781502536226964113">కొత్త‌ ట్యాబ్ పేజీని తెరవండి</translation>
 <translation id="1781553166608855614">మాట్లాడే భాష</translation>
 <translation id="1781771911845953849">ఖాతాలు మరియు సింక్‌</translation>
 <translation id="1781979858217752599">విండో ఆడియోను షేర్ చేయండి</translation>
@@ -1287,7 +1287,7 @@
 <translation id="199191324030140441">'అంతరాయం కలిగించవద్దు'ను ఆఫ్ చేయండి</translation>
 <translation id="1992397118740194946">సెట్ చేయలేదు</translation>
 <translation id="1994173015038366702">సైట్ URL</translation>
-<translation id="1995916364271252349">సైట్‌లు ఉపయోగించగల సమాచారాన్ని, అవి చూపగల కంటెంట్‌ను (లొకేషన్, కెమెరా, పాప్-అప్‌లు, మరిన్ని) నియంత్రిస్తుంది</translation>
+<translation id="1995916364271252349">సైట్‌లు ఏ సమాచారాన్ని ఉపయోగించవచ్చు, ఏ కంటెంట్‌ను చూపవచ్చు (లొకేషన్, కెమెరా, పాప్-అప్‌లు, మరిన్ని) అన్నవి కంట్రోల్ చేస్తుంది</translation>
 <translation id="1997433994358798851">మీ పరికరానికి కనెక్ట్ చేయడానికి, బ్లూటూత్‌ను ఉపయోగించడానికి Chromeకు అనుమతి కావాలి</translation>
 <translation id="1997616988432401742">మీ ప్రమాణపత్రాలు</translation>
 <translation id="1999115740519098545">ప్రారంభించిన తర్వాత</translation>
@@ -4023,7 +4023,7 @@
 <translation id="4170314459383239649">నిష్క్రమించేటప్పుడు క్లియర్ చేయండి</translation>
 <translation id="417096670996204801">ఒక ప్రొఫైల్‌ను ఎంచుకోండి</translation>
 <translation id="4175137578744761569">లేత వంగ రంగు మరియు తెలుపు</translation>
-<translation id="4176463684765177261">ఆపివేయబడింది</translation>
+<translation id="4176463684765177261">డిజేబుల్ చేయబడింది</translation>
 <translation id="4176864026061939326">ఈ పరికరం మేనేజ్ చేయబడుతోంది. <ph name="USER_EMAIL_ADDRESS" /> ఖాతా కోసం మీ పరికర అడ్మినిస్ట్రేటర్‌కు ఒక కొత్త ప్రొఫైల్ అవసరం</translation>
 <translation id="4177501066905053472">యాడ్ టాపిక్‌లు</translation>
 <translation id="4177668342649553942"><ph name="SHORTCUT_NAME" />‌ను తెరవండి - <ph name="APP_NAME" /></translation>
@@ -4045,7 +4045,7 @@
 <translation id="4195001808989442226">'Chromebook కోసం Steam'ను (బీటా) తెరవడం సాధ్యపడలేదు</translation>
 <translation id="4195378859392041564">మీ మౌస్‌తో ఏదైనా కీపై క్లిక్ చేసి, ఆపై అనుకూలంగా మార్చడానికి కీబోర్డ్ కీని నొక్కండి</translation>
 <translation id="4195643157523330669">కొత్త ట్యాబ్‌లో తెరువు</translation>
-<translation id="4195814663415092787">మీరు నిష్క్రమించిన చోటు నుండే కొనసాగించండి</translation>
+<translation id="4195814663415092787">ఇంతకు ముందు ఆపిన చోట నుండే కొనసాగించండి</translation>
 <translation id="4198268995694216131">అదనపు సైట్‌లు</translation>
 <translation id="4200689466366162458">అనుకూల పదాలు</translation>
 <translation id="4200983522494130825">కొత్త &amp;టాబ్</translation>
@@ -4217,7 +4217,7 @@
 <translation id="4345587454538109430">కాన్ఫిగర్ చేయి...</translation>
 <translation id="4345732373643853732">సర్వర్‌కు వినియోగదారు పేరు తెలియదు</translation>
 <translation id="4348426576195894795">ఈ ఖాతాను తీసివేస్తే, ఈ ఖాతాతో సైన్ ఇన్ అయిన Chrome ప్రొఫైల్స్ ఏవైనా ఉంటే, అవి కూడా తొలగించబడతాయి</translation>
-<translation id="4348766275249686434">లోపాలను సేకరించు</translation>
+<translation id="4348766275249686434">ఎర్రర్‌లను సేకరించడానికి అనుమతించండి</translation>
 <translation id="4349828822184870497">సహాయకరమైనవి</translation>
 <translation id="4350230709416545141">మీ లొకేషన్‌ను యాక్సెస్ చేయకుండా <ph name="HOST" />ను ఎల్లప్పుడూ బ్లాక్ చేయండి</translation>
 <translation id="4350782034419308508">హే Google</translation>
@@ -5713,7 +5713,7 @@
     <ph name="BEGIN_PARAGRAPH4" />అదనంగా మీ వెబ్ &amp; యాప్ యాక్టివిటీ సెట్టింగ్ ఆన్‌లో ఉన్నట్లయితే, ఈ డేటా మీ Google ఖాతాలో స్టోరేజ్‌ చేయబడవచ్చు. account.google.comలో మీరు మీ డేటాను చూడవచ్చు, తొలగింవచ్చు, మీ ఖాతా సెట్టింగ్‌లను మార్చవచ్చు.<ph name="END_PARAGRAPH4" /></translation>
 <translation id="5585019845078534178">కార్డ్‌లు</translation>
 <translation id="5585118885427931890">బుక్‌మార్క్ ఫోల్డర్‌ను క్రియేట్ చేయడం సాధ్యం కాలేదు.</translation>
-<translation id="558563010977877295">నిర్దిష్ట పేజీని లేదా పేజీల సెట్‌ను తెరువు</translation>
+<translation id="558563010977877295">ఒక నిర్దిష్ట పేజీని లేదా పేజీల సెట్‌ను తెరవండి</translation>
 <translation id="5585898376467608182">మీ పరికరంలో స్టోరేజ్ తక్కువగా ఉంది. <ph name="APP_NAME" />ను ఉపయోగించడానికి, కనీసం <ph name="MINIMUM_SPACE" /> ఖాళీ స్పేస్ అవసరం. తగిన ఖాళీ స్పేస్ కోసం, పరికరం నుండి ఫైల్స్‌ను తొలగించండి.</translation>
 <translation id="5585912436068747822">ఫార్మాటింగ్ విఫలమైంది</translation>
 <translation id="5587765208077583036">షేర్ చేయడానికి, Files యాప్‌లో ఫోల్డర్ మీద కుడి క్లిక్ చేసి, ఆపై "<ph name="SPECIFIC_NAME" />‌తో షేర్ చేయండి" ఆప్షన్‌ను ఎంచుకోండి.</translation>
@@ -6403,7 +6403,7 @@
 <translation id="6154240335466762404">అన్ని పోర్ట్‌లను తీసివేయండి</translation>
 <translation id="615436196126345398">ప్రోటోకాల్</translation>
 <translation id="6155141482566063812">బ్యాక్‌గ్రౌండ్ ట్యాబ్ మీ స్క్రీన్‌ను షేర్ చేస్తోంది</translation>
-<translation id="6156323911414505561">బుక్‌మార్క్‌ల బార్‌ను చూపించు</translation>
+<translation id="6156323911414505561">బుక్‌మార్క్‌ల బార్‌ను చూపాలి</translation>
 <translation id="6156863943908443225">స్క్రిప్ట్ కాష్</translation>
 <translation id="6156944117133588106">నావిగేషన్ బటన్‌లను టాబ్లెట్ మోడ్‌లో చూపించు</translation>
 <translation id="615930144153753547">సైట్‌లు ఇమేజ్‌లను చూపగలవు</translation>
@@ -7858,7 +7858,7 @@
 <translation id="737728204345822099">ఈ సైట్‌కు మీ సందర్శన గురించిన సమాచారం మీ సెక్యూరిటీ కీలో రికార్డ్ చేయబడుతుంది.</translation>
 <translation id="7377451353532943397">సెన్సార్ యాక్సెస్‌ను బ్లాక్ చేయడం కొనసాగించండి</translation>
 <translation id="7377481913241237033">కోడ్ ద్వారా కనెక్ట్ అవ్వండి</translation>
-<translation id="73786666777299047">Chrome వెబ్ స్టోర్‌ను తెరువు</translation>
+<translation id="73786666777299047">Chrome వెబ్ స్టోర్‌ను తెరవండి</translation>
 <translation id="7380272457268061606">లోకల్ డేటా రికవరీని డిజేబుల్ చేయాలా?</translation>
 <translation id="7380459290951585794">మీ ఫోన్ సమీపంలోనే ఉండి, అన్‌లాక్ చేసి ఉండి, అలాగే అందులో బ్లూటూత్, Wi-Fi ఆన్ చేయబడి ఉన్నాయని నిర్ధారించుకోండి</translation>
 <translation id="7380622428988553498">పరికరం పేరులో చెల్లని అక్షరాలు ఉన్నాయి</translation>
@@ -8344,7 +8344,7 @@
 <translation id="7751619076382363711">మీరు ఏ సైట్‌లనూ తీసివేయలేదు</translation>
 <translation id="7752832973194460442">Android యాప్ సమాచారం</translation>
 <translation id="7753735457098489144">స్టోరేజ్ స్పేస్ లేనందున, ఇన్‌స్టాల్ చేయడం విఫలమైంది. స్పేస్‌ను ఖాళీ చేయడానికి, పరికర స్టోరేజ్ నుండి ఫైళ్లను తొలగించండి.</translation>
-<translation id="7754704193130578113">ప్రతి ఫైల్‌ను డౌన్‌లోడ్ చేసే ముందు ఎక్కడ సేవ్ చేయాలో అడుగు</translation>
+<translation id="7754704193130578113">ప్రతి ఫైల్‌ను డౌన్‌లోడ్ చేసే ముందు, దానిని ఎక్కడ సేవ్ చేయాలో అడగాలి</translation>
 <translation id="7757592200364144203">పరికరం పేరు మార్చండి</translation>
 <translation id="7757739382819740102">సమీపంలోని కాంటాక్ట్‌లు మీతో షేర్ చేసుకోవచ్చు. ఆమోదం అవసరం.</translation>
 <translation id="7757787379047923882"><ph name="DEVICE_NAME" /> నుండి షేర్ చేయబడిన వచనం</translation>
@@ -8366,7 +8366,7 @@
 <translation id="7767972280546034736"><ph name="APP_NAME" /> కోసం పాస్-కీని క్రియేట్ చేయండి</translation>
 <translation id="7768507955883790804">మీరు సైట్‌లను సందర్శించినపుడు, అవి ఆటోమేటిక్‌గా ఈ సెట్టింగ్‌ను ఫాలో అవుతాయి</translation>
 <translation id="7768526219335215384"><ph name="ORIGIN" />, <ph name="FOLDERNAME" />‌లోని ఫైళ్లను చూడగలదు</translation>
-<translation id="7768770796815395237">మార్చు</translation>
+<translation id="7768770796815395237">మార్చండి</translation>
 <translation id="7768784765476638775">వినడానికి ఎంచుకోండి</translation>
 <translation id="7769748505895274502">ఇటీవల మూసివేసిన వాటిని కుదించండి</translation>
 <translation id="7770072242481632881">సైడ్ ప్యానెల్ ఎంపిక సాధనం</translation>
@@ -8999,7 +8999,7 @@
 <translation id="826905130698769948">చెల్లని క్లయింట్ సర్టిఫికెట్</translation>
 <translation id="8270320981823560179">Drive</translation>
 <translation id="82706708334564640">ఇటీవలి డౌన్‌లోడ్ హిస్టరీ</translation>
-<translation id="827097179112817503">హోమ్ బటన్‌ను చూపు</translation>
+<translation id="827097179112817503">హోమ్ బటన్‌ను చూపాలి</translation>
 <translation id="8271268254812352141">మీరు టెక్స్ట్‌ను కుడి క్లిక్ చేసినప్పుడు లేదా తాకి, నొక్కి ఉంచినప్పుడు నిర్వచనాలు, అనువాదాలు, లేదా యూనిట్ మార్పిడులను పొందండి. <ph name="LINK_BEGIN" />వెబ్‌సైట్ భాషల<ph name="LINK_END" />లో అనువాద భాషలను అనుకూలంగా మార్చండి.</translation>
 <translation id="8271379370373330993">తల్లిదండ్రులారా, తర్వాత కొన్ని దశలు మీ కోసం. ఖాతాను సెటప్ చేసిన తర్వాత మీరు <ph name="DEVICE_TYPE" />ను చిన్నారికి తిరిగి ఇవ్వవచ్చు.</translation>
 <translation id="8272194309885535896">చిత్రాన్ని డౌన్‌లోడ్ చేయి</translation>
@@ -9188,7 +9188,7 @@
 <translation id="8422748173858722634">IMEI</translation>
 <translation id="8422787418163030046">ట్రే అందుబాటులో లేదు</translation>
 <translation id="8424250197845498070">అడ్వాన్స్‌డ్ ప్రొటెక్షన్ బ్లాక్ చేసింది</translation>
-<translation id="8425213833346101688">మార్చు</translation>
+<translation id="8425213833346101688">మార్చండి</translation>
 <translation id="8425492902634685834">టాస్క్‌బార్‌కి పిన్ చేయి</translation>
 <translation id="8425768983279799676">మీరు మీ పిన్‌ని ఉపయోగించి మీ పరికరాన్ని అన్‌లాక్ చేయవచ్చు.</translation>
 <translation id="8426111352542548860">గ్రూప్‌ను సేవ్ చేయండి</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_tr.xtb b/chromium/chrome/app/resources/generated_resources_tr.xtb
index cd3eabaed12..45185d0db7a 100644
--- a/chromium/chrome/app/resources/generated_resources_tr.xtb
+++ b/chromium/chrome/app/resources/generated_resources_tr.xtb
@@ -654,7 +654,7 @@ Uygulamalara vermiş olduğunuz izinler bu hesap için geçerli olabilir. Androi
 <translation id="1523279371236772909">Geçen ay görüntülendi</translation>
 <translation id="1523978563989812243">Metin okuma motorları</translation>
 <translation id="1524430321211440688">Klavye</translation>
-<translation id="1524563461097350801">Hayır, teşekkürler</translation>
+<translation id="1524563461097350801">Hayır, Teşekkürler</translation>
 <translation id="1525740877599838384">Konumu belirlemek için yalnızca kablosuz ağ kullan</translation>
 <translation id="152629053603783244">Linux'u yeniden başlat</translation>
 <translation id="1526560967942511387">Adsız Doküman</translation>
@@ -2691,7 +2691,7 @@ Sunucunun mesajı: <ph name="SERVER_MSG" /></translation>
 <translation id="3090871774332213558">"<ph name="DEVICE_NAME" />" eşlendi</translation>
 <translation id="3093714882666365141">Sitelerin ödeme işleyici yüklemesine izin verme</translation>
 <translation id="3094141017404513551">Bu işlem göz atma etkinliklerinizi <ph name="EXISTING_USER" /> hesabından ayıracak</translation>
-<translation id="3094223846531205616">{COUNT,plural, =0{Süresi bugün dolacak}=1{Süresi yarın dolacak}other{Süresi # içinde dolacak}}</translation>
+<translation id="3094223846531205616">{COUNT,plural, =0{Süresi bugün dolacak}=1{Süresi yarın dolacak}other{Süresi # gün içinde dolacak}}</translation>
 <translation id="3094521107841754472"><ph name="PREVIOUS_PRICE" /> olan fiyat <ph name="CURRENT_PRICE" /> olarak değişti.</translation>
 <translation id="3095871294753148861">Yer işaretleri, şifreler ve diğer tarayıcı verileri, birincil hesapla senkronize edilir.</translation>
 <translation id="3099836255427453137">{NUM_EXTENSIONS,plural, =1{Zararlı olabilecek 1 uzantı kapalı. İsterseniz bunu kaldırabilirsiniz.}other{Zararlı olabilecek {NUM_EXTENSIONS} uzantı kapalı. İsterseniz bunları kaldırabilirsiniz.}}</translation>
@@ -5442,7 +5442,7 @@ Uzaklaştırmak için Ctrl + Alt + Parlaklığı Azalt tuşlarını kullanın.</
 <translation id="5383740867328871413">Adsız grup - <ph name="GROUP_CONTENTS" /> - <ph name="COLLAPSED_STATE" /></translation>
 <translation id="538822246583124912">Kurumsal politika değişti. Araç çubuğuna denemeler düğmesi eklendi. Denemeleri etkinleştirmek için iletişim kutusunu açmak üzere tıklayın.</translation>
 <translation id="5388885445722491159">Eşleştirilmiş</translation>
-<translation id="5389626883706033615">Sitelerin, hakkınızda kaydettikleri bilgileri kullanmak için izin istemesi engellendi</translation>
+<translation id="5389626883706033615">Sitelerin, hakkınızda kaydettikleri bilgileri kullanmak için izin istemesi engellenir</translation>
 <translation id="5390112241331447203">Geri bildirim raporlarında gönderilen system_logs.txt dosyasını dahil et.</translation>
 <translation id="5390677308841849479">Koyu kırmızı ve turuncu</translation>
 <translation id="5390743329570580756">Gönder</translation>
@@ -7372,7 +7372,7 @@ Güvenliği ihlal edilmiş # şifreniz daha var. Google Şifre Yöneticisi bu ş
 <translation id="6970856801391541997">Belirli Sayfaları Yazdır</translation>
 <translation id="6970861306198150268">Bu sitede kullandığınız şifreyi kaydettiğinizden emin olun</translation>
 <translation id="6971184043765343932">Yüklediğiniz resim</translation>
-<translation id="6972754398087986839">Başlarken</translation>
+<translation id="6972754398087986839">Başla</translation>
 <translation id="697312151395002334">Pop-up'lar gönderip yönlendirmeler kullanmasına izin verilen siteler</translation>
 <translation id="6973611239564315524">Debian 10 (Buster) sürümüne geçiş yapılabilir</translation>
 <translation id="69739764870135975">Google'ı varsayılan arama motorunuz olarak da kullanıyorsanız bağlamla daha alakalı, daha iyi öneriler görürsünüz</translation>
@@ -9139,7 +9139,7 @@ Anahtar dosyanızı güvenli bir yerde saklayın. Uzantınızın yeni sürümler
 <translation id="8386091599636877289">Politika bulunamadı.</translation>
 <translation id="8387361103813440603">Konumunuzu görmesine izin verilmeyen siteler</translation>
 <translation id="8388770971141403598">İkincil profiller desteklenmiyor</translation>
-<translation id="8389492867173948260">Bu uzantının ziyaret ettiğiniz web sitelerindeki tüm verilerinizi okuması ve değiştirmesine izin verin:</translation>
+<translation id="8389492867173948260">Bu uzantının ziyaret ettiğim web sitelerindeki tüm verilerimi okuması ve değiştirmesine izin ver:</translation>
 <translation id="8390449457866780408">Sunucu kullanılamıyor.</translation>
 <translation id="8391218455464584335">Vinil</translation>
 <translation id="8392726714909453725">Seç ve Dinle ayarları</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_uk.xtb b/chromium/chrome/app/resources/generated_resources_uk.xtb
index fb3bb2ce19c..f8d2c74d929 100644
--- a/chromium/chrome/app/resources/generated_resources_uk.xtb
+++ b/chromium/chrome/app/resources/generated_resources_uk.xtb
@@ -2015,7 +2015,7 @@
 <translation id="2541706104884128042">Налаштовано новий час сну</translation>
 <translation id="2542050502251273923">Налаштовує рівень налагодження менеджера й інших сервісів з'єднання з мережею за допомогою ff_debug.</translation>
 <translation id="2544352060595557290">Цю вкладку</translation>
-<translation id="2546283357679194313">Файли cookie й дані із сайтів</translation>
+<translation id="2546283357679194313">Файли cookie й дані сайтів</translation>
 <translation id="2546302722632337735">Не дозволяти сайтам використовувати ідентифікатори, щоб відтворювати захищений контент</translation>
 <translation id="2546991196809436099">Щоб збільшити елементи на екрані, наблизьте область. Щоб увімкнути або вимкнути лупу, натисніть клавішу пошуку + Ctrl + M.</translation>
 <translation id="2548347166720081527">Дозволено: <ph name="PERMISSION" /></translation>
@@ -7396,7 +7396,7 @@
 <translation id="6970861306198150268">Переконайтеся, що зберігаєте для цього сайту поточний пароль</translation>
 <translation id="6971184043765343932">Завантажене вами зображення</translation>
 <translation id="6972754398087986839">Почати</translation>
-<translation id="697312151395002334">Дозволено показувати спливаючі вікна та використовувати переспрямування</translation>
+<translation id="697312151395002334">Дозволено показувати спливаючі вікна й використовувати переспрямування</translation>
 <translation id="6973611239564315524">Доступне оновлення Debian 10 (Buster)</translation>
 <translation id="69739764870135975">Якщо Google є вашою пошуковою системою за умовчанням, ви бачитимете кращі та доречніші за контекстом підказки</translation>
 <translation id="697508444536771064">Завершити роботу Linux</translation>
@@ -8127,7 +8127,7 @@
 <translation id="7581007437437492586">Правила налаштовані правильно</translation>
 <translation id="7581462281756524039">Інструмент очищення</translation>
 <translation id="7582582252461552277">Віддавати перевагу цій мережі</translation>
-<translation id="7582844466922312471">Мобільний трафік</translation>
+<translation id="7582844466922312471">Мобільний Інтернет</translation>
 <translation id="7583948862126372804">Кількість</translation>
 <translation id="7585106857920830898">Перевірка відповідності правилам безпеки вашої організації…</translation>
 <translation id="7586498138629385861">Chrome працюватиме, доки будуть відкриті додатки Chrome.</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_uz.xtb b/chromium/chrome/app/resources/generated_resources_uz.xtb
index a9b84d39606..b55ec09ae8c 100644
--- a/chromium/chrome/app/resources/generated_resources_uz.xtb
+++ b/chromium/chrome/app/resources/generated_resources_uz.xtb
@@ -2169,7 +2169,7 @@ Oʻz qurilmangizda Family Link ilovasini oʻrnatib, bu hisob sozlamalarini boshq
 <translation id="2691385045260836588">Model</translation>
 <translation id="2691440343905273290">Kiritish sozlamalarini oʻzgartirish</translation>
 <translation id="2692503699962701720">Tahrirlangan matn va elementlar turini aytish vaqtida talaffuz ohangini oʻzgartirish</translation>
-<translation id="2692901429679246677">Aqua</translation>
+<translation id="2692901429679246677">Dengiz</translation>
 <translation id="2693134906590795721">Batareya holati signallari</translation>
 <translation id="2693176596243495071">Ana xolos! Kutilmagan xatolik yuz berdi. Qayta urinib ko‘ring, agar muammo qaytarilsa administrator bilan bog‘laning.</translation>
 <translation id="2698147581454716013">Bu majmuadagi qurilma. Kiosk va Signage Upgrade bilan roʻyxatdan oʻtib boʻlmaydi.</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_vi.xtb b/chromium/chrome/app/resources/generated_resources_vi.xtb
index cd6a400a783..be65a1f42fc 100644
--- a/chromium/chrome/app/resources/generated_resources_vi.xtb
+++ b/chromium/chrome/app/resources/generated_resources_vi.xtb
@@ -616,7 +616,7 @@ Các quyền bạn từng cấp cho ứng dụng có thể áp dụng cho cả t
 <translation id="1485015260175968628">Tiện ích/ứng dụng giờ đây có thể:</translation>
 <translation id="1485141095922496924">Phiên bản <ph name="PRODUCT_VERSION" /> (<ph name="PRODUCT_CHANNEL" />) <ph name="PRODUCT_MODIFIER" /> <ph name="PRODUCT_VERSION_BITS" /></translation>
 <translation id="1485197926103629489">Microsoft 365 yêu cầu lưu trữ các tệp trong OneDrive. Các tệp trên thiết bị sẽ di chuyển sang OneDrive, còn các tệp từ vị trí khác sẽ được sao chép vào đó. Bạn có thể tìm thấy các tệp của mình ở thư mục Microsoft OneDrive trong ứng dụng Files.</translation>
-<translation id="1486096554574027028">Tìm kiếm mật khẩu</translation>
+<translation id="1486096554574027028">Tìm mật khẩu</translation>
 <translation id="1486486872607808064">Quét mã QR này bằng máy ảnh trên thiết bị mà bạn muốn tạo khoá đăng nhập cho <ph name="APP_NAME" /></translation>
 <translation id="1487335504823219454">Bật - cài đặt tùy chỉnh</translation>
 <translation id="1493892686965953381">Đang đợi <ph name="LOAD_STATE_PARAMETER" />...</translation>
@@ -1491,7 +1491,7 @@ Bạn có thể quản lý các tùy chọn cài đặt của tài khoản này
 <translation id="2148892889047469596">Thẻ Truyền</translation>
 <translation id="2149973817440762519">Chỉnh sửa dấu trang</translation>
 <translation id="2150139952286079145">Tìm kiếm máy in đích</translation>
-<translation id="2150661552845026580">Và "<ph name="EXTENSION_NAME" />"?</translation>
+<translation id="2150661552845026580">Thêm "<ph name="EXTENSION_NAME" />"?</translation>
 <translation id="2151576029659734873">Chỉ mục thẻ không hợp lệ được nhập.</translation>
 <translation id="2152281589789213846">Thêm máy in vào hồ sơ của bạn</translation>
 <translation id="2154484045852737596">Chỉnh sửa thẻ</translation>
@@ -1516,7 +1516,7 @@ Bạn có thể quản lý các tùy chọn cài đặt của tài khoản này
 <translation id="2166369534954157698">Lươn ngắn lại chê trạch dài</translation>
 <translation id="2168454383292731451"><ph name="BEGIN_PARAGRAPH1" />Thiết bị này (Số sê-ri: <ph name="SERIAL_NUMBER" />) đã bị khoá.<ph name="END_PARAGRAPH1" />
     <ph name="BEGIN_PARAGRAPH2" />Tính năng quản lý thiết bị Chrome bằng <ph name="MS_AD_NAME" /> không còn được hỗ trợ nữa. Để đăng nhập, hãy sử dụng một thiết bị khác hoặc liên hệ với quản trị viên thiết bị.<ph name="END_PARAGRAPH2" /></translation>
-<translation id="2169062631698640254">Đăng nhập bằng mọi cách</translation>
+<translation id="2169062631698640254">Tiếp tục đăng nhập</translation>
 <translation id="2173302385160625112">Kiểm tra đường kết nối Internet của bạn</translation>
 <translation id="2173801458090845390">Thêm ID yêu cầu vào thiết bị này</translation>
 <translation id="2175384018164129879">&amp;Quản lý Công cụ tìm kiếm và công cụ Tìm kiếm trang web</translation>
@@ -3276,7 +3276,7 @@ Bạn có thể quản lý các tùy chọn cài đặt của tài khoản này
 <translation id="3593152357631900254">Bật chế độ Fuzzy-Pinyin</translation>
 <translation id="3593965109698325041">Ràng buộc Tên của Chứng chỉ</translation>
 <translation id="3596012367874587041">Cài đặt ứng dụng</translation>
-<translation id="3596414637720633074">Chặn cookie của bên thứ ba ở chế độ Ẩn danh</translation>
+<translation id="3596414637720633074">Chặn cookie của bên thứ ba ở Chế độ ẩn danh</translation>
 <translation id="3599221874935822507">Nhô lên</translation>
 <translation id="3600051066689725006">Thông tin yêu cầu web</translation>
 <translation id="360180734785106144">Cung cấp các tính năng mới khi có sẵn</translation>
@@ -3689,7 +3689,7 @@ Thông tin này có thể bao gồm thông tin về phần mềm đã cài đặ
 <translation id="3904326018476041253">Dịch vụ vị trí</translation>
 <translation id="3905218345729976782">Kết nối với Wi-Fi bằng điện thoại Android</translation>
 <translation id="3905761538810670789">Sửa ứng dụng</translation>
-<translation id="3908288065506437185">Chặn cookie của bên thứ ba ở chế độ Ẩn danh</translation>
+<translation id="3908288065506437185">Chặn cookie của bên thứ ba ở Chế độ ẩn danh</translation>
 <translation id="3908501907586732282">Bật tiện ích</translation>
 <translation id="3909701002594999354">Hiển thị tất cả &amp;nút điều khiển</translation>
 <translation id="3909791450649380159">Cắ&amp;t</translation>
@@ -4555,7 +4555,7 @@ Thông tin này có thể bao gồm thông tin về phần mềm đã cài đặ
 <translation id="4617270414136722281">Tùy chọn tiện ích</translation>
 <translation id="4617880081511131945">Không thiết lập được kết nối</translation>
 <translation id="4619564267100705184">Xác minh danh tính của bạn</translation>
-<translation id="4619615317237390068">Thẻ từ các thiết bị khác</translation>
+<translation id="4619615317237390068">Thẻ trên các thiết bị khác</translation>
 <translation id="4620809267248568679">Cài đặt này được tiện ích thực hiện.</translation>
 <translation id="4622051949285931942">Tắt tính năng cập nhật tự động?</translation>
 <translation id="4623167406982293031">Xác minh tài khoản</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_zh-CN.xtb b/chromium/chrome/app/resources/generated_resources_zh-CN.xtb
index d3e9f0c0ecb..8ee7c5ced90 100644
--- a/chromium/chrome/app/resources/generated_resources_zh-CN.xtb
+++ b/chromium/chrome/app/resources/generated_resources_zh-CN.xtb
@@ -5813,7 +5813,7 @@
 <translation id="5697832193891326782">表情符号选择器</translation>
 <translation id="5698462638680260399">登录后才能使用密码</translation>
 <translation id="570043786759263127">Google Play 应用和服务</translation>
-<translation id="5700761515355162635">允许使用第三方 Cookie</translation>
+<translation id="5700761515355162635">已允许使用第三方 Cookie</translation>
 <translation id="5700836101007545240">“添加连接”功能已由您的管理员停用</translation>
 <translation id="5701080607174488915">从服务器获取政策时出错。</translation>
 <translation id="5701212929149679556">移动网络漫游</translation>
@@ -6578,7 +6578,7 @@
 <translation id="6322559670748154781">此文件属于不常下载的内容，已被“高级保护”机制屏蔽</translation>
 <translation id="6324916366299863871">修改快捷方式</translation>
 <translation id="6325191661371220117">停用自动启动</translation>
-<translation id="6326175484149238433">从Chrome中移除</translation>
+<translation id="6326175484149238433">从 Chrome 中移除</translation>
 <translation id="6326855256003666642">正在使用相应扩展程序的活动数</translation>
 <translation id="6327785803543103246">网络代理自动发现</translation>
 <translation id="6331818708794917058">网站可以请求连接到 MIDI 设备</translation>
@@ -7958,7 +7958,7 @@
 <translation id="747114903913869239">错误：无法对扩展程序进行解码</translation>
 <translation id="7471520329163184433">减速</translation>
 <translation id="747312361841682912">删除显示的数据</translation>
-<translation id="7473891865547856676">不，谢谢</translation>
+<translation id="7473891865547856676">不用了</translation>
 <translation id="747459581954555080">全部恢复</translation>
 <translation id="747507174130726364">{NUM_DAYS,plural, =1{必须立即退还此设备}other{请在 {NUM_DAYS} 天内退还 <ph name="DEVICE_TYPE" />}}</translation>
 <translation id="7475671414023905704">Netscape 忘了密码网址</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_zh-HK.xtb b/chromium/chrome/app/resources/generated_resources_zh-HK.xtb
index dbf78c18b2d..fd57cd9f40c 100644
--- a/chromium/chrome/app/resources/generated_resources_zh-HK.xtb
+++ b/chromium/chrome/app/resources/generated_resources_zh-HK.xtb
@@ -542,7 +542,7 @@
 <translation id="1430915738399379752">列印</translation>
 <translation id="1431188203598586230">最後一次軟件更新</translation>
 <translation id="1432581352905426595">管理搜尋引擎</translation>
-<translation id="1433478348197382180">朗讀模式</translation>
+<translation id="1433478348197382180">閱讀模式</translation>
 <translation id="1434696352799406980">此功能會重設您的起始網頁、新分頁、搜尋引擎和固定標籤，同時停用所有擴充程式並清除 Cookie 等暫存資料，但不會清除您的書籤、記錄及已儲存的密碼。</translation>
 <translation id="1434886155212424586">首頁是新分頁</translation>
 <translation id="1435940442311036198">在其他裝置上使用密鑰</translation>
@@ -591,7 +591,7 @@
 <translation id="1470084204649225129">{NUM_TABS,plural, =1{在新群組中加入分頁}other{在新群組中加入分頁}}</translation>
 <translation id="1470350905258700113">使用此裝置</translation>
 <translation id="1470946456740188591">如要開啟或關閉「鍵盤瀏覽」功能，請使用快速鍵 Ctrl+Search+7</translation>
-<translation id="1471034383866732283">朗讀模式無法找出此頁面的主要內容</translation>
+<translation id="1471034383866732283">閱讀模式找不到此頁面的主要內容</translation>
 <translation id="1472675084647422956">顯示更多</translation>
 <translation id="1473223074251193484">設定網絡共享設定</translation>
 <translation id="1474785664565228650">Parallels Desktop 需要重新啟動，麥克風設定的變更才會生效。重新啟動 Parallels Desktop 即可繼續。</translation>
@@ -1479,7 +1479,7 @@
 <translation id="2143778271340628265">手動 Proxy 設定</translation>
 <translation id="2143808295261240440">使用建議的密碼</translation>
 <translation id="2143915448548023856">顯示設定</translation>
-<translation id="2144536955299248197">憑證檢視者：<ph name="CERTIFICATE_NAME" /></translation>
+<translation id="2144536955299248197">憑證檢視器：<ph name="CERTIFICATE_NAME" /></translation>
 <translation id="2144557304298909478">Linux 的 Android 應用程式開發</translation>
 <translation id="2144873026585036769">要使用你的 Google 帳戶儲存和填入密碼和密鑰嗎？</translation>
 <translation id="2146263598007866206">網站可能會自動同時下載相關檔案，以便節省時間</translation>
@@ -1784,7 +1784,7 @@
 <translation id="2364498172489649528">已通過</translation>
 <translation id="2365507699358342471">此網站可以查看複製到剪貼簿的文字和圖片。</translation>
 <translation id="2367972762794486313">顯示應用程式</translation>
-<translation id="2369058545741334020">在「朗讀模式」中開啟</translation>
+<translation id="2369058545741334020">用閱讀模式開啟</translation>
 <translation id="236939127352773362">當附近的裝置正在分享內容時</translation>
 <translation id="2371076942591664043">完成後開啟(&amp;D)</translation>
 <translation id="237336063998926520">根據您的 IP 位址確定位置</translation>
@@ -3007,7 +3007,7 @@
 <translation id="3371351218553893534">這一行過長：<ph name="ERROR_LINE" /></translation>
 <translation id="3372602033006349389">在其他裝置上</translation>
 <translation id="337286756654493126">讀取您在應用程式中開啟的資料夾</translation>
-<translation id="3373059063088819384">在「朗讀模式」中開啟</translation>
+<translation id="3373059063088819384">用閱讀模式開啟</translation>
 <translation id="3373196968211632036">子女的 Google 帳戶無法使用 Chromebook 版 Steam (Beta 版本)</translation>
 <translation id="3373701465337594448">開啟設定後，系統會在此顯示您曾瀏覽的網站清單來推斷您的興趣。</translation>
 <translation id="3374294321938930390"><ph name="BOOKMARK_TITLE" /> 移咗去「<ph name="NEW_FOLDER_TITLE" />」入面。</translation>
@@ -4114,7 +4114,7 @@
 <translation id="4259388776256904261">請稍候片刻</translation>
 <translation id="4260182282978351200"><ph name="FILE_NAME" /> 可能不安全。要傳送到「Google 進階保護」進行掃瞄嗎？按住 Shift+F6 鍵即可切換至下載內容列的位置。</translation>
 <translation id="4260699894265914672">按下鍵盤按鍵即可自訂</translation>
-<translation id="4260722247480053581">在無痕式視窗中開啟</translation>
+<translation id="4260722247480053581">在無痕視窗中開啟</translation>
 <translation id="4261429981378979799">擴充程式權限</translation>
 <translation id="4262004481148703251">關閉警告</translation>
 <translation id="4263223596040212967">請檢查您的鍵盤版面配置，然後再試一次。</translation>
@@ -6490,7 +6490,7 @@
 <translation id="6235208551686043831">開咗裝置相機。請將相機鏡頭對準 eSIM 卡嘅 QR 碼。</translation>
 <translation id="6237297174664969437">您隨時可在 Chrome 設定中選擇要同步的瀏覽器資料。在<ph name="LINK_BEGIN" />裝置設定<ph name="LINK_END" />中，您可控制透過 Chrome 瀏覽器安裝的網絡應用程式的同步功能。Google 可能會根據您的記錄，提供個人化「搜尋」和其他服務。</translation>
 <translation id="6237474966939441970">觸控筆筆記應用程式</translation>
-<translation id="623755660902014047">朗讀模式</translation>
+<translation id="623755660902014047">閱讀模式</translation>
 <translation id="6237985190818217347">此檔案可能隱藏惡意軟件</translation>
 <translation id="6238767809035845642">從其他裝置分享的文字</translation>
 <translation id="6238923052227198598">在上鎖畫面上顯示最新筆記</translation>
@@ -6657,7 +6657,7 @@
 <translation id="6377268785556383139">有 1 個同「<ph name="SEARCH_TEXT" />」相關嘅搜尋結果</translation>
 <translation id="6378392501584240055">開啟 Wi-Fi 網絡清單</translation>
 <translation id="6380143666419481200">接受並繼續</translation>
-<translation id="6383382161803538830">此頁面上無法使用朗讀模式</translation>
+<translation id="6383382161803538830">閱讀模式無法在此頁面上使用</translation>
 <translation id="638418309848716977">支援的連結</translation>
 <translation id="6384275966486438344">變更您的搜尋設定為：<ph name="SEARCH_HOST" /></translation>
 <translation id="63849924261838903">{NUM_TABS,plural, =1{未命名的群組 - 1 個分頁}other{未命名的群組 - # 個分頁}}</translation>
@@ -8253,7 +8253,7 @@
 <translation id="7684212569183643648">已由管理員安裝</translation>
 <translation id="7684559058815332124">前往網頁驗證入口登入網頁</translation>
 <translation id="7684718995427157417">如要建立並測試您的應用程式，請啟用「Android 偵錯橋接器」(ADB)。請注意，此操作允許安裝未經 Google 驗證的 Android 應用程式，並且需要恢復原廠設定才能停用。</translation>
-<translation id="7684913007876670600">如要以簡化檢視模式顯示此頁面，請開啟側面板，並選取 [朗讀模式]</translation>
+<translation id="7684913007876670600">如要簡化此頁面，請開啟側面板並選取 [閱讀模式]</translation>
 <translation id="7685049629764448582">JavaScript 記憶體使用量</translation>
 <translation id="7685087414635069102">必須提供 PIN</translation>
 <translation id="7686086654630106285">進一步瞭解網站建議的廣告</translation>
diff --git a/chromium/chrome/app/resources/generated_resources_zh-TW.xtb b/chromium/chrome/app/resources/generated_resources_zh-TW.xtb
index 19e566aa5ff..88410987c1b 100644
--- a/chromium/chrome/app/resources/generated_resources_zh-TW.xtb
+++ b/chromium/chrome/app/resources/generated_resources_zh-TW.xtb
@@ -15,7 +15,7 @@
 <translation id="1007057452468855774">開啟 Google Play 商店</translation>
 <translation id="1008186147501209563">匯出書籤</translation>
 <translation id="1008261151167010035"><ph name="BRAND" />會記住你的登入資訊，並在情況允許時自動登入。如果關閉這項功能，系統每次都會詢問你是否要登入。</translation>
-<translation id="1008544602823861396">已遭封鎖，無法使用你的資訊 (位於</translation>
+<translation id="1008544602823861396">已遭封鎖，無法使用你在以下網站的資訊</translation>
 <translation id="1008557486741366299">現在不要</translation>
 <translation id="1009454959501038262">{NUM_SITES,plural, =1{為保護你的資料，系統已從你 2 個月以來未曾造訪的一個網站移除相關權限}other{為保護你的資料，系統已從你 2 個月以來未曾造訪的多個網站移除相關權限}}</translation>
 <translation id="1009663062402466586">現已提供遊戲控制項</translation>
@@ -681,7 +681,7 @@
 <translation id="1545177026077493356">自動 Kiosk 模式</translation>
 <translation id="1545749641540134597">掃描 QR code</translation>
 <translation id="1545775234664667895">已安裝「<ph name="THEME_NAME" />」主題</translation>
-<translation id="1546031833947068368">{COUNT,plural, =1{你的無痕式視窗不會重新開啟。}other{你的 # 個無痕式視窗不會重新開啟。}}</translation>
+<translation id="1546031833947068368">{COUNT,plural, =1{你的無痕視窗不會重新開啟。}other{你的 # 個無痕視窗不會重新開啟。}}</translation>
 <translation id="1546280085599573572">這個擴充功能已變更您點選 [首頁] 按鈕時所顯示的網頁。</translation>
 <translation id="1546452108651444655"><ph name="CHILD_NAME" /> 要求安裝具有下列功能的<ph name="EXTENSION_TYPE" />：</translation>
 <translation id="1547123415014299762">已允許第三方 Cookie</translation>
@@ -863,7 +863,7 @@
 <translation id="1668979692599483141">瞭解建議功能</translation>
 <translation id="1670399744444387456">基本</translation>
 <translation id="1673137583248014546"><ph name="URL" /> 要求查看安全金鑰的製造商和型號</translation>
-<translation id="1674073353928166410">在無痕式視窗中開啟所有 (<ph name="URL_COUNT" /> 個) 網址</translation>
+<translation id="1674073353928166410">在無痕視窗中開啟所有 (<ph name="URL_COUNT" /> 個) 網址</translation>
 <translation id="1677306805708094828">無法新增<ph name="EXTENSION_TYPE_PARAMETER" /></translation>
 <translation id="1677472565718498478"><ph name="TIME" /> 後用盡</translation>
 <translation id="1678849866171627536">掃描失敗。這個檔案可能是病毒或惡意軟體。</translation>
@@ -872,7 +872,7 @@
 <translation id="167983332380191032">管理服務傳回了 HTTP 錯誤。</translation>
 <translation id="167997285881077031">文字轉語音的聲音設定</translation>
 <translation id="1680849702532889074">安裝 Linux 應用程式的過程中發生錯誤。</translation>
-<translation id="1682548588986054654">新增無痕式視窗</translation>
+<translation id="1682548588986054654">新增無痕視窗</translation>
 <translation id="1682696837763999627">大型滑鼠游標</translation>
 <translation id="1682867089915960590">要開啟鍵盤瀏覽功能嗎？</translation>
 <translation id="1686550358074589746">啟用滑行輸入功能</translation>
@@ -1031,7 +1031,7 @@
     <ph name="LINE_BREAKS2" />
     這項操作不會影響其他裝置上的應用程式或內容。</translation>
 <translation id="1809734401532861917">將我的書籤、歷史記錄、密碼和其他設定新增至 <ph name="USER_EMAIL_ADDRESS" /></translation>
-<translation id="1810070166657251157">如要在手機上使用儲存的密碼，請依序掃描 QR code、下載 Chrome iOS 版，然後登入 Google 帳戶。</translation>
+<translation id="1810070166657251157">如要在手機上使用儲存的密碼，請掃描 QR code 下載 Chrome iOS 版，然後登入 Google 帳戶。</translation>
 <translation id="1810366086647840386">映像檔伺服器</translation>
 <translation id="1811908311154949291">無痕模式下的 Fenced Frame：<ph name="FENCEDFRAME_SITE" /></translation>
 <translation id="1812284620455788548">投放 <ph name="TAB_NAME" /></translation>
@@ -1044,7 +1044,7 @@
 <translation id="1816036116994822943">鍵盤掃描速度</translation>
 <translation id="1817871734039893258">Microsoft 檔案復原</translation>
 <translation id="1818913467757368489">正在上傳記錄。</translation>
-<translation id="1819443852740954262">在無痕式視窗中開啟所有網址</translation>
+<translation id="1819443852740954262">在無痕視窗中開啟所有網址</translation>
 <translation id="1819721979226826163">依序輕觸 [應用程式通知] &gt; [Google Play 服務]。</translation>
 <translation id="1820028137326691631">請輸入管理員提供的密碼</translation>
 <translation id="1822140782238030981">已經是 Chrome 使用者了嗎？請登入帳戶</translation>
@@ -1355,7 +1355,7 @@
 <translation id="2059913712424898428">時區</translation>
 <translation id="2060375639911876205">移除 eSIM 卡設定檔</translation>
 <translation id="2061366302742593739">沒有可顯示的內容</translation>
-<translation id="2062354623176996748">如果不希望系統在你使用網路時儲存你的瀏覽記錄，請使用無痕式視窗</translation>
+<translation id="2062354623176996748">如果不希望系統在你使用網路時儲存你的瀏覽記錄，請使用無痕視窗</translation>
 <translation id="206308717637808771">在關閉所有視窗後刪除資料。資料的處理方式與目前瀏覽的網站相同</translation>
 <translation id="2065405795449409761">Chrome 目前受到自動測試軟體控制。</translation>
 <translation id="2067591192939433190">來自「<ph name="VENDOR_NAME" />」</translation>
@@ -1599,7 +1599,7 @@
 <translation id="2249635629516220541">自訂網站可用來顯示廣告的資訊</translation>
 <translation id="2251218783371366160">使用系統檢視器開啟</translation>
 <translation id="225163402930830576">重新整理網路</translation>
-<translation id="2251809247798634662">新增無痕式視窗</translation>
+<translation id="2251809247798634662">新增無痕視窗</translation>
 <translation id="2252017960592955005">檢視防護 (Beta 版)</translation>
 <translation id="2253318212986772520">無法擷取「<ph name="PRINTER_NAME" />」的 PPD。</translation>
 <translation id="2253927598983295051">選擇要與「<ph name="APP_NAME" />」分享的內容</translation>
@@ -1769,7 +1769,7 @@
 <translation id="2364498172489649528">已通過</translation>
 <translation id="2365507699358342471">這個網站可以讀取已複製到剪貼簿的文字和圖片。</translation>
 <translation id="2367972762794486313">顯示應用程式</translation>
-<translation id="2369058545741334020">以唯讀模式開啟</translation>
+<translation id="2369058545741334020">以閱讀模式開啟</translation>
 <translation id="236939127352773362">當附近的裝置正在分享內容時</translation>
 <translation id="2371076942591664043">完成後開啟(&amp;D)</translation>
 <translation id="237336063998926520">使用你的 IP 位址判定所在位置</translation>
@@ -1811,7 +1811,7 @@
 <translation id="2410298923485357543">在裝置連上網路時使用自然語音</translation>
 <translation id="2410754283952462441">選擇帳戶</translation>
 <translation id="241082044617551207">不明的外掛程式</translation>
-<translation id="2410940059315936967">你造訪的網站可以嵌入其他網站的內容，例如圖片、廣告和文字。其他網站設定的 Cookie 稱為第三方 Cookie。</translation>
+<translation id="2410940059315936967">你造訪的網站可能會嵌入其他網站的內容，例如圖片、廣告和文字。其他網站設定的 Cookie 稱為第三方 Cookie。</translation>
 <translation id="2411666601450687801">這部裝置不允許使用任何虛擬機器</translation>
 <translation id="2412015533711271895">你必須取得家長或監護人允許，才能使用這個擴充功能</translation>
 <translation id="2412593942846481727">有可用的更新</translation>
@@ -2445,7 +2445,7 @@
 <translation id="2893701697603065178">受管理的開發環境</translation>
 <translation id="2894757982205307093">在群組中新增分頁</translation>
 <translation id="289695669188700754">金鑰識別碼：<ph name="KEY_ID" /></translation>
-<translation id="2897713966423243833">所有無痕式視窗關閉後，這項自訂設定將會移除</translation>
+<translation id="2897713966423243833">所有無痕視窗關閉後，這項自訂設定將會移除</translation>
 <translation id="2897878306272793870">你確定要開啟 <ph name="TAB_COUNT" /> 分頁嗎？</translation>
 <translation id="2900247416110050639">Google 文件、試算表和簡報要求將檔案儲存在 Google 雲端硬碟中。系統會移動本機檔案，並複製其他位置的檔案。你可以在「檔案」應用程式的 Google 雲端硬碟資料夾中找到檔案。</translation>
 <translation id="290105521672621980">檔案使用不受支援的功能</translation>
@@ -2777,7 +2777,7 @@
 <translation id="3182749001423093222">拼字檢查</translation>
 <translation id="3183139917765991655">設定檔匯入工具</translation>
 <translation id="3183143381919926261">行動數據網路</translation>
-<translation id="3183613134231754987">這個密碼金鑰只會儲存在 Windows Hello 中。關閉所有無痕式視窗後，密碼金鑰會保存在這部裝置上。</translation>
+<translation id="3183613134231754987">這個密碼金鑰只會儲存在 Windows Hello 中。關閉所有無痕視窗後，密碼金鑰會保存在這部裝置上。</translation>
 <translation id="3183944777708523606">顯示器排列位置</translation>
 <translation id="3184536091884214176">設定或管理 CUPS 印表機。<ph name="LINK_BEGIN" />瞭解詳情<ph name="LINK_END" /></translation>
 <translation id="3185014249447200271">{NUM_APPS,plural, =1{已封鎖這個應用程式}other{已封鎖部分應用程式}}</translation>
@@ -3301,7 +3301,7 @@
 <translation id="3625481642044239431">選取的檔案無效，請再試一次。</translation>
 <translation id="3626296069957678981">如要為這部 Chromebook 充電，請使用相容的 Dell 電池。</translation>
 <translation id="3627320433825461852">剩下不到 1 分鐘</translation>
-<translation id="3627588569887975815">在無痕式視窗中開啟連結(&amp;G)</translation>
+<translation id="3627588569887975815">在無痕視窗中開啟連結(&amp;G)</translation>
 <translation id="3627671146180677314">Netscape 憑證更新時間</translation>
 <translation id="3628275722731025472">關閉藍牙</translation>
 <translation id="3629664892718440872">記住這個選擇</translation>
@@ -3474,7 +3474,7 @@
 <translation id="3758842566811519622">已設定 Cookie</translation>
 <translation id="3759933321830434300">封鎖網頁部分內容</translation>
 <translation id="3760460896538743390">檢查背景頁面(&amp;B)</translation>
-<translation id="37613671848467444">在無痕式視窗中開啟(&amp;I)</translation>
+<translation id="37613671848467444">在無痕視窗中開啟(&amp;I)</translation>
 <translation id="3761390540041101668">請清楚說明問題，並盡可能提供重現問題的步驟</translation>
 <translation id="3761556954875533505">要允許網站編輯檔案嗎？</translation>
 <translation id="3763433740586298940">如果不想讓網站儲存造訪資訊，建議你封鎖這些網站。Chrome 也會自動將 30 天前的網站從清單中刪除。</translation>
@@ -3602,7 +3602,7 @@
 <translation id="3844888638014364087">已插入表情符號</translation>
 <translation id="3846116211488856547">取得網站開發工具、Android 應用程式等等。安裝 Linux 將下載 <ph name="DOWNLOAD_SIZE" /> 的資料。</translation>
 <translation id="3847319713229060696">協助我們改善所有人的網路安全性</translation>
-<translation id="3848547754896969219">在無痕式視窗中開啟(&amp;I)</translation>
+<translation id="3848547754896969219">在無痕視窗中開啟(&amp;I)</translation>
 <translation id="3850172593216628215">安全性更新已終止，購買新款 Chromebook 可省下 $50 美元以上</translation>
 <translation id="385051799172605136">返回</translation>
 <translation id="3851428669031642514">載入不安全的指令碼</translation>
@@ -3650,7 +3650,7 @@
 <translation id="3890064827463908288">開啟 Chrome 同步功能以使用 Wi-Fi 同步功能</translation>
 <translation id="389313931326656921">指派代表「下一個」的外接切換裝置</translation>
 <translation id="3893268973182382220">目前無法載入這個面板</translation>
-<translation id="3893295674388762059">如要清除資料，請關閉所有無痕式視窗</translation>
+<translation id="3893295674388762059">如要清除資料，請關閉所有無痕視窗</translation>
 <translation id="3893536212201235195">讀取及變更你的無障礙設定</translation>
 <translation id="3893630138897523026">ChromeVox (互動朗讀)</translation>
 <translation id="3893764153531140319"><ph name="DOWNLOADED_SIZE" />/<ph name="DOWNLOAD_SIZE" /></translation>
@@ -4102,7 +4102,7 @@
 <translation id="4259388776256904261">請稍待片刻</translation>
 <translation id="4260182282978351200"><ph name="FILE_NAME" /> 可能含有危險內容。要傳送至 Google 進階保護進行掃描嗎？按下 Shift + F6 鍵即可返回下載內容列區域。</translation>
 <translation id="4260699894265914672">按下鍵盤按鍵即可自訂</translation>
-<translation id="4260722247480053581">在無痕式視窗中開啟</translation>
+<translation id="4260722247480053581">在無痕視窗中開啟</translation>
 <translation id="4261429981378979799">擴充功能權限</translation>
 <translation id="4262004481148703251">忽略警告</translation>
 <translation id="4263223596040212967">請檢查你的鍵盤配置，然後再試一次。</translation>
@@ -4151,7 +4151,7 @@
 <translation id="4297219207642690536">重新啟動並重設</translation>
 <translation id="4297813521149011456">螢幕旋轉</translation>
 <translation id="4298660926525614540">卸除式儲存裝置名稱</translation>
-<translation id="4299022904780065004">新增無痕式視窗(&amp;I)</translation>
+<translation id="4299022904780065004">新增無痕視窗(&amp;I)</translation>
 <translation id="4301671483919369635">這個頁面具有檔案編輯權限</translation>
 <translation id="4303079906735388947">為安全金鑰設定新的 PIN 碼</translation>
 <translation id="4304713468139749426">密碼管理工具</translation>
@@ -4295,7 +4295,7 @@
 <translation id="4412992751769744546">允許第三方 Cookie</translation>
 <translation id="4413087696295876280">讀取 ChromeOS Flex 裝置資訊和資料</translation>
 <translation id="44141919652824029">要允許「<ph name="APP_NAME" />」取得已連結 USB 裝置的清單嗎？</translation>
-<translation id="4414232939543644979">新增無痕式視窗(&amp;I)</translation>
+<translation id="4414232939543644979">新增無痕視窗(&amp;I)</translation>
 <translation id="4414242853388122273">移除「<ph name="VM_NAME" />」時發生錯誤，請再試一次。</translation>
 <translation id="4415213869328311284">你的 <ph name="DEVICE_TYPE" /> 已準備就緒。</translation>
 <translation id="4415245286584082850">找不到裝置。您可以在新分頁中開啟說明中心文章。</translation>
@@ -4673,7 +4673,7 @@
 <translation id="4728558894243024398">平台</translation>
 <translation id="4730492586225682674">在螢幕鎖定狀態下顯示以觸控筆記錄的最新筆記</translation>
 <translation id="4730888769809690665">你已允許 <ph name="SITE" /> 傳送通知</translation>
-<translation id="4731306954230393087">這個網站可使用與你相關的既有資訊</translation>
+<translation id="4731306954230393087">這些網站可使用與你相關的既有資訊</translation>
 <translation id="473140019006744096">裝置空間不足，無法完成這項更新作業。請在裝置上釋出 <ph name="NECESSARY_SPACE" /> 的空間，然後再試一次。</translation>
 <translation id="4733161265940833579"><ph name="BATTERY_PERCENTAGE" />% (左側)</translation>
 <translation id="4733793249294335256">位置</translation>
@@ -5171,7 +5171,7 @@
 <translation id="5153234146675181447">移除手機</translation>
 <translation id="5153907427821264830"><ph name="STATUS" /> • <ph name="MESSAGE" /></translation>
 <translation id="5154108062446123722">「<ph name="PRINTING_DESTINATION" />」進階設定</translation>
-<translation id="5154702632169343078">主旨</translation>
+<translation id="5154702632169343078">主體</translation>
 <translation id="5154917547274118687">記憶體</translation>
 <translation id="5155327081870541046">在網址列中針對想搜尋的網站輸入快捷字詞 (例如「@bookmarks」)，然後按下你慣用的鍵盤快速鍵並輸入搜尋字詞。</translation>
 <translation id="5156638757840305347">游標會在出現或移動時醒目顯示</translation>
@@ -5219,7 +5219,7 @@
 <translation id="5192062846343383368">開啟 Family Link 應用程式以查看監督功能設定</translation>
 <translation id="5193978546360574373">這麼做會移除這部 Chromebook 的 Google 雲端硬碟存取權，包括已設為可離線存取的所有檔案存取權</translation>
 <translation id="5193988420012215838">已複製到剪貼簿</translation>
-<translation id="5194256020863090856">這項操作只會影響無痕式視窗</translation>
+<translation id="5194256020863090856">這項操作只會影響無痕視窗</translation>
 <translation id="5195074424945754995">符合這些規則的網址不會觸發瀏覽器切換功能，且可在 <ph name="BROWSER_NAME" /> 或 <ph name="ALTERNATIVE_BROWSER_NAME" /> 中開啟。</translation>
 <translation id="5195863934285556588"><ph name="BEGIN_PARAGRAPH1" />Google 的定位服務會使用 Wi‑Fi、行動網路和感應器等來源，推測出這部裝置的所在位置。<ph name="END_PARAGRAPH1" />
     <ph name="BEGIN_PARAGRAPH2" />您隨時可在裝置上關閉 Android 定位服務，只要依序前往「設定」&gt;「應用程式」&gt;「Google Play 商店」&gt;「管理 Android 偏好設定」&gt;「安全性與位置資訊」&gt;「位置」即可。您也可以在相同選單中關閉「Google 定位精確度」，禁止 Android 定位服務使用 Wi-Fi、行動網路和感應器。<ph name="END_PARAGRAPH2" /></translation>
@@ -5389,7 +5389,7 @@
 <translation id="5336689872433667741">游標和觸控板</translation>
 <translation id="5337771866151525739">由第三方安裝。</translation>
 <translation id="5337926771328966926">目前的裝置名稱為「<ph name="DEVICE_NAME" />」</translation>
-<translation id="5338338064218053691">使用無痕式視窗，安心進行私密瀏覽</translation>
+<translation id="5338338064218053691">使用無痕視窗，安心進行私密瀏覽</translation>
 <translation id="5338503421962489998">本機儲存空間</translation>
 <translation id="5339031667684712858">已移除的網站</translation>
 <translation id="5340787663756381836">尋找並編輯(&amp;F)</translation>
@@ -5423,7 +5423,7 @@
 <translation id="5368441245151140827">這項擴充功能無法讀取及變更網站資訊，也無法在背景執行</translation>
 <translation id="5368720394188453070">你的手機已鎖定，必須解鎖才能繼續操作。</translation>
 <translation id="5368779022775404937">登入 <ph name="REALM" /></translation>
-<translation id="536882527576164740">{0,plural, =1{無痕式視窗}other{無痕式視窗 (#)}}</translation>
+<translation id="536882527576164740">{0,plural, =1{無痕視窗}other{無痕視窗 (#)}}</translation>
 <translation id="5369491905435686894">啟用滑鼠加速</translation>
 <translation id="5369694795837229225">設定 Linux 開發環境</translation>
 <translation id="5370819323174483825">重新載入(&amp;R)</translation>
@@ -6058,7 +6058,7 @@
 <translation id="5888889603768021126">目前登入身分</translation>
 <translation id="5889282057229379085">中繼 CA 數目上限：<ph name="NUM_INTERMEDIATE_CA" /></translation>
 <translation id="5889629805140803638">使用你的<ph name="BEGIN_LINK" />同步通關密語<ph name="END_LINK" />加密同步的資料。系統將不會加密你在 Google Pay 中的付款方式和地址，也不會同步 Chrome 中的瀏覽記錄。</translation>
-<translation id="5891084409170578560">你造訪的網站可以嵌入其他網站的內容，例如圖片、廣告和文字。這些其他網站可要求你授予權限，在你瀏覽網站時使用與你相關的既有資訊。</translation>
+<translation id="5891084409170578560">你造訪的網站可能會嵌入其他網站的內容，例如圖片、廣告和文字。這些其他網站可要求你授予權限，在你瀏覽網站時使用與你相關的既有資訊。</translation>
 <translation id="5891688036610113830">偏好的 Wi-Fi 網路</translation>
 <translation id="5894056653502215961">取消選取資料夾：<ph name="FOLDER_TITLE" /></translation>
 <translation id="5895138241574237353">重新啟動</translation>
@@ -6164,7 +6164,7 @@
 <translation id="5972826969634861500">啟動 <ph name="PRODUCT_NAME" /></translation>
 <translation id="5973041996755340290">「<ph name="CLIENT_NAME" />」已開始為這個瀏覽器偵錯</translation>
 <translation id="5973605538625120605">變更 PIN 碼</translation>
-<translation id="5975056890546437204">{COUNT,plural, =0{在無痕式視窗中開啟所有網址(&amp;I)}=1{在無痕式視窗中開啟(&amp;I)}other{在無痕式視窗中開啟所有 ({COUNT} 個) 網址(&amp;I)}}</translation>
+<translation id="5975056890546437204">{COUNT,plural, =0{在無痕視窗中開啟所有網址(&amp;I)}=1{在無痕視窗中開啟(&amp;I)}other{在無痕視窗中開啟所有 ({COUNT} 個) 網址(&amp;I)}}</translation>
 <translation id="5975792506968920132">電池充電百分比</translation>
 <translation id="5976160379964388480">其他</translation>
 <translation id="5977976211062815271">在這部裝置上</translation>
@@ -6490,7 +6490,7 @@
 <translation id="6242852299490624841">將焦點移至這個分頁</translation>
 <translation id="6243774244933267674">無法與伺服器連線</translation>
 <translation id="6244245036423700521">匯入 ONC 檔案</translation>
-<translation id="6245523954602476652">你可以在 Google 密碼管理工具中取得這個密碼。</translation>
+<translation id="6245523954602476652">你可以透過 Google 密碼管理工具使用這組密碼。</translation>
 <translation id="6246790815526961700">從裝置上傳</translation>
 <translation id="6247557882553405851">Google 密碼管理工具</translation>
 <translation id="6247620186971210352">找不到應用程式</translation>
@@ -7154,7 +7154,7 @@
 <translation id="6808039367995747522">如要繼續，請插入並輕觸安全金鑰</translation>
 <translation id="6808166974213191158">ChromeOS Flex 系統映像檔寫入工具</translation>
 <translation id="6808193438228982088">狐狸</translation>
-<translation id="6809470175540814047">在無痕式視窗中開啟</translation>
+<translation id="6809470175540814047">在無痕視窗中開啟</translation>
 <translation id="6809656734323672573">如果你同意，Google 助理會處於待機模式，以便偵測「Ok Google」指令，並透過 Voice Match 功能辨識是你否正在說話。
     <ph name="BR" />
     Voice Match 可讓 Google 助理辨識你的聲音，進而區分你與其他人。Google 助理會錄製你的聲音片段以建立專屬的語音模型，而且這個模型只會儲存在你的裝置上。為提升辨識準確度，系統可能會暫時將你的語音模型傳送到 Google 進行處理。
@@ -7381,7 +7381,7 @@
 <translation id="6979440798594660689">靜音 (預設)</translation>
 <translation id="6979737339423435258">不限時間</translation>
 <translation id="6980402667292348590">insert 鍵</translation>
-<translation id="6981553172137913845">如果想要進行私密瀏覽，請按一下三個圓點圖示的選單，然後開啟無痕式視窗</translation>
+<translation id="6981553172137913845">如果想要進行私密瀏覽，請按一下三個圓點圖示的選單，然後開啟無痕視窗</translation>
 <translation id="6981761993313539853">請確認你的藍牙裝置放在附近，且處於配對模式。只配對你信任的裝置。<ph name="BEGIN_LINK_LEARN_MORE" />瞭解詳情<ph name="END_LINK_LEARN_MORE" /></translation>
 <translation id="6981982820502123353">無障礙設定</translation>
 <translation id="6983507711977005608">中斷與「即時網路共用」網路的連線</translation>
@@ -7446,7 +7446,7 @@
 <translation id="7025082428878635038">全新的手勢瀏覽功能正式登場</translation>
 <translation id="7025190659207909717">行動數據服務管理</translation>
 <translation id="7025895441903756761">安全性與隱私權</translation>
-<translation id="7027258625819743915">{COUNT,plural, =0{在無痕式視窗中開啟所有網址(&amp;I)}=1{在無痕式視窗中開啟(&amp;I)}other{在無痕式視窗中開啟所有 ({COUNT} 個) 網址(&amp;I)}}</translation>
+<translation id="7027258625819743915">{COUNT,plural, =0{在無痕視窗中開啟所有網址(&amp;I)}=1{在無痕視窗中開啟(&amp;I)}other{在無痕視窗中開啟所有 ({COUNT} 個) 網址(&amp;I)}}</translation>
 <translation id="7029307918966275733">未安裝 Crostini。請安裝 Crostini 以查看開發人員名單。</translation>
 <translation id="7029809446516969842">密碼</translation>
 <translation id="7030304022046916278">系統會將網址傳送給安全瀏覽功能進行檢查</translation>
@@ -7477,7 +7477,7 @@
 <translation id="7053983685419859001">封鎖</translation>
 <translation id="7055152154916055070">已禁止重新導向：</translation>
 <translation id="7055451306017383754">某個應用程式正在使用這個資料夾，因此無法取消分享。系統會在下次關閉 Parallels Desktop 時取消分享這個資料夾。</translation>
-<translation id="7056418393177503237">{0,plural, =1{無痕式視窗}other{已開啟 # 個無痕式視窗}}</translation>
+<translation id="7056418393177503237">{0,plural, =1{無痕視窗}other{已開啟 # 個無痕視窗}}</translation>
 <translation id="7056526158851679338">檢查裝置 (&amp;I)</translation>
 <translation id="7057184853669165321">{NUM_MINS,plural, =1{1 分鐘前已執行安全檢查}other{{NUM_MINS} 分鐘前已執行安全檢查}}</translation>
 <translation id="7057767408836081338">無法取得應用程式資料，正在嘗試繼續執行應用程式...</translation>
@@ -8083,7 +8083,7 @@
 <translation id="7561982940498449837">關閉選單</translation>
 <translation id="756445078718366910">開啟瀏覽器視窗</translation>
 <translation id="7564847347806291057">結束處理程序</translation>
-<translation id="756503097602602175">你可以透過<ph name="LINK_BEGIN" />設定<ph name="LINK_END" />管理已登入的 Google 帳戶。你授予網站和應用程式的權限可能適用於所有帳戶。如果不想讓網站和應用程式存取你的帳戶資訊，請以訪客身分登入 <ph name="DEVICE_TYPE" />，或透過<ph name="LINK_2_BEGIN" />無痕式視窗<ph name="LINK_2_END" />瀏覽網頁。</translation>
+<translation id="756503097602602175">你可以透過<ph name="LINK_BEGIN" />設定<ph name="LINK_END" />管理已登入的 Google 帳戶。你授予網站和應用程式的權限可能適用於所有帳戶。如果不想讓網站和應用程式存取你的帳戶資訊，請以訪客身分登入 <ph name="DEVICE_TYPE" />，或透過<ph name="LINK_2_BEGIN" />無痕視窗<ph name="LINK_2_END" />瀏覽網頁。</translation>
 <translation id="7566118625369982896">管理 Play 應用程式連結</translation>
 <translation id="756809126120519699">已清除 Chrome 資料</translation>
 <translation id="756876171895853918">自訂顯示圖片</translation>
@@ -8141,7 +8141,7 @@
 <translation id="7617263010641145920">開啟 Play 商店</translation>
 <translation id="7617648809369507487">使用低擾式通知</translation>
 <translation id="7621382409404463535">系統無法儲存裝置設定。</translation>
-<translation id="7621480263311228380">這個網站不可使用與你相關的既有資訊</translation>
+<translation id="7621480263311228380">這些網站不可使用與你相關的既有資訊</translation>
 <translation id="7621595347123595643">如果忘記密碼或 PIN 碼，就無法復原本機資料。</translation>
 <translation id="7622114377921274169">充電中。</translation>
 <translation id="7622768823216805500">網站通常會安裝付款處理常式，以便提供相關的購物功能 (例如更方便的結帳方式)</translation>
@@ -8595,7 +8595,7 @@
 <translation id="7952904276017482715">預期的 ID 為「<ph name="EXPECTED_ID" />」，但實際的 ID 為「<ph name="NEW_ID" />」</translation>
 <translation id="7953669802889559161">輸入法</translation>
 <translation id="7953955868932471628">管理快速鍵</translation>
-<translation id="7955105108888461311">要求存取權</translation>
+<translation id="7955105108888461311">親自詢問</translation>
 <translation id="7955177647836564772">如果 Smart Lock 已開啟，且手機處於解鎖狀態，你就不必輸入密碼或 PIN 碼</translation>
 <translation id="7956373551960864128">已儲存的印表機</translation>
 <translation id="7957074856830851026">查看裝置資訊，例如裝置序號或資產 ID</translation>
@@ -8974,7 +8974,7 @@
 <translation id="8264024885325823677">這項設定是由系統管理員管理。</translation>
 <translation id="8264718194193514834">「<ph name="EXTENSION_NAME" />」啟用了全螢幕。</translation>
 <translation id="826511437356419340">已進入視窗總覽模式。滑動畫面或按下鍵盤上的 Tab 鍵即可瀏覽。</translation>
-<translation id="8265671588726449108">{COUNT,plural, =1{重新啟動後，系統將不會開啟無痕式視窗}other{重新啟動後，系統將不會重新開啟 {COUNT} 個無痕式視窗}}</translation>
+<translation id="8265671588726449108">{COUNT,plural, =1{重新啟動後，系統將不會開啟無痕視窗}other{重新啟動後，系統將不會重新開啟 {COUNT} 個無痕視窗}}</translation>
 <translation id="8266947622852630193">所有輸入法</translation>
 <translation id="8267539814046467575">新增印表機</translation>
 <translation id="8267961145111171918"><ph name="BEGIN_PARAGRAPH1" />這會提供裝置和裝置使用情況的一般資訊 (例如電池電量、系統和應用程式活動，以及錯誤資訊)。這些資料會用於改善 Android 使用體驗，而部分匯總資訊還能協助 Google 應用程式和合作夥伴 (例如 Android 開發人員) 提高應用程式和產品的品質。<ph name="END_PARAGRAPH1" />
@@ -9115,7 +9115,7 @@
 <translation id="8376451933628734023">如果這個網頁應用程式企圖讓你誤認為其他應用程式，請解除安裝。</translation>
 <translation id="8376532149031784008">正在重新載入 <ph name="DOMAIN" />…</translation>
 <translation id="8376752431516546391">Google 搜尋側邊面板</translation>
-<translation id="8377625247046155446">這個密碼金鑰只會儲存在這部裝置中。關閉所有無痕式視窗後，密碼金鑰會保存在這部裝置上。</translation>
+<translation id="8377625247046155446">這個密碼金鑰只會儲存在這部裝置中。關閉所有無痕視窗後，密碼金鑰會保存在這部裝置上。</translation>
 <translation id="8378714024927312812">由貴機構管理</translation>
 <translation id="8379988659465232385">名稱不得留空</translation>
 <translation id="8379991678458444070">將此分頁加入書籤，日後便能快速開啟這個頁面</translation>
@@ -9449,7 +9449,7 @@
 <translation id="8655972064210167941">無法驗證您的密碼，導致登入失敗。請與您的管理員聯絡或再試一次。</translation>
 <translation id="8656888282555543604">啟用點字記錄功能</translation>
 <translation id="8657393004602556571">你要捨棄這則意見嗎？</translation>
-<translation id="8661290697478713397">在無痕式視窗中開啟連結(&amp;G)</translation>
+<translation id="8661290697478713397">在無痕視窗中開啟連結(&amp;G)</translation>
 <translation id="8662671328352114214">加入 <ph name="TYPE" /> 網路</translation>
 <translation id="8662733268723715832">作業時間過長。你可以選擇略過或繼續等待。</translation>
 <translation id="8662795692588422978">人員</translation>
@@ -9714,7 +9714,7 @@
 <translation id="8864055848767439877">正在與 <ph name="APP_NAME" /> 共用 <ph name="TAB_NAME" /></translation>
 <translation id="8864104359314908853">已儲存密碼</translation>
 <translation id="8864458770072227512">已將 <ph name="EMAIL" /> 從這個裝置中移除</translation>
-<translation id="8865112428068029930">你會與其他人共用電腦嗎？試試使用無痕式視窗。</translation>
+<translation id="8865112428068029930">你會與其他人共用電腦嗎？試試使用無痕視窗。</translation>
 <translation id="8867102760244540173">搜尋分頁...</translation>
 <translation id="8867228703146808825">將版本詳細資料複製到剪貼簿</translation>
 <translation id="8868333925931032127">正在啟動展示模式</translation>
diff --git a/chromium/chrome/app/resources/google_chrome_strings_eu.xtb b/chromium/chrome/app/resources/google_chrome_strings_eu.xtb
index 0dc55be7bf5..2d95c74e8fc 100644
--- a/chromium/chrome/app/resources/google_chrome_strings_eu.xtb
+++ b/chromium/chrome/app/resources/google_chrome_strings_eu.xtb
@@ -59,7 +59,7 @@ Eginbide batzuk agian dira erabilgarri egongo eta hobespenei egindako aldaketak
 <translation id="2018528049276128029">Profil bakoitzak Chrome-ko informazio propioa dauka; adibidez, laster-markak, historia, pasahitzak eta beste</translation>
 <translation id="2018879682492276940">Ezin izan da instalatu. Saiatu berriro.</translation>
 <translation id="2071318482926839249">Beste kontu batek dagoeneko hasita dauka saioa. Arakatze-jarduerak bereizita edukitzeko, Chrome-k profil bat sor dezake zuretzat.</translation>
-<translation id="207902854391093810">Probak abian diren bitartean, iragarkien neurketari esker, bisitatzen dituzun webguneek Chrome-ri informazioa eska diezaiokete. Informazio horren bidez, webguneek beren iragarkien errendimendua neur dezakete. Webguneen artean ahalik eta informazio gutxien transferituta mugatzen du iragarkien neurketak webguneen arteko jarraipena.</translation>
+<translation id="207902854391093810">Probak abian diren bitartean, iragarkien neurketari esker, bisitatzen dituzun webguneek Chrome-ri informazioa eska diezaiokete. Informazio horren bidez, webguneek beren iragarkien errendimendua neur dezakete. Webguneen artean ahalik eta informazio gutxien transferituta mugatzen du iragarkien neurketak webgunearteko jarraipena.</translation>
 <translation id="2091012649849228750">Etorkizunean Google Chrome-ren eguneratzeak eskuratzeko, Windows 10 edo bertsio berriago bat beharko duzu. Ordenagailua Windows 8 erabiltzen ari da.</translation>
 <translation id="2094648590148273905">ChromeOS Flex-en baldintzak</translation>
 <translation id="2094919256425865063">Chrome-tik irten nahi duzu hala ere?</translation>
@@ -203,7 +203,7 @@ Eginbide batzuk agian dira erabilgarri egongo eta hobespenei egindako aldaketak
 <translation id="4427306783828095590">Babes handiagoa eskaintzen du phishingaren eta malwarearen aurka</translation>
 <translation id="4450664632294415862">Chrome - Hasi saioa sarean - <ph name="PAGE_TITLE" /></translation>
 <translation id="4458462641685292929">Beste eragiketa bat ari da egiten Google Chrome. Saiatu berriro geroago.</translation>
-<translation id="4459234553906210702">Iragarkien neurketari esker, bisitatzen dituzun webguneek Chrome-ri informazioa eska diezaiokete. Informazio horren bidez, webguneek beren iragarkien errendimendua neur dezakete. Webguneen artean ahalik eta informazio gutxien transferituta mugatzen du iragarkien neurketak webguneen arteko jarraipena.</translation>
+<translation id="4459234553906210702">Iragarkien neurketari esker, bisitatzen dituzun webguneek Chrome-ri informazioa eska diezaiokete. Informazio horren bidez, webguneek beren iragarkien errendimendua neur dezakete. Webguneen artean ahalik eta informazio gutxien transferituta mugatzen du iragarkien neurketak webgunearteko jarraipena.</translation>
 <translation id="4561051373932531560">Google Chrome-rekin, telefono-zenbakietan klik egin dezakezu Skype bidez horietara deitzeko!</translation>
 <translation id="4567424176335768812"><ph name="USER_EMAIL_ADDRESS" /> gisa hasi duzu saioa. Laster-markak, historia eta bestelako ezarpenak atzi ditzakezu saioa hasita daukaten gailu guztien bidez.</translation>
 <translation id="4571503333518166079">Joan Chrome-ren jakinarazpen-ezarpenetara</translation>
diff --git a/chromium/chrome/app/resources/google_chrome_strings_hi.xtb b/chromium/chrome/app/resources/google_chrome_strings_hi.xtb
index be61e02af6d..019fcd21d40 100644
--- a/chromium/chrome/app/resources/google_chrome_strings_hi.xtb
+++ b/chromium/chrome/app/resources/google_chrome_strings_hi.xtb
@@ -296,7 +296,7 @@ Google Chrome आपकी सेटिंग बहाल नहीं कर �
 <translation id="6326175484149238433">Chrome से हटाएं</translation>
 <translation id="6327105987658262776">कोई अपडेट उपलब्ध नहीं है.</translation>
 <translation id="6360449101159168105">टैब के इनऐक्टिव होने पर, मेमोरी खाली की गई थी, ताकि Chrome को तेज़ी से ऐक्सेस किया जा सके. इस साइट को हमेशा ऐक्टिव रखने का विकल्प चुना जा सकता है.</translation>
-<translation id="6412673304250309937">Chrome में पहले से सेव असुरक्षित साइटों के साथ यूआरएल की जांच करता है. अगर कोई साइट आपका पासवर्ड चुराने की कोशिश करती है या आप कोई नुकसान पहुंचाने वाली फ़ाइल डाउनलोड करते हैं, तो Chrome सुरक्षित ब्राउज़िंग की सेवा को उनका यूआरएल भेजता है. यूआरएल के साथ इनमें उन पेज की कुछ सामग्री भी शामिल होती है.</translation>
+<translation id="6412673304250309937">यह सेवा, Chrome में पहले से सेव असुरक्षित साइटों के साथ यूआरएल की जांच करती है. अगर कोई साइट आपका पासवर्ड चुराने की कोशिश करती है या कोई नुकसान पहुंचाने वाली फ़ाइल डाउनलोड की जाती है, तो Chrome सुरक्षित ब्राउज़िंग की सेवा को उनका यूआरएल भेजता है. यूआरएल के साथ-साथ उन पेजों का कुछ कॉन्टेंट भी भेजा जाता है.</translation>
 <translation id="6417690341895039567">{COUNT,plural, =1{Chrome का 1 मिनट तक इस्तेमाल न करने पर, आपका संगठन इसे अपने-आप बंद कर देता है. ब्राउज़िंग डेटा मिटा दिया जाता है. इसमें, ब्राउज़िंग का इतिहास, ऑटोमैटिक भरी जाने वाली जानकारी, और डाउनलोड की गई फ़ाइलें शामिल हो सकती हैं.}one{Chrome का # मिनट तक इस्तेमाल न करने पर, आपका संगठन इसे अपने-आप बंद कर देता है. ब्राउज़िंग डेटा मिटा दिया जाता है. इसमें, ब्राउज़िंग का इतिहास, ऑटोमैटिक भरी जाने वाली जानकारी, और डाउनलोड की गई फ़ाइलें शामिल हो सकती हैं.}other{Chrome का # मिनट तक इस्तेमाल न करने पर, आपका संगठन इसे अपने-आप बंद कर देता है. ब्राउज़िंग डेटा मिटा दिया जाता है. इसमें, ब्राउज़िंग का इतिहास, ऑटोमैटिक भरी जाने वाली जानकारी, और डाउनलोड की गई फ़ाइलें शामिल हो सकती हैं.}}</translation>
 <translation id="6418662306461808273">क्या आप मौजूदा Chrome प्रोफ़ाइल में स्विच करना चाहते हैं?</translation>
 <translation id="648319183876919572">बेहतर सुरक्षित ब्राउज़िंग की सुविधा, आपको नुकसान पहुंचाने वाली वेबसाइटों और डाउनलोड से बचाती है</translation>
diff --git a/chromium/chrome/app/resources/google_chrome_strings_pl.xtb b/chromium/chrome/app/resources/google_chrome_strings_pl.xtb
index 317575ceace..a7a8db5cb80 100644
--- a/chromium/chrome/app/resources/google_chrome_strings_pl.xtb
+++ b/chromium/chrome/app/resources/google_chrome_strings_pl.xtb
@@ -193,7 +193,7 @@
 <translation id="4328355335528187361">Wersja deweloperska Google Chrome (mDNS-In)</translation>
 <translation id="4334294535648607276">Pobieranie ukończone.</translation>
 <translation id="4335235004908507846">Chrome pomaga chronić Cię przed naruszeniami bezpieczeństwa danych, niebezpiecznymi rozszerzeniami i innymi zagrożeniami.</translation>
-<translation id="4343195214584226067">Rozszerzenie <ph name="EXTENSION_NAME" /> zostało dodane do Chrome</translation>
+<translation id="4343195214584226067"><ph name="EXTENSION_NAME" /> – dodano do Chrome</translation>
 <translation id="4384570495110188418">Chrome nie może sprawdzić haseł, jeśli się nie zalogujesz</translation>
 <translation id="4393248995085527349">Aby otrzymywać w przyszłości aktualizacje Google Chrome, musisz mieć system macOS 10.15 lub nowszy. Na tym komputerze jest zainstalowany system macOS 10.13.</translation>
 <translation id="4427306783828095590">Silniejsza ochrona lepiej chroni przed phishingiem i złośliwym oprogramowaniem</translation>
diff --git a/chromium/chrome/app/resources/google_chrome_strings_te.xtb b/chromium/chrome/app/resources/google_chrome_strings_te.xtb
index 98332d53840..c4df5d045cf 100644
--- a/chromium/chrome/app/resources/google_chrome_strings_te.xtb
+++ b/chromium/chrome/app/resources/google_chrome_strings_te.xtb
@@ -336,7 +336,7 @@
 <translation id="7177959540995930968">మీరు ఈ ఫీచర్‌ల గురించి Chrome సెట్టింగ్‌లలో మరింత తెలుసుకోవచ్చు.</translation>
 <translation id="7193885263065350793">Chromeను <ph name="TIMEOUT_DURATION" /> సమయం పాటు వినియోగించకపోతే, మీ సంస్థ దానిని మూసివేస్తుంది.</translation>
 <translation id="7242029209006116544">మీరు నిర్వహించబడే ఖాతాతో సైన్ ఇన్ చేస్తున్నారు. దీని నిర్వాహకునికి మీ Google Chrome ప్రొఫైల్‌పై నియంత్రణను అందిస్తున్నారు. మీ యాప్‌లు, బుక్‌మార్క్‌లు, హిస్టరీ, పాస్‌వర్డ్‌లు, ఇతర సెట్టింగ్‌ల వంటి మీ Chrome డేటా, శాశ్వతంగా <ph name="USER_NAME" />కు అనుబంధించబడుతుంది. మీరు Google ఖాతాల డ్యాష్‌బోర్డ్ ద్వారా ఈ డేటాను తొలగించవచ్చు, కానీ ఈ డేటాను మరో ఖాతాతో అనుబంధించలేరు. మీరు ప్రస్తుతం ఉన్న మీ Chrome డేటాను వేరుగా ఉంచడానికి ఐచ్ఛికంగా కొత్త‌ ప్రొఫైల్‌ను క్రియేట్ చేయవచ్చు. <ph name="LEARN_MORE" /></translation>
-<translation id="7295052994004373688">Google Chrome UIను చూపడానికి ఈ భాష ఉపయోగించబడింది</translation>
+<translation id="7295052994004373688">Google Chrome UI ఈ భాషలో చూపబడుతుంది</translation>
 <translation id="7296210096911315575">ముఖ్యమైన వినియోగ, భద్రతా సమాచారం</translation>
 <translation id="7308322188646931570">ఫైళ్లను డౌన్‌లోడ్ చేయడానికి Chromeకు స్టోరేజ్‌ యాక్సెస్ అవసరం</translation>
 <translation id="7339898014177206373">కొత్త విండో</translation>
diff --git a/chromium/chrome/app/resources/google_chrome_strings_zh-CN.xtb b/chromium/chrome/app/resources/google_chrome_strings_zh-CN.xtb
index 6cf8c2565de..bddce65c387 100644
--- a/chromium/chrome/app/resources/google_chrome_strings_zh-CN.xtb
+++ b/chromium/chrome/app/resources/google_chrome_strings_zh-CN.xtb
@@ -288,7 +288,7 @@
 <translation id="6277547788421725101">你的家长已为 Chrome 停用“网站、应用和扩展程序的权限”</translation>
 <translation id="6291089322031436445">Chrome 开发者版应用</translation>
 <translation id="6291549208091401781">已为您计算机上的所有用户安装 Google Chrome。</translation>
-<translation id="6326175484149238433">从Chrome中移除</translation>
+<translation id="6326175484149238433">从 Chrome 中移除</translation>
 <translation id="6327105987658262776">没有可用的更新。</translation>
 <translation id="6360449101159168105">当此标签页处于闲置状态时，系统会释放一些内存，以让 Chrome 保持快速运行。您可以选择始终不让此网站处于闲置状态。</translation>
 <translation id="6412673304250309937">将网址与存储在 Chrome 中的不安全网站列表进行比对。如果某个网站企图窃取您的密码，或者您下载了有害的文件，Chrome 可能还会将相应网址连同少量网页内容发送给“安全浏览”功能。</translation>
diff --git a/chromium/chrome/app/resources/google_chrome_strings_zh-TW.xtb b/chromium/chrome/app/resources/google_chrome_strings_zh-TW.xtb
index 68dd90e2d69..354d3e3e346 100644
--- a/chromium/chrome/app/resources/google_chrome_strings_zh-TW.xtb
+++ b/chromium/chrome/app/resources/google_chrome_strings_zh-TW.xtb
@@ -22,7 +22,7 @@
 <translation id="137466361146087520">Google Chrome 測試版</translation>
 <translation id="1399397803214730675">這台電腦已安裝較新的 Google Chrome 版本，如果軟體無法順利運作，請解除安裝 Google Chrome，然後再試一次。</translation>
 <translation id="139993653570221430">你隨時可以前往 Chrome 設定變更這個選項。系統會同時執行試用功能和目前放送廣告的方式，因此你不會立即看到變化。</translation>
-<translation id="1425903838053942728">{COUNT,plural, =0{Chrome 已完成更新。重新啟動後即可立即使用最新版本。屆時會重新開啟你目前的分頁。}=1{Chrome 已完成更新。重新啟動後即可立即使用最新版本。屆時會重新開啟你目前的分頁，但無痕式視窗不會重新開啟。}other{Chrome 已完成更新。重新啟動後即可立即使用最新版本。屆時會重新開啟你目前的分頁，但有 # 個無痕式視窗不會重新開啟。}}</translation>
+<translation id="1425903838053942728">{COUNT,plural, =0{Chrome 已完成更新。重新啟動後即可立即使用最新版本。屆時會重新開啟你目前的分頁。}=1{Chrome 已完成更新。重新啟動後即可立即使用最新版本。屆時會重新開啟你目前的分頁，但無痕視窗不會重新開啟。}other{Chrome 已完成更新。重新啟動後即可立即使用最新版本。屆時會重新開啟你目前的分頁，但有 # 個無痕視窗不會重新開啟。}}</translation>
 <translation id="1434626383986940139">Chrome Canary 應用程式</translation>
 <translation id="1492280395845991349">重新啟動即可完成 Chrome 更新程序</translation>
 <translation id="1507198376417198979">自訂新的 Chrome 設定檔</translation>
@@ -40,7 +40,7 @@
 <translation id="1640672724030957280">下載中…</translation>
 <translation id="1642309806724967937">視你的設定而定，Chrome 也可能會傳送 Cookie 和你目前的網址</translation>
 <translation id="1662146548738125461">關於 ChromeOS Flex</translation>
-<translation id="1674870198290878346">在 Chrome 無痕式視窗中開啟連結(&amp;G)</translation>
+<translation id="1674870198290878346">在 Chrome 無痕視窗中開啟連結(&amp;G)</translation>
 <translation id="1682634494516646069">Google Chrome 無法讀取及寫入資料目錄：<ph name="USER_DATA_DIRECTORY" /></translation>
 <translation id="1698376642261615901">Google Chrome 瀏覽器開啟網頁和執行應用程式的速度奇快無比！除了執行速度迅速、穩定且容易使用之外，內建防護機制還可讓你安心瀏覽網頁，無需擔心受到網路釣魚與惡意軟體的威脅。</translation>
 <translation id="1713301662689114961">{0,plural, =1{Chrome 將在 1 小時後重新啟動}other{Chrome 將在 # 小時後重新啟動}}</translation>
@@ -154,7 +154,7 @@
 <translation id="3541482654983822893">Chrome 無法檢查你的密碼，請於 24 小時後再試。</translation>
 <translation id="3576528680708590453">系統管理員已設定 Google Chrome 開啟替代瀏覽器來存取 <ph name="TARGET_URL_HOSTNAME" />。</translation>
 <translation id="3582972582564653026">進行同步處理即可在你的所有裝置上享有個人化的 Chrome 體驗</translation>
-<translation id="3596080736082218006">{COUNT,plural, =0{系統管理員要求你重新啟動 Chrome，以套用更新}=1{系統管理員要求你重新啟動 Chrome，以套用更新。你的無痕式視窗不會重新開啟。}other{系統管理員要求你重新啟動 Chrome，以套用更新。你的 # 個無痕式視窗不會重新開啟。}}</translation>
+<translation id="3596080736082218006">{COUNT,plural, =0{系統管理員要求你重新啟動 Chrome，以套用更新}=1{系統管理員要求你重新啟動 Chrome，以套用更新。你的無痕視窗不會重新開啟。}other{系統管理員要求你重新啟動 Chrome，以套用更新。你的 # 個無痕視窗不會重新開啟。}}</translation>
 <translation id="3622797965165704966">無論是登入 Google 帳戶使用 Chrome，還是以 Google 帳戶使用共用電腦，現在都變得更容易了。</translation>
 <translation id="3673813398384385993">Chrome 偵測到「<ph name="EXTENSION_NAME" />」含有惡意軟體</translation>
 <translation id="3703994572283698466">Chrome OS 受惠於其他<ph name="BEGIN_LINK_CROS_OSS" />開放原始碼軟體<ph name="END_LINK_CROS_OSS" />技術才能成功發布，<ph name="BEGIN_LINK_LINUX_OSS" />Linux 開發環境<ph name="END_LINK_LINUX_OSS" />也一樣。</translation>
@@ -169,7 +169,7 @@
 <translation id="3835168907083856002">這項操作會為 <ph name="USER_EMAIL_ADDRESS" /> 建立新的 Chrome 設定檔</translation>
 <translation id="386202838227397562">請關閉所有 Google Chrome 視窗，並再試一次</translation>
 <translation id="3865754807470779944">已安裝 Chrome <ph name="PRODUCT_VERSION" /> 版</translation>
-<translation id="3873044882194371212">在 Chrome 無痕式視窗中開啟連結(&amp;G)</translation>
+<translation id="3873044882194371212">在 Chrome 無痕視窗中開啟連結(&amp;G)</translation>
 <translation id="3889417619312448367">解除安裝 Google Chrome</translation>
 <translation id="3999683152997576765">你可以查看網站用於顯示廣告的興趣主題，並且視需要移除。Chrome 會根據近期瀏覽記錄推測你可能感興趣的主題。</translation>
 <translation id="4035053306113201399">Chrome OS 必須重新啟動，才能套用更新。</translation>
@@ -253,7 +253,7 @@ Google Chrome 無法復原你的設定。</translation>
 <translation id="5530733413481476019">提升 Chrome 的運作速度</translation>
 <translation id="5566025111015594046">Google Chrome (mDNS-In)</translation>
 <translation id="565744775970812598"><ph name="FILE_NAME" /> 可能不安全，因此遭到 Chrome 封鎖。</translation>
-<translation id="5678190148303298925">{COUNT,plural, =0{系統管理員要求你重新啟動 Chrome，以套用這項更新}=1{系統管理員要求你重新啟動 Chrome，以套用這項更新。你的無痕式視窗不會重新開啟。}other{系統管理員要求你重新啟動 Chrome，以套用這項更新。你的 # 個無痕式視窗不會重新開啟。}}</translation>
+<translation id="5678190148303298925">{COUNT,plural, =0{系統管理員要求你重新啟動 Chrome，以套用這項更新}=1{系統管理員要求你重新啟動 Chrome，以套用這項更新。你的無痕視窗不會重新開啟。}other{系統管理員要求你重新啟動 Chrome，以套用這項更新。你的 # 個無痕視窗不會重新開啟。}}</translation>
 <translation id="5686916850681061684">自訂及管理 Google Chrome。重要注意事項 - 按這裡瞭解詳情。</translation>
 <translation id="5690427481109656848">Google LLC</translation>
 <translation id="570005089986962444">這項設定開啟時，Chrome 會釋出閒置分頁占用的記憶體，為使用中的分頁和其他應用程式提供更多電腦資源，保持 Chrome 快速運作。當你切回閒置分頁時，這些分頁會自動恢復為「使用中」狀態。</translation>
@@ -332,7 +332,7 @@ Google Chrome 無法復原你的設定。</translation>
 <translation id="7098166902387133879">Google Chrome 正在使用你的麥克風。</translation>
 <translation id="7099479769133613710">重新啟動以更新 Chrome OS(&amp;C)</translation>
 <translation id="7106741999175697885">工作管理員 - Google Chrome</translation>
-<translation id="7140653346177713799">{COUNT,plural, =0{Chrome 有可用的更新，重新啟動後即可套用。}=1{Chrome 有可用的更新，重新啟動後即可套用。你的無痕式視窗不會重新開啟。}other{Chrome 有可用的更新，重新啟動後即可套用。你的 # 個無痕式視窗不會重新開啟。}}</translation>
+<translation id="7140653346177713799">{COUNT,plural, =0{Chrome 有可用的更新，重新啟動後即可套用。}=1{Chrome 有可用的更新，重新啟動後即可套用。你的無痕視窗不會重新開啟。}other{Chrome 有可用的更新，重新啟動後即可套用。你的 # 個無痕視窗不會重新開啟。}}</translation>
 <translation id="7155997830309522122">如果是的話，請編輯你儲存在 Chrome 中的密碼，使其與新密碼相符。</translation>
 <translation id="7161904924553537242">歡迎使用 Google Chrome</translation>
 <translation id="7177959540995930968">你可以前往 Chrome 設定進一步瞭解這些功能。</translation>
diff --git a/chromium/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc b/chromium/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc
index 4fe6dd97648..8eb60c05d3e 100644
--- a/chromium/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc
+++ b/chromium/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc
@@ -362,9 +362,13 @@ void ReadAnythingUntrustedPageHandler::LogTextStyle() {
   base::UmaHistogramExactLinear(string_constants::kFontScaleHistogramName,
                                 GetNormalizedFontScale(font_scale),
                                 maximum_font_scale_logging + 1);
-  ReadAnythingFont font =
-      font_map_.at(prefs->GetString(prefs::kAccessibilityReadAnythingFontName));
-  base::UmaHistogramEnumeration(string_constants::kFontNameHistogramName, font);
+  std::string font_name =
+      prefs->GetString(prefs::kAccessibilityReadAnythingFontName);
+  if (font_map_.find(font_name) != font_map_.end()) {
+    ReadAnythingFont font = font_map_.at(font_name);
+    base::UmaHistogramEnumeration(string_constants::kFontNameHistogramName,
+                                  font);
+  }
   read_anything::mojom::Colors color =
       static_cast<read_anything::mojom::Colors>(
           prefs->GetInteger(prefs::kAccessibilityReadAnythingColorInfo));
diff --git a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_es-419.xtb b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_es-419.xtb
index 6f0d4b72c67..e4e06ce72b8 100644
--- a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_es-419.xtb
+++ b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_es-419.xtb
@@ -262,7 +262,7 @@
 <translation id="5677928146339483299">Bloqueado</translation>
 <translation id="5689516760719285838">Ubicación</translation>
 <translation id="5690795753582697420">La cámara está desactivada en la configuración de Android</translation>
-<translation id="5700761515355162635">Se permiten cookies de terceros</translation>
+<translation id="5700761515355162635">Se permiten las cookies de terceros</translation>
 <translation id="5706552988683188916">Esta acción borra las cookies y otros datos de sitios para <ph name="WEBSITE" /></translation>
 <translation id="5719847187258001597">Esta acción borrará todos los datos y cookies almacenados por <ph name="ORIGIN" /> o su app que aparece en la pantalla principal.</translation>
 <translation id="5723967018671998714">En el modo Incógnito, se bloquean las cookies de terceros</translation>
diff --git a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_fa.xtb b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_fa.xtb
index e10820ee5af..401016afc27 100644
--- a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_fa.xtb
+++ b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_fa.xtb
@@ -115,7 +115,7 @@
 <translation id="2932883381142163287">گزارش سوءاستفاده</translation>
 <translation id="2968755619301702150">بیننده گواهی</translation>
 <translation id="300526633675317032">این کار کل <ph name="SIZE_IN_KB" /> فضای ذخیره‌سازی وب‌سایت را پاک می‌کند.</translation>
-<translation id="3008272652534848354">بازنشانی مجوزها</translation>
+<translation id="3008272652534848354">بازنشانی اجازه‌ها</translation>
 <translation id="301521992641321250">مسدود‌شده به‌طور خودکار</translation>
 <translation id="3069226013421428034">ورود به سیستم شخص ثالث برای سایت خاصی مجاز می‌شود.</translation>
 <translation id="3082992102194421695">{COUNT,plural, =1{فردا منقضی می‌شود}one{‫# روز دیگر منقضی می‌شود}other{‫# روز دیگر منقضی می‌شود}}</translation>
@@ -215,7 +215,7 @@
 <translation id="4883854917563148705">تنظیمات مدیریت‌شده بازنشانی نشدند</translation>
 <translation id="4887024562049524730">قبل از اینکه به سایت‌ها اجازه داده شود به دستگاه و داده‌های واقعیت مجازی دسترسی یابند سؤال شود (توصیه می‌شود)</translation>
 <translation id="4955223779495905865">یکی از سایت‌هایی که بازدید می‌کنید می‌تواند از سایت‌های دیگر محتوایی مثل تصویر، آگهی، و نوشتار جاسازی کند. هریک از این سایت‌ها می‌توانند برای شخصی کردن تجربه شما کوکی و داده‌های دیگر ذخیره کنند.</translation>
-<translation id="4962975101802056554">لغو همه مجوزها برای دستگاه</translation>
+<translation id="4962975101802056554">لغو همه اجازه‌ها برای دستگاه</translation>
 <translation id="497421865427891073">جلو رفتن</translation>
 <translation id="4976702386844183910">آخرین بازدید: <ph name="DATE" /></translation>
 <translation id="4985206706500620449">کوکی‌های شخص ثالث را برای این سایت مجاز کرده‌اید</translation>
@@ -268,7 +268,7 @@
 <translation id="5723967018671998714">کوکی‌های شخص ثالث در «حالت ناشناس» مسدود شده‌اند</translation>
 <translation id="5740126560802162366">سایت‌ها می‌توانند در دستگاه داده ذخیره کنند</translation>
 <translation id="5771720122942595109"><ph name="PERMISSION_1" /> مسدود شد</translation>
-<translation id="5804241973901381774">مجوزها</translation>
+<translation id="5804241973901381774">اجازه‌ها</translation>
 <translation id="5810805850857689118">با این کار، همه داده‌ها و کوکی‌های <ph name="ORIGIN" /> و همه سایت‌های تحت آن پاک خواهد شد</translation>
 <translation id="5860033963881614850">خاموش</translation>
 <translation id="5876056640971328065">مکث ویدیو</translation>
@@ -403,7 +403,7 @@
 <translation id="8197286292360124385"><ph name="PERMISSION_1" /> مجاز است</translation>
 <translation id="8200772114523450471">ازسرگیری</translation>
 <translation id="8206354486702514201">این تنظیم توسط سرپرست شما اجباری شده است.</translation>
-<translation id="8211406090763984747">اتصال امن است</translation>
+<translation id="8211406090763984747">اتصال ایمن است</translation>
 <translation id="8249310407154411074">انتقال به بالا</translation>
 <translation id="8261506727792406068">حذف</translation>
 <translation id="8284326494547611709">زیرنویس‌ها</translation>
diff --git a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_fr.xtb b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_fr.xtb
index 021e67dbdbc..bb821fecdc2 100644
--- a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_fr.xtb
+++ b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_fr.xtb
@@ -181,7 +181,7 @@
 <translation id="4053720452172726777">Personnaliser et contrôler Google Chrome</translation>
 <translation id="4149994727733219643">Vue simplifiée pour les pages Web</translation>
 <translation id="4151930093518524179">Zoom par défaut</translation>
-<translation id="4165986682804962316">Paramètres du site</translation>
+<translation id="4165986682804962316">Paramètres des sites</translation>
 <translation id="4169549551965910670">Connecté à un appareil USB</translation>
 <translation id="4194328954146351878">Vous demander avant d'autoriser les sites à consulter et modifier des informations sur des appareils NFC (recommandé)</translation>
 <translation id="4200726100658658164">Accéder aux paramètres de localisation</translation>
diff --git a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_gu.xtb b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_gu.xtb
index fe60000cf8e..ced365a927f 100644
--- a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_gu.xtb
+++ b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_gu.xtb
@@ -186,7 +186,7 @@
 <translation id="4194328954146351878">NFC ડિવાઇસ પર સાઇટને માહિતી જોવાની અને બદલવાની મંજૂરી આપતા પહેલાં પૂછો (ભલામણ કરવામાં આવે છે)</translation>
 <translation id="4200726100658658164">સ્થાન સેટિંગ ખોલો</translation>
 <translation id="4226663524361240545">સૂચનાઓ ઉપકરણને વાઇબ્રેટ કરી શકે છે</translation>
-<translation id="4259722352634471385">નેવિગેશન અવરોધિત છે: <ph name="URL" /></translation>
+<translation id="4259722352634471385">નૅવિગેશન બ્લૉક કરેલું છે: <ph name="URL" /></translation>
 <translation id="4278390842282768270">મંજૂર</translation>
 <translation id="429312253194641664">સાઇટ મીડિયા ચલાવી રહી છે</translation>
 <translation id="42981349822642051">વિસ્તૃત કરો</translation>
@@ -458,7 +458,7 @@
 <translation id="8926666909099850184">આ ડિવાઇસ માટે NFC સેવા બંધ કરેલી છે. તેને <ph name="BEGIN_LINK" />Android સેટિંગ<ph name="END_LINK" />માં ચાલુ કરો.</translation>
 <translation id="8928445016601307354">NFC ડિવાઇસ પર સાઇટને માહિતી જોવાથી અને બદલવાથી બ્લૉક કરો</translation>
 <translation id="8958424370300090006">કોઈ ચોક્કસ સાઇટ માટે કુકીને બ્લૉક કરો.</translation>
-<translation id="8959122750345127698">નેવિગેશન બિનપહોંચ યોગ્ય છે: <ph name="URL" /></translation>
+<translation id="8959122750345127698">નૅવિગેશન સુધી પહોંચી શકાય તેમ નથી: <ph name="URL" /></translation>
 <translation id="8986362086234534611">ભૂલી જાઓ</translation>
 <translation id="8990043154272859344">બધી સાઇટમાંથી તમને સાઇન આઉટ કરવામાં આવશે</translation>
 <translation id="9019902583201351841">તમારા માતાપિતા દ્વારા મેનેજ થયેલ</translation>
diff --git a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_hi.xtb b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_hi.xtb
index ae51acb33da..9fd496817a0 100644
--- a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_hi.xtb
+++ b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_hi.xtb
@@ -265,7 +265,7 @@
 <translation id="5700761515355162635">तीसरे पक्ष की कुकी को अनुमति है</translation>
 <translation id="5706552988683188916">इससे, <ph name="WEBSITE" /> की कुकी और साइट का अन्य डेटा मिट जाता है</translation>
 <translation id="5719847187258001597">इससे वे सभी डेटा और कुकी मिट जाएंगे जिन्हें <ph name="ORIGIN" /> या इसके ऐप्लिकेशन ने आपकी होम स्क्रीन पर सेव किया है.</translation>
-<translation id="5723967018671998714">गुप्त मोड में तीसरे पक्ष की कुकी ब्लॉक हैं</translation>
+<translation id="5723967018671998714">गुप्त मोड में तीसरे पक्ष की कुकी ब्लॉक रहती हैं</translation>
 <translation id="5740126560802162366">साइटें आपके डिवाइस पर डेटा सेव कर सकती हैं</translation>
 <translation id="5771720122942595109"><ph name="PERMISSION_1" /> को ब्लॉक किया गया</translation>
 <translation id="5804241973901381774">अनुमतियां</translation>
diff --git a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_hr.xtb b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_hr.xtb
index 6b0b0640f11..f0f75293ad8 100644
--- a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_hr.xtb
+++ b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_hr.xtb
@@ -140,7 +140,7 @@
 <translation id="3362437373201486687">Traženje Bluetooth uređaja</translation>
 <translation id="3386292677130313581">Web-lokacije moraju tražiti dopuštenje za pristup lokaciji (preporučeno)</translation>
 <translation id="3403537308306431953"><ph name="ZOOM_LEVEL" />%%</translation>
-<translation id="344449859752187052">Blokirani su kolačići treće strane</translation>
+<translation id="344449859752187052">Blokirani su kolačići trećih strana</translation>
 <translation id="3465378418721443318">{DAYS,plural, =1{Chrome će sutra ponovno blokirati kolačiće}one{# dan dok Chrome ponovo ne blokira kolačiće}few{# dana dok Chrome ponovo ne blokira kolačiće}other{# dana dok Chrome ponovo ne blokira kolačiće}}</translation>
 <translation id="3521663503435878242">Web-lokacije na domeni <ph name="DOMAIN" /></translation>
 <translation id="3538390592868664640">Blokirajte web-lokacije da izrađuju 3D kartu vašeg okruženja ili prate položaj kamere</translation>
@@ -221,7 +221,7 @@
 <translation id="4985206706500620449">Dopustili ste kolačiće trećih strana za ovu web-lokaciju</translation>
 <translation id="4994033804516042629">Nije pronađen nijedan kontakt</translation>
 <translation id="4996978546172906250">Dijeli putem</translation>
-<translation id="5001526427543320409">Kolačići treće strane</translation>
+<translation id="5001526427543320409">Kolačići trećih strana</translation>
 <translation id="5039804452771397117">Dopusti</translation>
 <translation id="5048398596102334565">Dopuštanje pristupa senzorima kretanja za web-lokacije (preporučeno)</translation>
 <translation id="5050380848339752099">Ova će web-lokacija dijeliti podatke s aplikacijom izvan anonimnog načina.</translation>
@@ -395,7 +395,7 @@
 <translation id="8087000398470557479">Sadržaj potječe s domene <ph name="DOMAIN_NAME" />, a omogućuje ga Google.</translation>
 <translation id="8088603949666785339">Više opcija u <ph name="BANNER_TITLE" /></translation>
 <translation id="8116925261070264013">Bez zvuka</translation>
-<translation id="813082847718468539">Prikaz informacija o web-mjestu</translation>
+<translation id="813082847718468539">Prikaz informacija o web-lokaciji</translation>
 <translation id="8131740175452115882">Potvrdi</translation>
 <translation id="8154912474061769055">Značajke na mnogim web-lokacijama možda neće funkcionirati</translation>
 <translation id="8168435359814927499">Sadržaj</translation>
diff --git a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_iw.xtb b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_iw.xtb
index e36414a6726..5e891574fea 100644
--- a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_iw.xtb
+++ b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_iw.xtb
@@ -193,7 +193,8 @@
 <translation id="4336434711095810371">ניקוי כל הנתונים</translation>
 <translation id="4338831206024587507">כל האתרים בדומיין <ph name="DOMAIN" /></translation>
 <translation id="4402755511846832236">אתרים לא יוכלו לדעת מתי המכשיר הזה משמש אותך באופן פעיל</translation>
-<translation id="4412992751769744546">‏התר קובצי Cookie של צד שלישי</translation>
+<translation id="4412992751769744546">‏אישור לקובצי Cookie של צד שלישי
+</translation>
 <translation id="4428065317363009941">התאמה אישית של מודעות</translation>
 <translation id="4434045419905280838">חלונות קופצים והפניות אוטומטיות</translation>
 <translation id="4468959413250150279">השתקת צלילים באתר ספציפי.</translation>
@@ -315,7 +316,7 @@
 <translation id="6545864417968258051">‏סריקת Bluetooth</translation>
 <translation id="6552800053856095716">{PERMISSIONS_SUMMARY_BLOCKED,plural, =1{נחסמו ההרשאות <ph name="PERMISSION_1" />,‏ <ph name="PERMISSION_2" /> ועוד אחת (<ph name="NUM_MORE" />)}one{נחסמו ההרשאות <ph name="PERMISSION_1" />,‏ <ph name="PERMISSION_2" /> ועוד <ph name="NUM_MORE" />}two{נחסמו ההרשאות <ph name="PERMISSION_1" />,‏ <ph name="PERMISSION_2" /> ועוד <ph name="NUM_MORE" />}other{נחסמו ההרשאות <ph name="PERMISSION_1" />,‏ <ph name="PERMISSION_2" /> ועוד <ph name="NUM_MORE" />}}</translation>
 <translation id="6554732001434021288">הביקור האחרון התבצע לפני <ph name="NUM_DAYS" /> ימים</translation>
-<translation id="6561560012278703671">הצגת חיווי בסרגל הכתובות (מונע הקפצה של חלוניות הודעה מפריעות)</translation>
+<translation id="6561560012278703671">הצגת התראות שקטה יותר (למניעת הקפצה של חלוניות מפריעות)</translation>
 <translation id="6593061639179217415">לגרסה במחשב</translation>
 <translation id="6608650720463149374"><ph name="GIGABYTES" /> GB</translation>
 <translation id="6612358246767739896">תוכן מוגן</translation>
diff --git a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_ja.xtb b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_ja.xtb
index 185d75280f1..3c044fa9313 100644
--- a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_ja.xtb
+++ b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_ja.xtb
@@ -193,7 +193,7 @@
 <translation id="4336434711095810371">データをすべて消去</translation>
 <translation id="4338831206024587507"><ph name="DOMAIN" /> のすべてのサイト</translation>
 <translation id="4402755511846832236">サイトによるこのデバイスのアクティブ状態の検出をブロックする</translation>
-<translation id="4412992751769744546">サードパーティの Cookie を許可</translation>
+<translation id="4412992751769744546">サードパーティの Cookie を許可する</translation>
 <translation id="4428065317363009941">広告のカスタマイズ</translation>
 <translation id="4434045419905280838">ポップアップとリダイレクト</translation>
 <translation id="4468959413250150279">特定のサイトの音声をミュートします。</translation>
diff --git a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_kn.xtb b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_kn.xtb
index c90240666fe..4afd085d1b4 100644
--- a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_kn.xtb
+++ b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_kn.xtb
@@ -318,7 +318,7 @@
 <translation id="6561560012278703671">ನಿಶ್ಯಬ್ದ ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆಯನ್ನು ಬಳಸಿ (ನಿಮಗೆ ಅಡಚಣೆ ಉಂಟುಮಾಡುವ ಅಧಿಸೂಚನೆಯ ಪ್ರಾಂಪ್ಟ್‌ಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ)</translation>
 <translation id="6593061639179217415">ಡೆಸ್ಕ್‌ಟಾಪ್‌ ಸೈಟ್‌</translation>
 <translation id="6608650720463149374"><ph name="GIGABYTES" /> GB</translation>
-<translation id="6612358246767739896">ಸಂರಕ್ಷಿಸಿದ ವಿಷಯ</translation>
+<translation id="6612358246767739896">ಸಂರಕ್ಷಿಸಿದ ಕಂಟೆಂಟ್‍</translation>
 <translation id="662080504995468778">ಉಳಿಯಿರಿ</translation>
 <translation id="6643016212128521049">ತೆರವುಗೊಳಿಸಿ</translation>
 <translation id="6653342741369270081">ಫುಲ್ ಸ್ಕ್ರೀನ್‌ನಿಂದ ನಿರ್ಗಮಿಸಲು ಹಿಂದೆ ಬಟನ್ ಅನ್ನು ಒತ್ತಿರಿ.</translation>
@@ -398,7 +398,7 @@
 <translation id="813082847718468539">ಸೈಟ್ ಮಾಹಿತಿಯನ್ನು ವೀಕ್ಷಿಸಿ</translation>
 <translation id="8131740175452115882">ದೃಢೀಕರಿಸು</translation>
 <translation id="8154912474061769055">ಹಲವು ಸೈಟ್‌ಗಳಲ್ಲಿನ ಫೀಚರ್‌ಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸದೇ ಇರಬಹುದು</translation>
-<translation id="8168435359814927499">ವಿಷಯ</translation>
+<translation id="8168435359814927499">ಕಂಟೆಂಟ್‍</translation>
 <translation id="8186479265534291036">ಸೈಟ್ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತಿಲ್ಲವೇ? ಥರ್ಡ್-ಪಾರ್ಟಿ ಕುಕೀಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ</translation>
 <translation id="8197286292360124385"><ph name="PERMISSION_1" /> ಅನ್ನು ಅನುಮತಿಸಲಾಗಿದೆ</translation>
 <translation id="8200772114523450471">ಪುನರಾರಂಭಿಸು</translation>
diff --git a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_ky.xtb b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_ky.xtb
index 079d0d501f6..d67633cfe9f 100644
--- a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_ky.xtb
+++ b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_ky.xtb
@@ -288,7 +288,7 @@
 <translation id="6064125863973209585">Жүктөлүп алынгандар</translation>
 <translation id="6071501408666570960">Бул сайттан чыгарылышыңыз мүмкүн</translation>
 <translation id="6165508094623778733">Кошумча маалымат</translation>
-<translation id="6177111841848151710">Учурдагы издөө каражаты үчүн бөгөттөлгөн</translation>
+<translation id="6177111841848151710">Учурдагы издөө куралы үчүн бөгөттөлгөн</translation>
 <translation id="6177128806592000436">Бул сайтка туташуу коопсуз эмес</translation>
 <translation id="6181444274883918285">Сайтты бөтөнчө тизмеге кошуу</translation>
 <translation id="6192792657125177640">Өзгөчө шарттар</translation>
@@ -338,7 +338,7 @@
 <translation id="6981982820502123353">Атайын мүмкүн-төр</translation>
 <translation id="6992289844737586249">Сайттар микрофонуңузду колдоноордон мурун уруксат суралсын (сунушталат)</translation>
 <translation id="7000754031042624318">Android Параметрлеринен өчүрүлгөн</translation>
-<translation id="7016516562562142042">Учурдагы издөө каражаты үчүн уруксат берилген</translation>
+<translation id="7016516562562142042">Учурдагы издөө куралы үчүн уруксат берилген</translation>
 <translation id="702275896380648118">Бул сайт сизге жаккан нерселерди аныктап, башка сайттарга жарнамаларды сунуштап турат. Ошондой эле, ал Сhrome'дон жарнама темаларыңыз тууралуу маалымат алып, сизге ылайыктуу жарнамаларды көрсөтүп турат.</translation>
 <translation id="7053983685419859001">Бөгөттөө</translation>
 <translation id="7066151586745993502">{NUM_SELECTED,plural, =1{1 тандалды}other{# тандалды}}</translation>
diff --git a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_no.xtb b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_no.xtb
index c84a7a3b048..0243078d65e 100644
--- a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_no.xtb
+++ b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_no.xtb
@@ -112,7 +112,7 @@
 <translation id="2903493209154104877">Adresser</translation>
 <translation id="2910701580606108292">Spør før nettsteder kan spille av beskyttet innhold</translation>
 <translation id="2913331724188855103">Tillat at nettsteder lagrer og leser data i informasjonskapsler (anbefales)</translation>
-<translation id="2932883381142163287">Rapportér uriktig bruk</translation>
+<translation id="2932883381142163287">Rapporter uriktig bruk</translation>
 <translation id="2968755619301702150">Visningsprogram for sertifikater</translation>
 <translation id="300526633675317032">Dette sletter alle dataene (<ph name="SIZE_IN_KB" />) fra nettstedslagringen.</translation>
 <translation id="3008272652534848354">Tilbakestill tillatelser</translation>
diff --git a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_ru.xtb b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_ru.xtb
index 2ba1e16888e..a930a0b8c0a 100644
--- a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_ru.xtb
+++ b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_ru.xtb
@@ -115,7 +115,7 @@
 <translation id="2932883381142163287">Сообщить о нарушении</translation>
 <translation id="2968755619301702150">Просмотр сертификатов</translation>
 <translation id="300526633675317032">Будут удалены все данные сайтов (<ph name="SIZE_IN_KB" />).</translation>
-<translation id="3008272652534848354">Сбросить все разрешения</translation>
+<translation id="3008272652534848354">Сбросить разрешения</translation>
 <translation id="301521992641321250">Заблокировано автоматически</translation>
 <translation id="3069226013421428034">Разрешить вход через сторонние сервисы для определенного сайта.</translation>
 <translation id="3082992102194421695">{COUNT,plural, =1{Срок действия истекает завтра}one{Срок действия истекает через # день}few{Срок действия истекает через # дня}many{Срок действия истекает через # дней}other{Срок действия истекает через # дня}}</translation>
@@ -181,7 +181,7 @@
 <translation id="4053720452172726777">Настройка и управление Google Chrome</translation>
 <translation id="4149994727733219643">Упрощенный просмотр веб-страниц</translation>
 <translation id="4151930093518524179">Масштаб по умолчанию</translation>
-<translation id="4165986682804962316">Настройки сайтов</translation>
+<translation id="4165986682804962316">Настройки сайта</translation>
 <translation id="4169549551965910670">Выполнено подключение к USB-устройству</translation>
 <translation id="4194328954146351878">Запрашивать для сайтов разрешение на доступ к информации и ее изменение через NFC (рекомендуется)</translation>
 <translation id="4200726100658658164">Открыть настройки геолокации</translation>
diff --git a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_sv.xtb b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_sv.xtb
index a2095505be6..87f69a5b2eb 100644
--- a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_sv.xtb
+++ b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_sv.xtb
@@ -140,7 +140,7 @@
 <translation id="3362437373201486687">Söker efter Bluetooth-enheter</translation>
 <translation id="3386292677130313581">Fråga innan webbplatser tillåts att veta var du befinner dig (rekommenderas)</translation>
 <translation id="3403537308306431953"><ph name="ZOOM_LEVEL" /> %%</translation>
-<translation id="344449859752187052">Cookies från tredje part har blockerats</translation>
+<translation id="344449859752187052">Tredjepartscookies har blockerats</translation>
 <translation id="3465378418721443318">{DAYS,plural, =1{Cookies blockeras i Chrome igen i morgon}other{Cookies blockeras i Chrome igen om # dagar}}</translation>
 <translation id="3521663503435878242">Webbplatser under <ph name="DOMAIN" /></translation>
 <translation id="3538390592868664640">Blockera webbplatser från att skapa en 3D-karta över dina omgivningar eller registrera kamerans position</translation>
@@ -276,7 +276,7 @@
 <translation id="5887687176710214216">Besöktes senast i går</translation>
 <translation id="5916664084637901428">På</translation>
 <translation id="5922853908706496913">Delar skärmen</translation>
-<translation id="5922967540311291836">Blockera cookies från tredje part</translation>
+<translation id="5922967540311291836">Blockera tredjepartscookies</translation>
 <translation id="5939518447894949180">Återställ</translation>
 <translation id="5968921426641056619">Ange webbadress</translation>
 <translation id="5975083100439434680">Zooma ut</translation>
@@ -292,7 +292,7 @@
 <translation id="6177128806592000436">Anslutningen till webbplatsen är inte säker</translation>
 <translation id="6181444274883918285">Lägg till en webbplats i undantagen</translation>
 <translation id="6192792657125177640">Undantag</translation>
-<translation id="6196640612572343990">Blockera cookies från tredje part</translation>
+<translation id="6196640612572343990">Blockera tredjepartscookies</translation>
 <translation id="6205314730813004066">Annonsintegritet</translation>
 <translation id="6216432067784365534">Alternativ för <ph name="NAME_OF_LIST_ITEM" /></translation>
 <translation id="6231752747840485235">Vill du avinstallera <ph name="APP_NAME" />?</translation>
diff --git a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_tr.xtb b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_tr.xtb
index 311bb3e401b..b85ff0b13dd 100644
--- a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_tr.xtb
+++ b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_tr.xtb
@@ -118,7 +118,7 @@
 <translation id="3008272652534848354">İzinleri sıfırla</translation>
 <translation id="301521992641321250">Otomatik olarak engellendi</translation>
 <translation id="3069226013421428034">Belirli bir sitede üçüncü taraf oturum açmaya izin verin.</translation>
-<translation id="3082992102194421695">{COUNT,plural, =1{Süresi yarın dolacak}other{Süresi # içinde dolacak}}</translation>
+<translation id="3082992102194421695">{COUNT,plural, =1{Süresi yarın dolacak}other{Süresi # gün içinde dolacak}}</translation>
 <translation id="310297983047869047">Önceki slayt</translation>
 <translation id="3109724472072898302">Daraltılmış</translation>
 <translation id="3114012059975132928">Video oynatıcı</translation>
diff --git a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_uk.xtb b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_uk.xtb
index 0cca29ba3fb..7280016b9f9 100644
--- a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_uk.xtb
+++ b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_uk.xtb
@@ -89,7 +89,7 @@
 <translation id="2490684707762498678">Адміністратор сімейної групи: <ph name="APP_NAME" /></translation>
 <translation id="2498359688066513246">Довідка й відгуки</translation>
 <translation id="2501278716633472235">Назад</translation>
-<translation id="2546283357679194313">Файли cookie й дані із сайтів</translation>
+<translation id="2546283357679194313">Файли cookie й дані сайтів</translation>
 <translation id="2569468611847789653">{COOKIE_COUNT,plural, =1{1 файл cookie заблоковано}one{# файл cookie заблоковано}few{# файли cookie заблоковано}many{# файлів cookie заблоковано}other{# файлу cookie заблоковано}}</translation>
 <translation id="2570922361219980984">На цьому пристрої також вимкнено доступ до геоданих. Увімкніть його в <ph name="BEGIN_LINK" />налаштуваннях Android<ph name="END_LINK" />.</translation>
 <translation id="257931822824936280">Розгорнуто – натисніть, щоб згорнути.</translation>
diff --git a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_vi.xtb b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_vi.xtb
index 6f0aa76c355..a8f1ecb4452 100644
--- a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_vi.xtb
+++ b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_vi.xtb
@@ -149,7 +149,7 @@
 <translation id="3586500876634962664">Đang sử dụng máy ảnh và micrô</translation>
 <translation id="358794129225322306">Cho phép một trang web tự động tải xuống nhiều tệp.</translation>
 <translation id="3594780231884063836">Tắt tiếng video</translation>
-<translation id="3596414637720633074">Chặn cookie của bên thứ ba ở chế độ Ẩn danh</translation>
+<translation id="3596414637720633074">Chặn cookie của bên thứ ba ở Chế độ ẩn danh</translation>
 <translation id="3600792891314830896">Tắt tiếng trên các trang web phát âm thanh</translation>
 <translation id="3602290021589620013">Xem trước</translation>
 <translation id="3628308229821498208">Cụm từ tìm kiếm đề xuất</translation>
@@ -168,7 +168,7 @@
 <translation id="385051799172605136">Quay lại</translation>
 <translation id="3859306556332390985">Tìm kiếm tiến</translation>
 <translation id="3895926599014793903">Buộc bật thu phóng</translation>
-<translation id="3908288065506437185">Chặn cookie của bên thứ ba ở chế độ Ẩn danh</translation>
+<translation id="3908288065506437185">Chặn cookie của bên thứ ba ở Chế độ ẩn danh</translation>
 <translation id="3918378745482005425">Một số tính năng có thể không hoạt động. Các trang web có liên quan vẫn có thể sử dụng cookie của bên thứ ba.</translation>
 <translation id="3955193568934677022">Cho phép trang web phát nội dung được bảo vệ (được đề xuất)</translation>
 <translation id="3967822245660637423">Đã tải xuống xong</translation>
@@ -380,7 +380,7 @@
 <translation id="783819812427904514">Bật tiếng video</translation>
 <translation id="7846076177841592234">Hủy chọn</translation>
 <translation id="7882806643839505685">Cho phép phát âm thanh trên một trang web cụ thể.</translation>
-<translation id="789180354981963912">Chặn cookie của bên thứ ba ở chế độ Ẩn danh:</translation>
+<translation id="789180354981963912">Chặn cookie của bên thứ ba ở Chế độ ẩn danh:</translation>
 <translation id="7895868624847501462">Thao tác này sẽ xoá toàn bộ dữ liệu cục bộ, kể cả cookie, và đặt lại mọi quyền cho <ph name="DOMAIN" /> cũng như mọi trang web thuộc nhóm này</translation>
 <translation id="7940722705963108451">Nhắc tôi</translation>
 <translation id="7974024493641668069">{COUNT,plural, =1{<ph name="FPS_MEMBERS_COUNT" /> trang web trong nhóm các trang web của <ph name="FPS_OWNER" /> có thể xem hoạt động của bạn trong nhóm}other{<ph name="FPS_MEMBERS_COUNT" /> trang web trong nhóm các trang web của <ph name="FPS_OWNER" /> có thể xem hoạt động của bạn trong nhóm}}</translation>
diff --git a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb
index 6719436840d..b4e40775f59 100644
--- a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb
+++ b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb
@@ -262,7 +262,7 @@
 <translation id="5677928146339483299">已禁止</translation>
 <translation id="5689516760719285838">位置信息</translation>
 <translation id="5690795753582697420">已在 Android 设置中关闭摄像头</translation>
-<translation id="5700761515355162635">允许使用第三方 Cookie</translation>
+<translation id="5700761515355162635">已允许使用第三方 Cookie</translation>
 <translation id="5706552988683188916">此操作会删除 <ph name="WEBSITE" /> 的 Cookie 和其他网站数据</translation>
 <translation id="5719847187258001597">此操作会清除 <ph name="ORIGIN" /> 或其在主屏幕中安装的应用所存储的全部数据和 Cookie。</translation>
 <translation id="5723967018671998714">已阻止无痕模式下的第三方 Cookie</translation>
diff --git a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_zh-HK.xtb b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_zh-HK.xtb
index e148918c172..5bb64ff43ef 100644
--- a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_zh-HK.xtb
+++ b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_zh-HK.xtb
@@ -113,7 +113,7 @@
 <translation id="2910701580606108292">網站播放受保護內容前先詢問您</translation>
 <translation id="2913331724188855103">允許網站儲存及讀取 Cookie 資料 (建議)</translation>
 <translation id="2932883381142163287">舉報濫用</translation>
-<translation id="2968755619301702150">憑證檢視者</translation>
+<translation id="2968755619301702150">憑證檢視器</translation>
 <translation id="300526633675317032">這會將網站儲存空間的 <ph name="SIZE_IN_KB" /> 資料全部清除。</translation>
 <translation id="3008272652534848354">重設權限</translation>
 <translation id="301521992641321250">已自動封鎖</translation>
diff --git a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_zh-TW.xtb b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_zh-TW.xtb
index 0d67e6ef417..dcee081e3d4 100644
--- a/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_zh-TW.xtb
+++ b/chromium/components/browser_ui/strings/android/translations/browser_ui_strings_zh-TW.xtb
@@ -79,7 +79,7 @@
 <translation id="2390272837142897736">放大</translation>
 <translation id="2402980924095424747"><ph name="MEGABYTES" /> MB</translation>
 <translation id="2404630663942400771">{PERMISSIONS_SUMMARY_ALLOWED,plural, =1{已允許「<ph name="PERMISSION_1" />」、「<ph name="PERMISSION_2" />」和另外 <ph name="NUM_MORE" /> 項權限}other{已允許「<ph name="PERMISSION_1" />」、「<ph name="PERMISSION_2" />」和另外 <ph name="NUM_MORE" /> 項權限}}</translation>
-<translation id="2410940059315936967">你造訪的網站可以嵌入其他網站的內容，例如圖片、廣告和文字。其他網站設定的 Cookie 稱為第三方 Cookie。</translation>
+<translation id="2410940059315936967">你造訪的網站可能會嵌入其他網站的內容，例如圖片、廣告和文字。其他網站設定的 Cookie 稱為第三方 Cookie。</translation>
 <translation id="2434158240863470628">下載完成 <ph name="SEPARATOR" /> <ph name="BYTES_DOWNLOADED" /></translation>
 <translation id="244264527810019436">在無痕模式下，某些網站的功能可能無法正常運作</translation>
 <translation id="2442870161001914531">一律要求電腦版網站</translation>
@@ -214,7 +214,7 @@
 <translation id="483914009762354899">包括這個網域中的所有網站</translation>
 <translation id="4883854917563148705">無法重設受管理的設定</translation>
 <translation id="4887024562049524730">系統必須先詢問你，才能允許網站使用你的虛擬實境裝置和資料 (建議設定)</translation>
-<translation id="4955223779495905865">你造訪的網站可以嵌入其他網站的內容，例如圖片、廣告和文字。這些網站可以儲存 Cookie 和其他資料，為你提供個人化體驗。</translation>
+<translation id="4955223779495905865">你造訪的網站可能會嵌入其他網站的內容，例如圖片、廣告和文字。這些網站可以儲存 Cookie 和其他資料，為你提供個人化體驗。</translation>
 <translation id="4962975101802056554">撤銷裝置的所有權限</translation>
 <translation id="497421865427891073">往前</translation>
 <translation id="4976702386844183910">上次造訪日期：<ph name="DATE" /></translation>
diff --git a/chromium/components/certificate_transparency/data/log_list.json b/chromium/components/certificate_transparency/data/log_list.json
index d5b1716a785..29bd8853a32 100644
--- a/chromium/components/certificate_transparency/data/log_list.json
+++ b/chromium/components/certificate_transparency/data/log_list.json
@@ -1,6 +1,6 @@
 {
-  "version": "26.24",
-  "log_list_timestamp": "2023-10-26T12:55:07Z",
+  "version": "26.41",
+  "log_list_timestamp": "2023-11-12T12:55:47Z",
   "operators": [
     {
       "name": "Google",
diff --git a/chromium/components/history/core/browser/history_backend_unittest.cc b/chromium/components/history/core/browser/history_backend_unittest.cc
index 067451221ba..406605faf93 100644
--- a/chromium/components/history/core/browser/history_backend_unittest.cc
+++ b/chromium/components/history/core/browser/history_backend_unittest.cc
@@ -3814,7 +3814,15 @@ TEST_F(HistoryBackendTest, QueryMostVisitedURLs) {
                   MostVisitedURL(GURL("http://example5.com"), kSomeTitle)));
 }
 
-TEST_F(HistoryBackendTest, QueryMostRepeatedQueriesForKeyword) {
+// https://crbug.com/1488458#c16
+#if BUILDFLAG(IS_ANDROID)
+#define MAYBE_QueryMostRepeatedQueriesForKeyword \
+  DISABLED_QueryMostRepeatedQueriesForKeyword
+#else
+#define MAYBE_QueryMostRepeatedQueriesForKeyword \
+  QueryMostRepeatedQueriesForKeyword
+#endif  // BUILDFLAG(IS_ANDROID)
+TEST_F(HistoryBackendTest, MAYBE_QueryMostRepeatedQueriesForKeyword) {
   ASSERT_TRUE(backend_.get());
 
   // Choose the local midnight of today last week as the baseline for the last
diff --git a/chromium/components/media_router/common/providers/cast/certificate/net_trust_store.cc b/chromium/components/media_router/common/providers/cast/certificate/net_trust_store.cc
index 1e181ccd2ce..7dfb57ac4bf 100644
--- a/chromium/components/media_router/common/providers/cast/certificate/net_trust_store.cc
+++ b/chromium/components/media_router/common/providers/cast/certificate/net_trust_store.cc
@@ -4,6 +4,8 @@
 
 #include "components/media_router/common/providers/cast/certificate/net_trust_store.h"
 
+#include <string_view>
+
 #include "base/check.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ -17,6 +19,7 @@
 #include "net/cert/pki/path_builder.h"
 #include "net/cert/pki/simple_path_builder_delegate.h"
 #include "net/cert/x509_util.h"
+#include "third_party/openscreen/src/cast/common/public/trust_store.h"
 
 namespace {
 
@@ -62,7 +65,7 @@ std::unique_ptr<openscreen::cast::TrustStore> TrustStore::CreateInstanceForTest(
 
 // static
 std::unique_ptr<openscreen::cast::TrustStore>
-TrustStore::CreateInstanceFromPemFile(absl::string_view file_path) {
+TrustStore::CreateInstanceFromPemFile(std::string_view file_path) {
   std::string pem_data;
   CHECK(base::ReadFileToString(base::FilePath::FromASCII(base::StringPiece(
                                    file_path.data(), file_path.size())),
diff --git a/chromium/components/permissions/android/translations/permissions_android_strings_fa.xtb b/chromium/components/permissions/android/translations/permissions_android_strings_fa.xtb
index 8b524da32df..28c65883d5a 100644
--- a/chromium/components/permissions/android/translations/permissions_android_strings_fa.xtb
+++ b/chromium/components/permissions/android/translations/permissions_android_strings_fa.xtb
@@ -14,13 +14,13 @@
 <translation id="4915549754973153784"><ph name="BEGIN_LINK" />دریافت راهنمایی<ph name="END_LINK" /> درحین اسکن دستگاه‌ها…</translation>
 <translation id="4925793601605263825"><ph name="APP_NAME" /> برای این سایت باید اجازه دسترسی به میکروفون داشته باشد.</translation>
 <translation id="5230560987958996918"><ph name="SITE" /> می‌خواهد دستگاه‌های «بلوتوث» اطراف را جستجو کند. دستگاه‌های زیر پیدا شدند:</translation>
-<translation id="5527082711130173040">‏Chrome برای جستجوی دستگاه‌ها باید به مکان دسترسی داشته باشد. <ph name="BEGIN_LINK1" />به‌روزرسانی مجوزها<ph name="END_LINK1" /> . دسترسی به مکان نیز <ph name="BEGIN_LINK2" />برای این دستگاه خاموش است<ph name="END_LINK2" />.</translation>
+<translation id="5527082711130173040">‏Chrome برای جستجوی دستگاه‌ها باید به مکان دسترسی داشته باشد. <ph name="BEGIN_LINK1" />به‌روزرسانی اجازه‌ها<ph name="END_LINK1" /> . دسترسی به مکان نیز <ph name="BEGIN_LINK2" />برای این دستگاه خاموش است<ph name="END_LINK2" />.</translation>
 <translation id="5817918615728894473">مرتبط‌سازی</translation>
 <translation id="5858741533101922242">‏Chrome قادر به روشن کردن آداپتور بلوتوث نیست</translation>
 <translation id="5860491529813859533">روشن کردن</translation>
 <translation id="6049776452963514597"><ph name="APP_NAME" /> برای این سایت باید اجازه دسترسی به دوربین و میکروفون داشته باشد.</translation>
 <translation id="6092062101542170135">‏برای ادامه دادن، NFC را در تنظیمات Android روشن کنید</translation>
-<translation id="6656545060687952787">‏Chrome برای جستجوی دستگاه‌ها باید به مکان دسترسی داشته باشد. <ph name="BEGIN_LINK" />به‌روزرسانی مجوزها<ph name="END_LINK" /></translation>
+<translation id="6656545060687952787">‏Chrome برای جستجوی دستگاه‌ها باید به مکان دسترسی داشته باشد. <ph name="BEGIN_LINK" />به‌روزرسانی اجازه‌ها<ph name="END_LINK" /></translation>
 <translation id="7146360184282545445"><ph name="APP_NAME" /> برای ایجاد نقشه سه‌بعدی از محیط اطرافتان، باید اجازه دسترسی به دوربین داشته باشد.</translation>
 <translation id="7624880197989616768"><ph name="BEGIN_LINK1" />دریافت راهنمایی<ph name="END_LINK1" /> یا <ph name="BEGIN_LINK2" />اسکن مجدد<ph name="END_LINK2" /></translation>
 <translation id="781351614677332494"><ph name="APP_NAME" /> برای هم‌رسانی مکانتان با این سایت باید به مکانتان دسترسی داشته باشد.</translation>
diff --git a/chromium/components/strings/components_chromium_strings_ar.xtb b/chromium/components/strings/components_chromium_strings_ar.xtb
index 8fc8695498c..4721a976173 100644
--- a/chromium/components/strings/components_chromium_strings_ar.xtb
+++ b/chromium/components/strings/components_chromium_strings_ar.xtb
@@ -20,7 +20,7 @@
           إعدادات الشبكة المحلية
           وألغ وضع علامة في مربّع الاختيار "استخدام خادم وكيل لشبكة الاتصال المحلية".</translation>
 <translation id="4622039161600275920">‏تم حظر هذه الصفحة بواسطة متصفّح Chromium.</translation>
-<translation id="48558539577516920">‏اسمح لـ Chromium بالدخول إلى الشبكة من خلال إعدادات الجدار الناري أو
+<translation id="48558539577516920">‏اسمح لـ Chromium بالدخول إلى الشبكة من خلال إعدادات جدار الحماية أو
         برنامج مكافحة الفيروسات.</translation>
 <translation id="580822234363523061">‏انتقل إلى
           قائمة Chromium &gt;
diff --git a/chromium/components/strings/components_google_chrome_strings_ar.xtb b/chromium/components/strings/components_google_chrome_strings_ar.xtb
index 5c88c3cd088..6c656ab3aef 100644
--- a/chromium/components/strings/components_google_chrome_strings_ar.xtb
+++ b/chromium/components/strings/components_google_chrome_strings_ar.xtb
@@ -9,7 +9,7 @@
 <translation id="2447485272386224171">‏أصبح Chrome الآن متاحًا بفضل المشروع المفتوح المصدر <ph name="BEGIN_LINK_CHROMIUM" />Chromium<ph name="END_LINK_CHROMIUM" /> و<ph name="BEGIN_LINK_OSS" />برامج أخرى مفتوحة المصدر<ph name="END_LINK_OSS" />.</translation>
 <translation id="2588322182880276190">‏شعار Chrome</translation>
 <translation id="3444832043240812445">تعرض هذه الصفحة فقط معلومات عن الأعطال الحديثة إذا <ph name="BEGIN_LINK" />فعّلت الإبلاغ عن الأعطال<ph name="END_LINK" />.</translation>
-<translation id="3875312571075912821">‏اسمح لمتصفح Chrome بالدخول إلى الشبكة من خلال إعدادات الجدار الناري أو
+<translation id="3875312571075912821">‏اسمح لمتصفح Chrome بالدخول إلى الشبكة من خلال إعدادات جدار الحماية أو
         برنامج مكافحة الفيروسات.</translation>
 <translation id="5005121315113832363">‏تم حظر هذه الصفحة بواسطة متصفّح Chrome.</translation>
 <translation id="585620188971323280">يُرجى تعديل إعدادات ميزة "الملء التلقائي" لبيانات طُرق الدفع.</translation>
diff --git a/chromium/components/strings/components_strings_ar.xtb b/chromium/components/strings/components_strings_ar.xtb
index f1606b7bbca..bc5a6b0e1bb 100644
--- a/chromium/components/strings/components_strings_ar.xtb
+++ b/chromium/components/strings/components_strings_ar.xtb
@@ -1535,7 +1535,7 @@
 <translation id="4202218894997543208">المواضيع التي حظرتها</translation>
 <translation id="4202554117186904723">اللفافة الخامسة</translation>
 <translation id="4203769790323223880">تم رفض طلب الوصول إلى الكاميرا.</translation>
-<translation id="4203896806696719780"><ph name="BEGIN_LINK" />التحقق من عمليات ضبط الجدار الناري وبرامج مكافحة الفيروسات<ph name="END_LINK" /></translation>
+<translation id="4203896806696719780"><ph name="BEGIN_LINK" />التحقق من عمليات ضبط جدار الحماية وبرامج مكافحة الفيروسات<ph name="END_LINK" /></translation>
 <translation id="4209092469652827314">كبير</translation>
 <translation id="4210602799576081649">انتهت صلاحية رمز إثبات الهوية، يُرجى طلب رمز جديد.</translation>
 <translation id="421066178035138955">استخدام أجهزة الواقع الافتراضي وبياناتها</translation>
@@ -3000,7 +3000,7 @@
 <translation id="7220786058474068424">جارٍ المعالجة</translation>
 <translation id="7221855153210829124">عرض الإشعارات</translation>
 <translation id="7221857374443660083">يريد المصرف التأكد من هويتك.</translation>
-<translation id="722454870747268814">علامة تبويب جديدة للتصفح المتخفي</translation>
+<translation id="722454870747268814">علامة تبويب للتصفح المتخفي</translation>
 <translation id="7226276626900992675">لقد سمحت لهذا الموقع الإلكتروني باستخدام ملفات تعريف الارتباط التابعة لجهات خارجية. يعني هذا أنّه من المفترض أن تعمل معظم ميزات الموقع الإلكتروني، ولكنّك ستحظى بمستوى حماية أقل.</translation>
 <translation id="7227293336683593977">سجلّ الأسعار</translation>
 <translation id="7227747683324411744">إنّ المهاجمين على الموقع الإلكتروني الذي تحاول الانتقال إليه قد يتمكّنون من خداعك لتثبيت برامج ضارة تؤثر في طريقة التصفُّح من خلال تغيير الصفحة الرئيسية مثلًا أو عرض إعلانات إضافية على المواقع الإلكترونية التي تنتقل إليها.</translation>
@@ -3287,7 +3287,7 @@
 <translation id="7754587126786572336">‏سيتم إغلاق علامات تبويب Chrome وتطبيقاته عند بدء التحديث</translation>
 <translation id="7755287808199759310">قد يلغي والداك الحظر لك</translation>
 <translation id="7755624218968747854">اللفافة الأساسية</translation>
-<translation id="7758069387465995638">ربما حظر الجدار الناري أو برامج مكافحة الفيروسات الاتصال.</translation>
+<translation id="7758069387465995638">ربما حظر جدار الحماية أو برامج مكافحة الفيروسات الاتصال.</translation>
 <translation id="7759809451544302770">اختياري</translation>
 <translation id="7760497246331667482">موسيقى "ريغي" والبحر الكاريبي</translation>
 <translation id="776110834126722255">متوقّفة</translation>
@@ -3674,7 +3674,7 @@
 <translation id="8553387990086529628">وجهات سياحية</translation>
 <translation id="8554010658308662631">تحميل المزيد</translation>
 <translation id="8554181323880688938">سلع فاخرة</translation>
-<translation id="8554802735558319842">لمزيد من الأمان على الأجهزة المشتركة، يمكنك إثبات هويتك في كل مرة تستخدم فيها ميزة "الملء التلقائي" لإتمام عملية الدفع.</translation>
+<translation id="8554802735558319842">لمزيد من الأمان على الأجهزة المشتركة، يمكنك إثبات هويتك في كل مرة تستخدم فيها ميزة الملء التلقائي لإتمام عملية الدفع.</translation>
 <translation id="8554912124839363479">{NUM_PERMISSIONS,plural, =1{إعادة ضبط الإذن}zero{إعادة ضبط الأذونات}two{إعادة ضبط الإذنَين}few{إعادة ضبط الأذونات}many{إعادة ضبط الأذونات}other{إعادة ضبط الأذونات}}</translation>
 <translation id="8555010941760982128">استخدام هذا الرمز عند الدفع</translation>
 <translation id="8556297087315686325">مراقبة شبكات وإدارتها</translation>
diff --git a/chromium/components/strings/components_strings_as.xtb b/chromium/components/strings/components_strings_as.xtb
index 0500bfaaa09..6ab8d390c3e 100644
--- a/chromium/components/strings/components_strings_as.xtb
+++ b/chromium/components/strings/components_strings_as.xtb
@@ -3101,7 +3101,7 @@
 <translation id="7441864845853794192">ভোজনবিলাসী আৰু বিশেষ খাদ্য</translation>
 <translation id="7442725080345379071">পাতল কমলা ৰং</translation>
 <translation id="7444046173054089907">এই ছাইটটো অৱৰোধ কৰা হৈছে</translation>
-<translation id="7445762425076701745">আপুনি সংযোগ হৈ থকা ছাৰ্ভাৰটোৰ পৰিচয় সম্পূৰ্ণকৈ মান্য কৰিব নোৱাৰি। আপুনি কেৱল আপোনাৰ নেটৱৰ্কৰ ভিতৰত মান্য নাম এটা ব্যৱহাৰ কৰি এটা ছাৰ্ভাৰৰ সৈতে সংযোগ হৈ আছে আৰু বাহ্যিক কোনো প্ৰমাণপত্ৰৰ কৰ্তৃপক্ষই কোনো প্ৰকাৰে সেই নামটোৰ গৰাকীক মান্য কৰিব নোৱাৰে। প্ৰমাণপত্ৰ প্ৰদানকাৰী কিছুমান কৰ্তৃপক্ষই যিহেতু যিকোনো ধৰণৰ এই নামসমূহৰ বাবে প্ৰমাণপত্ৰ জাৰি কৰিব, আপুনি এটা সঠিক ৱেবছাইটৰ সৈতে সংযোগ হৈ আছে আৰু আপুনি এজন আক্ৰমণকাৰী নহয় বুলি নিশ্চিত কৰিবলৈ কোনো উপায় নাথাকে।</translation>
+<translation id="7445762425076701745">আপুনি সংযোগ হৈ থকা ছাৰ্ভাৰটোৰ পৰিচয় সম্পূৰ্ণকৈ মান্য কৰিব নোৱাৰি। আপুনি কেৱল আপোনাৰ নেটৱৰ্কৰ ভিতৰত মান্য নাম এটা ব্যৱহাৰ কৰি এটা ছাৰ্ভাৰৰ সৈতে সংযোগ হৈ আছে আৰু বাহ্যিক কোনো প্ৰমাণপত্ৰৰ কৰ্তৃপক্ষই কোনো প্ৰকাৰে সেই নামটোৰ গৰাকীক মান্য কৰিব নোৱাৰে। প্ৰমাণপত্ৰ প্ৰদানকাৰী কিছুমান কৰ্তৃপক্ষই যিহেতু যিকোনো ধৰণৰ এই নামসমূহৰ বাবে প্ৰমাণপত্ৰ জাৰি কৰিব, আপুনি এটা সঠিক ৱেবছাইটৰ সৈতে সংযোগ হৈ আছে আৰু আপুনি এগৰাকী আক্ৰমণকাৰী নহয় বুলি নিশ্চিত কৰিবলৈ কোনো উপায় নাথাকে।</translation>
 <translation id="7447234474237738389">পোছাক সম্পৰ্কীয় সেৱা</translation>
 <translation id="7447625772313191651"><ph name="NAME" /> (<ph name="WIDTH" /> x <ph name="HEIGHT" /> মি.মি.)</translation>
 <translation id="7450577240311017924">ছিংক পৰিচালনা কৰাৰ বুটাম, আপুনি Chromeৰ ছেটিঙত কি তথ্য ছিংক কৰিব সেয়া পৰিচালনা কৰিবলৈ সক্ৰিয় কৰক</translation>
diff --git a/chromium/components/strings/components_strings_ca.xtb b/chromium/components/strings/components_strings_ca.xtb
index 1879b5f68db..41a9b6d4af1 100644
--- a/chromium/components/strings/components_strings_ca.xtb
+++ b/chromium/components/strings/components_strings_ca.xtb
@@ -2346,7 +2346,7 @@ En cas contrari, la configuració de privadesa el bloquejarà. Això permetrà q
 <translation id="5884465125445718607">Sobre xinès número 6</translation>
 <translation id="5887400589839399685">S'ha desat la targeta</translation>
 <translation id="5887687176710214216">Darrera visita: ahir</translation>
-<translation id="5888023855665301188">Tramita la compra més ràpidament quan es desin els CVC. <ph name="LINK_BEGIN" />Suprimeix els codis de seguretat desats<ph name="LINK_END" /></translation>
+<translation id="5888023855665301188">Desa els CVC per tramitar les compres més ràpidament. <ph name="LINK_BEGIN" />Suprimeix els codis de seguretat desats<ph name="LINK_END" /></translation>
 <translation id="5895138241574237353">Reinicia</translation>
 <translation id="5895187275912066135">Emès el</translation>
 <translation id="5901630391730855834">Groc</translation>
@@ -2507,7 +2507,7 @@ En cas contrari, la configuració de privadesa el bloquejarà. Això permetrà q
 <translation id="6222527803348563979">Papereria</translation>
 <translation id="6224281071334553713">Pedres precioses i joies</translation>
 <translation id="6226163402662242066"><ph name="MANAGE_CHROME_ACCESSIBILITY_FOCUSED_FRIENDLY_MATCH_TEXT" />: prem Tab i després Retorn per personalitzar les eines d'accessibilitat a la configuració de Chrome</translation>
-<translation id="6229196330202833460">Serveis de reproducció en continu de programes de televisió i pel·lícules</translation>
+<translation id="6229196330202833460">Serveis de reproducció en línia de programes de televisió i pel·lícules</translation>
 <translation id="6229649258872345286">Viatges en família</translation>
 <translation id="6232271601416750929">Cosmètica ètica i sostenible</translation>
 <translation id="6234122620015464377">Retalla després de cada document</translation>
@@ -3298,7 +3298,7 @@ Detalls addicionals:
 <translation id="7781829728241885113">Ahir</translation>
 <translation id="7785790577395078482">aquesta tauleta</translation>
 <translation id="7786368602962652765">Un camp obligatori és buit. Emplena'l abans de desar.</translation>
-<translation id="7786912885126430740">Tramita la compra més ràpidament quan es desin els CVC</translation>
+<translation id="7786912885126430740">Desa els CVC per tramitar les compres més ràpidament</translation>
 <translation id="7790488044432570133">Els llocs web que visites poden demanar a Chrome informació que els ajuda a mesurar el rendiment dels seus anuncis. Chrome permet que els llocs web recullin tipus de dades limitats, com ara l'hora del dia en què se t'ha mostrat un anunci.</translation>
 <translation id="7791011319128895129">No publicada</translation>
 <translation id="7791196057686275387">Embalat</translation>
diff --git a/chromium/components/strings/components_strings_da.xtb b/chromium/components/strings/components_strings_da.xtb
index 462cf833ac5..f0abf5a0814 100644
--- a/chromium/components/strings/components_strings_da.xtb
+++ b/chromium/components/strings/components_strings_da.xtb
@@ -1723,7 +1723,7 @@ Ellers vil det blive blokeret af dine privatlivsindstillinger. Det giver det ind
 <translation id="457875822857220463">Levering</translation>
 <translation id="4579699065574932398">Bankrelaterede handlinger</translation>
 <translation id="4582204425268416675">Fjern kort</translation>
-<translation id="4582595824823167856">Få en sms-besked</translation>
+<translation id="4582595824823167856">Få en besked</translation>
 <translation id="4586607503179159908">Betalingsmetoden er verificeret</translation>
 <translation id="4587425331216688090">Vil du fjerne adressen fra Chrome?</translation>
 <translation id="459089498662672729">Administratorpolitikken tillader ikke, at du indsætter indhold fra <ph name="ORIGIN_NAME" /> på denne placering</translation>
@@ -2235,7 +2235,7 @@ Ellers vil det blive blokeret af dine privatlivsindstillinger. Det giver det ind
 <translation id="5629630648637658800">Der kunne ikke indlæses indstillinger for politik</translation>
 <translation id="5631439013527180824">Ugyldigt token for enhedsadministration</translation>
 <translation id="5632485077360054581">Vis mig hvordan</translation>
-<translation id="5633066919399395251">Brugere med ondsindede hensigter, der i øjeblikket er på <ph name="BEGIN_BOLD" /><ph name="SITE" /><ph name="END_BOLD" />, kan forsøge at installere farlige programmer på din computer, der stjæler eller sletter dine oplysninger (f.eks. fotos, adgangskoder, beskeder og kreditkort). <ph name="BEGIN_LEARN_MORE_LINK" />Få flere oplysninger<ph name="END_LEARN_MORE_LINK" /></translation>
+<translation id="5633066919399395251">Brugere med ondsindede hensigter, der i øjeblikket er på <ph name="BEGIN_BOLD" /><ph name="SITE" /><ph name="END_BOLD" />, kan forsøge at installere farlige programmer på din computer, der stjæler eller sletter dine oplysninger (f.eks. billeder, adgangskoder, beskeder og kreditkort). <ph name="BEGIN_LEARN_MORE_LINK" />Få flere oplysninger<ph name="END_LEARN_MORE_LINK" /></translation>
 <translation id="563324245173044180">Vildledende indhold er blokeret.</translation>
 <translation id="5633259641094592098">Kult- og indiefilm</translation>
 <translation id="563371367637259496">Mobil</translation>
@@ -2698,7 +2698,7 @@ Ellers vil det blive blokeret af dine privatlivsindstillinger. Det giver det ind
 <translation id="6629652037942826935">Luksusrejser</translation>
 <translation id="6630043285902923878">Finder USB-enheder...</translation>
 <translation id="6630388727238334626">Knappen Administrer Chrome-indstillinger, aktivér for at gå til dine Chrome-indstillinger.</translation>
-<translation id="6630809736994426279">Brugere med ondsindede hensigter, der i øjeblikket er på <ph name="BEGIN_BOLD" /><ph name="SITE" /><ph name="END_BOLD" />, kan forsøge at installere farlige programmer på din Mac, som stjæler eller sletter dine oplysninger (f.eks. fotos, adgangskoder, beskeder og kreditkort). <ph name="BEGIN_LEARN_MORE_LINK" />Få flere oplysninger<ph name="END_LEARN_MORE_LINK" /></translation>
+<translation id="6630809736994426279">Brugere med ondsindede hensigter, der i øjeblikket er på <ph name="BEGIN_BOLD" /><ph name="SITE" /><ph name="END_BOLD" />, kan forsøge at installere farlige programmer på din Mac, som stjæler eller sletter dine oplysninger (f.eks. billeder, adgangskoder, beskeder og kreditkort). <ph name="BEGIN_LEARN_MORE_LINK" />Få flere oplysninger<ph name="END_LEARN_MORE_LINK" /></translation>
 <translation id="663260587451432563">JIS B4</translation>
 <translation id="6633405994164965230">Computerundervisning</translation>
 <translation id="6633476656216409494">Virksomheds- og produktivitetssoftware</translation>
diff --git a/chromium/components/strings/components_strings_de.xtb b/chromium/components/strings/components_strings_de.xtb
index c6b7f563faa..4fdb065d038 100644
--- a/chromium/components/strings/components_strings_de.xtb
+++ b/chromium/components/strings/components_strings_de.xtb
@@ -880,7 +880,7 @@ Du wirst sonst gemäß deinen Datenschutzeinstellungen blockiert. Wenn Cookies u
 <translation id="2824775600643448204">Adress- und Suchleiste</translation>
 <translation id="2826760142808435982">Die Verbindung ist mit <ph name="CIPHER" /> verschlüsselt und authentifiziert und verwendet <ph name="KX" /> als Mechanismus für den Schlüsselaustausch.</translation>
 <translation id="2835170189407361413">Formular leeren</translation>
-<translation id="2838682941130655229"><ph name="EMBEDDED_URL" /> möchte Informationen nutzen, die sie zu deiner Person gespeichert hat</translation>
+<translation id="2838682941130655229"><ph name="EMBEDDED_URL" /> möchte Informationen nutzen, die zu deiner Person gespeichert wurden</translation>
 <translation id="2839032553903800133">Benachrichtigungen blockiert</translation>
 <translation id="2839501879576190149">Warnung: Gefälschte Website</translation>
 <translation id="2851291081585704741">Du bist offline</translation>
@@ -1180,7 +1180,7 @@ Du wirst sonst gemäß deinen Datenschutzeinstellungen blockiert. Wenn Cookies u
 <translation id="3461266716147554923"><ph name="URL" /> möchte Texte und Bilder aus der Zwischenablage abrufen</translation>
 <translation id="3461824795358126837">Textmarker</translation>
 <translation id="3462200631372590220">Erweiterte Informationen ausblenden</translation>
-<translation id="3465972433695735758">Auf diese PDF-Datei kann nicht zugegriffen werden. Text extrahiert mit KI-Technologie von Google.</translation>
+<translation id="3465972433695735758">Auf diese PDF-Datei kann nicht zugegriffen werden. Text extrahiert mit Google AI.</translation>
 <translation id="346601286295919445">Chemie</translation>
 <translation id="3468054117417088249"><ph name="TAB_SWITCH_SUFFIX" />, derzeit geöffnet, Tabulatortaste und dann Eingabetaste drücken, um zum offenen Tab zu wechseln</translation>
 <translation id="3470563864795286535"><ph name="CLOSE_INCOGNITO_WINDOWS_FOCUSED_FRIENDLY_MATCH_TEXT" /> – drücke die Tabulatortaste und dann die Eingabetaste, um alle geöffneten Inkognitofenster zu schließen</translation>
@@ -1593,7 +1593,7 @@ Du wirst sonst gemäß deinen Datenschutzeinstellungen blockiert. Wenn Cookies u
 <translation id="428639260510061158">{NUM_CARDS,plural, =1{Diese Karte wurde in deinem Google-Konto gespeichert}other{Diese Karten wurden in deinem Google-Konto gespeichert}}</translation>
 <translation id="4287495839370498922">Erweiterter Datenschutz bei Anzeigen in Chrome</translation>
 <translation id="4290920330097335010">Nie erlauben</translation>
-<translation id="4296207570293932800">Es sind neue Funktionen zum Datenschutz bei Anzeigen verfügbar</translation>
+<translation id="4296207570293932800">Neue Funktion zum Datenschutz bei Werbung verfügbar</translation>
 <translation id="4297502707443874121">Miniaturansicht für Seite <ph name="THUMBNAIL_PAGE" /></translation>
 <translation id="4298000214066716287">Investitionen</translation>
 <translation id="42981349822642051">Maximieren</translation>
@@ -1908,7 +1908,7 @@ Du wirst sonst gemäß deinen Datenschutzeinstellungen blockiert. Wenn Cookies u
 <translation id="4953689047182316270">Auf Bedienungshilfen reagieren</translation>
 <translation id="4957080528849277028">Schaltfläche „Chrome-Verlauf ansehen“ – aktivieren, um in den Chrome-Einstellungen deinen Browserverlauf aufzurufen und zu verwalten</translation>
 <translation id="4958444002117714549">Liste einblenden</translation>
-<translation id="4960068118612257147">In den Datenschutzeinstellungen für Anzeigen von Chrome kannst du jederzeit Änderungen vornehmen.</translation>
+<translation id="4960068118612257147">In den Datenschutzeinstellungen für Werbungen von Chrome kannst du jederzeit Änderungen vornehmen.</translation>
 <translation id="4964505745997821360">Krankenversicherung</translation>
 <translation id="4968522289500246572">Diese App wurde für Mobilgeräte entwickelt. Ihre Größe kann deshalb eventuell nicht richtig angepasst werden. Außerdem können Probleme auftreten und sie wird möglicherweise neu gestartet.</translation>
 <translation id="4968665849807487749">Kann anfordern, Fenster auf allen deinen Bildschirmen zu verwalten</translation>
@@ -2081,7 +2081,7 @@ Du wirst sonst gemäß deinen Datenschutzeinstellungen blockiert. Wenn Cookies u
 <translation id="5306593769196050043">Beide Auftragsblätter</translation>
 <translation id="5307166000025436103">Gültig</translation>
 <translation id="5308380583665731573">Verbinden</translation>
-<translation id="5308406951783863385">Du kannst Änderungen in den Einstellungen von Chrome vornehmen</translation>
+<translation id="5308406951783863385">In den Einstellungen von Chrome kannst du jederzeit Änderungen vornehmen.</translation>
 <translation id="5308689395849655368">Die Absturzberichtsfunktion ist deaktiviert.</translation>
 <translation id="5310178588836736698">Geländegängige Fahrzeuge</translation>
 <translation id="5314967030527622926">Falzmaschine</translation>
@@ -3303,7 +3303,7 @@ Weitere Details:
 <translation id="7791543448312431591">Hinzufügen</translation>
 <translation id="7798389633136518089">Ignoriert, weil die Richtlinie nicht von einer cloudbasierten Quelle konfiguriert wurde.</translation>
 <translation id="7800304661137206267">Die Verbindung ist mit <ph name="CIPHER" /> verschlüsselt; für die Nachrichtenauthentifizierung wird <ph name="MAC" /> verwendet und als Mechanismus für den Schlüsselaustausch <ph name="KX" />.</translation>
-<translation id="7800977246388195491">Chrome schließt aufgrund deines aktuellen Browserverlaufs auf Themen, die dich interessieren könnten. Außerdem können besuchte Websites feststellen, was dir gefällt. Weitere besuchte Websites können diese Informationen abfragen und dir dann personalisierte Werbung anzeigen. Du kannst festlegen, welche Themen und Websites für Werbung verwendet werden.</translation>
+<translation id="7800977246388195491">Chrome schließt aufgrund deines aktuellen Browserverlaufs auf Themen, die dich interessieren könnten. Außerdem können besuchte Websites feststellen, was dir gefällt. Websites können diese Informationen dann abfragen und dir personalisierte Werbung anzeigen. Du kannst festlegen, welche Themen und Websites für Werbung verwendet werden.</translation>
 <translation id="7802523362929240268">Website ist vertrauenswürdig</translation>
 <translation id="7802989406998618639">Gib den <ph name="NUMBER_OF_DIGITS" />-stelligen Sicherheitscode auf der <ph name="SIDE_OF_CARD" /> ein, damit deine Bank deine Identität bestätigen kann</translation>
 <translation id="780301667611848630">Nein, danke</translation>
@@ -3666,7 +3666,7 @@ Weitere Details:
 <translation id="8553387990086529628">Touristenziele</translation>
 <translation id="8554010658308662631">Weitere laden</translation>
 <translation id="8554181323880688938">Luxusgüter</translation>
-<translation id="8554802735558319842">Für noch mehr Sicherheit auf gemeinsam verwendeten Geräten aktiviere die Bestätigung bei jeder Autofill-Bezahlung.</translation>
+<translation id="8554802735558319842">Für noch mehr Sicherheit auf gemeinsam verwendeten Geräten aktiviere die Bestätigung für jede Zahlung, bei der du die Autofill-Funktion nutzt.</translation>
 <translation id="8554912124839363479">{NUM_PERMISSIONS,plural, =1{Berechtigung zurücksetzen}other{Berechtigungen zurücksetzen}}</translation>
 <translation id="8555010941760982128">Diesen Code beim Bezahlen verwenden</translation>
 <translation id="8556297087315686325">Netzwerküberwachung und ‑verwaltung</translation>
@@ -3956,7 +3956,7 @@ Weitere Details:
 <translation id="917450738466192189">Das Serverzertifikat ist ungültig.</translation>
 <translation id="9174623988242579721">Autotuning</translation>
 <translation id="9174917557437862841">Schaltfläche zum Wechseln des Tabs, Eingabetaste drücken, um zu diesem Tab zu wechseln</translation>
-<translation id="9177283544810807743">Auf diese PDF-Datei kann nicht zugegriffen werden. Text wird extrahiert mit KI-Technologie von Google.</translation>
+<translation id="9177283544810807743">Auf diese PDF-Datei kann nicht zugegriffen werden. Text wird extrahiert mit Google AI.</translation>
 <translation id="9179703756951298733">Zahlungsmethoden und Kreditkartendaten in den Chrome-Einstellungen verwalten</translation>
 <translation id="9179907736442194268">Du wirst bei einem Preisnachlass auf einer Website per E-Mail benachrichtigt</translation>
 <translation id="9183302530794969518">Google Docs</translation>
diff --git a/chromium/components/strings/components_strings_en-GB.xtb b/chromium/components/strings/components_strings_en-GB.xtb
index 7f94919474c..ba2281a99fa 100644
--- a/chromium/components/strings/components_strings_en-GB.xtb
+++ b/chromium/components/strings/components_strings_en-GB.xtb
@@ -3119,7 +3119,7 @@ Additional details:
 <translation id="7463075493919226237">Australian football</translation>
 <translation id="7465963048299965912">10 in x 13 in</translation>
 <translation id="7469935732330206581">Form is not secure</translation>
-<translation id="7473891865547856676">No, Thanks</translation>
+<translation id="7473891865547856676">No, thanks</translation>
 <translation id="7481312909269577407">Forward</translation>
 <translation id="7481603210197454575">Envelope Italian</translation>
 <translation id="7483482939016730822">School Supplies and Classroom Equipment</translation>
diff --git a/chromium/components/strings/components_strings_es-419.xtb b/chromium/components/strings/components_strings_es-419.xtb
index 8618982a1a2..308bf008e9e 100644
--- a/chromium/components/strings/components_strings_es-419.xtb
+++ b/chromium/components/strings/components_strings_es-419.xtb
@@ -1754,7 +1754,7 @@ De lo contrario, la configuración de privacidad bloqueará esta acción. Esto p
 <translation id="4644670975240021822">Orden inverso hacia abajo</translation>
 <translation id="4646534391647090355">Ir ahora</translation>
 <translation id="4648262692072505866">El hash debe tener el formato SHA-256.</translation>
-<translation id="4652266463001779298">No permitido</translation>
+<translation id="4652266463001779298">No se permite</translation>
 <translation id="4652440160515225514">Tu organización bloqueó este sitio porque infringe una política.</translation>
 <translation id="4653167719759882810">Fusiones y adquisiciones</translation>
 <translation id="4658638640878098064">Grapa en la esquina superior izquierda</translation>
@@ -2695,7 +2695,7 @@ De lo contrario, la configuración de privacidad bloqueará esta acción. Esto p
 <translation id="6615297766614333076">Apilador 2</translation>
 <translation id="6624427990725312378">Información de contacto</translation>
 <translation id="6627727261837091711">Mostrar los detalles de la personalización de anuncios</translation>
-<translation id="6628463337424475685"><ph name="ENGINE" /> Búsqueda</translation>
+<translation id="6628463337424475685">Búsqueda de <ph name="ENGINE" /></translation>
 <translation id="6629652037942826935">Viajes de lujo</translation>
 <translation id="6630043285902923878">Buscando dispositivos USB…</translation>
 <translation id="6630388727238334626">Botón Administrar la configuración de Chrome: actívalo para visitar tu configuración de Chrome</translation>
diff --git a/chromium/components/strings/components_strings_es.xtb b/chromium/components/strings/components_strings_es.xtb
index f8f71332228..b76568bdea6 100644
--- a/chromium/components/strings/components_strings_es.xtb
+++ b/chromium/components/strings/components_strings_es.xtb
@@ -70,7 +70,7 @@
 <translation id="112840717907525620">Caché de política correcta</translation>
 <translation id="1131264053432022307">Imagen copiada</translation>
 <translation id="1142713751288681188">Tipo de papel</translation>
-<translation id="1142846828089312304">Bloquear cookies de terceros en incógnito</translation>
+<translation id="1142846828089312304">Bloquear cookies de terceros en Incógnito</translation>
 <translation id="1147769322402934017">Galerías de imágenes online</translation>
 <translation id="1150565364351027703">Gafas de sol</translation>
 <translation id="1150979032973867961">Este servidor no ha podido probar que su dominio es <ph name="DOMAIN" />, el sistema operativo de tu ordenador no confía en su certificado de seguridad. Este problema puede deberse a una configuración incorrecta o a que un atacante haya interceptado la conexión.</translation>
@@ -1476,7 +1476,7 @@ De lo contrario, lo impedirá tu configuración de privacidad. Permitirá que el
 <translation id="4088981014127559358">Cara 1 del desplazamiento de la imagen en el eje Y</translation>
 <translation id="4089152113577680600">Bandeja 14</translation>
 <translation id="4096237801206588987">11x15 pulgadas</translation>
-<translation id="4098354747657067197">El sitio web al que vas a acceder es engañoso</translation>
+<translation id="4098354747657067197">Sitio web engañoso</translation>
 <translation id="4099048595830172239">La política del administrador no recomienda que compartas tu pantalla con <ph name="APPLICATION_TITLE" /> cuando se muestra contenido confidencial:</translation>
 <translation id="4099391883283080991"><ph name="CUSTOMIZE_CHROME_FONTS_FOCUSED_FRIENDLY_MATCH_TEXT" />, pulsa Tabulador y luego Intro para personalizar los tamaños de fuente y los tipos de letra de Chrome</translation>
 <translation id="4101413244023615925">Texto e imágenes</translation>
diff --git a/chromium/components/strings/components_strings_eu.xtb b/chromium/components/strings/components_strings_eu.xtb
index 0b0a9cd4573..7efc3a06318 100644
--- a/chromium/components/strings/components_strings_eu.xtb
+++ b/chromium/components/strings/components_strings_eu.xtb
@@ -2331,7 +2331,7 @@ Bestela, pribatutasun-ezarpenek blokeatu egingo dute baimen hori. Baimen honekin
 <translation id="5862579898803147654">8. pilatzailea</translation>
 <translation id="5863847714970149516">Baliteke orria dirua kobratzen saiatzea</translation>
 <translation id="5866257070973731571">Gehitu telefono-zenbakia</translation>
-<translation id="5866898949289125849">Garatzaileen tresnen orria ikusten ari zara</translation>
+<translation id="5866898949289125849">Garatzaileentzako tresnen orria ikusten ari zara</translation>
 <translation id="5869405914158311789">Ezin gara konektatu webgunera</translation>
 <translation id="5869522115854928033">Gordetako pasahitzak</translation>
 <translation id="5872692522325383488">Gorde da IBANa</translation>
diff --git a/chromium/components/strings/components_strings_fa.xtb b/chromium/components/strings/components_strings_fa.xtb
index 22e304aa41f..3f4c4daa8a6 100644
--- a/chromium/components/strings/components_strings_fa.xtb
+++ b/chromium/components/strings/components_strings_fa.xtb
@@ -365,7 +365,7 @@
 <translation id="1705644428387053571">شرایط خدمات</translation>
 <translation id="1706625117072057435">سطوح بزرگ‌نمایی</translation>
 <translation id="1706954506755087368">{1,plural, =1{این سرور نتوانست ثابت کند این <ph name="DOMAIN" /> است؛ اعتبار گواهی امنیتی آن ظاهراً فردا شروع می‌شود. ممکن است علت این موضوع پیکربندی اشتباه باشد یا مهاجمی اتصالتان را قطع می‌کند.}one{این سرور نتوانست ثابت کند این <ph name="DOMAIN" /> است؛ اعتبار گواهی امنیتی آن ظاهراً # روز دیگر شروع می‌شود. ممکن است علت این موضوع پیکربندی اشتباه باشد یا مهاجمی اتصالتان را قطع می‌کند.}other{این سرور نتوانست ثابت کند این <ph name="DOMAIN" /> است؛ اعتبار گواهی امنیتی آن ظاهراً # روز دیگر شروع می‌شود. ممکن است علت این موضوع پیکربندی اشتباه باشد یا مهاجمی اتصالتان را قطع می‌کند.}}</translation>
-<translation id="1710259589646384581">OS</translation>
+<translation id="1710259589646384581">سیستم‌عامل</translation>
 <translation id="1711234383449478798">نادیده گرفته شده است زیرا <ph name="POLICY_NAME" /> روی <ph name="VALUE" /> تنظیم نشده است.</translation>
 <translation id="1711528724596764268">یادگیری ماشین و هوش مصنوعی</translation>
 <translation id="1712552549805331520"><ph name="URL" /> می‌خواهد داده‌ها را برای همیشه در رایانه محلی‌تان ذخیره کند</translation>
@@ -574,7 +574,7 @@
 <translation id="214556005048008348">لغو پرداخت</translation>
 <translation id="2148613324460538318">افزودن کارت</translation>
 <translation id="2148716181193084225">امروز</translation>
-<translation id="2149968176347646218">اتصال امن نیست</translation>
+<translation id="2149968176347646218">اتصال ایمن نیست</translation>
 <translation id="2152495481414285304">برنامه‌های کاربردی</translation>
 <translation id="2153609454945889823">‏«خدمات Google Play ویژه واقعیت افزوده» نصب شود؟</translation>
 <translation id="2154144347038514978">اجرای خودکار در دستگاه</translation>
@@ -776,7 +776,7 @@
 <translation id="2587841377698384444">‏شناسه Directory API:</translation>
 <translation id="2594318783181750337">نمای وب سریع:</translation>
 <translation id="2595719060046994702">این دستگاه و حساب توسط شرکت یا سازمان دیگری مدیریت نمی‌شود.</translation>
-<translation id="2596415276201385844">‏به منظور برقراری یک اتصال امن، لازم است که ساعت شما به درستی تنظیم شود. زیرا گواهینامه‌هایی که وب‌سایت‌ها برای شناسایی خودشان استفاده می‌کنند تنها برای دوره‌های زمانی خاصی معتبر هستند. از آنجا که ساعت دستگاه نادرست است، Chrome نمی‌تواند این گواهینامه‌ها را تأیید کند.</translation>
+<translation id="2596415276201385844">‏به منظور برقراری یک اتصال ایمن، لازم است که ساعت شما به درستی تنظیم شود. زیرا گواهینامه‌هایی که وب‌سایت‌ها برای شناسایی خودشان استفاده می‌کنند تنها برای دوره‌های زمانی خاصی معتبر هستند. از آنجا که ساعت دستگاه نادرست است، Chrome نمی‌تواند این گواهینامه‌ها را تأیید کند.</translation>
 <translation id="2597378329261239068">این سند توسط گذرواژه محافظت می‌شود.  لطفاً یک گذرواژه وارد کنید.</translation>
 <translation id="259821504105826686">عکاسی و هنرهای دیجیتال</translation>
 <translation id="2601150049980261779">فیلم عاشقانه</translation>
@@ -1757,7 +1757,7 @@
 <translation id="4652440160515225514">سازمانتان این سایت را مسدود کرده است زیرا خط‌مشی‌ای را نقض می‌کند.</translation>
 <translation id="4653167719759882810">ادغام و تملک</translation>
 <translation id="4658638640878098064">منگنه در بالا سمت چپ</translation>
-<translation id="4660119392514473465">اکنون می‌توانید به‌طور خصوصی مرور کنید و افراد دیگری که از این دستگاه استفاده می‌کنند فعالیت شما را نخواهند دید. باوجوداین، بارگیری‌ها، نشانک‌ها، و موارد فهرست خواندن ذخیره خواهند شد.</translation>
+<translation id="4660119392514473465">اکنون می‌توانید به‌طور خصوصی مرور کنید و افراد دیگری که از این دستگاه استفاده می‌کنند فعالیت شما را نخواهند دید. باوجود این، بارگیری‌ها، نشانک‌ها، و موارد فهرست خواندن ذخیره خواهند شد.</translation>
 <translation id="4660567771874403130">انرژی و تأسیسات</translation>
 <translation id="4663373278480897665">دوربین مجاز است</translation>
 <translation id="466561305373967878">بازی‌های تخته‌ای</translation>
@@ -2236,7 +2236,7 @@
 <translation id="5631439013527180824">نشانه مدیریت دستگاه نامعتبر است</translation>
 <translation id="5632485077360054581">نمایش روش انجام کار</translation>
 <translation id="5633066919399395251">شاید درحال‌حاضر مهاجم‌ها در <ph name="BEGIN_BOLD" /><ph name="SITE" /><ph name="END_BOLD" /> در تلاش باشند برنامه‌های خطرناکی در رایانه‌تان نصب کنند که اطلاعات شما (مانند عکس‌ها، گذرواژه‌ها، پیام‌ها و کارت‌های اعتباری) را به سرقت می‌برند یا حذف می‌کنند. <ph name="BEGIN_LEARN_MORE_LINK" />بیشتر بدانید<ph name="END_LEARN_MORE_LINK" /></translation>
-<translation id="563324245173044180">محتوای فریب‌دهنده مسدود شد.</translation>
+<translation id="563324245173044180">محتوای فریب‌کارانه مسدود شد.</translation>
 <translation id="5633259641094592098">فیلم کالت و مستقل</translation>
 <translation id="563371367637259496">دستگاه همراه</translation>
 <translation id="5635237618724097525">تلفن هوشمند</translation>
@@ -2312,7 +2312,7 @@
 <translation id="5800727402210090597">تعمیرات و خدمات تلفن همراه</translation>
 <translation id="580241730938216256">شروع به‌روزرسانی</translation>
 <translation id="5803412860119678065">می‌خواهید <ph name="CARD_DETAIL" /> خود را وارد کنید؟</translation>
-<translation id="5804241973901381774">مجوزها</translation>
+<translation id="5804241973901381774">اجازه‌ها</translation>
 <translation id="5808435672482059465">‏مشاهده «سابقه Chrome»</translation>
 <translation id="5808542072418270309">بازی شبیه‌سازی</translation>
 <translation id="5810442152076338065">اتصال شما به <ph name="DOMAIN" /> با استفاده از یک مجموعه رمز منسوخ، رمزگذاری شده است.</translation>
@@ -2523,7 +2523,7 @@
 <translation id="6264376385120300461">به‌هرحال بارگیری شود</translation>
 <translation id="6264485186158353794">بازگشت به ایمنی</translation>
 <translation id="6265794661083428563">کپی کردن مقدار خط‌مشی <ph name="POLICY_NAME" /></translation>
-<translation id="6266934640124581640">سبز دودی روشن</translation>
+<translation id="6266934640124581640">سبزآبی روشن</translation>
 <translation id="6270066318535733958">قایق‌رانی</translation>
 <translation id="6272088941196661550">‏سفر جستجو را ازسر بگیرید تا فعالیت‌های مرتبط را در سابقه Chrome ببینید</translation>
 <translation id="6272383483618007430">Google Update</translation>
@@ -2911,7 +2911,7 @@
 <translation id="7058163556978339998"><ph name="BROWSER" /> تأیید کرده است که صادرکننده گواهی‌نامه این وب‌سایت <ph name="ISSUER" /> است.</translation>
 <translation id="7058774143982824355">‏سرویس تجزیه‌کننده گذرواژه CSV</translation>
 <translation id="7061777300866737982">ایمنی و امنیت خانه</translation>
-<translation id="7062635574500127092">سبز دودی</translation>
+<translation id="7062635574500127092">سبزآبی</translation>
 <translation id="706295145388601875">‏افزودن و مدیریت نشانی‌ها در تنظیمات Chrome</translation>
 <translation id="7064443976734085921">خودروهای کوچک</translation>
 <translation id="7064851114919012435">اطلاعات تماس</translation>
@@ -3157,7 +3157,7 @@
 <translation id="7534987659046836932">پاکت سی۷</translation>
 <translation id="7535087603100972091">مقدار</translation>
 <translation id="7537536606612762813">اجباری</translation>
-<translation id="7542995811387359312">تکمیل خودکار کارت اعتباری غیر فعال است زیرا این فرم از یک اتصال امن استفاده نمی‌کند.</translation>
+<translation id="7542995811387359312">تکمیل خودکار کارت اعتباری غیر فعال است زیرا این فرم از یک اتصال ایمن استفاده نمی‌کند.</translation>
 <translation id="7543525346216957623">از والدینتان بخواهید این کار را انجام دهد</translation>
 <translation id="7546409722674205727">درحال راه‌اندازی <ph name="APP_NAME" /></translation>
 <translation id="7548892272833184391">رفع خطاهای اتصال</translation>
@@ -3484,7 +3484,7 @@
 <translation id="8208363704094329105">۴۰۰ × ۳۰۰ میلی‌متر</translation>
 <translation id="8210490490377416373">انتخاب نام خط‌مشی</translation>
 <translation id="8210604850413485128">میزبانی وب</translation>
-<translation id="8211406090763984747">اتصال امن است</translation>
+<translation id="8211406090763984747">اتصال ایمن است</translation>
 <translation id="8213853114485953510">JIS Exec</translation>
 <translation id="8216640997712497593">۱۸ × ۱۴ اینچ</translation>
 <translation id="8217240300496046857">سایت‌ها نمی‌توانند از کوکی‌هایی که شما را در وب ردیابی می‌کند استفاده کنند. ویژگی‌های برخی سایت‌ها ممکن است کار نکنند.</translation>
@@ -3743,7 +3743,7 @@
 <translation id="8736059027199600831">۳۰ × ۴۰ اینچ</translation>
 <translation id="8737134861345396036">‏<ph name="LAUNCH_INCOGNITO_FOCUSED_FRIENDLY_MATCH_TEXT" />، برای باز کردن «پنجره ناشناس» جدید و مرور کردن به‌صورت خصوصی، دکمه Tab (جهش) و سپس Enter (ورود) را فشار دهید</translation>
 <translation id="8737685506611670901">باز کردن پیوندهای <ph name="PROTOCOL" /> به‌جای <ph name="REPLACED_HANDLER_TITLE" /></translation>
-<translation id="8738058698779197622">‏به منظور برقراری یک اتصال امن، لازم است که ساعت شما به درستی تنظیم شود. زیرا گواهینامه‌هایی که وب‌سایت‌ها برای شناسایی خودشان استفاده می‌کنند تنها برای دوره‌های زمانی خاصی معتبر هستند. از آنجایی که ساعت دستگاه نادرست است، Chromium نمی‌تواند این گواهینامه‌ها را تأیید کند.</translation>
+<translation id="8738058698779197622">‏به منظور برقراری یک اتصال ایمن، لازم است که ساعت شما به درستی تنظیم شود. زیرا گواهینامه‌هایی که وب‌سایت‌ها برای شناسایی خودشان استفاده می‌کنند تنها برای دوره‌های زمانی خاصی معتبر هستند. از آنجایی که ساعت دستگاه نادرست است، Chromium نمی‌تواند این گواهینامه‌ها را تأیید کند.</translation>
 <translation id="8740359287975076522">‏<ph name="HOST_NAME" />’s &lt;abbr id="dnsDefinition"&gt;آدرس DNS&lt;/abbr&gt; پیدا نشد. درحال بررسی برای تشخیص مشکل.</translation>
 <translation id="8742371904523228557"><ph name="ONE_TIME_CODE" /> کد شما برای <ph name="ORIGIN" /> است</translation>
 <translation id="874918643257405732">نشانک‌گذاری این برگه</translation>
@@ -3833,7 +3833,7 @@
 <translation id="8931333241327730545">‏می‌خواهید این کارت را در حساب Google خود ذخیره کنید؟</translation>
 <translation id="8932102934695377596">ساعت شما عقب است</translation>
 <translation id="893332455753468063">افزودن نام</translation>
-<translation id="8942355029279167844">‏سرپرستتان به <ph name="APP_NAME" /> اجازه داده است تا برای بهبود دادن تجربه استفاده از محصول، داده‌های عیب‌یابی را جمع‌آوری کند. برای دریافت اطلاعات بیشتر، به <ph name="BEGIN_LINK" />https://www.parallels.com/pcep<ph name="END_LINK" /> بروید.</translation>
+<translation id="8942355029279167844">‏سرپرستتان به <ph name="APP_NAME" /> اجازه داده است تا برای بهبود تجربه استفاده از محصول، داده‌های عیب‌یابی را جمع‌آوری کند. برای دریافت اطلاعات بیشتر، به <ph name="BEGIN_LINK" />https://www.parallels.com/pcep<ph name="END_LINK" /> بروید.</translation>
 <translation id="8943282376843390568">لیمویی</translation>
 <translation id="8949493680961858543">A1x4</translation>
 <translation id="8951415078585015151">قانون و دولت</translation>
diff --git a/chromium/components/strings/components_strings_fr.xtb b/chromium/components/strings/components_strings_fr.xtb
index edc72c7ff65..8a7539bf6f8 100644
--- a/chromium/components/strings/components_strings_fr.xtb
+++ b/chromium/components/strings/components_strings_fr.xtb
@@ -1512,7 +1512,7 @@ Par défaut, ce type d'accès est bloqué par vos paramètres de confidentialit�
 <translation id="4154277373259957087">Chrome va maintenant valider votre identité avant de renseigner les modes de paiement. Vous pouvez modifier cela à tout moment dans <ph name="IDS_AUTOFILL_MANDATORY_REAUTH_CONFIRMATION_SETTINGS_LINK" />.</translation>
 <translation id="4159149286839604525">Cela signifie que la plupart des fonctionnalités devraient fonctionner, mais que votre protection est réduite</translation>
 <translation id="4159784952369912983">Violet</translation>
-<translation id="4165986682804962316">Paramètres du site</translation>
+<translation id="4165986682804962316">Paramètres des sites</translation>
 <translation id="4169535189173047238">Interdire</translation>
 <translation id="4171400957073367226">Signature de validation non valide.</translation>
 <translation id="4171489848299289778"><ph name="RESULT_MODIFIED_DATE" /> - <ph name="RESULT_OWNER" /> - <ph name="RESULT_PRODUCT_SOURCE" /></translation>
diff --git a/chromium/components/strings/components_strings_hi.xtb b/chromium/components/strings/components_strings_hi.xtb
index b397617d2d6..e97326961eb 100644
--- a/chromium/components/strings/components_strings_hi.xtb
+++ b/chromium/components/strings/components_strings_hi.xtb
@@ -2194,7 +2194,7 @@
 <translation id="5543722831081909240">180 डिग्री</translation>
 <translation id="555128936272638662">मोबाइल और वायरलेस ऐक्सेसरी</translation>
 <translation id="5551890439174915351">100 x 200 मि॰मी॰</translation>
-<translation id="5552137475244467770">Chrome उन सूचियों में शामिल आपके पासवर्ड की समय-समय पर जांच करता है जिन्हें ऑनलाइन प्रकाशित किया गया है. ऐसा करते समय, आपके पासवर्ड और उपयोगकर्ता नाम सुरक्षित रहते हैं, इसलिए उन्हें कोई नहीं देख सकता, यहां तक कि Google भी नहीं.</translation>
+<translation id="5552137475244467770">Chrome, ऑनलाइन पब्लिश होने वाली सूचियों में शामिल आपके पासवर्ड की समय-समय पर जांच करता है. ऐसा करते समय आपके पासवर्ड और उपयोगकर्ता नाम एनक्रिप्ट (सुरक्षित) रहते हैं, ताकि उन्हें कोई नहीं देख सके, Google भी नहीं.</translation>
 <translation id="5554520618550346933">जब पासवर्ड का इस्तेमाल किया जाता है, तब Chrome आपको चेतावनी देता है कि क्या वह ऑनलाइन पब्लिश हो चुका है. ऐसा करते समय, आपके पासवर्ड और उपयोगकर्ता नाम को एन्क्रिप्ट (सुरक्षित) किया जाता है, ताकि कोई उन्हें देख न सके, यहां तक कि Google भी नहीं.</translation>
 <translation id="5556459405103347317">फिर लोड करें</translation>
 <translation id="5558083606899411167">एयर कंडिशनर</translation>
@@ -2706,7 +2706,7 @@
 <translation id="6643016212128521049">मिटाएं</translation>
 <translation id="6645291930348198241">कुकी और साइट के डेटा को ऐक्सेस करना चाहती है.</translation>
 <translation id="6645478838938543427">कीमत में कमी की सूचनाएं <ph name="EMAIL_ADDRESS" /> पर भेजी जाएंगी</translation>
-<translation id="6646269444027925224">{COUNT,plural, =0{कोई नहीं}=1{1 साइट से (आपको अपने Google खाते से साइन आउट नहीं किया जाएगा)}one{# साइटों से (आपको अपने Google खाते से साइन आउट नहीं किया जाएगा)}other{# साइटों से (आपको अपने Google खाते से साइन आउट नहीं किया जाएगा)}}</translation>
+<translation id="6646269444027925224">{COUNT,plural, =0{कोई नहीं}=1{1 साइट से (आपको Google खाते से साइन आउट नहीं किया जाएगा)}one{# साइटों से (आपको Google खाते से साइन आउट नहीं किया जाएगा)}other{# साइटों से (आपको Google खाते से साइन आउट नहीं किया जाएगा)}}</translation>
 <translation id="6648459603387803038">आपका एडमिन किसी दूसरे डिवाइस से आपके ब्राउज़र का सेट अप बदल सकता है. इस डिवाइस की गतिविधि को Chrome से बाहर भी मैनेज किया जा सकता है.</translation>
 <translation id="6648524591329069940">Serif फ़ॉन्ट</translation>
 <translation id="6649510485211003056">195 x 270 मि॰मी॰</translation>
@@ -3273,7 +3273,7 @@
 <translation id="7734285854693414638">Google Forms में जल्दी से नया फ़ॉर्म बनाएं</translation>
 <translation id="773466115871691567"><ph name="SOURCE_LANGUAGE" /> भाषा के पेज का हमेशा अनुवाद करें</translation>
 <translation id="7736959720849233795">लिंक का पता कॉपी करें</translation>
-<translation id="7740996059027112821">मानक</translation>
+<translation id="7740996059027112821">स्टैंडर्ड</translation>
 <translation id="77424286611022110">इस साइट पर, तंग करने वाले या गुमराह करने वाले विज्ञापन दिखते हैं. <ph name="LEARN_MORE_LINK_TEXT" /></translation>
 <translation id="7744505202669469867">सेव किए गए पतों की टेबल</translation>
 <translation id="774634243536837715">खतरनाक सामग्री ब्लॉक की गई.</translation>
diff --git a/chromium/components/strings/components_strings_hr.xtb b/chromium/components/strings/components_strings_hr.xtb
index 4758e648070..b4dd2b491d8 100644
--- a/chromium/components/strings/components_strings_hr.xtb
+++ b/chromium/components/strings/components_strings_hr.xtb
@@ -1929,7 +1929,7 @@ To će u suprotnom biti onemogućeno na temelju vaših postavki privatnosti. To
 <translation id="4995474875135717171">Izmijenjeno:</translation>
 <translation id="4995749490935861684"><ph name="CUSTOMIZE_SEARCH_ENGINES_FOCUSED_FRIENDLY_MATCH_TEXT" />, pritisnite Tab, a zatim Enter da biste upravljali pretraživanjem web-lokacije i svojom zadanom tražilicom</translation>
 <translation id="4998950033665438990">Jedno lice</translation>
-<translation id="5001526427543320409">Kolačići treće strane</translation>
+<translation id="5001526427543320409">Kolačići trećih strana</translation>
 <translation id="5002932099480077015">Ako je to omogućeno, Chrome će pohraniti kopiju vaše kartice na ovom uređaju radi bržeg ispunjavanja obrazaca.</translation>
 <translation id="5007392906805964215">Pregled</translation>
 <translation id="5011561501798487822">Otkriveni jezik</translation>
@@ -2093,7 +2093,7 @@ To će u suprotnom biti onemogućeno na temelju vaših postavki privatnosti. To
 <translation id="5323105697514565458"><ph name="FRIENDLY_MATCH_TEXT" />, <ph name="MATCH_POSITION" /> od <ph name="NUM_MATCHES" /></translation>
 <translation id="5329858041417644019">Preglednikom se ne upravlja</translation>
 <translation id="5332219387342487447">Način otpreme</translation>
-<translation id="5332769172018416402">Pošalji upit u poruci</translation>
+<translation id="5332769172018416402">Pitaj porukom</translation>
 <translation id="5333022057423422993">Chrome je saznao da je zaporka koju ste upravo upotrijebili otkrivena u povredi podataka. Da biste zaštitili svoje račune, preporučujemo da provjerite spremljene zaporke.</translation>
 <translation id="5334013548165032829">Detaljni zapisnici sustava</translation>
 <translation id="5334145288572353250">Želite li spremiti adresu?</translation>
@@ -3363,7 +3363,7 @@ Dodatne pojedinosti:
 <translation id="7952192831285741665">European EDP</translation>
 <translation id="7952327717479677595">Gumb Upravljaj tražilicama, aktivirajte ga za upravljanje zadanom tražilicom i pretraživanjem web-lokacije</translation>
 <translation id="7953569069500808819">Rubni šav pri vrhu</translation>
-<translation id="7955105108888461311">Zamoli osobno</translation>
+<translation id="7955105108888461311">Pitaj osobno</translation>
 <translation id="7956713633345437162">Mobilne oznake</translation>
 <translation id="7961015016161918242">Nikad</translation>
 <translation id="7962467575542381659">Stroj platforme</translation>
diff --git a/chromium/components/strings/components_strings_id.xtb b/chromium/components/strings/components_strings_id.xtb
index 718aa30b919..69d0404f31a 100644
--- a/chromium/components/strings/components_strings_id.xtb
+++ b/chromium/components/strings/components_strings_id.xtb
@@ -250,7 +250,7 @@ Jika tidak, ini akan diblokir oleh setelan privasi Anda. Ini akan memungkinkan k
 <translation id="1462951478840426066">Menggunakan font di komputer Anda agar Anda dapat membuat konten dengan kualitas akurasi tinggi</translation>
 <translation id="1467432559032391204">Kiri</translation>
 <translation id="1468653229182955856"><ph name="ONE_TIME_CODE" /> adalah kode Anda untuk <ph name="EMBEDDED_ORIGIN" /> guna melanjutkan di <ph name="TOP_ORIGIN" /></translation>
-<translation id="1472675084647422956">Tampilkan lainnya</translation>
+<translation id="1472675084647422956">Tampilkan lebih banyak</translation>
 <translation id="1473183651233018052">JIS B10</translation>
 <translation id="147358896496811705">2A0</translation>
 <translation id="1474576429883213321">Layanan Kebersihan</translation>
@@ -1326,7 +1326,7 @@ disusupi oleh penyerang. Hanya buka <ph name="BEGIN_LINK" />situs yang tidak ama
 <translation id="374325029554577103">Produk Teknologi Kebugaran</translation>
 <translation id="3743765582345153106">Selalu verifikasi saat menggunakan isi otomatis</translation>
 <translation id="3744111561329211289">Sinkronisasi latar belakang</translation>
-<translation id="3744212718085287312">Jadikan kartu lebih aman dengan kartu virtual pada kesempatan berikutnya?</translation>
+<translation id="3744212718085287312">Mau lebih aman dengan kartu virtual di lain waktu?</translation>
 <translation id="3744286742364977428">File yang Anda download akan dikirimkan ke Google Cloud atau pihak ketiga untuk analisis. Misalnya, file mungkin dipindai untuk mendeteksi data sensitif atau malware dan mungkin disimpan berdasarkan kebijakan perusahaan.</translation>
 <translation id="3744899669254331632">Anda tidak dapat mengunjungi <ph name="SITE" /> sekarang karena situs web mengirim kredensial tak beraturan yang tidak dapat diproses Chromium. Kesalahan jaringan dan serangan biasanya bersifat sementara, sehingga halaman ini mungkin akan bekerja nanti.</translation>
 <translation id="3748009735914587286">Logam (Kilap Tinggi)</translation>
@@ -3041,7 +3041,7 @@ disusupi oleh penyerang. Hanya buka <ph name="BEGIN_LINK" />situs yang tidak ama
 <translation id="7341357280245177602">Kendaraan bekas</translation>
 <translation id="7346048084945669753">Berafiliasi:</translation>
 <translation id="7346062987309535530">Peralatan Makan</translation>
-<translation id="7352651011704765696">Ada yang tidak beres</translation>
+<translation id="7352651011704765696">Terjadi error</translation>
 <translation id="7353601530677266744">Baris Perintah</translation>
 <translation id="7354880545102894991">Perjalanan murah &amp; mendadak</translation>
 <translation id="7359588939039777303">Iklan diblokir.</translation>
diff --git a/chromium/components/strings/components_strings_iw.xtb b/chromium/components/strings/components_strings_iw.xtb
index 41e8f141255..f91fc490023 100644
--- a/chromium/components/strings/components_strings_iw.xtb
+++ b/chromium/components/strings/components_strings_iw.xtb
@@ -1489,7 +1489,7 @@
 <translation id="4112140312785995938">הרצה לאחור</translation>
 <translation id="4113354056388982663">‏עדכון קריטי לביצועים ב-Android</translation>
 <translation id="4114146879518089587">המשך לאתר</translation>
-<translation id="4116663294526079822">אפשר תמיד באתר זה</translation>
+<translation id="4116663294526079822">תמיד מותר באתר הזה</translation>
 <translation id="4116701314593212016">JIS B7</translation>
 <translation id="4116798170070772848">RA2</translation>
 <translation id="4117700440116928470">היקף המדיניות אינו נתמך.</translation>
@@ -2487,7 +2487,7 @@ Del</translation>
 <translation id="6160391204859821737">הפעלת תכונה לשמירה על פרטיות בפרסום</translation>
 <translation id="6165508094623778733">למידע נוסף</translation>
 <translation id="6167577165590485365">ניסיון האחזור האחרון:</translation>
-<translation id="6169916984152623906">עכשיו באפשרותך לגלוש באופן פרטי, ואנשים אחרים שמשתמשים במכשיר הזה לא יראו את הפעילות שלך. עם זאת, עדיין תתבצע שמירה של הורדות וסימניות.</translation>
+<translation id="6169916984152623906">עכשיו יש לך אפשרות לגלוש באופן פרטי, ואנשים אחרים שמשתמשים במכשיר הזה לא יראו את הפעילות שלך. עם זאת, עדיין תתבצע שמירה של הורדות וסימניות.</translation>
 <translation id="617256461084925519">‏Google Chrome מנסה לאמת את זהותך לצורך מילוי פרטי התשלום שלך.</translation>
 <translation id="6176387967264100435">המחיר הזה גבוה</translation>
 <translation id="6177128806592000436">החיבור שלך לאתר הזה לא מאובטח</translation>
diff --git a/chromium/components/strings/components_strings_ja.xtb b/chromium/components/strings/components_strings_ja.xtb
index a94270fa32f..ea325eec28a 100644
--- a/chromium/components/strings/components_strings_ja.xtb
+++ b/chromium/components/strings/components_strings_ja.xtb
@@ -1509,7 +1509,7 @@
 <translation id="4150099059797363385">中国 #4 封筒</translation>
 <translation id="4151403195736952345">全体の既定値を使用（検出）</translation>
 <translation id="4152318981910038897">{COUNT,plural, =1{1 ページ}other{{COUNT} ページ}}</translation>
-<translation id="4154277373259957087">Chrome では、お支払い方法を入力する前に本人確認が行われるようになります。この機能は <ph name="IDS_AUTOFILL_MANDATORY_REAUTH_CONFIRMATION_SETTINGS_LINK" /> でいつでも変更できます。</translation>
+<translation id="4154277373259957087">Chrome では、お支払い方法を入力する前に本人確認が行われるようになります。この機能は、<ph name="IDS_AUTOFILL_MANDATORY_REAUTH_CONFIRMATION_SETTINGS_LINK" />でいつでも変更できます。</translation>
 <translation id="4159149286839604525">サイトのほとんどの機能は動作しますが、保護の強度が低下します</translation>
 <translation id="4159784952369912983">パープル</translation>
 <translation id="4165986682804962316">サイトの設定</translation>
@@ -3669,7 +3669,7 @@
 <translation id="8553387990086529628">観光地</translation>
 <translation id="8554010658308662631">もっと読み込む</translation>
 <translation id="8554181323880688938">ブランド品、高級品</translation>
-<translation id="8554802735558319842">共有デバイスでセキュリティを強化するには、自動入力を使用した支払いのたびに確認する設定をオンにします。</translation>
+<translation id="8554802735558319842">共有デバイスでセキュリティを強化するために、自動入力を使用した支払いのたびに確認する設定をオンにします。</translation>
 <translation id="8554912124839363479">{NUM_PERMISSIONS,plural, =1{権限をリセット}other{権限をリセット}}</translation>
 <translation id="8555010941760982128">ご購入手続き時にこのコードを使用</translation>
 <translation id="8556297087315686325">ネットワーク監視、管理</translation>
diff --git a/chromium/components/strings/components_strings_kn.xtb b/chromium/components/strings/components_strings_kn.xtb
index 886b9f3eeef..8dde953c5af 100644
--- a/chromium/components/strings/components_strings_kn.xtb
+++ b/chromium/components/strings/components_strings_kn.xtb
@@ -543,7 +543,7 @@
 <translation id="20817612488360358">ಸಿಸ್ಟಂ ಪ್ರಾಕ್ಸಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬಳಸಲು ಹೊಂದಿಸಲಾಗಿದೆ ಆದರೆ ಬಹಿರಂಗವಾದ ಪ್ರಾಕ್ಸಿ ಕಾನ್ಫಿಗರೇಶನ್ ಅನ್ನು ಸಹ ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿದೆ.</translation>
 <translation id="2082238445998314030"><ph name="TOTAL_RESULTS" /> ರಲ್ಲಿ <ph name="RESULT_NUMBER" /> ಫಲಿತಾಂಶಗಳು</translation>
 <translation id="2083256696566019397">ಭೇಟಿ ನೀಡಿದ ಪ್ರತಿ ಬಾರಿಯೂ ಅನುಮತಿಸಿ</translation>
-<translation id="2085876078937250610">ಉಳಿಸಿ…</translation>
+<translation id="2085876078937250610">ಸೇವ್ ಮಾಡಿ…</translation>
 <translation id="2091887806945687916">ಶಬ್ಧ</translation>
 <translation id="2093982008204312032">Google Chrome, ಪಾಸ್‌ವರ್ಡ್‌ಗಳನ್ನು ಭರ್ತಿ ಮಾಡುವುದಕ್ಕಾಗಿ Windows Hello ಅನ್ನು ಆಫ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸುತ್ತಿದೆ.</translation>
 <translation id="2094505752054353250">ಡೊಮೇನ್ ಹೊಂದುತ್ತಿಲ್ಲ</translation>
@@ -1881,7 +1881,7 @@
 <translation id="4900217275619098670">ಒಂಭತ್ತನೇ ರೋಲ್</translation>
 <translation id="4901052769830245369">ಲೇಬಲ್‌ಗಳು (ಅರೆ ಹೊಳಪು)</translation>
 <translation id="4901162432287938633">ನೈರ್ಮಲ್ಯ ಮತ್ತು ಪ್ರಸಾಧನ ಸಾಮಗ್ರಿಗಳು</translation>
-<translation id="4901778704868714008">ಉಳಿಸಿ...</translation>
+<translation id="4901778704868714008">ಸೇವ್ ಮಾಡಿ...</translation>
 <translation id="4901952598169637881">ಸಾಮಾನ್ಯ ಶೂಗಳು</translation>
 <translation id="4905659621780993806">ನಿಮ್ಮ ನಿರ್ವಾಹಕರು <ph name="DATE" /> ರಂದು <ph name="TIME" /> ಸಮಯಕ್ಕೆ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮರುಪ್ರಾರಂಭಿಸುತ್ತಾರೆ. ನಿಮ್ಮ ಸಾಧನ ಮರುಪ್ರಾರಂಭವಾಗುವ ಮೊದಲು ಯಾವುದೇ ತೆರೆದಿರುವ ಐಟಂಗಳನ್ನು ಉಳಿಸಿ.</translation>
 <translation id="4913987521957242411">ಮೇಲಿನ ಎಡಭಾಗದಲ್ಲಿ ತೂತು ಮಾಡಿ</translation>
diff --git a/chromium/components/strings/components_strings_ky.xtb b/chromium/components/strings/components_strings_ky.xtb
index c5a0d550c7a..34339f8944f 100644
--- a/chromium/components/strings/components_strings_ky.xtb
+++ b/chromium/components/strings/components_strings_ky.xtb
@@ -953,7 +953,7 @@
 <translation id="2987034854559945715">Дал келген функциялар жок</translation>
 <translation id="2989742184762224133">Жогорку жагын эки жолу илмек менен бекитүү</translation>
 <translation id="2991174974383378012">Вебсайттар менен бөлүшүлүүдө</translation>
-<translation id="299122504639061328">Демейки издөө каражатын жана сайттан издөөнү башкаруу</translation>
+<translation id="299122504639061328">Демейки издөө куралын жана сайттан издөөнү башкаруу</translation>
 <translation id="2991571918955627853">Азыр <ph name="SITE" /> сайтына кире албайсыз, анткени вебсайт HSTS протоколун иштетип жатат. Тармак каталары жана чабуулдар адатта убактылуу көйгөй болгондуктан, бул барак кийинчерээк иштеп калышы мүмкүн.</translation>
 <translation id="2995517112308048736">Файлдын өлчөмү:</translation>
 <translation id="299990983510665749">Хэтчбектер</translation>
@@ -1459,7 +1459,7 @@
 <translation id="4063063121357725926">Google'га себеттериңиздеги товарларга арзандатууларды табууга уруксат бериңиз</translation>
 <translation id="406358100705415968">Жумуштун коопсуздугу үчүн коргоо каражаттары</translation>
 <translation id="4063924980214801036">Карталарды тезирээк ырастоо үчүн түзмөктүн кулпусун колдонуңуз</translation>
-<translation id="4065659219963895623">Ресторандар</translation>
+<translation id="4065659219963895623">Тамактануучу жайлар</translation>
 <translation id="4067098466788473230">Окуу үчүн гранттар жана стипендиялар</translation>
 <translation id="4067947977115446013">Дарегин туура көрсөтүңүз</translation>
 <translation id="4070790659619547722">Жарнамалардын майнаптуулугун аныктоо үчүн сайттар бири-бири менен жарнаманын кайсы убакытта көрсөтүлгөнү сыяктуу маалыматтын түрлөрүн бөлүшөт.</translation>
@@ -1927,7 +1927,7 @@
 <translation id="4992066212339426712">Үнүн чыгаруу</translation>
 <translation id="4995216769782533993">Картаңыздын чоо-жайын бул сайт менен бөлүшүү үчүн коопсуздук кодун ырастаңыз</translation>
 <translation id="4995474875135717171">Өзгөрүлгөн күнү:</translation>
-<translation id="4995749490935861684"><ph name="CUSTOMIZE_SEARCH_ENGINES_FOCUSED_FRIENDLY_MATCH_TEXT" />, сайттан издөө жана демейки издөө каражатын башкаруу үчүн Tab, андан кийин Enter баскычын басыңыз</translation>
+<translation id="4995749490935861684"><ph name="CUSTOMIZE_SEARCH_ENGINES_FOCUSED_FRIENDLY_MATCH_TEXT" />, сайттан издөө жана демейки издөө куралын башкаруу үчүн Tab, андан кийин Enter баскычын басыңыз</translation>
 <translation id="4998950033665438990">Картон</translation>
 <translation id="5001526427543320409">Үчүнчү тараптын cookie файлдары</translation>
 <translation id="5002932099480077015">Эгер иштетилсе, форманы тезирээк толтуруу үчүн карточкаңыздын көчүрмөсүн Chrome ушул түзмөккө сактап коёт.</translation>
@@ -3361,7 +3361,7 @@
 <translation id="7950027195171824198">Chrome параметрлеринен cookie файлдарынын параметрлерин башкаруу</translation>
 <translation id="7951415247503192394">(32 бит)</translation>
 <translation id="7952192831285741665">European EDP</translation>
-<translation id="7952327717479677595">"Издөө каражаттарынын баскычын башкаруу" баскычы. Демейки издөө каражатын жана cайттан издөөнү башкаруу үчүн иштетиңиз</translation>
+<translation id="7952327717479677595">"Издөө каражаттарынын баскычын башкаруу" баскычы. Демейки издөө куралын жана cайттан издөөнү башкаруу үчүн иштетиңиз</translation>
 <translation id="7953569069500808819">Жогорку четин жамоо</translation>
 <translation id="7955105108888461311">Жеке сурануу</translation>
 <translation id="7956713633345437162">Мобилдик кыстармалар</translation>
diff --git a/chromium/components/strings/components_strings_ne.xtb b/chromium/components/strings/components_strings_ne.xtb
index 8c80fb360b0..02507131944 100644
--- a/chromium/components/strings/components_strings_ne.xtb
+++ b/chromium/components/strings/components_strings_ne.xtb
@@ -3430,7 +3430,7 @@
 <translation id="8079031581361219619">साइट पुनः लोड गर्ने हो?</translation>
 <translation id="8079976827192572403">खतरनाक साइट</translation>
 <translation id="8081087320434522107">सेडान कारहरू</translation>
-<translation id="8086971161893892807">मस्यौदा</translation>
+<translation id="8086971161893892807">ड्राफ्ट</translation>
 <translation id="8088680233425245692">लेख गर्न असफल भयो।</translation>
 <translation id="808894953321890993">पासवर्ड परिवर्तन गर्नुहोस्‌</translation>
 <translation id="8090403583893450254">आकार २०</translation>
diff --git a/chromium/components/strings/components_strings_nl.xtb b/chromium/components/strings/components_strings_nl.xtb
index 3af8632edf8..717e55626a2 100644
--- a/chromium/components/strings/components_strings_nl.xtb
+++ b/chromium/components/strings/components_strings_nl.xtb
@@ -3205,7 +3205,7 @@ Aanvullende informatie:
 <translation id="7627785503571172573">Foto (film)</translation>
 <translation id="762844065391966283">Eén tegelijk</translation>
 <translation id="763042426047865637">Brandmelding- en beveiligingsservices</translation>
-<translation id="7630470133768862132">Status van toestemming:</translation>
+<translation id="7630470133768862132">Toestemmingsstatus:</translation>
 <translation id="7631444403134069754">Atletiek</translation>
 <translation id="7631527008834753063">Tv-gameshows</translation>
 <translation id="7633909222644580952">Prestatiegegevens en crashrapporten</translation>
diff --git a/chromium/components/strings/components_strings_no.xtb b/chromium/components/strings/components_strings_no.xtb
index ddb2f960e46..62f05bfb39c 100644
--- a/chromium/components/strings/components_strings_no.xtb
+++ b/chromium/components/strings/components_strings_no.xtb
@@ -235,7 +235,7 @@ I motsatt fall blir dette blokkert av personverninnstillingene. Dette gjør at i
 <translation id="1432581352905426595">Administrer søkemotorer</translation>
 <translation id="1433225466058025572">Prøv å flytte filene på nytt</translation>
 <translation id="1434317006812369578">Chrome har innebygde sikkerhetsfunksjoner som beskytter deg mens du surfer, for eksempel Google Safe Browsing. Safe Browsing <ph name="BEGIN_LINK" />har nylig funnet skadelig programvare på <ph name="SITE" /><ph name="END_LINK" />, som er innebygd i nettstedet du prøver å besøke.</translation>
-<translation id="1435940442311036198">Bruk en tilgangsnøkkel på en annen enhet</translation>
+<translation id="1435940442311036198">Bruk en passnøkkel på en annen enhet</translation>
 <translation id="1436185428532214179">Kan be om å få redigere filer og mapper på enheten</translation>
 <translation id="1442386063175183758">Høyre vindusfals</translation>
 <translation id="1442987760062738829">Hull</translation>
@@ -2213,7 +2213,7 @@ I motsatt fall blir dette blokkert av personverninnstillingene. Dette gjør at i
 <translation id="5578606540385219379">Tjenesteleverandører</translation>
 <translation id="557886905979275351">Barberhøvler og barbermaskiner</translation>
 <translation id="5580958916614886209">Kontroller utløpsmåneden, og prøv igjen</translation>
-<translation id="558420943003240152">Administrer passord og tilgangsnøkler…</translation>
+<translation id="558420943003240152">Administrer passord og passnøkler…</translation>
 <translation id="5586446728396275693">Ingen adresser er lagret</translation>
 <translation id="5586831831248371458">Søk på <ph name="KEYWORD_SUFFIX" /></translation>
 <translation id="5587987780934666589">Plattformbruker</translation>
@@ -2297,7 +2297,7 @@ I motsatt fall blir dette blokkert av personverninnstillingene. Dette gjør at i
 <translation id="5764920692828389743">Send til <ph name="EMAIL_ADDRESS" /></translation>
 <translation id="5765072501007116331">For å se leveringsmetoder og -krav, velg en adresse</translation>
 <translation id="57689295674415555">Ble ikke det virtuelle kortnummeret fylt ut?</translation>
-<translation id="5772086939108830423">Bruk en tilgangsnøkkel på en annen enhet</translation>
+<translation id="5772086939108830423">Bruk en passnøkkel på en annen enhet</translation>
 <translation id="5776313857861697733">Prioritet</translation>
 <translation id="5776574724412881956">Ble ikke det virtuelle kortet fylt inn? Klikk på detaljene for det virtuelle kortet for å kopiere dem til utklippstavlen. <ph name="IDS_AUTOFILL_VIRTUAL_CARD_MANUAL_FALLBACK_BUBBLE_LEARN_MORE_LINK_LABEL" /></translation>
 <translation id="5781136890105823427">Et eksperiment er slått på</translation>
@@ -2986,7 +2986,7 @@ I motsatt fall blir dette blokkert av personverninnstillingene. Dette gjør at i
 <translation id="7201591969684833065">Administratoren kan se</translation>
 <translation id="7202217080450895452"><ph name="LAUNCH_INCOGNITO_FOCUSED_FRIENDLY_MATCH_TEXT" /> – trykk på Tab og deretter på Enter for å åpne en ny inkognitofane for privat surfing</translation>
 <translation id="7203375778433816396">Angi Chrome som systemets standardnettleser</translation>
-<translation id="7207736436284129083">{COUNT,plural, =0{Ingen}=1{1 tilgangsnøkkel}other{# tilgangsnøkler}}</translation>
+<translation id="7207736436284129083">{COUNT,plural, =0{Ingen}=1{1 passnøkkel}other{# passnøkler}}</translation>
 <translation id="7210863904660874423"><ph name="HOST_NAME" /> retter seg ikke etter sikkerhetsstandardene.</translation>
 <translation id="7210993021468939304">Linux-aktivitet i beholderen, og kan installere og kjøre Linux-apper i beholderen</translation>
 <translation id="721197778055552897"><ph name="BEGIN_LINK" />Mer informasjon<ph name="END_LINK" /> om dette problemet.</translation>
@@ -3990,7 +3990,7 @@ Mer informasjon:
 <translation id="961930410699694996">Posisjon er tillatt denne gangen</translation>
 <translation id="962484866189421427">Dette innholdet kan prøve å installere villedende apper som gir seg ut for å være noe annet, eller samle inn data som kan brukes til å spore deg. <ph name="BEGIN_LINK" />Vis det likevel<ph name="END_LINK" /></translation>
 <translation id="963837307749850257">Alle brukere</translation>
-<translation id="964050462028070434">Administrer passord og tilgangsnøkler…</translation>
+<translation id="964050462028070434">Administrer passord og passnøkler…</translation>
 <translation id="96680173638229310">Biler og kjøretøy</translation>
 <translation id="969892804517981540">Offisiell delversjon</translation>
 <translation id="975560348586398090">{COUNT,plural, =0{Ingen}=1{1 element}other{# elementer}}</translation>
diff --git a/chromium/components/strings/components_strings_pa.xtb b/chromium/components/strings/components_strings_pa.xtb
index 29a76ddea27..a829fd11ac1 100644
--- a/chromium/components/strings/components_strings_pa.xtb
+++ b/chromium/components/strings/components_strings_pa.xtb
@@ -2441,7 +2441,7 @@
 <translation id="6060009363608157444">ਅਵੈਧ DnsOverHttps ਮੋਡ।</translation>
 <translation id="6061154937977953833">ਕੁਸ਼ਤੀ</translation>
 <translation id="6062937464449575061">ਕੀਮਤ ਟਰੈਕਿੰਗ ਬੰਦ ਕਰੋ</translation>
-<translation id="6064217302520318294">ਸਕ੍ਰੀਨ ਲੌਕ</translation>
+<translation id="6064217302520318294">ਸਕ੍ਰੀਨ ਲਾਕ</translation>
 <translation id="6064602040258638498">ਕੂਪਨ ਅਤੇ ਛੋਟ ਪੇਸ਼ਕਸ਼ਾਂ</translation>
 <translation id="6080696365213338172">ਤੁਸੀਂ ਇੱਕ ਪ੍ਰਬੰਧਕ ਵੱਲੋਂ-ਮੁਹੱਈਆ ਕੀਤਾ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਵਰਤਦੇ ਹੋਏ ਸਮੱਗਰੀ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕੀਤੀ ਹੈ। ਜੋ ਡਾਟਾ ਤੁਸੀਂ <ph name="DOMAIN" /> ਨੂੰ ਮੁਹੱਈਆ ਕਰਦੇ ਹੋ, ਉਹ ਤੁਹਾਡੇ ਪ੍ਰਬੰਧਕ ਵੱਲੋਂ ਰੋਕਿਆ ਜਾ ਸਕਦਾ ਹੈ।</translation>
 <translation id="6085149458302186532">ਲੇਬਲ (ਰੰਗੀਨ)</translation>
diff --git a/chromium/components/strings/components_strings_pl.xtb b/chromium/components/strings/components_strings_pl.xtb
index dacf08e4830..cb2269f0288 100644
--- a/chromium/components/strings/components_strings_pl.xtb
+++ b/chromium/components/strings/components_strings_pl.xtb
@@ -2134,7 +2134,7 @@ Uruchamianie aplikacji może potrwać dłużej niż zwykle.</translation>
 <translation id="5414446060143308245">Wymagane jest sprawdzenie plików przed przeniesieniem</translation>
 <translation id="5414511064953050917">Przenieś mimo to</translation>
 <translation id="5421136146218899937">Wyczyść dane przeglądania...</translation>
-<translation id="5423269318075950257">Monitoruj cenę</translation>
+<translation id="5423269318075950257">Śledź cenę</translation>
 <translation id="5425241977284572032">{NUM_COOKIES,plural, =0{Brak witryn z zablokowanym dostępem}=1{1 witryna z zablokowanym dostępem}few{# witryny z zablokowanym dostępem}many{# witryn z zablokowanym dostępem}other{# witryny z zablokowanym dostępem}}</translation>
 <translation id="5426179911063097041"><ph name="SITE" /> chce wysyłać Ci powiadomienia</translation>
 <translation id="5430298929874300616">Usuń zakładkę</translation>
diff --git a/chromium/components/strings/components_strings_ru.xtb b/chromium/components/strings/components_strings_ru.xtb
index 7f1c8741dc3..fa1e8417607 100644
--- a/chromium/components/strings/components_strings_ru.xtb
+++ b/chromium/components/strings/components_strings_ru.xtb
@@ -124,7 +124,7 @@
 <translation id="1243027604378859286">Автор:</translation>
 <translation id="1246424317317450637">Полужирный</translation>
 <translation id="1247030632403369975">Алюминий</translation>
-<translation id="1250759482327835220">Чтобы ускорить процесс оплаты в будущем, сохраните карту, свое имя и платежный адрес в аккаунте Google.</translation>
+<translation id="1250759482327835220">Чтобы оплачивать покупки быстрее, сохраните карту, свое имя и платежный адрес в аккаунте Google.</translation>
 <translation id="1252209483516427155">Верхняя одежда</translation>
 <translation id="1253921432148366685"><ph name="TYPE_1" />, <ph name="TYPE_2" /> (данные синхронизируются)</translation>
 <translation id="1255086252236620440">Миксеры</translation>
@@ -1221,7 +1221,7 @@
 <translation id="3552297013052089404">Шрифт без засечек</translation>
 <translation id="3558573058928565255">До дня</translation>
 <translation id="355995771319966853">Отменить автозаполнение</translation>
-<translation id="3560824484345057728">Открыть список связанных сайтов</translation>
+<translation id="3560824484345057728">Показать связанные сайты</translation>
 <translation id="3566021033012934673">Подключение не защищено</translation>
 <translation id="3566336457819493938">215 x 315 мм</translation>
 <translation id="3566649245868131295">Вакансии в сфере здравоохранения и медицины</translation>
@@ -1281,7 +1281,7 @@
 <translation id="3658742229777143148">Версия</translation>
 <translation id="3664782872746246217">Ключевые слова:</translation>
 <translation id="3667704023705708645">Венчурный капитал</translation>
-<translation id="3671117652518853176">Если параметр отключен, данные могут периодически проверяться в целях безопасности</translation>
+<translation id="3671117652518853176">Если параметр отключен, мы можем время от времени предлагать вам подтвердить свою личность в целях безопасности</translation>
 <translation id="3671540257457995106">Разрешить изменение размера?</translation>
 <translation id="3672568546897166916">Ошибка: <ph name="ERROR_PATH" />. <ph name="ERROR_MESSAGE" /></translation>
 <translation id="3674751419374947706">Сетевое оборудование</translation>
@@ -1323,9 +1323,9 @@
 <translation id="3740319564441798148">Автобусы и поезда дальнего следования</translation>
 <translation id="3740447166056383374">Проверьте файлы, перед тем как копировать их</translation>
 <translation id="374325029554577103">Фитнес-гаджеты</translation>
-<translation id="3743765582345153106">Всегда проверять при автозаполнении</translation>
+<translation id="3743765582345153106">Всегда подтверждать личность при использовании автозаполнения</translation>
 <translation id="3744111561329211289">Фоновая синхронизация</translation>
-<translation id="3744212718085287312">Использовать в следующий раз виртуальную карту для защиты?</translation>
+<translation id="3744212718085287312">Виртуальная карта безопаснее. Использовать ее в следующий раз?</translation>
 <translation id="3744286742364977428">Скачанные вами файлы передаются на проверку в Google Cloud или сторонние сервисы. В частности, файлы могут быть просканированы на наличие конфиденциальных данных или вредоносного ПО, а также храниться на основании правил компании.</translation>
 <translation id="3744899669254331632">Перейти на сайт <ph name="SITE" /> невозможно, так как его идентификационные данные зашифрованы, и Chrome не может их обработать. Это могло произойти из-за ошибки сети или атаки на сайт. Скорее всего, он заработает через некоторое время.</translation>
 <translation id="3748009735914587286">Металл (с высоким лоском)</translation>
@@ -1508,10 +1508,10 @@
 <translation id="4150099059797363385">Конверт Chinese 4</translation>
 <translation id="4151403195736952345">Использовать глобальный параметр по умолчанию (находить)</translation>
 <translation id="4152318981910038897">{COUNT,plural, =1{Страница 1}one{Страница {COUNT}}few{Страница {COUNT}}many{Страница {COUNT}}other{Страница {COUNT}}}</translation>
-<translation id="4154277373259957087">Теперь Chrome заполняет платежные данные только после подтверждения личности. Чтобы изменить это поведение, перейдите в <ph name="IDS_AUTOFILL_MANDATORY_REAUTH_CONFIRMATION_SETTINGS_LINK" />.</translation>
+<translation id="4154277373259957087">Теперь Chrome будет заполнять платежные данные только после подтверждения личности. Чтобы изменить это, перейдите в <ph name="IDS_AUTOFILL_MANDATORY_REAUTH_CONFIRMATION_SETTINGS_LINK" />.</translation>
 <translation id="4159149286839604525">Это значит, что большинство функций сайта должно работать, но вы будете менее защищены.</translation>
 <translation id="4159784952369912983">Фиолетовый</translation>
-<translation id="4165986682804962316">Настройки сайтов</translation>
+<translation id="4165986682804962316">Настройки сайта</translation>
 <translation id="4169535189173047238">Запретить</translation>
 <translation id="4171400957073367226">Подтверждающая подпись недействительна</translation>
 <translation id="4171489848299289778"><ph name="RESULT_MODIFIED_DATE" /> – <ph name="RESULT_OWNER" /> – <ph name="RESULT_PRODUCT_SOURCE" /></translation>
@@ -2018,7 +2018,7 @@
 <translation id="5171045022955879922">Введите запрос или URL</translation>
 <translation id="5172758083709347301">Локальный компьютер</translation>
 <translation id="5177076414499237632">Подробнее об источнике и теме этой страницы</translation>
-<translation id="5179490652562926740">Настройки проверки оплаты сохранены</translation>
+<translation id="5179490652562926740">Настройки подтверждения личности при оплате сохранены.</translation>
 <translation id="5179510805599951267">Это не <ph name="ORIGINAL_LANGUAGE" />? Сообщите об ошибке</translation>
 <translation id="518639307526414276">Корм и товары для домашних животных</translation>
 <translation id="5187079891181379721">Корпоративные мероприятия</translation>
@@ -2526,7 +2526,7 @@
 <translation id="6270066318535733958">Лодочный спорт</translation>
 <translation id="6272088941196661550">Посмотреть похожие действия в истории Chrome</translation>
 <translation id="6272383483618007430">Google Update</translation>
-<translation id="627746635834430766">Чтобы ускорить процесс оплаты в будущем, сохраните карту и платежный адрес в аккаунте Google.</translation>
+<translation id="627746635834430766">Чтобы оплачивать покупки быстрее, сохраните карту и платежный адрес в аккаунте Google.</translation>
 <translation id="6279183038361895380">Чтобы показать курсор, нажмите |<ph name="ACCELERATOR" />|</translation>
 <translation id="6280223929691119688">Невозможно доставить заказ по этому адресу. Выберите другой вариант.</translation>
 <translation id="6284292079994426700">26 x 38 дюймов</translation>
@@ -3537,7 +3537,7 @@
 <translation id="8287123726498397887">Конверт (с изображением)</translation>
 <translation id="8288807391153049143">Показать сертификат</translation>
 <translation id="8289355894181816810">Уточните информацию у администратора сети.</translation>
-<translation id="8292520987784410870">Всегда выполнять проверку?</translation>
+<translation id="8292520987784410870">Всегда подтверждать личность?</translation>
 <translation id="8293206222192510085">Добавление закладки</translation>
 <translation id="829335040383910391">звук</translation>
 <translation id="8294431847097064396">Источник</translation>
@@ -3667,7 +3667,7 @@
 <translation id="8553387990086529628">Туристические направления</translation>
 <translation id="8554010658308662631">Ещё</translation>
 <translation id="8554181323880688938">Предметы роскоши</translation>
-<translation id="8554802735558319842">Чтобы ещё надежнее защитить общие устройства, включайте проверку каждый раз, когда платите с использованием функции автозаполнения.</translation>
+<translation id="8554802735558319842">Чтобы улучшить свою безопасность при оплате на общих устройствах, включите функцию "Всегда подтверждать личность при использовании автозаполнения".</translation>
 <translation id="8554912124839363479">{NUM_PERMISSIONS,plural, =1{Сбросить разрешение}one{Сбросить все разрешения}few{Сбросить все разрешения}many{Сбросить все разрешения}other{Сбросить все разрешения}}</translation>
 <translation id="8555010941760982128">Укажите этот код при оформлении заказа</translation>
 <translation id="8556297087315686325">Управление сетями и мониторинг</translation>
@@ -3801,7 +3801,7 @@
 <translation id="885730110891505394">Доступ Google</translation>
 <translation id="8858065207712248076">Chrome рекомендует сбросить пароль, используемый в подразделении <ph name="BEGIN_BOLD" /><ph name="ORG_NAME" /><ph name="END_BOLD" />, если вы указывали его на других сайтах.</translation>
 <translation id="885906927438988819">Если все правильно, <ph name="BEGIN_LINK" />воспользуйтесь инструментом "Диагностика сетей Windows"<ph name="END_LINK" />.</translation>
-<translation id="8863218129525348270">Чтобы ускорить процесс оплаты в будущем, сохраните карту на своем устройстве</translation>
+<translation id="8863218129525348270">Чтобы оплачивать покупки быстрее, сохраните карту на своем устройстве</translation>
 <translation id="8864939224504814334">Деловая одежда</translation>
 <translation id="8866132857352163524">Саундтреки</translation>
 <translation id="8866481888320382733">Не удалось выполнить анализ настроек политики</translation>
diff --git a/chromium/components/strings/components_strings_sv.xtb b/chromium/components/strings/components_strings_sv.xtb
index b74d6029510..11ec4291335 100644
--- a/chromium/components/strings/components_strings_sv.xtb
+++ b/chromium/components/strings/components_strings_sv.xtb
@@ -1509,7 +1509,7 @@ Annars blockeras detta av integritetsinställningarna. Om du tillåter detta kan
 <translation id="4150099059797363385">Kinesiskt nr 4-kuvert</translation>
 <translation id="4151403195736952345">Använd global standardinställning (Upptäck)</translation>
 <translation id="4152318981910038897">{COUNT,plural, =1{Sida 1}other{Sida {COUNT}}}</translation>
-<translation id="4154277373259957087">Nu verifierar Chrome din identitet innan betalningsmetoder autofylls. Du kan uppdatera detta när som helst i <ph name="IDS_AUTOFILL_MANDATORY_REAUTH_CONFIRMATION_SETTINGS_LINK" />.</translation>
+<translation id="4154277373259957087">Nu verifierar Chrome din identitet innan betalningsmetoder fylls i. Du kan uppdatera detta när som helst i <ph name="IDS_AUTOFILL_MANDATORY_REAUTH_CONFIRMATION_SETTINGS_LINK" />.</translation>
 <translation id="4159149286839604525">Det betyder att de flesta webbplatsfunktionerna bör fungera, men du är mindre skyddad</translation>
 <translation id="4159784952369912983">Lila</translation>
 <translation id="4165986682804962316">Webbplatsinställningar</translation>
@@ -2492,7 +2492,7 @@ Annars blockeras detta av integritetsinställningarna. Om du tillåter detta kan
 <translation id="61877208875190028">Damkläder</translation>
 <translation id="6194209731893739467">Se alla bevakade produkter här</translation>
 <translation id="6195371403461054755">Geologi</translation>
-<translation id="6196640612572343990">Blockera cookies från tredje part</translation>
+<translation id="6196640612572343990">Blockera tredjepartscookies</translation>
 <translation id="6197648101609735209">89 x 89 mm</translation>
 <translation id="6198480336395236519">Helt avskurna flikar</translation>
 <translation id="6203231073485539293">Kontrollera internetanslutningen</translation>
diff --git a/chromium/components/strings/components_strings_te.xtb b/chromium/components/strings/components_strings_te.xtb
index 083145d281f..e001df4cba6 100644
--- a/chromium/components/strings/components_strings_te.xtb
+++ b/chromium/components/strings/components_strings_te.xtb
@@ -1515,7 +1515,7 @@
 <translation id="4172051516777682613">ఎల్లప్పుడూ చూపు</translation>
 <translation id="4173315687471669144">ఫుల్‌స్కేప్</translation>
 <translation id="4173827307318847180">{MORE_ITEMS,plural, =1{మరో <ph name="ITEM_COUNT" /> అంశం}other{మరో <ph name="ITEM_COUNT" /> అంశాలు}}</translation>
-<translation id="4176463684765177261">ఆపివేయబడింది</translation>
+<translation id="4176463684765177261">డిజేబుల్ చేయబడింది</translation>
 <translation id="4176535426287761656">టైమ్‌షేర్‌లు &amp; వెకేషన్ ప్రాపర్టీలు</translation>
 <translation id="4177501066905053472">యాడ్ టాపిక్‌లు</translation>
 <translation id="4179515394835346607"><ph name="ROW_NAME" /> <ph name="ROW_CONTENT" /></translation>
@@ -3067,7 +3067,7 @@
 <translation id="7390545607259442187">కార్డ్‌ని నిర్ధారించండి</translation>
 <translation id="7392089738299859607">అడ్రస్‌ను అప్‌డేట్ చేయండి</translation>
 <translation id="739728382607845710">పేమెంట్ హ్యాండ్లర్ చిహ్నం</translation>
-<translation id="7399802613464275309">భద్రతా చెక్-అప్</translation>
+<translation id="7399802613464275309">సేఫ్టీ చెక్</translation>
 <translation id="7400418766976504921">URL</translation>
 <translation id="7403392780200267761">'లింక్‌ను షేర్ చేయడం', 'QR కోడ్‌ను క్రియేట్ చేయడం', 'కాస్ట్ చేయడం' ఇంకా మరెన్నో ఆప్షన్‌ల ద్వారా ఈ ట్యాబ్‌ను షేర్ చేయండి</translation>
 <translation id="7403591733719184120">మీ <ph name="DEVICE_NAME" /> నిర్వహించబడుతోంది</translation>
diff --git a/chromium/components/strings/components_strings_th.xtb b/chromium/components/strings/components_strings_th.xtb
index 5d5cf66aefc..955e68c1b31 100644
--- a/chromium/components/strings/components_strings_th.xtb
+++ b/chromium/components/strings/components_strings_th.xtb
@@ -3246,7 +3246,7 @@
 <translation id="7682451652090915298">รักบี้</translation>
 <translation id="7684683146428206649">โลหะ</translation>
 <translation id="7684928361160505327">{0,plural, =1{<ph name="FILE_NAME" /> ถูกบล็อกเนื่องจากนโยบาย}other{ไฟล์ <ph name="FILE_COUNT" /> รายการถูกบล็อกเนื่องจากนโยบาย}}</translation>
-<translation id="7687186412095877299">กรอกฟอร์มการชำระเงินด้วยวิธีการชำระเงินที่คุณบันทึกไว้</translation>
+<translation id="7687186412095877299">กรอกแบบฟอร์มการชำระเงินด้วยวิธีการชำระเงินที่คุณบันทึกไว้</translation>
 <translation id="7687305263118037187">การลองใหม่หมดเวลา</translation>
 <translation id="7690647519407127574">ไปรษณียบัตร Oufuku Hagaki</translation>
 <translation id="7693583928066320343">ลำดับหน้าที่ได้รับ</translation>
@@ -3621,7 +3621,7 @@
 <translation id="8457125768502047971">ไม่จำกัด</translation>
 <translation id="8458202188076138974">Letter Extra</translation>
 <translation id="8460854335417802511">เปิด</translation>
-<translation id="8461694314515752532">เข้ารหัสลับข้อมูลที่ซิงค์ด้วยรหัสผ่านการซิงค์ของคุณเอง</translation>
+<translation id="8461694314515752532">เข้ารหัสข้อมูลที่ซิงค์ด้วยรหัสผ่านการซิงค์ของคุณเอง</translation>
 <translation id="8466379296835108687">{COUNT,plural, =1{บัตรเครดิต 1 ใบ}other{บัตรเครดิต # ใบ}}</translation>
 <translation id="8468358362970107653">Envelope C3</translation>
 <translation id="8473626140772740486">300 x 450 มม.</translation>
diff --git a/chromium/components/strings/components_strings_uk.xtb b/chromium/components/strings/components_strings_uk.xtb
index d7e43e06847..a186908b122 100644
--- a/chromium/components/strings/components_strings_uk.xtb
+++ b/chromium/components/strings/components_strings_uk.xtb
@@ -610,7 +610,7 @@
 <translation id="2213606439339815911">Отримання записів…</translation>
 <translation id="2213612003795704869">Сторінку надруковано</translation>
 <translation id="2215632862494199917">Автомобільні шоу</translation>
-<translation id="2215727959747642672">Редагування файлу</translation>
+<translation id="2215727959747642672">Редагування файлів</translation>
 <translation id="2215963164070968490">Собаки</translation>
 <translation id="2218879909401188352">Зловмисники можуть використати сайт <ph name="BEGIN_BOLD" /><ph name="SITE" /><ph name="END_BOLD" />, щоб установити небезпечні додатки, які шкодять пристроям, наприклад, додають приховані платежі за мобільний зв’язок або викрадають особисту інформацію. <ph name="BEGIN_LEARN_MORE_LINK" />Докладніше<ph name="END_LEARN_MORE_LINK" /></translation>
 <translation id="2219658597883514593">Переглянути навчальний посібник знову</translation>
@@ -753,7 +753,7 @@
 <translation id="2544546346215446551">Адміністратор перезапустив ваш пристрій</translation>
 <translation id="2544644783021658368">Один документ</translation>
 <translation id="254524874071906077">Установити Chrome веб-переглядачем за умовчанням</translation>
-<translation id="2546283357679194313">Файли cookie й дані із сайтів</translation>
+<translation id="2546283357679194313">Файли cookie й дані сайтів</translation>
 <translation id="2547466893236767989">Веб-дизайн і розробка</translation>
 <translation id="254947805923345898">Недійсне значення правила.</translation>
 <translation id="2549836668759467704">Консультації з будівництва й підряди</translation>
@@ -1348,7 +1348,7 @@
 <translation id="3780694243617746492">Вихідний контейнер</translation>
 <translation id="3781428340399460090">Яскраво-рожевий</translation>
 <translation id="3783418713923659662">Mastercard</translation>
-<translation id="3784372983762739446">Пристрої Bluetooth</translation>
+<translation id="3784372983762739446">Пристрої з Bluetooth</translation>
 <translation id="3789155188480882154">Розмір 16</translation>
 <translation id="3789841737615482174">Установити</translation>
 <translation id="3792100426446126328"><ph name="NAME" /> (<ph name="WIDTH" /> x <ph name="HEIGHT" /> дюйм.)</translation>
diff --git a/chromium/components/strings/components_strings_vi.xtb b/chromium/components/strings/components_strings_vi.xtb
index 5c7414450f6..361c3af6624 100644
--- a/chromium/components/strings/components_strings_vi.xtb
+++ b/chromium/components/strings/components_strings_vi.xtb
@@ -70,7 +70,7 @@
 <translation id="112840717907525620">Bộ nhớ đệm chính sách OK</translation>
 <translation id="1131264053432022307">Hình ảnh bạn đã sao chép</translation>
 <translation id="1142713751288681188">Loại giấy</translation>
-<translation id="1142846828089312304">Chặn cookie của bên thứ ba ở chế độ Ẩn danh</translation>
+<translation id="1142846828089312304">Chặn cookie của bên thứ ba ở Chế độ ẩn danh</translation>
 <translation id="1147769322402934017">Thư viện ảnh trực tuyến</translation>
 <translation id="1150565364351027703">Kính mát</translation>
 <translation id="1150979032973867961">Máy chủ này không chứng minh được rằng đó là <ph name="DOMAIN" />; chứng chỉ bảo mật của máy chủ này không được hệ điều hành máy tính của bạn tin cậy. Điều này có thể do định cấu hình sai hoặc có kẻ tấn công chặn kết nối của bạn.</translation>
@@ -649,7 +649,7 @@ Nếu bạn từ chối, chế độ cài đặt quyền riêng tư của bạn
 <translation id="2288422996159078444">Mọi thông tin bạn nhập, mọi trang bạn xem hoặc mọi hoạt động khác trên web đều sẽ bị theo dõi. Nội dung trên các trang web có thể bị thay đổi mà bạn không hề hay biết.</translation>
 <translation id="2289385804009217824">Cắt bỏ</translation>
 <translation id="2292556288342944218">Quyền truy cập Internet của bạn bị chặn</translation>
-<translation id="2293443924986248631">Khi tùy chọn này bật, các trang web không thể dùng cookie theo dõi bạn trên web. Do đó, các tính năng trên một số trang web có thể hoạt động không đúng cách.</translation>
+<translation id="2293443924986248631">Khi tùy chọn này bật, các trang web không thể dùng cookie theo dõi bạn trên web. Do đó, các tính năng trên một số trang web có thể không hoạt động như bình thường.</translation>
 <translation id="2300306941146563769">Chưa tải lên</translation>
 <translation id="230286397113210245">Nút Mở cửa sổ ẩn danh, hãy nhấn nút này để mở cửa sổ ẩn danh mới và duyệt web ở chế độ riêng tư</translation>
 <translation id="2312234273148520048">Gia vị và nêm gia vị</translation>
@@ -1282,7 +1282,7 @@ Nếu bạn từ chối, chế độ cài đặt quyền riêng tư của bạn
 <translation id="3658742229777143148">Bản sửa đổi</translation>
 <translation id="3664782872746246217">Từ khóa:</translation>
 <translation id="3667704023705708645">Vốn đầu tư mạo hiểm</translation>
-<translation id="3671117652518853176">Khi tắt tính năng này, đôi khi bạn có thể nhận được yêu cầu xác minh vì mục đích bảo mật</translation>
+<translation id="3671117652518853176">Khi tắt tính năng này, đôi khi bạn sẽ được yêu cầu xác minh vì mục đích bảo mật</translation>
 <translation id="3671540257457995106">Cho phép thay đổi kích thước?</translation>
 <translation id="3672568546897166916">Có lỗi ở <ph name="ERROR_PATH" />: <ph name="ERROR_MESSAGE" /></translation>
 <translation id="3674751419374947706">Thiết bị mạng</translation>
@@ -1509,7 +1509,7 @@ Nếu bạn từ chối, chế độ cài đặt quyền riêng tư của bạn
 <translation id="4150099059797363385">Phong bì kiểu Trung số 4</translation>
 <translation id="4151403195736952345">Sử dụng giá trị mặc định chung (Phát hiện)</translation>
 <translation id="4152318981910038897">{COUNT,plural, =1{Trang 1}other{Trang {COUNT}}}</translation>
-<translation id="4154277373259957087">Từ giờ trở đi, Chrome sẽ xác minh danh tính của bạn trước khi điền phương thức thanh toán. Bạn có thể cập nhật tùy chọn này bất cứ lúc nào trong phần <ph name="IDS_AUTOFILL_MANDATORY_REAUTH_CONFIRMATION_SETTINGS_LINK" />.</translation>
+<translation id="4154277373259957087">Từ giờ trở đi, Chrome sẽ xác minh danh tính của bạn trước khi điền phương thức thanh toán. Bạn có thể cập nhật lựa chọn này bất cứ lúc nào trong phần <ph name="IDS_AUTOFILL_MANDATORY_REAUTH_CONFIRMATION_SETTINGS_LINK" />.</translation>
 <translation id="4159149286839604525">Chế độ cài đặt này làm giảm khả năng bảo vệ nhưng hầu hết các tính năng của trang web sẽ hoạt động</translation>
 <translation id="4159784952369912983">Tím</translation>
 <translation id="4165986682804962316">Cài đặt trang web</translation>
@@ -1869,7 +1869,7 @@ Nếu bạn từ chối, chế độ cài đặt quyền riêng tư của bạn
 <translation id="4877047577339061095">Kệ và nhà kho gia đình</translation>
 <translation id="4877083676943085827">{COUNT,plural, =0{Không có}=1{<ph name="EXAMPLE_DOMAIN_1" />}=2{<ph name="EXAMPLE_DOMAIN_1" />, <ph name="EXAMPLE_DOMAIN_2" />}other{<ph name="EXAMPLE_DOMAIN_1" />, <ph name="EXAMPLE_DOMAIN_2" />, <ph name="AND_MORE" />}}</translation>
 <translation id="4877422487531841831">Cụm từ tìm kiếm <ph name="TEXT" /></translation>
-<translation id="4877521229462766300">Cho phép nội dung đã nhúng?</translation>
+<translation id="4877521229462766300">Cho phép nội dung được nhúng?</translation>
 <translation id="4879491255372875719">Tự động (mặc định)</translation>
 <translation id="4880827082731008257">Nhật ký tìm kiếm</translation>
 <translation id="4881695831933465202">Mở</translation>
@@ -2482,7 +2482,7 @@ Nếu bạn từ chối, chế độ cài đặt quyền riêng tư của bạn
 <translation id="6160391204859821737">Bật một tính năng về quyền riêng tư trong quảng cáo</translation>
 <translation id="6165508094623778733">Tìm hiểu thêm</translation>
 <translation id="6167577165590485365">Lần tìm nạp mới nhất:</translation>
-<translation id="6169916984152623906">Giờ đây, bạn có thể duyệt web riêng tư và người khác sử dụng thiết bị này sẽ không thấy hoạt động của bạn. Tuy nhiên, tài nguyên đã tải xuống và dấu trang sẽ được lưu.</translation>
+<translation id="6169916984152623906">Giờ đây, bạn có thể duyệt web ở chế độ riêng tư. Những người khác dùng thiết bị này sẽ không xem được hoạt động của bạn. Tuy nhiên, tệp đã tải xuống và dấu trang sẽ được lưu lại.</translation>
 <translation id="617256461084925519">Google Chrome đang cố gắng xác minh danh tính của bạn để có thể điền thông tin thanh toán cho bạn.</translation>
 <translation id="6176387967264100435">Đây là mức giá cao</translation>
 <translation id="6177128806592000436">Kết nối của bạn tới trang web này không an toàn</translation>
@@ -3668,7 +3668,7 @@ Thông tin chi tiết bổ sung:
 <translation id="8553387990086529628">Điểm đến du lịch</translation>
 <translation id="8554010658308662631">Tải thêm</translation>
 <translation id="8554181323880688938">Xa xỉ phẩm</translation>
-<translation id="8554802735558319842">Để tăng cường bảo mật cho thiết bị dùng chung, hãy bật tuỳ chọn xác minh mỗi khi bạn thanh toán bằng tính năng tự động điền.</translation>
+<translation id="8554802735558319842">Để tăng cường bảo mật cho thiết bị dùng chung, hãy bật tính năng xác minh mỗi khi bạn thanh toán bằng tính năng tự động điền.</translation>
 <translation id="8554912124839363479">{NUM_PERMISSIONS,plural, =1{Đặt lại quyền}other{Đặt lại quyền}}</translation>
 <translation id="8555010941760982128">Sử dụng mã này khi thanh toán</translation>
 <translation id="8556297087315686325">Quản lý và giám sát mạng</translation>
diff --git a/chromium/components/strings/components_strings_zh-CN.xtb b/chromium/components/strings/components_strings_zh-CN.xtb
index 84ca86f2411..f2882b6589c 100644
--- a/chromium/components/strings/components_strings_zh-CN.xtb
+++ b/chromium/components/strings/components_strings_zh-CN.xtb
@@ -2991,7 +2991,7 @@
 <translation id="7220786058474068424">正在处理</translation>
 <translation id="7221855153210829124">显示通知</translation>
 <translation id="7221857374443660083">银行想确认您的身份</translation>
-<translation id="722454870747268814">打开新的无痕模式标签页</translation>
+<translation id="722454870747268814">新的无痕式标签页</translation>
 <translation id="7226276626900992675">您已允许此网站使用第三方 Cookie。这意味着大部分网站功能应该都能正常运行，但您将采用较低级别的保护措施。</translation>
 <translation id="7227293336683593977">既往价格</translation>
 <translation id="7227747683324411744">您正在尝试访问的网站上的攻击者可能会诱使您安装有害软件，以操纵您的浏览体验，例如，更改您的主页或在您访问的网站上展示广告。</translation>
@@ -3114,7 +3114,7 @@
 <translation id="7463075493919226237">澳式足球</translation>
 <translation id="7465963048299965912">10 x 13 英寸</translation>
 <translation id="7469935732330206581">表单不安全</translation>
-<translation id="7473891865547856676">不，谢谢</translation>
+<translation id="7473891865547856676">不用了</translation>
 <translation id="7481312909269577407">前进</translation>
 <translation id="7481603210197454575">意式信封</translation>
 <translation id="7483482939016730822">学习用品和教室设备</translation>
@@ -3663,7 +3663,7 @@
 <translation id="8553387990086529628">旅游目的地</translation>
 <translation id="8554010658308662631">加载更多</translation>
 <translation id="8554181323880688938">奢侈品</translation>
-<translation id="8554802735558319842">为了提高共用设备的安全性，请开启此设置让系统在您每次使用自动填充功能付款时都进行验证。</translation>
+<translation id="8554802735558319842">为了提高共享设备的安全性，请开启此设置让系统在您每次使用自动填充功能付款时都进行验证。</translation>
 <translation id="8554912124839363479">{NUM_PERMISSIONS,plural, =1{重置这项权限}other{重置这些权限}}</translation>
 <translation id="8555010941760982128">结账时请使用此促销代码</translation>
 <translation id="8556297087315686325">网络监控与管理</translation>
diff --git a/chromium/components/strings/components_strings_zh-TW.xtb b/chromium/components/strings/components_strings_zh-TW.xtb
index b219c2ac46e..a0fd00a5676 100644
--- a/chromium/components/strings/components_strings_zh-TW.xtb
+++ b/chromium/components/strings/components_strings_zh-TW.xtb
@@ -195,7 +195,7 @@
 <translation id="1357195169723583938">最近使用過裝置的使用者及其使用時間</translation>
 <translation id="1358187717814494928">建立試算表</translation>
 <translation id="1359836962251219822">餐廚用具</translation>
-<translation id="1360955481084547712">開啟新的無痕式視窗以進行私密瀏覽</translation>
+<translation id="1360955481084547712">開啟新的無痕視窗以進行私密瀏覽</translation>
 <translation id="1363819917331173092">不要詢問是否要翻譯<ph name="SOURCE_LANGUAGE" />的網頁</translation>
 <translation id="1364822246244961190">這項政策遭到封鎖，系統會忽略其設定值。</translation>
 <translation id="1368318639262510626">在這款恐龍遊戲中，你要協助在荒野中奔馳的像素風恐龍閃避仙人掌和翼手龍。聽見提示音效時，按下空白鍵即可躍過障礙物。</translation>
@@ -651,7 +651,7 @@
 <translation id="2292556288342944218">您的網際網路存取權遭到封鎖</translation>
 <translation id="2293443924986248631">開啟這項功能後，網站無法使用 Cookie 來追蹤你在網路上的活動。某些網站的功能可能無法正常運作。</translation>
 <translation id="2300306941146563769">未上傳</translation>
-<translation id="230286397113210245">「開啟無痕式視窗」按鈕，啟動後即可開啟新的無痕式視窗進行私密瀏覽</translation>
+<translation id="230286397113210245">「開啟無痕視窗」按鈕，啟動後即可開啟新的無痕視窗進行私密瀏覽</translation>
 <translation id="2312234273148520048">調味品和醬料</translation>
 <translation id="2316159751672436664">在 Chrome OS 設定中依個人需求調整無障礙工具</translation>
 <translation id="2316887270356262533">釋出不到 1 MB。下次造訪部分網站時，載入速度可能會變慢。</translation>
@@ -934,7 +934,7 @@
 <translation id="2948083400971632585">你可以在設定頁面停用任何為連線設置的 Proxy。</translation>
 <translation id="2949183777371959169">裝置並未透過 Chrome 瀏覽器雲端管理服務註冊，因此系統已忽略這項政策。</translation>
 <translation id="2951588413176968965">我的出紙槽</translation>
-<translation id="2952820037279740115">關閉所有無痕式視窗</translation>
+<translation id="2952820037279740115">關閉所有無痕視窗</translation>
 <translation id="2952904171810469095">A2 x 5</translation>
 <translation id="2954624054936281172">「已儲存的付款方式」表格</translation>
 <translation id="295526156371527179">警告：這項政策並非字典，因此未依照政策中指定的方式合併為字典。</translation>
@@ -1068,7 +1068,7 @@
 <translation id="3229277193950731405">複製版本字串</translation>
 <translation id="323107829343500871">輸入 <ph name="CREDIT_CARD" /> 的信用卡驗證碼</translation>
 <translation id="3234666976984236645">一律偵測這個網站的重要內容</translation>
-<translation id="3238395604961564389">在無痕式視窗中開啟連結</translation>
+<translation id="3238395604961564389">在無痕視窗中開啟連結</translation>
 <translation id="3240683217920639535"><ph name="MANAGE_CHROME_THEMES_FOCUSED_FRIENDLY_MATCH_TEXT" />；按下 Tab 鍵再按下 Enter 鍵即可自訂瀏覽器外觀</translation>
 <translation id="3240791268468473923">無相符安全付款憑證表已開啟</translation>
 <translation id="324180406144491771">「<ph name="HOST_NAME" />」連結已遭到封鎖</translation>
@@ -1182,7 +1182,7 @@
 <translation id="3465972433695735758">這份 PDF 無法存取。系統已運用 Google AI 技術擷取文字</translation>
 <translation id="346601286295919445">化學</translation>
 <translation id="3468054117417088249"><ph name="TAB_SWITCH_SUFFIX" />，目前已開啟，依序按下 Tab 鍵和 Enter 鍵即可切換至開啟的分頁</translation>
-<translation id="3470563864795286535"><ph name="CLOSE_INCOGNITO_WINDOWS_FOCUSED_FRIENDLY_MATCH_TEXT" />；按下 Tab 鍵再按下 Enter 鍵即可關閉目前開啟的所有無痕式視窗</translation>
+<translation id="3470563864795286535"><ph name="CLOSE_INCOGNITO_WINDOWS_FOCUSED_FRIENDLY_MATCH_TEXT" />；按下 Tab 鍵再按下 Enter 鍵即可關閉目前開啟的所有無痕視窗</translation>
 <translation id="3474392552865647225">「自訂 Chrome 中的字型」按鈕，啟動後即可自訂 Chrome 中的字型大小和字體</translation>
 <translation id="3477679029130949506">電影場次與放映時間</translation>
 <translation id="3478033058537426179">依群組分類</translation>
@@ -1289,7 +1289,7 @@
 <translation id="3676592649209844519">裝置 ID：</translation>
 <translation id="3677008721441257057">你是否要前往 &lt;a href="#" id="dont-proceed-link"&gt;<ph name="DOMAIN" />&lt;/a&gt;？</translation>
 <translation id="3678029195006412963">無法簽署要求</translation>
-<translation id="3678529606614285348">在新的無痕式視窗中開啟網頁 (Ctrl + Shift + N 鍵)</translation>
+<translation id="3678529606614285348">在新的無痕視窗中開啟網頁 (Ctrl + Shift + N 鍵)</translation>
 <translation id="3678914302246317895">輸入 <ph name="OTP_LENGTH" /> 位數驗證碼</translation>
 <translation id="3681007416295224113">憑證資訊</translation>
 <translation id="3681421644246505351">Chrome 會根據你近期的瀏覽記錄，記下你感興趣的主題。</translation>
@@ -1508,7 +1508,7 @@
 <translation id="4150099059797363385">Envelope Chinese #4</translation>
 <translation id="4151403195736952345">使用全域預設設定 (偵測)</translation>
 <translation id="4152318981910038897">{COUNT,plural, =1{第 1 頁}other{第 {COUNT} 頁}}</translation>
-<translation id="4154277373259957087">Chrome 會先驗證你的身分，再填入付款方式。你隨時可以前往 <ph name="IDS_AUTOFILL_MANDATORY_REAUTH_CONFIRMATION_SETTINGS_LINK" /> 更新這項設定。</translation>
+<translation id="4154277373259957087">Chrome 會先驗證你的身分，再填入付款方式。你隨時可以前往<ph name="IDS_AUTOFILL_MANDATORY_REAUTH_CONFIRMATION_SETTINGS_LINK" />更新相關資料。</translation>
 <translation id="4159149286839604525">這表示大多數網站功能應該都能正常運作，但保護程度較低</translation>
 <translation id="4159784952369912983">紫色</translation>
 <translation id="4165986682804962316">網站設定</translation>
@@ -1548,7 +1548,7 @@
     &lt;li&gt;在隨即開啟的登入頁面登入後，即可使用網際網路。&lt;/li&gt;
     &lt;/ol&gt;
     &lt;h4&gt;步驟 2：以無痕模式開啟網頁 (僅適用於電腦)&lt;/h4&gt;
-    &lt;p&gt;使用無痕式視窗開啟您曾造訪的網頁。&lt;/p&gt;
+    &lt;p&gt;使用無痕視窗開啟您曾造訪的網頁。&lt;/p&gt;
     &lt;p&gt;如果網頁可以順利開啟，表示有 Chrome 擴充功能並未正常運作。如要修正這項錯誤，請關閉該擴充功能。&lt;/p&gt;
     &lt;h4&gt;步驟 3：更新您的作業系統&lt;/h4&gt;
     &lt;p&gt;確認您的裝置已更新至最新版本的作業系統。&lt;/p&gt;
@@ -1772,7 +1772,7 @@
 <translation id="4682496302933121474">要翻譯網頁嗎？</translation>
 <translation id="468314109939257734">查看虛擬卡號</translation>
 <translation id="4687718960473379118">網站建議廣告</translation>
-<translation id="469028408546145398">「關閉無痕式視窗」按鈕，啟動後即可關閉目前開啟的所有無痕式視窗</translation>
+<translation id="469028408546145398">「關閉無痕視窗」按鈕，啟動後即可關閉目前開啟的所有無痕視窗</translation>
 <translation id="4691093235373904540">屋頂施工</translation>
 <translation id="4692623383562244444">搜尋引擎</translation>
 <translation id="4698692901173737941">搏擊運動</translation>
@@ -1868,7 +1868,7 @@
 <translation id="4877047577339061095">居家儲藏與陳列架</translation>
 <translation id="4877083676943085827">{COUNT,plural, =0{無}=1{<ph name="EXAMPLE_DOMAIN_1" />}=2{<ph name="EXAMPLE_DOMAIN_1" />、<ph name="EXAMPLE_DOMAIN_2" />}other{<ph name="EXAMPLE_DOMAIN_1" />、<ph name="EXAMPLE_DOMAIN_2" /> <ph name="AND_MORE" />}}</translation>
 <translation id="4877422487531841831">搜尋「<ph name="TEXT" />」</translation>
-<translation id="4877521229462766300">要允許內嵌的內容嗎？</translation>
+<translation id="4877521229462766300">要允許嵌入的內容嗎？</translation>
 <translation id="4879491255372875719">自動 (預設)</translation>
 <translation id="4880827082731008257">搜尋記錄</translation>
 <translation id="4881695831933465202">開啟</translation>
@@ -2009,7 +2009,7 @@
 <translation id="5153314898060540200">硬式搖滾與前衛音樂</translation>
 <translation id="5157504274688344097">量販店與百貨公司</translation>
 <translation id="5158275234811857234">封面</translation>
-<translation id="5159010409087891077">在新的無痕式視窗中開啟網頁 (⇧ + ⌘ + N 鍵)</translation>
+<translation id="5159010409087891077">在新的無痕視窗中開啟網頁 (⇧ + ⌘ + N 鍵)</translation>
 <translation id="5161334686036120870">標題：</translation>
 <translation id="5161506081086828129">堆疊出紙器 9</translation>
 <translation id="5164798890604758545">已輸入文字</translation>
@@ -2968,7 +2968,7 @@
 <translation id="7175401108899573750">{SHIPPING_OPTIONS,plural, =0{<ph name="SHIPPING_OPTION_PREVIEW" />}=1{<ph name="SHIPPING_OPTION_PREVIEW" />和另外 <ph name="NUMBER_OF_ADDITIONAL_SHIPPING_OPTIONS" /> 種選項}other{<ph name="SHIPPING_OPTION_PREVIEW" />和另外 <ph name="NUMBER_OF_ADDITIONAL_SHIPPING_OPTIONS" /> 種選項}}</translation>
 <translation id="7179323680825933600">儲存及填入付款方式</translation>
 <translation id="7180611975245234373">重新整理</translation>
-<translation id="7181261019481237103">開啟無痕式視窗</translation>
+<translation id="7181261019481237103">開啟無痕視窗</translation>
 <translation id="7182878459783632708">沒有設定任何政策</translation>
 <translation id="7184379626380324540">家居佈置</translation>
 <translation id="7186367841673660872">此網頁內容已由<ph name="ORIGINAL_LANGUAGE" />翻譯成<ph name="LANGUAGE_LANGUAGE" /></translation>
@@ -3363,7 +3363,7 @@
 <translation id="7952192831285741665">歐洲 EDP</translation>
 <translation id="7952327717479677595">「管理搜尋引擎」按鈕，啟動後即可管理預設搜尋引擎和站內搜尋</translation>
 <translation id="7953569069500808819">邊緣裝訂 (右側)</translation>
-<translation id="7955105108888461311">要求存取權</translation>
+<translation id="7955105108888461311">親自詢問</translation>
 <translation id="7956713633345437162">行動版書籤</translation>
 <translation id="7961015016161918242">一律不要</translation>
 <translation id="7962467575542381659">平台機器</translation>
@@ -3740,7 +3740,7 @@
 <translation id="8733764070897080460">你可以封鎖不想與網站分享的主題，Chrome 也會自動刪除 4 週以前的主題。瞭解詳情</translation>
 <translation id="8734529307927223492">你的 <ph name="DEVICE_TYPE" /> 是由 <ph name="MANAGER" /> 管理</translation>
 <translation id="8736059027199600831">30 x 40 吋</translation>
-<translation id="8737134861345396036"><ph name="LAUNCH_INCOGNITO_FOCUSED_FRIENDLY_MATCH_TEXT" />，按下 Tab 鍵再按下 Enter 鍵即可開啟新的無痕式視窗進行私密瀏覽</translation>
+<translation id="8737134861345396036"><ph name="LAUNCH_INCOGNITO_FOCUSED_FRIENDLY_MATCH_TEXT" />，按下 Tab 鍵再按下 Enter 鍵即可開啟新的無痕視窗進行私密瀏覽</translation>
 <translation id="8737685506611670901">開啟<ph name="PROTOCOL" />連結 (取代 <ph name="REPLACED_HANDLER_TITLE" />)</translation>
 <translation id="8738058698779197622">你必須正確設定時鐘，才能建立安全連線。這是因為網站驗證身分時所使用的憑證僅於特定一段時間內有效。由於你裝置的時鐘不正確，因此 Chromium 無法驗證這些憑證。</translation>
 <translation id="8740359287975076522">找不到 <ph name="HOST_NAME" /> 的 &lt;abbr id="dnsDefinition"&gt;DNS 位址&lt;/abbr&gt;，正在診斷問題。</translation>
@@ -3757,7 +3757,7 @@
 <translation id="87601671197631245">這個網站的安全性設定過舊，因此你傳送給這個網站的的資訊 (例如密碼、訊息或信用卡資訊) 可能會外洩。</translation>
 <translation id="8761567432415473239">Google 安全瀏覽最近在「<ph name="SITE" />」<ph name="BEGIN_LINK" />發現了有害程式<ph name="END_LINK" />。</translation>
 <translation id="8763927697961133303">USB 裝置</translation>
-<translation id="8763986294015493060">關閉目前開啟的所有無痕式視窗</translation>
+<translation id="8763986294015493060">關閉目前開啟的所有無痕視窗</translation>
 <translation id="8766943070169463815">已開啟安全付款憑證驗證表</translation>
 <translation id="8767765348545497220">關閉說明泡泡</translation>
 <translation id="8768225988514678921">「建立簡報」按鈕，啟動後即可在 Google 簡報中快速建立新簡報</translation>
diff --git a/chromium/content/browser/browser_interface_binders.cc b/chromium/content/browser/browser_interface_binders.cc
index a0c3fd36afb..b2efe3c9568 100644
--- a/chromium/content/browser/browser_interface_binders.cc
+++ b/chromium/content/browser/browser_interface_binders.cc
@@ -353,7 +353,8 @@ void BindDateTimeChooserForFrame(
 void BindTextSuggestionHostForFrame(
     RenderFrameHost* host,
     mojo::PendingReceiver<blink::mojom::TextSuggestionHost> receiver) {
-  auto* view = static_cast<RenderWidgetHostViewAndroid*>(host->GetView());
+  auto* view =
+      RenderWidgetHostViewAndroid::FromRenderWidgetHostView(host->GetView());
   if (!view || !view->text_suggestion_host())
     return;
 
diff --git a/chromium/content/browser/loader/file_url_loader_factory_browsertest.cc b/chromium/content/browser/loader/file_url_loader_factory_browsertest.cc
index 292d6741d63..53b167f1e97 100644
--- a/chromium/content/browser/loader/file_url_loader_factory_browsertest.cc
+++ b/chromium/content/browser/loader/file_url_loader_factory_browsertest.cc
@@ -44,6 +44,10 @@
 #include "net/test/gtest_util.h"
 #include "url/gurl.h"
 
+#if BUILDFLAG(IS_ANDROID)
+#include "base/android/build_info.h"
+#endif
+
 namespace content {
 namespace {
 
@@ -521,6 +525,14 @@ IN_PROC_BROWSER_TEST_F(FileURLLoaderFactoryDisabledSecurityBrowserTest,
 }
 
 IN_PROC_BROWSER_TEST_F(FileURLLoaderFactoryBrowserTest, LastModified) {
+#if BUILDFLAG(IS_ANDROID)
+  // This test doesn't work properly on Nougat; crbug.com/1502619
+  if (base::android::BuildInfo::GetInstance()->sdk_int() <=
+      base::android::SDK_VERSION_NOUGAT) {
+    GTEST_SKIP();
+  }
+#endif
+
   // Create a temporary file with an arbitrary last-modified timestamp.
   const char kLastModified[] = "1994-11-15T12:45:26.000Z";
   base::FilePath path;
diff --git a/chromium/content/browser/loader/navigation_url_loader_impl.cc b/chromium/content/browser/loader/navigation_url_loader_impl.cc
index 3b58e4f2de2..a7aefbd5e7d 100644
--- a/chromium/content/browser/loader/navigation_url_loader_impl.cc
+++ b/chromium/content/browser/loader/navigation_url_loader_impl.cc
@@ -691,10 +691,10 @@ void NavigationURLLoaderImpl::MaybeStartLoader(
     next_interceptor->MaybeCreateLoader(
         *resource_request_, browser_context_,
         base::BindOnce(&NavigationURLLoaderImpl::MaybeStartLoader,
-                       base::Unretained(this), next_interceptor),
+                       weak_factory_.GetWeakPtr(), next_interceptor),
         base::BindOnce(
             &NavigationURLLoaderImpl::FallbackToNonInterceptedRequest,
-            base::Unretained(this)));
+            weak_factory_.GetWeakPtr()));
     return;
   }
 
diff --git a/chromium/content/browser/renderer_host/render_widget_host_view_android.cc b/chromium/content/browser/renderer_host/render_widget_host_view_android.cc
index b982f292787..734b9217193 100644
--- a/chromium/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/chromium/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -217,6 +217,17 @@ bool IsFullscreenSurfaceSyncSupported() {
 
 }  // namespace
 
+// static
+RenderWidgetHostViewAndroid*
+RenderWidgetHostViewAndroid::FromRenderWidgetHostView(
+    RenderWidgetHostView* view) {
+  if (!view || static_cast<RenderWidgetHostViewBase*>(view)
+                   ->IsRenderWidgetHostViewChildFrame()) {
+    return nullptr;
+  }
+  return static_cast<RenderWidgetHostViewAndroid*>(view);
+}
+
 RenderWidgetHostViewAndroid::ScreenStateChangeHandler::ScreenStateChangeHandler(
     RenderWidgetHostViewAndroid* rwhva)
     : rwhva_(rwhva) {}
diff --git a/chromium/content/browser/renderer_host/render_widget_host_view_android.h b/chromium/content/browser/renderer_host/render_widget_host_view_android.h
index ef1a016716c..590b0d035b3 100644
--- a/chromium/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/chromium/content/browser/renderer_host/render_widget_host_view_android.h
@@ -86,6 +86,9 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
       public ui::ViewAndroidObserver,
       public ui::WindowAndroidObserver {
  public:
+  static RenderWidgetHostViewAndroid* FromRenderWidgetHostView(
+      RenderWidgetHostView* view);
+
   RenderWidgetHostViewAndroid(RenderWidgetHostImpl* widget,
                               gfx::NativeView parent_native_view);
 
diff --git a/chromium/extensions/strings/extensions_strings_kn.xtb b/chromium/extensions/strings/extensions_strings_kn.xtb
index e1b58a84bdf..3a845068e65 100644
--- a/chromium/extensions/strings/extensions_strings_kn.xtb
+++ b/chromium/extensions/strings/extensions_strings_kn.xtb
@@ -12,20 +12,20 @@
 <translation id="2159915644201199628">ಚಿತ್ರವನ್ನು ಡಿಕೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ: '<ph name="IMAGE_NAME" />'</translation>
 <translation id="2350172092385603347">ಲೋಕಲೈಜೇಷನ್ ಬಳಸಲಾಗಿದೆ, ಆದರೆ ಡಿಫಾಲ್ಟ್ _ಲೋಕಲ್ ಅನ್ನು ಮ್ಯಾನಿಫಾಸ್ಟ್‌ನಲ್ಲಿ ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ.</translation>
 <translation id="2576842806987913196">ಪ್ರಸ್ತುತ ಈ ಹೆಸರಿನೊಂದಿಗೆ ಈಗಾಗಲೇ CRX ಫೈಲ್ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ.</translation>
-<translation id="2785530881066938471">'<ph name="RELATIVE_PATH" />' ಫೈಲ್ ಅನ್ನು ವಿಷಯ ಸ್ಕ್ರಿಪ್ಟ್‌ಗಾಗಿ ಲೋಡ್ ಮಾಡಲು ಆಗುವುದಿಲ್ಲ. ಇದು UTF-8 ಎನ್‌ಕೋಡ್ ಆಗಿಲ್ಲ.</translation>
+<translation id="2785530881066938471">'<ph name="RELATIVE_PATH" />' ಫೈಲ್ ಅನ್ನು ಕಂಟೆಂಟ್‍ ಸ್ಕ್ರಿಪ್ಟ್‌ಗಾಗಿ ಲೋಡ್ ಮಾಡಲು ಆಗುವುದಿಲ್ಲ. ಇದು UTF-8 ಎನ್‌ಕೋಡ್ ಆಗಿಲ್ಲ.</translation>
 <translation id="2903070246402204397">ನಿರ್ವಾಹಕರಿಂದ <ph name="EXTENSION_NAME" /> (ವಿಸ್ತರಣೆ ಐಡಿ "<ph name="EXTENSION_ID" />") ಅನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ. <ph name="ADMIN_INFO" /></translation>
 <translation id="2988488679308982380">ಪ್ಯಾಕೇಜ್ ಅನ್ನು ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಲಾಗುವುದಿಲ್ಲ: '<ph name="ERROR_CODE" />'</translation>
 <translation id="3115238746683532089"><ph name="VENDOR_ID" /> ಮಾರಾಟಗಾರರಿಂದ <ph name="PRODUCT_ID" /> ಅಪರಿಚಿತ ಉತ್ಪನ್ನ (ಕ್ರಮ ಸಂಖ್ಯೆ <ph name="SERIAL_NUMBER" />)</translation>
 <translation id="3144135466825225871">crx ಫೈಲ್ ಅನ್ನು ಸ್ಥಾನಾಂತರಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ. ಫೈಲ್ ಬಳಕೆಯಲ್ಲಿದೆಯೆ ಎಂದು ಪರಿಶೀಲಿಸಿ.</translation>
 <translation id="3163201441334626963"><ph name="VENDOR_ID" /> ಮಾರಾಟಗಾರರಿಂದ <ph name="PRODUCT_ID" /> ಅಪರಿಚಿತ ಉತ್ಪನ್ನ</translation>
-<translation id="3302709122321372472">css '<ph name="RELATIVE_PATH" />' ವಿಷಯ ಸ್ಕ್ರಿಪ್ಟ್‌‌ಗಾಗಿ ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ.</translation>
+<translation id="3302709122321372472">css '<ph name="RELATIVE_PATH" />' ಕಂಟೆಂಟ್‍ ಸ್ಕ್ರಿಪ್ಟ್‌‌ಗಾಗಿ ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ.</translation>
 <translation id="3369521687965833290">ವಿಸ್ತರಣೆಯನ್ನು ಅನ್‌ಪ್ಯಾಕ್ ಮಾಡಲಾಗುವುದಿಲ್ಲ. ವಿಸ್ತರಣೆಯನ್ನು ಸುರಕ್ಷಿತವಾಗಿ ಅನ್‌ಪ್ಯಾಕ್ ಮಾಡಲು, ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಡೈರೆಕ್ಟರಿಯಲ್ಲಿ ಪಾಥ್ ಇದ್ದು ಅದು ಡ್ರೈವ್ ಅಕ್ಷರದೊಂದಿಗೆ ಪ್ರಾರಂಭವಾಗುತ್ತದೆ ಮತ್ತು ಜಂಕ್ಷನ್, ಮೌಂಟ್ ಪಾಯಿಂಟ್ ಅಥವಾ ಸಿಮ್‌ಲಿಂಕ್ ಅನ್ನು ಹೊಂದಿರುವುದಿಲ್ಲ. ನಿಮ್ಮ ಪ್ರೊಫೈಲ್‌ನಲ್ಲಿ ಯಾವುದೇ ಪಾಥ್ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವುದಿಲ್ಲ.</translation>
 <translation id="3393440416772303020"><ph name="PRODUCT_NAME" /> (ಕ್ರಮ ಸಂಖ್ಯೆ <ph name="SERIAL_NUMBER" />)</translation>
 <translation id="3466070586188012397"><ph name="VENDOR_ID" /> ಮಾರಾಟಗಾರರಿಂದ <ph name="PRODUCT_NAME" /> (ಕ್ರಮ ಸಂಖ್ಯೆ <ph name="SERIAL_NUMBER" />)</translation>
 <translation id="3561217442734750519">ಖಾಸಗಿ ಕೀಲಿಗಾಗಿ ಇನ್‌ಪುಟ್ ಮೌಲ್ಯವು ಮಾನ್ಯವಾದ ಹಾದಿಯಾಗಿರಬೇಕು.</translation>
 <translation id="388442998277590542">ಆಯ್ಕೆಗಳ ಪುಟ '<ph name="OPTIONS_PAGE" />' ವನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುವುದಿಲ್ಲ.</translation>
 <translation id="3984413272403535372">ವಿಸ್ತರಣೆಗೆ ಸೈನ್ ಇನ್ ಮಾಡುವಾಗ ದೋಷ.</translation>
-<translation id="39964277676607559">javascript '<ph name="RELATIVE_PATH" />' ಅನ್ನು ವಿಷಯ ಸ್ಕ್ರಿಪ್ಟ್‌ಗಾಗಿ ಲೋಡ್ ಮಾಡಲಾಗುವುದಿಲ್ಲ.</translation>
+<translation id="39964277676607559">javascript '<ph name="RELATIVE_PATH" />' ಅನ್ನು ಕಂಟೆಂಟ್‍ ಸ್ಕ್ರಿಪ್ಟ್‌ಗಾಗಿ ಲೋಡ್ ಮಾಡಲಾಗುವುದಿಲ್ಲ.</translation>
 <translation id="4115165561519362854">ಈ ಮೆಷಿನ್‌ನ ನಿರ್ವಾಹಕರಿಗೆ <ph name="EXTENSION_VERSION" /> ನ ಕನಿಷ್ಠ ಆವೃತಿಯನ್ನು <ph name="EXTENSION_NAME" /> ಹೊಂದಬೇಕಾದ ಅಗತ್ಯವಿದೆ. ಅದು ಹೊಸ ಆವೃತ್ತಿಗೆ (ಅಥವಾ ಹೆಚ್ಚಿನ) ನವೀಕರಣಗೊಳ್ಳುವವರೆಗೂ ಇದನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ.</translation>
 <translation id="4233778200880751280">'<ph name="ABOUT_PAGE" />' ಪುಟದ ಕುರಿತು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ.</translation>
 <translation id="471800408830181311">ಖಾಸಗಿ ಕೀಲಿಯನ್ನು ಔಟ್‌ಪುಟ್ ಮಾಡಲು ವಿಫಲವಾಗಿದೆ.</translation>
diff --git a/chromium/gpu/config/gpu_lists_version.h b/chromium/gpu/config/gpu_lists_version.h
index 5d4ca879c89..a73710fe727 100644
--- a/chromium/gpu/config/gpu_lists_version.h
+++ b/chromium/gpu/config/gpu_lists_version.h
@@ -3,6 +3,6 @@
 #ifndef GPU_CONFIG_GPU_LISTS_VERSION_H_
 #define GPU_CONFIG_GPU_LISTS_VERSION_H_
 
-#define GPU_LISTS_VERSION "9adabcda10ae153d258101bf5c4d4188a5c1aea3"
+#define GPU_LISTS_VERSION "9ad2fa676cb2a404642791e0e4818170cb4adbd8"
 
 #endif  // GPU_CONFIG_GPU_LISTS_VERSION_H_
diff --git a/chromium/infra/config/generated/builders/ci/Android FYI Release (Pixel 6)/properties.json b/chromium/infra/config/generated/builders/ci/Android FYI Release (Pixel 6)/properties.json
deleted file mode 100644
index 3a73bd8ee7c..00000000000
--- a/chromium/infra/config/generated/builders/ci/Android FYI Release (Pixel 6)/properties.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android FYI Release (Pixel 6)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.gpu.fyi",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "config": "arm64_builder_rel_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "config": "android",
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "GPU FYI Android arm64 Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "GPU FYI Android arm64 Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.gpu.fyi",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "arm64_builder_rel_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "config": "android",
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Android FYI Release (Pixel 6)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "gpu-fyi-cq-android-arm64",
-          "group": "tryserver.chromium.android"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.gpu.fyi",
-  "perf_dashboard_machine_group": "ChromiumGPUFYI",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Android Release (Nexus 5X)/properties.json b/chromium/infra/config/generated/builders/ci/Android Release (Nexus 5X)/properties.json
deleted file mode 100644
index 2a7459d0db2..00000000000
--- a/chromium/infra/config/generated/builders/ci/Android Release (Nexus 5X)/properties.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android Release (Nexus 5X)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks",
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Android Release (Nexus 5X)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "android-arm64-rel",
-          "group": "tryserver.chromium.android"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.gpu",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Android Release (Nexus 5X)/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Android Release (Nexus 5X)/shadow-properties.json
deleted file mode 100644
index 999510c8817..00000000000
--- a/chromium/infra/config/generated/builders/ci/Android Release (Nexus 5X)/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Android WebView N (dbg)/properties.json b/chromium/infra/config/generated/builders/ci/Android WebView N (dbg)/properties.json
deleted file mode 100644
index 71d2c360d97..00000000000
--- a/chromium/infra/config/generated/builders/ci/Android WebView N (dbg)/properties.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android WebView N (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "apply_configs": [
-                  "remove_all_system_webviews"
-                ],
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Android arm64 Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android arm64 Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Android WebView N (dbg)",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Android WebView O (dbg)/properties.json b/chromium/infra/config/generated/builders/ci/Android WebView O (dbg)/properties.json
deleted file mode 100644
index 9a2f66922e6..00000000000
--- a/chromium/infra/config/generated/builders/ci/Android WebView O (dbg)/properties.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android WebView O (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "apply_configs": [
-                  "remove_all_system_webviews"
-                ],
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Android arm64 Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android arm64 Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Android WebView O (dbg)",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Android WebView P (dbg)/properties.json b/chromium/infra/config/generated/builders/ci/Android WebView P (dbg)/properties.json
deleted file mode 100644
index 4abfee366bf..00000000000
--- a/chromium/infra/config/generated/builders/ci/Android WebView P (dbg)/properties.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android WebView P (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "apply_configs": [
-                  "remove_all_system_webviews"
-                ],
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Android arm64 Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android arm64 Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Android WebView P (dbg)",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Android arm Builder (dbg)/properties.json b/chromium/infra/config/generated/builders/ci/Android arm Builder (dbg)/properties.json
deleted file mode 100644
index 263354f86f1..00000000000
--- a/chromium/infra/config/generated/builders/ci/Android arm Builder (dbg)/properties.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android arm Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 32,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Android arm Builder (dbg)",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Android arm Builder (dbg)/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Android arm Builder (dbg)/shadow-properties.json
deleted file mode 100644
index 999510c8817..00000000000
--- a/chromium/infra/config/generated/builders/ci/Android arm Builder (dbg)/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Android arm64 Builder (dbg)/properties.json b/chromium/infra/config/generated/builders/ci/Android arm64 Builder (dbg)/properties.json
deleted file mode 100644
index 0906d201291..00000000000
--- a/chromium/infra/config/generated/builders/ci/Android arm64 Builder (dbg)/properties.json
+++ /dev/null
@@ -1,330 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android WebView N (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "apply_configs": [
-                  "remove_all_system_webviews"
-                ],
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Android arm64 Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android WebView O (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "apply_configs": [
-                  "remove_all_system_webviews"
-                ],
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Android arm64 Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android WebView P (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "apply_configs": [
-                  "remove_all_system_webviews"
-                ],
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Android arm64 Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android arm64 Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Nougat Phone Tester",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Android arm64 Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Oreo Phone Tester",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Android arm64 Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-pie-arm64-dbg",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Android arm64 Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Android arm64 Builder (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Android WebView N (dbg)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Android WebView O (dbg)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Android WebView P (dbg)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Nougat Phone Tester",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Oreo Phone Tester",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "android-pie-arm64-dbg",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "android-oreo-arm64-dbg",
-          "group": "tryserver.chromium.android"
-        },
-        {
-          "builder": "android-pie-arm64-dbg",
-          "group": "tryserver.chromium.android"
-        },
-        {
-          "builder": "try-nougat-phone-tester",
-          "group": "tryserver.chromium.android"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Android arm64 Builder (dbg)/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Android arm64 Builder (dbg)/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/Android arm64 Builder (dbg)/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Android arm64 Builder All Targets (dbg)/properties.json b/chromium/infra/config/generated/builders/ci/Android arm64 Builder All Targets (dbg)/properties.json
deleted file mode 100644
index 6ed0bd5ca1c..00000000000
--- a/chromium/infra/config/generated/builders/ci/Android arm64 Builder All Targets (dbg)/properties.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android arm64 Builder All Targets (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Android arm64 Builder All Targets (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "android_compile_dbg",
-          "group": "tryserver.chromium.android"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Android arm64 Builder All Targets (dbg)/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Android arm64 Builder All Targets (dbg)/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/Android arm64 Builder All Targets (dbg)/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Android x64 Builder (dbg)/properties.json b/chromium/infra/config/generated/builders/ci/Android x64 Builder (dbg)/properties.json
deleted file mode 100644
index 742c97af9dd..00000000000
--- a/chromium/infra/config/generated/builders/ci/Android x64 Builder (dbg)/properties.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android x64 Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "x64_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Android x64 Builder (dbg)",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Android x64 Builder (dbg)/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Android x64 Builder (dbg)/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/Android x64 Builder (dbg)/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Android x64 Builder All Targets (dbg)/properties.json b/chromium/infra/config/generated/builders/ci/Android x64 Builder All Targets (dbg)/properties.json
deleted file mode 100644
index fa86279e0f2..00000000000
--- a/chromium/infra/config/generated/builders/ci/Android x64 Builder All Targets (dbg)/properties.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android x64 Builder All Targets (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "x64_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Android x64 Builder All Targets (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "android_compile_x64_dbg",
-          "group": "tryserver.chromium.android"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Android x64 Builder All Targets (dbg)/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Android x64 Builder All Targets (dbg)/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/Android x64 Builder All Targets (dbg)/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Android x86 Builder (dbg)/properties.json b/chromium/infra/config/generated/builders/ci/Android x86 Builder (dbg)/properties.json
deleted file mode 100644
index 8cf986bf69d..00000000000
--- a/chromium/infra/config/generated/builders/ci/Android x86 Builder (dbg)/properties.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android x86 Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "x86_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 32,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Android x86 Builder (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "android_compile_x86_dbg",
-          "group": "tryserver.chromium.android"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Android x86 Builder (dbg)/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Android x86 Builder (dbg)/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/Android x86 Builder (dbg)/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Cast Android (dbg)/properties.json b/chromium/infra/config/generated/builders/ci/Cast Android (dbg)/properties.json
deleted file mode 100644
index e3f33ffaf69..00000000000
--- a/chromium/infra/config/generated/builders/ci/Cast Android (dbg)/properties.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Cast Android (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "cast_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 32,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Cast Android (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "android-x64-cast",
-          "group": "tryserver.chromium.android"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Cast Android (dbg)/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Cast Android (dbg)/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/Cast Android (dbg)/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Cast Linux Debug/properties.json b/chromium/infra/config/generated/builders/ci/Cast Linux Debug/properties.json
deleted file mode 100644
index e0102bf9c54..00000000000
--- a/chromium/infra/config/generated/builders/ci/Cast Linux Debug/properties.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Cast Linux Debug",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "chromium_clang",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Cast Linux Debug",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "linux-x64-castos-dbg",
-          "group": "tryserver.chromium.linux"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.linux",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Cast Linux Debug/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Cast Linux Debug/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/Cast Linux Debug/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Cast Linux/properties.json b/chromium/infra/config/generated/builders/ci/Cast Linux/properties.json
deleted file mode 100644
index 8babf97a221..00000000000
--- a/chromium/infra/config/generated/builders/ci/Cast Linux/properties.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Cast Linux",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_clang",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Cast Linux",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "linux-x64-castos",
-          "group": "tryserver.chromium.linux"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.linux",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Cast Linux/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Cast Linux/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/Cast Linux/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Builder/properties.json b/chromium/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Builder/properties.json
deleted file mode 100644
index 780bf536ce8..00000000000
--- a/chromium/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Builder/properties.json
+++ /dev/null
@@ -1,138 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Linux x64 DEPS Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "linux"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Linux x64 DEPS Release (Intel UHD 630)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "linux"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Linux x64 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Linux x64 DEPS Release (NVIDIA)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "linux"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Linux x64 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Linux x64 DEPS Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Linux x64 DEPS Release (Intel UHD 630)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Dawn Linux x64 DEPS Release (NVIDIA)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "dawn-linux-x64-deps-rel",
-          "group": "tryserver.chromium.dawn"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.dawn",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Builder/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Builder/shadow-properties.json
deleted file mode 100644
index 999510c8817..00000000000
--- a/chromium/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Builder/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release (Intel UHD 630)/properties.json b/chromium/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release (Intel UHD 630)/properties.json
deleted file mode 100644
index adf3cccd421..00000000000
--- a/chromium/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release (Intel UHD 630)/properties.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Linux x64 DEPS Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "linux"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Linux x64 DEPS Release (Intel UHD 630)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "linux"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Linux x64 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Linux x64 DEPS Release (Intel UHD 630)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "dawn-linux-x64-deps-rel",
-          "group": "tryserver.chromium.dawn"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.dawn",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release (NVIDIA)/properties.json b/chromium/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release (NVIDIA)/properties.json
deleted file mode 100644
index 5c7b471a3b1..00000000000
--- a/chromium/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release (NVIDIA)/properties.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Linux x64 DEPS Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "linux"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Linux x64 DEPS Release (NVIDIA)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "linux"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Linux x64 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Linux x64 DEPS Release (NVIDIA)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "dawn-linux-x64-deps-rel",
-          "group": "tryserver.chromium.dawn"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.dawn",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Builder/properties.json b/chromium/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Builder/properties.json
deleted file mode 100644
index 4db4f2d4806..00000000000
--- a/chromium/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Builder/properties.json
+++ /dev/null
@@ -1,138 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Mac x64 DEPS Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Mac x64 DEPS Release (AMD)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Mac x64 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Mac x64 DEPS Release (Intel)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Mac x64 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Mac x64 DEPS Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Mac x64 DEPS Release (AMD)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Dawn Mac x64 DEPS Release (Intel)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "dawn-mac-x64-deps-rel",
-          "group": "tryserver.chromium.dawn"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.dawn",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Builder/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Builder/shadow-properties.json
deleted file mode 100644
index 999510c8817..00000000000
--- a/chromium/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Builder/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release (AMD)/properties.json b/chromium/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release (AMD)/properties.json
deleted file mode 100644
index e6fe0e75101..00000000000
--- a/chromium/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release (AMD)/properties.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Mac x64 DEPS Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Mac x64 DEPS Release (AMD)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Mac x64 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Mac x64 DEPS Release (AMD)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "dawn-mac-x64-deps-rel",
-          "group": "tryserver.chromium.dawn"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.dawn",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release (Intel)/properties.json b/chromium/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release (Intel)/properties.json
deleted file mode 100644
index 7eff5bce079..00000000000
--- a/chromium/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release (Intel)/properties.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Mac x64 DEPS Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Mac x64 DEPS Release (Intel)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Mac x64 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Mac x64 DEPS Release (Intel)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "dawn-mac-x64-deps-rel",
-          "group": "tryserver.chromium.dawn"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.dawn",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Builder/properties.json b/chromium/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Builder/properties.json
deleted file mode 100644
index e3bcdeaecf1..00000000000
--- a/chromium/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Builder/properties.json
+++ /dev/null
@@ -1,138 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x64 DEPS Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x64 DEPS Release (Intel)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Win10 x64 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x64 DEPS Release (NVIDIA)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Win10 x64 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Win10 x64 DEPS Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Win10 x64 DEPS Release (Intel)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Dawn Win10 x64 DEPS Release (NVIDIA)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "dawn-win10-x64-deps-rel",
-          "group": "tryserver.chromium.dawn"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 80,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.dawn",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Builder/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Builder/shadow-properties.json
deleted file mode 100644
index 51352a4842f..00000000000
--- a/chromium/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Builder/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 80,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release (Intel)/properties.json b/chromium/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release (Intel)/properties.json
deleted file mode 100644
index 05e387e7ed8..00000000000
--- a/chromium/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release (Intel)/properties.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x64 DEPS Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x64 DEPS Release (Intel)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Win10 x64 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Win10 x64 DEPS Release (Intel)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "dawn-win10-x64-deps-rel",
-          "group": "tryserver.chromium.dawn"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.dawn",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release (NVIDIA)/properties.json b/chromium/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release (NVIDIA)/properties.json
deleted file mode 100644
index 9f050790c26..00000000000
--- a/chromium/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release (NVIDIA)/properties.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x64 DEPS Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x64 DEPS Release (NVIDIA)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Win10 x64 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Win10 x64 DEPS Release (NVIDIA)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "dawn-win10-x64-deps-rel",
-          "group": "tryserver.chromium.dawn"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.dawn",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Builder/properties.json b/chromium/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Builder/properties.json
deleted file mode 100644
index abbc0cbd164..00000000000
--- a/chromium/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Builder/properties.json
+++ /dev/null
@@ -1,138 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x86 DEPS Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 32,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x86 DEPS Release (Intel)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 32,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Win10 x86 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x86 DEPS Release (NVIDIA)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 32,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Win10 x86 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Win10 x86 DEPS Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Win10 x86 DEPS Release (Intel)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Dawn Win10 x86 DEPS Release (NVIDIA)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "dawn-win10-x86-deps-rel",
-          "group": "tryserver.chromium.dawn"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 80,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.dawn",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Builder/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Builder/shadow-properties.json
deleted file mode 100644
index 51352a4842f..00000000000
--- a/chromium/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Builder/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 80,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release (Intel)/properties.json b/chromium/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release (Intel)/properties.json
deleted file mode 100644
index 31e1be53442..00000000000
--- a/chromium/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release (Intel)/properties.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x86 DEPS Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 32,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x86 DEPS Release (Intel)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 32,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Win10 x86 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Win10 x86 DEPS Release (Intel)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "dawn-win10-x86-deps-rel",
-          "group": "tryserver.chromium.dawn"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.dawn",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release (NVIDIA)/properties.json b/chromium/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release (NVIDIA)/properties.json
deleted file mode 100644
index c9b6df2fd9c..00000000000
--- a/chromium/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release (NVIDIA)/properties.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x86 DEPS Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 32,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x86 DEPS Release (NVIDIA)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 32,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Win10 x86 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Win10 x86 DEPS Release (NVIDIA)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "dawn-win10-x86-deps-rel",
-          "group": "tryserver.chromium.dawn"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.dawn",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/GPU FYI Android arm64 Builder/properties.json b/chromium/infra/config/generated/builders/ci/GPU FYI Android arm64 Builder/properties.json
deleted file mode 100644
index b6edb00f33a..00000000000
--- a/chromium/infra/config/generated/builders/ci/GPU FYI Android arm64 Builder/properties.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android FYI Release (Pixel 6)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.gpu.fyi",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "config": "arm64_builder_rel_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "config": "android",
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "GPU FYI Android arm64 Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "GPU FYI Android arm64 Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.gpu.fyi",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "arm64_builder_rel_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "config": "android",
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "GPU FYI Android arm64 Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Android FYI Release (Pixel 6)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "gpu-fyi-cq-android-arm64",
-          "group": "tryserver.chromium.android"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.gpu.fyi",
-  "perf_dashboard_machine_group": "ChromiumGPUFYI",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/GPU FYI Android arm64 Builder/shadow-properties.json b/chromium/infra/config/generated/builders/ci/GPU FYI Android arm64 Builder/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/GPU FYI Android arm64 Builder/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/GPU Linux Builder/properties.json b/chromium/infra/config/generated/builders/ci/GPU Linux Builder/properties.json
deleted file mode 100644
index 8e2fac32f26..00000000000
--- a/chromium/infra/config/generated/builders/ci/GPU Linux Builder/properties.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "GPU Linux Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Release (NVIDIA)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "GPU Linux Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "GPU Linux Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Release (NVIDIA)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "linux-rel",
-          "group": "tryserver.chromium.linux"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "bootstrap_env": {
-      "RBE_clang_depscan_archive": "true"
-    },
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.gpu",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/GPU Linux Builder/shadow-properties.json b/chromium/infra/config/generated/builders/ci/GPU Linux Builder/shadow-properties.json
deleted file mode 100644
index e93339fdc50..00000000000
--- a/chromium/infra/config/generated/builders/ci/GPU Linux Builder/shadow-properties.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "$build/reclient": {
-    "bootstrap_env": {
-      "RBE_clang_depscan_archive": "true"
-    },
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/GPU Mac Builder/properties.json b/chromium/infra/config/generated/builders/ci/GPU Mac Builder/properties.json
deleted file mode 100644
index 5260054e86e..00000000000
--- a/chromium/infra/config/generated/builders/ci/GPU Mac Builder/properties.json
+++ /dev/null
@@ -1,138 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "GPU Mac Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac Release (Intel)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "GPU Mac Builder",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac Retina Release (AMD)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "GPU Mac Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "GPU Mac Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Mac Release (Intel)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Mac Retina Release (AMD)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "mac-rel",
-          "group": "tryserver.chromium.mac"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.gpu",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/GPU Mac Builder/shadow-properties.json b/chromium/infra/config/generated/builders/ci/GPU Mac Builder/shadow-properties.json
deleted file mode 100644
index 999510c8817..00000000000
--- a/chromium/infra/config/generated/builders/ci/GPU Mac Builder/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/GPU Win x64 Builder/properties.json b/chromium/infra/config/generated/builders/ci/GPU Win x64 Builder/properties.json
deleted file mode 100644
index d2a4d798caf..00000000000
--- a/chromium/infra/config/generated/builders/ci/GPU Win x64 Builder/properties.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "GPU Win x64 Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Win10 x64 Release (NVIDIA)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "GPU Win x64 Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "GPU Win x64 Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Win10 x64 Release (NVIDIA)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "win-rel",
-          "group": "tryserver.chromium.win"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 80,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.gpu",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/GPU Win x64 Builder/shadow-properties.json b/chromium/infra/config/generated/builders/ci/GPU Win x64 Builder/shadow-properties.json
deleted file mode 100644
index 51352a4842f..00000000000
--- a/chromium/infra/config/generated/builders/ci/GPU Win x64 Builder/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 80,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Linux ASan LSan Builder/properties.json b/chromium/infra/config/generated/builders/ci/Linux ASan LSan Builder/properties.json
deleted file mode 100644
index b2661262e5d..00000000000
--- a/chromium/infra/config/generated/builders/ci/Linux ASan LSan Builder/properties.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux ASan LSan Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-memory-archive",
-              "builder_group": "chromium.memory",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "lsan",
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_asan",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux ASan LSan Tests (1)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-memory-archive",
-              "builder_group": "chromium.memory",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "lsan",
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_asan",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux ASan LSan Builder",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux ASan Tests (sandboxed)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-memory-archive",
-              "builder_group": "chromium.memory",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_asan",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux ASan LSan Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux ASan LSan Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Linux ASan LSan Tests (1)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Linux ASan Tests (sandboxed)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "linux_chromium_asan_rel_ng",
-          "group": "tryserver.chromium.linux"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.memory",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Linux ASan LSan Builder/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Linux ASan LSan Builder/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/Linux ASan LSan Builder/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Linux ASan LSan Tests (1)/properties.json b/chromium/infra/config/generated/builders/ci/Linux ASan LSan Tests (1)/properties.json
deleted file mode 100644
index 066e32dc29b..00000000000
--- a/chromium/infra/config/generated/builders/ci/Linux ASan LSan Tests (1)/properties.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux ASan LSan Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-memory-archive",
-              "builder_group": "chromium.memory",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "lsan",
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_asan",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux ASan LSan Tests (1)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-memory-archive",
-              "builder_group": "chromium.memory",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "lsan",
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_asan",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux ASan LSan Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux ASan LSan Tests (1)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "linux_chromium_asan_rel_ng",
-          "group": "tryserver.chromium.linux"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.memory",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Linux ASan Tests (sandboxed)/properties.json b/chromium/infra/config/generated/builders/ci/Linux ASan Tests (sandboxed)/properties.json
deleted file mode 100644
index e3bfee98461..00000000000
--- a/chromium/infra/config/generated/builders/ci/Linux ASan Tests (sandboxed)/properties.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux ASan LSan Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-memory-archive",
-              "builder_group": "chromium.memory",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "lsan",
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_asan",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux ASan Tests (sandboxed)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-memory-archive",
-              "builder_group": "chromium.memory",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_asan",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux ASan LSan Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux ASan Tests (sandboxed)",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.memory",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Linux Builder (Wayland)/properties.json b/chromium/infra/config/generated/builders/ci/Linux Builder (Wayland)/properties.json
deleted file mode 100644
index 399fcf128b0..00000000000
--- a/chromium/infra/config/generated/builders/ci/Linux Builder (Wayland)/properties.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Builder (Wayland)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Tests (Wayland)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux Builder (Wayland)",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Builder (Wayland)",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Tests (Wayland)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "linux-wayland-rel",
-          "group": "tryserver.chromium.linux"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "bootstrap_env": {
-      "RBE_clang_depscan_archive": "true"
-    },
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.linux",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Linux Builder (Wayland)/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Linux Builder (Wayland)/shadow-properties.json
deleted file mode 100644
index e93339fdc50..00000000000
--- a/chromium/infra/config/generated/builders/ci/Linux Builder (Wayland)/shadow-properties.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "$build/reclient": {
-    "bootstrap_env": {
-      "RBE_clang_depscan_archive": "true"
-    },
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Linux Builder (dbg)/properties.json b/chromium/infra/config/generated/builders/ci/Linux Builder (dbg)/properties.json
deleted file mode 100644
index 34c9cbb1c0e..00000000000
--- a/chromium/infra/config/generated/builders/ci/Linux Builder (dbg)/properties.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Tests (dbg)(1)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Builder (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Tests (dbg)(1)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "linux_chromium_compile_dbg_ng",
-          "group": "tryserver.chromium.linux"
-        },
-        {
-          "builder": "linux_chromium_dbg_ng",
-          "group": "tryserver.chromium.linux"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "bootstrap_env": {
-      "RBE_clang_depscan_archive": "true"
-    },
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.linux",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Linux Builder (dbg)/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Linux Builder (dbg)/shadow-properties.json
deleted file mode 100644
index e93339fdc50..00000000000
--- a/chromium/infra/config/generated/builders/ci/Linux Builder (dbg)/shadow-properties.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "$build/reclient": {
-    "bootstrap_env": {
-      "RBE_clang_depscan_archive": "true"
-    },
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Linux Builder/properties.json b/chromium/infra/config/generated/builders/ci/Linux Builder/properties.json
deleted file mode 100644
index 51ab03032a5..00000000000
--- a/chromium/infra/config/generated/builders/ci/Linux Builder/properties.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Tests",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "linux-rel",
-          "group": "tryserver.chromium.linux"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "bootstrap_env": {
-      "RBE_clang_depscan_archive": "true"
-    },
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.linux",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Linux Builder/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Linux Builder/shadow-properties.json
deleted file mode 100644
index 20100e56513..00000000000
--- a/chromium/infra/config/generated/builders/ci/Linux Builder/shadow-properties.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "$build/reclient": {
-    "bootstrap_env": {
-      "RBE_clang_depscan_archive": "true"
-    },
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Linux Release (NVIDIA)/properties.json b/chromium/infra/config/generated/builders/ci/Linux Release (NVIDIA)/properties.json
deleted file mode 100644
index ece04f81f98..00000000000
--- a/chromium/infra/config/generated/builders/ci/Linux Release (NVIDIA)/properties.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "GPU Linux Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Release (NVIDIA)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "GPU Linux Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Release (NVIDIA)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "linux-rel",
-          "group": "tryserver.chromium.linux"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.gpu",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Linux TSan Builder/properties.json b/chromium/infra/config/generated/builders/ci/Linux TSan Builder/properties.json
deleted file mode 100644
index 7e42c195b51..00000000000
--- a/chromium/infra/config/generated/builders/ci/Linux TSan Builder/properties.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux TSan Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-memory-archive",
-              "builder_group": "chromium.memory",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_tsan2",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux TSan Tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-memory-archive",
-              "builder_group": "chromium.memory",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_tsan2",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux TSan Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux TSan Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Linux TSan Tests",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "linux_chromium_tsan_rel_ng",
-          "group": "tryserver.chromium.linux"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.memory",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Linux TSan Builder/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Linux TSan Builder/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/Linux TSan Builder/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Linux TSan Tests/properties.json b/chromium/infra/config/generated/builders/ci/Linux TSan Tests/properties.json
deleted file mode 100644
index 47895f967d2..00000000000
--- a/chromium/infra/config/generated/builders/ci/Linux TSan Tests/properties.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux TSan Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-memory-archive",
-              "builder_group": "chromium.memory",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_tsan2",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux TSan Tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-memory-archive",
-              "builder_group": "chromium.memory",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_tsan2",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux TSan Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux TSan Tests",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "linux_chromium_tsan_rel_ng",
-          "group": "tryserver.chromium.linux"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 80,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.memory",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Linux TSan Tests/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Linux TSan Tests/shadow-properties.json
deleted file mode 100644
index 51352a4842f..00000000000
--- a/chromium/infra/config/generated/builders/ci/Linux TSan Tests/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 80,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Linux Tests (Wayland)/properties.json b/chromium/infra/config/generated/builders/ci/Linux Tests (Wayland)/properties.json
deleted file mode 100644
index 8b54516de6a..00000000000
--- a/chromium/infra/config/generated/builders/ci/Linux Tests (Wayland)/properties.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Builder (Wayland)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Tests (Wayland)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux Builder (Wayland)",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Tests (Wayland)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "linux-wayland-rel",
-          "group": "tryserver.chromium.linux"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.linux",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Linux Tests (dbg)(1)/properties.json b/chromium/infra/config/generated/builders/ci/Linux Tests (dbg)(1)/properties.json
deleted file mode 100644
index 58280623502..00000000000
--- a/chromium/infra/config/generated/builders/ci/Linux Tests (dbg)(1)/properties.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Tests (dbg)(1)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Tests (dbg)(1)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "linux_chromium_compile_dbg_ng",
-          "group": "tryserver.chromium.linux"
-        },
-        {
-          "builder": "linux_chromium_dbg_ng",
-          "group": "tryserver.chromium.linux"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.linux",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Linux Tests/properties.json b/chromium/infra/config/generated/builders/ci/Linux Tests/properties.json
deleted file mode 100644
index 86cd2234c98..00000000000
--- a/chromium/infra/config/generated/builders/ci/Linux Tests/properties.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Tests",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "linux-rel",
-          "group": "tryserver.chromium.linux"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.linux",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Mac Builder (dbg)/properties.json b/chromium/infra/config/generated/builders/ci/Mac Builder (dbg)/properties.json
deleted file mode 100644
index d25796a9c27..00000000000
--- a/chromium/infra/config/generated/builders/ci/Mac Builder (dbg)/properties.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac13 Tests (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Mac Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Mac Builder (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Mac13 Tests (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "mac_chromium_compile_dbg_ng",
-          "group": "tryserver.chromium.mac"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.mac",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Mac Builder (dbg)/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Mac Builder (dbg)/shadow-properties.json
deleted file mode 100644
index 999510c8817..00000000000
--- a/chromium/infra/config/generated/builders/ci/Mac Builder (dbg)/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Mac Builder/properties.json b/chromium/infra/config/generated/builders/ci/Mac Builder/properties.json
deleted file mode 100644
index 838813300e2..00000000000
--- a/chromium/infra/config/generated/builders/ci/Mac Builder/properties.json
+++ /dev/null
@@ -1,203 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac10.15 Tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Mac Builder",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac11 Tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.mac",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Mac Builder",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac12 Tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.mac",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Mac Builder",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac13 Tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.mac",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Mac Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Mac Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Mac10.15 Tests",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Mac11 Tests",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Mac12 Tests",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Mac13 Tests",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "mac-rel",
-          "group": "tryserver.chromium.mac"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.mac",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Mac Builder/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Mac Builder/shadow-properties.json
deleted file mode 100644
index 999510c8817..00000000000
--- a/chromium/infra/config/generated/builders/ci/Mac Builder/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Mac Release (Intel)/properties.json b/chromium/infra/config/generated/builders/ci/Mac Release (Intel)/properties.json
deleted file mode 100644
index 3834dd2c971..00000000000
--- a/chromium/infra/config/generated/builders/ci/Mac Release (Intel)/properties.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "GPU Mac Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac Release (Intel)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "GPU Mac Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Mac Release (Intel)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "mac-rel",
-          "group": "tryserver.chromium.mac"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.gpu",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Mac Retina Release (AMD)/properties.json b/chromium/infra/config/generated/builders/ci/Mac Retina Release (AMD)/properties.json
deleted file mode 100644
index f7b891dbcf4..00000000000
--- a/chromium/infra/config/generated/builders/ci/Mac Retina Release (AMD)/properties.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "GPU Mac Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac Retina Release (AMD)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "GPU Mac Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Mac Retina Release (AMD)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "mac-rel",
-          "group": "tryserver.chromium.mac"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.gpu",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Mac10.15 Tests/properties.json b/chromium/infra/config/generated/builders/ci/Mac10.15 Tests/properties.json
deleted file mode 100644
index c09c61a9520..00000000000
--- a/chromium/infra/config/generated/builders/ci/Mac10.15 Tests/properties.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac10.15 Tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Mac Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Mac10.15 Tests",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.mac",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Mac11 Tests/properties.json b/chromium/infra/config/generated/builders/ci/Mac11 Tests/properties.json
deleted file mode 100644
index c6a42383b0b..00000000000
--- a/chromium/infra/config/generated/builders/ci/Mac11 Tests/properties.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac11 Tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.mac",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Mac Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Mac11 Tests",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.mac",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Mac12 Tests/properties.json b/chromium/infra/config/generated/builders/ci/Mac12 Tests/properties.json
deleted file mode 100644
index f349a091464..00000000000
--- a/chromium/infra/config/generated/builders/ci/Mac12 Tests/properties.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac12 Tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.mac",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Mac Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Mac12 Tests",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.mac",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Mac13 Tests (dbg)/properties.json b/chromium/infra/config/generated/builders/ci/Mac13 Tests (dbg)/properties.json
deleted file mode 100644
index 2671afb4374..00000000000
--- a/chromium/infra/config/generated/builders/ci/Mac13 Tests (dbg)/properties.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac13 Tests (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Mac Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Mac13 Tests (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "mac_chromium_compile_dbg_ng",
-          "group": "tryserver.chromium.mac"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.mac",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Mac13 Tests/properties.json b/chromium/infra/config/generated/builders/ci/Mac13 Tests/properties.json
deleted file mode 100644
index 982ad1c2a7d..00000000000
--- a/chromium/infra/config/generated/builders/ci/Mac13 Tests/properties.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac13 Tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.mac",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Mac Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Mac13 Tests",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "mac-rel",
-          "group": "tryserver.chromium.mac"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.mac",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Nougat Phone Tester/properties.json b/chromium/infra/config/generated/builders/ci/Nougat Phone Tester/properties.json
deleted file mode 100644
index cab410be6e9..00000000000
--- a/chromium/infra/config/generated/builders/ci/Nougat Phone Tester/properties.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android arm64 Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Nougat Phone Tester",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Android arm64 Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Nougat Phone Tester",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "try-nougat-phone-tester",
-          "group": "tryserver.chromium.android"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Oreo Phone Tester/properties.json b/chromium/infra/config/generated/builders/ci/Oreo Phone Tester/properties.json
deleted file mode 100644
index bc6bfbb45d0..00000000000
--- a/chromium/infra/config/generated/builders/ci/Oreo Phone Tester/properties.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android arm64 Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Oreo Phone Tester",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Android arm64 Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Oreo Phone Tester",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "android-oreo-arm64-dbg",
-          "group": "tryserver.chromium.android"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Win Builder (dbg)/properties.json b/chromium/infra/config/generated/builders/ci/Win Builder (dbg)/properties.json
deleted file mode 100644
index 37441462ed2..00000000000
--- a/chromium/infra/config/generated/builders/ci/Win Builder (dbg)/properties.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Win Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-win-archive",
-              "builder_group": "chromium.win",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 32
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Win Builder (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "win_chromium_compile_dbg_ng",
-          "group": "tryserver.chromium.win"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "bootstrap_env": {
-      "RBE_v": "3"
-    },
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.win",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Win Builder (dbg)/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Win Builder (dbg)/shadow-properties.json
deleted file mode 100644
index 6604671a659..00000000000
--- a/chromium/infra/config/generated/builders/ci/Win Builder (dbg)/shadow-properties.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "$build/reclient": {
-    "bootstrap_env": {
-      "RBE_v": "3"
-    },
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Win Builder/properties.json b/chromium/infra/config/generated/builders/ci/Win Builder/properties.json
deleted file mode 100644
index f1cd4edc895..00000000000
--- a/chromium/infra/config/generated/builders/ci/Win Builder/properties.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Win Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-win-archive",
-              "builder_group": "chromium.win",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 32
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Win Builder",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.win",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Win Builder/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Win Builder/shadow-properties.json
deleted file mode 100644
index 999510c8817..00000000000
--- a/chromium/infra/config/generated/builders/ci/Win Builder/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Win x64 Builder/properties.json b/chromium/infra/config/generated/builders/ci/Win x64 Builder/properties.json
deleted file mode 100644
index 8e12331e40e..00000000000
--- a/chromium/infra/config/generated/builders/ci/Win x64 Builder/properties.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Win x64 Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-win-archive",
-              "builder_group": "chromium.win",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Win10 Tests x64",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-win-archive",
-              "builder_group": "chromium.win",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Win x64 Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Win x64 Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Win10 Tests x64",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "win-rel",
-          "group": "tryserver.chromium.win"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.win",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Win x64 Builder/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Win x64 Builder/shadow-properties.json
deleted file mode 100644
index 999510c8817..00000000000
--- a/chromium/infra/config/generated/builders/ci/Win x64 Builder/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Win10 Tests x64/properties.json b/chromium/infra/config/generated/builders/ci/Win10 Tests x64/properties.json
deleted file mode 100644
index ba813b74f4e..00000000000
--- a/chromium/infra/config/generated/builders/ci/Win10 Tests x64/properties.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Win x64 Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-win-archive",
-              "builder_group": "chromium.win",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Win10 Tests x64",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-win-archive",
-              "builder_group": "chromium.win",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Win x64 Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Win10 Tests x64",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "win-rel",
-          "group": "tryserver.chromium.win"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.win",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Win10 Tests x64/shadow-properties.json b/chromium/infra/config/generated/builders/ci/Win10 Tests x64/shadow-properties.json
deleted file mode 100644
index 999510c8817..00000000000
--- a/chromium/infra/config/generated/builders/ci/Win10 Tests x64/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/Win10 x64 Release (NVIDIA)/properties.json b/chromium/infra/config/generated/builders/ci/Win10 x64 Release (NVIDIA)/properties.json
deleted file mode 100644
index 76dbf258138..00000000000
--- a/chromium/infra/config/generated/builders/ci/Win10 x64 Release (NVIDIA)/properties.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "GPU Win x64 Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Win10 x64 Release (NVIDIA)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "GPU Win x64 Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Win10 x64 Release (NVIDIA)",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "win-rel",
-          "group": "tryserver.chromium.win"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.gpu",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-12-x64-rel/properties.json b/chromium/infra/config/generated/builders/ci/android-12-x64-rel/properties.json
deleted file mode 100644
index 40acce873d3..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-12-x64-rel/properties.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-12-x64-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "x64_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "android-12-x64-rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "android-12-x64-rel",
-          "group": "tryserver.chromium.android"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-12-x64-rel/shadow-properties.json b/chromium/infra/config/generated/builders/ci/android-12-x64-rel/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-12-x64-rel/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-cronet-arm-dbg/properties.json b/chromium/infra/config/generated/builders/ci/android-cronet-arm-dbg/properties.json
deleted file mode 100644
index 21d82657397..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-cronet-arm-dbg/properties.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-cronet-arm-dbg",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "cronet_builder",
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 32,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "android-cronet-arm-dbg",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "android-cronet-arm-dbg",
-          "group": "tryserver.chromium.android"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-cronet-arm-dbg/shadow-properties.json b/chromium/infra/config/generated/builders/ci/android-cronet-arm-dbg/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-cronet-arm-dbg/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-cronet-arm-rel/properties.json b/chromium/infra/config/generated/builders/ci/android-cronet-arm-rel/properties.json
deleted file mode 100644
index 459455f6dc6..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-cronet-arm-rel/properties.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-cronet-arm-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "cronet_builder",
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "android",
-                "target_bits": 32,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "android-cronet-arm-rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "android_cronet",
-          "group": "tryserver.chromium.android"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-cronet-arm-rel/shadow-properties.json b/chromium/infra/config/generated/builders/ci/android-cronet-arm-rel/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-cronet-arm-rel/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-cronet-mainline-clang-x86-dbg/properties.json b/chromium/infra/config/generated/builders/ci/android-cronet-mainline-clang-x86-dbg/properties.json
deleted file mode 100644
index dafaf352c55..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-cronet-mainline-clang-x86-dbg/properties.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-cronet-mainline-clang-x86-dbg",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "x86_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "cronet_builder",
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 32,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "android-cronet-mainline-clang-x86-dbg",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-cronet-mainline-clang-x86-dbg/shadow-properties.json b/chromium/infra/config/generated/builders/ci/android-cronet-mainline-clang-x86-dbg/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-cronet-mainline-clang-x86-dbg/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-cronet-x64-dbg/properties.json b/chromium/infra/config/generated/builders/ci/android-cronet-x64-dbg/properties.json
deleted file mode 100644
index 2784e66af52..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-cronet-x64-dbg/properties.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-cronet-x64-dbg",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "x64_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "cronet_builder",
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "android-cronet-x64-dbg",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-cronet-x64-dbg/shadow-properties.json b/chromium/infra/config/generated/builders/ci/android-cronet-x64-dbg/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-cronet-x64-dbg/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-cronet-x86-dbg-10-tests/properties.json b/chromium/infra/config/generated/builders/ci/android-cronet-x86-dbg-10-tests/properties.json
deleted file mode 100644
index e9bdb4d43c7..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-cronet-x86-dbg-10-tests/properties.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-cronet-x86-dbg",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "x86_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "cronet_builder",
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 32,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-cronet-x86-dbg-10-tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "config": "x86_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "cronet_builder",
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 32,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "android-cronet-x86-dbg",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "android-cronet-x86-dbg-10-tests",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "android-cronet-x86-dbg-10-tests",
-          "group": "tryserver.chromium.android"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-cronet-x86-dbg/properties.json b/chromium/infra/config/generated/builders/ci/android-cronet-x86-dbg/properties.json
deleted file mode 100644
index 5306929c545..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-cronet-x86-dbg/properties.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-cronet-x86-dbg",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "x86_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "cronet_builder",
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 32,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-cronet-x86-dbg-10-tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "config": "x86_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "cronet_builder",
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 32,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "android-cronet-x86-dbg",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "android-cronet-x86-dbg",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "android-cronet-x86-dbg-10-tests",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "android-cronet-x86-dbg-10-tests",
-          "group": "tryserver.chromium.android"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-cronet-x86-dbg/shadow-properties.json b/chromium/infra/config/generated/builders/ci/android-cronet-x86-dbg/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-cronet-x86-dbg/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-nougat-x86-rel/properties.json b/chromium/infra/config/generated/builders/ci/android-nougat-x86-rel/properties.json
deleted file mode 100644
index 1a998fae85e..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-nougat-x86-rel/properties.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-nougat-x86-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "x86_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "build_config": "Release",
-                "config": "android",
-                "target_bits": 32,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android",
-                  "enable_wpr_tests"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "android-nougat-x86-rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "android-nougat-x86-rel",
-          "group": "tryserver.chromium.android"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-nougat-x86-rel/shadow-properties.json b/chromium/infra/config/generated/builders/ci/android-nougat-x86-rel/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-nougat-x86-rel/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-official/properties.json b/chromium/infra/config/generated/builders/ci/android-official/properties.json
deleted file mode 100644
index dd628366cc9..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-official/properties.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-official",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "config": "android",
-                "target_arch": "arm",
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "android-official",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "android-official",
-          "group": "tryserver.chromium"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-official/shadow-properties.json b/chromium/infra/config/generated/builders/ci/android-official/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-official/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-pie-arm64-dbg/properties.json b/chromium/infra/config/generated/builders/ci/android-pie-arm64-dbg/properties.json
deleted file mode 100644
index fd8b4c224cc..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-pie-arm64-dbg/properties.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android arm64 Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-pie-arm64-dbg",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Android arm64 Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "android-pie-arm64-dbg",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "android-pie-arm64-dbg",
-          "group": "tryserver.chromium.android"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-pie-arm64-rel/properties.json b/chromium/infra/config/generated/builders/ci/android-pie-arm64-rel/properties.json
deleted file mode 100644
index 5265d6563e7..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-pie-arm64-rel/properties.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-pie-arm64-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks",
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "android-pie-arm64-rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "android-arm64-rel",
-          "group": "tryserver.chromium.android"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.android",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/android-pie-arm64-rel/shadow-properties.json b/chromium/infra/config/generated/builders/ci/android-pie-arm64-rel/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/android-pie-arm64-rel/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/fuchsia-arm64-cast-receiver-rel/properties.json b/chromium/infra/config/generated/builders/ci/fuchsia-arm64-cast-receiver-rel/properties.json
index 078f2d3523c..9779ac77e8e 100644
--- a/chromium/infra/config/generated/builders/ci/fuchsia-arm64-cast-receiver-rel/properties.json
+++ b/chromium/infra/config/generated/builders/ci/fuchsia-arm64-cast-receiver-rel/properties.json
@@ -65,6 +65,6 @@
   "builder_group": "chromium.fuchsia",
   "recipe": "chromium",
   "sheriff_rotations": [
-    "chrome_browser_release"
+    "fuchsia"
   ]
 }
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/fuchsia-arm64-rel/properties.json b/chromium/infra/config/generated/builders/ci/fuchsia-arm64-rel/properties.json
index 7582c374039..6c2fb92ffe1 100644
--- a/chromium/infra/config/generated/builders/ci/fuchsia-arm64-rel/properties.json
+++ b/chromium/infra/config/generated/builders/ci/fuchsia-arm64-rel/properties.json
@@ -65,6 +65,6 @@
   "builder_group": "chromium.fuchsia",
   "recipe": "chromium",
   "sheriff_rotations": [
-    "chrome_browser_release"
+    "fuchsia"
   ]
 }
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/fuchsia-official/properties.json b/chromium/infra/config/generated/builders/ci/fuchsia-official/properties.json
index 2981f31d213..887703e4cbf 100644
--- a/chromium/infra/config/generated/builders/ci/fuchsia-official/properties.json
+++ b/chromium/infra/config/generated/builders/ci/fuchsia-official/properties.json
@@ -62,6 +62,6 @@
   "builder_group": "chromium",
   "recipe": "chromium",
   "sheriff_rotations": [
-    "chrome_browser_release"
+    "fuchsia"
   ]
 }
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/fuchsia-x64-cast-receiver-rel/properties.json b/chromium/infra/config/generated/builders/ci/fuchsia-x64-cast-receiver-rel/properties.json
index 4c83653dbf2..6a11c2d11f5 100644
--- a/chromium/infra/config/generated/builders/ci/fuchsia-x64-cast-receiver-rel/properties.json
+++ b/chromium/infra/config/generated/builders/ci/fuchsia-x64-cast-receiver-rel/properties.json
@@ -63,6 +63,6 @@
   "builder_group": "chromium.fuchsia",
   "recipe": "chromium",
   "sheriff_rotations": [
-    "chrome_browser_release"
+    "fuchsia"
   ]
 }
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/fuchsia-x64-rel/properties.json b/chromium/infra/config/generated/builders/ci/fuchsia-x64-rel/properties.json
index db8c070c88e..bdbcf7c6868 100644
--- a/chromium/infra/config/generated/builders/ci/fuchsia-x64-rel/properties.json
+++ b/chromium/infra/config/generated/builders/ci/fuchsia-x64-rel/properties.json
@@ -63,6 +63,6 @@
   "builder_group": "chromium.fuchsia",
   "recipe": "chromium",
   "sheriff_rotations": [
-    "chrome_browser_release"
+    "fuchsia"
   ]
 }
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/ios-simulator-cronet/properties.json b/chromium/infra/config/generated/builders/ci/ios-simulator-cronet/properties.json
deleted file mode 100644
index a0eb5934995..00000000000
--- a/chromium/infra/config/generated/builders/ci/ios-simulator-cronet/properties.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "ios-simulator-cronet",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-fyi-archive",
-              "builder_group": "chromium.fyi",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb",
-                  "mac_toolchain"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "ios"
-              },
-              "legacy_gclient_config": {
-                "config": "ios"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "ios-simulator-cronet",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "ios-simulator-cronet",
-          "group": "tryserver.chromium.mac"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.fyi",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ],
-  "xcode_build_version": "15a5229m"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/ios-simulator-cronet/shadow-properties.json b/chromium/infra/config/generated/builders/ci/ios-simulator-cronet/shadow-properties.json
deleted file mode 100644
index 999510c8817..00000000000
--- a/chromium/infra/config/generated/builders/ci/ios-simulator-cronet/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/ios-simulator-full-configs/properties.json b/chromium/infra/config/generated/builders/ci/ios-simulator-full-configs/properties.json
deleted file mode 100644
index a14e13bc6f0..00000000000
--- a/chromium/infra/config/generated/builders/ci/ios-simulator-full-configs/properties.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "ios-simulator-full-configs",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb",
-                  "mac_toolchain"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "ios"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "ios"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "ios-simulator-full-configs",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "ios-simulator-full-configs",
-          "group": "tryserver.chromium.mac"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.mac",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ],
-  "xcode_build_version": "15a5229m"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/ios-simulator-full-configs/shadow-properties.json b/chromium/infra/config/generated/builders/ci/ios-simulator-full-configs/shadow-properties.json
deleted file mode 100644
index 999510c8817..00000000000
--- a/chromium/infra/config/generated/builders/ci/ios-simulator-full-configs/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/ios-simulator/properties.json b/chromium/infra/config/generated/builders/ci/ios-simulator/properties.json
deleted file mode 100644
index 36c6b4ec97c..00000000000
--- a/chromium/infra/config/generated/builders/ci/ios-simulator/properties.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "ios-simulator",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb",
-                  "mac_toolchain"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "ios"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "ios"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "ios-simulator",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "ios-simulator",
-          "group": "tryserver.chromium.mac"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.mac",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ],
-  "xcode_build_version": "15a5229m"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/ios-simulator/shadow-properties.json b/chromium/infra/config/generated/builders/ci/ios-simulator/shadow-properties.json
deleted file mode 100644
index 999510c8817..00000000000
--- a/chromium/infra/config/generated/builders/ci/ios-simulator/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/linux-official/properties.json b/chromium/infra/config/generated/builders/ci/linux-official/properties.json
deleted file mode 100644
index 245d4518677..00000000000
--- a/chromium/infra/config/generated/builders/ci/linux-official/properties.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "linux-official",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "checkout_pgo_profiles"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "linux-official",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "linux-official",
-          "group": "tryserver.chromium"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/linux-official/shadow-properties.json b/chromium/infra/config/generated/builders/ci/linux-official/shadow-properties.json
deleted file mode 100644
index 999510c8817..00000000000
--- a/chromium/infra/config/generated/builders/ci/linux-official/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/mac-arm64-rel/properties.json b/chromium/infra/config/generated/builders/ci/mac-arm64-rel/properties.json
deleted file mode 100644
index d012f599e3c..00000000000
--- a/chromium/infra/config/generated/builders/ci/mac-arm64-rel/properties.json
+++ /dev/null
@@ -1,163 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "mac-arm64-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_arch": "arm",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "mac11-arm64-rel-tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.mac",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_arch": "arm",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "mac-arm64-rel",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "mac12-arm64-rel-tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.mac",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_arch": "arm",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "mac-arm64-rel",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "mac13-arm64-rel-tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.mac",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_arch": "arm",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "mac-arm64-rel",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "mac-arm64-rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "mac11-arm64-rel-tests",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "mac12-arm64-rel-tests",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "mac13-arm64-rel-tests",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.mac",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/mac-arm64-rel/shadow-properties.json b/chromium/infra/config/generated/builders/ci/mac-arm64-rel/shadow-properties.json
deleted file mode 100644
index 999510c8817..00000000000
--- a/chromium/infra/config/generated/builders/ci/mac-arm64-rel/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/mac-official/properties.json b/chromium/infra/config/generated/builders/ci/mac-official/properties.json
deleted file mode 100644
index 3b075111bfb..00000000000
--- a/chromium/infra/config/generated/builders/ci/mac-official/properties.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "mac-official",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "checkout_pgo_profiles"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "mac-official",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "mac-official",
-          "group": "tryserver.chromium"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/mac-official/shadow-properties.json b/chromium/infra/config/generated/builders/ci/mac-official/shadow-properties.json
deleted file mode 100644
index 999510c8817..00000000000
--- a/chromium/infra/config/generated/builders/ci/mac-official/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 250,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/mac11-arm64-rel-tests/properties.json b/chromium/infra/config/generated/builders/ci/mac11-arm64-rel-tests/properties.json
deleted file mode 100644
index 3bc7957d122..00000000000
--- a/chromium/infra/config/generated/builders/ci/mac11-arm64-rel-tests/properties.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "mac-arm64-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_arch": "arm",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "mac11-arm64-rel-tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.mac",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_arch": "arm",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "mac-arm64-rel",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "mac11-arm64-rel-tests",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.mac",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/mac12-arm64-rel-tests/properties.json b/chromium/infra/config/generated/builders/ci/mac12-arm64-rel-tests/properties.json
deleted file mode 100644
index 87ea9d82595..00000000000
--- a/chromium/infra/config/generated/builders/ci/mac12-arm64-rel-tests/properties.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "mac-arm64-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_arch": "arm",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "mac12-arm64-rel-tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.mac",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_arch": "arm",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "mac-arm64-rel",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "mac12-arm64-rel-tests",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.mac",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/mac13-arm64-rel-tests/properties.json b/chromium/infra/config/generated/builders/ci/mac13-arm64-rel-tests/properties.json
deleted file mode 100644
index 8e883083998..00000000000
--- a/chromium/infra/config/generated/builders/ci/mac13-arm64-rel-tests/properties.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "mac-arm64-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_arch": "arm",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "mac13-arm64-rel-tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.mac",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_arch": "arm",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "mac-arm64-rel",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "mac13-arm64-rel-tests",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium.mac",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/win-official/properties.json b/chromium/infra/config/generated/builders/ci/win-official/properties.json
deleted file mode 100644
index 6f49eda4d5e..00000000000
--- a/chromium/infra/config/generated/builders/ci/win-official/properties.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "win-official",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "checkout_pgo_profiles"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "win-official",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "win-official",
-          "group": "tryserver.chromium"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/win-official/shadow-properties.json b/chromium/infra/config/generated/builders/ci/win-official/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/win-official/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/win32-official/properties.json b/chromium/infra/config/generated/builders/ci/win32-official/properties.json
deleted file mode 100644
index dcff93aeef1..00000000000
--- a/chromium/infra/config/generated/builders/ci/win32-official/properties.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "win32-official",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "config": "chromium",
-                "target_bits": 32
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "checkout_pgo_profiles"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "win32-official",
-          "project": "chromium-m118"
-        }
-      ],
-      "mirroring_builder_group_and_names": [
-        {
-          "builder": "win32-official",
-          "group": "tryserver.chromium"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-trusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "chromium",
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chrome_browser_release"
-  ]
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/ci/win32-official/shadow-properties.json b/chromium/infra/config/generated/builders/ci/win32-official/shadow-properties.json
deleted file mode 100644
index 2997dff3bf2..00000000000
--- a/chromium/infra/config/generated/builders/ci/win32-official/shadow-properties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  }
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/android-12-x64-rel-compilator/properties.json b/chromium/infra/config/generated/builders/try/android-12-x64-rel-compilator/properties.json
deleted file mode 100644
index ba062b5395c..00000000000
--- a/chromium/infra/config/generated/builders/try/android-12-x64-rel-compilator/properties.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-12-x64-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "x64_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "android-12-x64-rel",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/code_coverage": {
-    "coverage_test_types": [
-      "unit",
-      "overall"
-    ],
-    "use_java_coverage": true
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.android",
-  "recipe": "chromium/compilator"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/android-12-x64-rel/properties.json b/chromium/infra/config/generated/builders/try/android-12-x64-rel/properties.json
deleted file mode 100644
index d1a456cb5cd..00000000000
--- a/chromium/infra/config/generated/builders/try/android-12-x64-rel/properties.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "$build/chromium_orchestrator": {
-    "compilator": "android-12-x64-rel-compilator",
-    "compilator_watcher_git_revision": "e6d08be3fd589d4f222dae5d18dbc972e6117b23"
-  },
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-12-x64-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "x64_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "android-12-x64-rel",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/code_coverage": {
-    "coverage_test_types": [
-      "unit",
-      "overall"
-    ],
-    "use_java_coverage": true
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.android",
-  "cq": "required",
-  "recipe": "chromium/orchestrator"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/android-arm64-rel-compilator/properties.json b/chromium/infra/config/generated/builders/try/android-arm64-rel-compilator/properties.json
deleted file mode 100644
index 17bc52c3446..00000000000
--- a/chromium/infra/config/generated/builders/try/android-arm64-rel-compilator/properties.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android Release (Nexus 5X)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks",
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-pie-arm64-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks",
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Android Release (Nexus 5X)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "android-pie-arm64-rel",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/code_coverage": {
-    "coverage_test_types": [
-      "unit",
-      "overall"
-    ],
-    "use_clang_coverage": true
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.android",
-  "recipe": "chromium/compilator"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/android-arm64-rel/properties.json b/chromium/infra/config/generated/builders/try/android-arm64-rel/properties.json
deleted file mode 100644
index 46f5b62e9ab..00000000000
--- a/chromium/infra/config/generated/builders/try/android-arm64-rel/properties.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "$build/chromium_orchestrator": {
-    "compilator": "android-arm64-rel-compilator",
-    "compilator_watcher_git_revision": "e6d08be3fd589d4f222dae5d18dbc972e6117b23"
-  },
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android Release (Nexus 5X)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks",
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-pie-arm64-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks",
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Android Release (Nexus 5X)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "android-pie-arm64-rel",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/code_coverage": {
-    "coverage_test_types": [
-      "unit",
-      "overall"
-    ],
-    "use_clang_coverage": true
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.android",
-  "cq": "required",
-  "recipe": "chromium/orchestrator"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/android-cronet-arm-dbg/properties.json b/chromium/infra/config/generated/builders/try/android-cronet-arm-dbg/properties.json
deleted file mode 100644
index 9ecf958ce59..00000000000
--- a/chromium/infra/config/generated/builders/try/android-cronet-arm-dbg/properties.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-cronet-arm-dbg",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "cronet_builder",
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 32,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "android-cronet-arm-dbg",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.android",
-  "cq": "path-based",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/android-cronet-x86-dbg-10-tests/properties.json b/chromium/infra/config/generated/builders/try/android-cronet-x86-dbg-10-tests/properties.json
deleted file mode 100644
index ccafb7e69da..00000000000
--- a/chromium/infra/config/generated/builders/try/android-cronet-x86-dbg-10-tests/properties.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-cronet-x86-dbg",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "x86_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "cronet_builder",
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 32,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-cronet-x86-dbg-10-tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "config": "x86_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "cronet_builder",
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 32,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "android-cronet-x86-dbg",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "android-cronet-x86-dbg",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "android-cronet-x86-dbg-10-tests",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.android",
-  "cq": "path-based",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/android-nougat-x86-rel-compilator/properties.json b/chromium/infra/config/generated/builders/try/android-nougat-x86-rel-compilator/properties.json
deleted file mode 100644
index 40f451e81ea..00000000000
--- a/chromium/infra/config/generated/builders/try/android-nougat-x86-rel-compilator/properties.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-nougat-x86-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "x86_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "build_config": "Release",
-                "config": "android",
-                "target_bits": 32,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android",
-                  "enable_wpr_tests"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "android-nougat-x86-rel",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/code_coverage": {
-    "coverage_test_types": [
-      "unit",
-      "overall"
-    ],
-    "use_java_coverage": true
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.android",
-  "recipe": "chromium/compilator"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/android-nougat-x86-rel/properties.json b/chromium/infra/config/generated/builders/try/android-nougat-x86-rel/properties.json
deleted file mode 100644
index e6245c0d7b3..00000000000
--- a/chromium/infra/config/generated/builders/try/android-nougat-x86-rel/properties.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "$build/chromium_orchestrator": {
-    "compilator": "android-nougat-x86-rel-compilator",
-    "compilator_watcher_git_revision": "e6d08be3fd589d4f222dae5d18dbc972e6117b23"
-  },
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-nougat-x86-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "x86_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "build_config": "Release",
-                "config": "android",
-                "target_bits": 32,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android",
-                  "enable_wpr_tests"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "android-nougat-x86-rel",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/code_coverage": {
-    "coverage_test_types": [
-      "unit",
-      "overall"
-    ],
-    "use_java_coverage": true
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.android",
-  "cq": "required",
-  "recipe": "chromium/orchestrator"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/android-official/properties.json b/chromium/infra/config/generated/builders/try/android-official/properties.json
deleted file mode 100644
index 8e1ca8a504e..00000000000
--- a/chromium/infra/config/generated/builders/try/android-official/properties.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-official",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "config": "android",
-                "target_arch": "arm",
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "android-official",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/android-oreo-arm64-dbg/properties.json b/chromium/infra/config/generated/builders/try/android-oreo-arm64-dbg/properties.json
deleted file mode 100644
index b1a5841e04a..00000000000
--- a/chromium/infra/config/generated/builders/try/android-oreo-arm64-dbg/properties.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android arm64 Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Oreo Phone Tester",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Android arm64 Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Android arm64 Builder (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Oreo Phone Tester",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.android",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/android-pie-arm64-dbg/properties.json b/chromium/infra/config/generated/builders/try/android-pie-arm64-dbg/properties.json
deleted file mode 100644
index ba91bd87f42..00000000000
--- a/chromium/infra/config/generated/builders/try/android-pie-arm64-dbg/properties.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android arm64 Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-pie-arm64-dbg",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Android arm64 Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Android arm64 Builder (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "android-pie-arm64-dbg",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.android",
-  "cq": "path-based",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/android-x64-cast/properties.json b/chromium/infra/config/generated/builders/try/android-x64-cast/properties.json
deleted file mode 100644
index e87580f52a5..00000000000
--- a/chromium/infra/config/generated/builders/try/android-x64-cast/properties.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Cast Android (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "cast_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 32,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Cast Android (dbg)",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.android",
-  "cq": "required",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/android_compile_dbg/properties.json b/chromium/infra/config/generated/builders/try/android_compile_dbg/properties.json
deleted file mode 100644
index 3351ef44d85..00000000000
--- a/chromium/infra/config/generated/builders/try/android_compile_dbg/properties.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android arm64 Builder All Targets (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Android arm64 Builder All Targets (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "is_compile_only": true
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.android",
-  "cq": "required",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/android_compile_x64_dbg/properties.json b/chromium/infra/config/generated/builders/try/android_compile_x64_dbg/properties.json
deleted file mode 100644
index 831cf5537e0..00000000000
--- a/chromium/infra/config/generated/builders/try/android_compile_x64_dbg/properties.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android x64 Builder All Targets (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "x64_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Android x64 Builder All Targets (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "is_compile_only": true
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.android",
-  "cq": "path-based",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/android_compile_x86_dbg/properties.json b/chromium/infra/config/generated/builders/try/android_compile_x86_dbg/properties.json
deleted file mode 100644
index 85de8ef6492..00000000000
--- a/chromium/infra/config/generated/builders/try/android_compile_x86_dbg/properties.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android x86 Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "x86_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 32,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Android x86 Builder (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "is_compile_only": true
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.android",
-  "cq": "path-based",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/android_cronet/properties.json b/chromium/infra/config/generated/builders/try/android_cronet/properties.json
deleted file mode 100644
index d16f4221b28..00000000000
--- a/chromium/infra/config/generated/builders/try/android_cronet/properties.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "android-cronet-arm-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "cronet_builder",
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "android",
-                "target_bits": 32,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "android-cronet-arm-rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "is_compile_only": true
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.android",
-  "cq": "required",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/android_optional_gpu_tests_rel/properties.json b/chromium/infra/config/generated/builders/try/android_optional_gpu_tests_rel/properties.json
deleted file mode 100644
index 9de6e0c0ba9..00000000000
--- a/chromium/infra/config/generated/builders/try/android_optional_gpu_tests_rel/properties.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "try",
-              "builder": "android_optional_gpu_tests_rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-fyi-archive",
-              "builder_group": "tryserver.chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder"
-              },
-              "legacy_chromium_config": {
-                "config": "android",
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "try",
-          "builder": "android_optional_gpu_tests_rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "retry_failed_shards": false
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.android",
-  "cq": "path-based",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/chromeos-amd64-generic-rel/properties.json b/chromium/infra/config/generated/builders/try/chromeos-amd64-generic-rel/properties.json
index a0c59671c56..53346ddc74f 100644
--- a/chromium/infra/config/generated/builders/try/chromeos-amd64-generic-rel/properties.json
+++ b/chromium/infra/config/generated/builders/try/chromeos-amd64-generic-rel/properties.json
@@ -1,7 +1,7 @@
 {
   "$build/chromium_orchestrator": {
     "compilator": "chromeos-amd64-generic-rel-compilator",
-    "compilator_watcher_git_revision": "e6d08be3fd589d4f222dae5d18dbc972e6117b23"
+    "compilator_watcher_git_revision": "e3cad57252d996ab02463019e7f49343d739b885"
   },
   "$build/chromium_tests_builder_config": {
     "builder_config": {
diff --git a/chromium/infra/config/generated/builders/try/dawn-linux-x64-deps-rel/properties.json b/chromium/infra/config/generated/builders/try/dawn-linux-x64-deps-rel/properties.json
deleted file mode 100644
index 54ee32acd89..00000000000
--- a/chromium/infra/config/generated/builders/try/dawn-linux-x64-deps-rel/properties.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Linux x64 DEPS Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "linux"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Linux x64 DEPS Release (Intel UHD 630)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "linux"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Linux x64 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Linux x64 DEPS Release (NVIDIA)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "linux"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Linux x64 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Linux x64 DEPS Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Linux x64 DEPS Release (Intel UHD 630)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Dawn Linux x64 DEPS Release (NVIDIA)",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite",
-      "v.gpu"
-    ]
-  },
-  "builder_group": "tryserver.chromium.dawn",
-  "cq": "path-based",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/dawn-mac-x64-deps-rel/properties.json b/chromium/infra/config/generated/builders/try/dawn-mac-x64-deps-rel/properties.json
deleted file mode 100644
index f59353b14fa..00000000000
--- a/chromium/infra/config/generated/builders/try/dawn-mac-x64-deps-rel/properties.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Mac x64 DEPS Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Mac x64 DEPS Release (AMD)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Mac x64 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Mac x64 DEPS Release (Intel)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Mac x64 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Mac x64 DEPS Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Mac x64 DEPS Release (AMD)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Dawn Mac x64 DEPS Release (Intel)",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite",
-      "v.gpu"
-    ]
-  },
-  "builder_group": "tryserver.chromium.dawn",
-  "cq": "path-based",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/dawn-win10-x64-deps-rel/properties.json b/chromium/infra/config/generated/builders/try/dawn-win10-x64-deps-rel/properties.json
deleted file mode 100644
index f02c547d9aa..00000000000
--- a/chromium/infra/config/generated/builders/try/dawn-win10-x64-deps-rel/properties.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x64 DEPS Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x64 DEPS Release (Intel)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Win10 x64 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x64 DEPS Release (NVIDIA)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Win10 x64 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Win10 x64 DEPS Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Win10 x64 DEPS Release (Intel)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Dawn Win10 x64 DEPS Release (NVIDIA)",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite",
-      "v.gpu"
-    ]
-  },
-  "builder_group": "tryserver.chromium.dawn",
-  "cq": "path-based",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/dawn-win10-x86-deps-rel/properties.json b/chromium/infra/config/generated/builders/try/dawn-win10-x86-deps-rel/properties.json
deleted file mode 100644
index e1711f74cc8..00000000000
--- a/chromium/infra/config/generated/builders/try/dawn-win10-x86-deps-rel/properties.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x86 DEPS Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 32,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x86 DEPS Release (Intel)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 32,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Win10 x86 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Dawn Win10 x86 DEPS Release (NVIDIA)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-dawn-archive",
-              "builder_group": "chromium.dawn",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 32,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Dawn Win10 x86 DEPS Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Win10 x86 DEPS Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Dawn Win10 x86 DEPS Release (Intel)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Dawn Win10 x86 DEPS Release (NVIDIA)",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite",
-      "v.gpu"
-    ]
-  },
-  "builder_group": "tryserver.chromium.dawn",
-  "cq": "path-based",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-rel/properties.json b/chromium/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-rel/properties.json
index 2040730f817..d3cf5466675 100644
--- a/chromium/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-rel/properties.json
+++ b/chromium/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-rel/properties.json
@@ -1,7 +1,7 @@
 {
   "$build/chromium_orchestrator": {
     "compilator": "fuchsia-x64-cast-receiver-rel-compilator",
-    "compilator_watcher_git_revision": "e6d08be3fd589d4f222dae5d18dbc972e6117b23"
+    "compilator_watcher_git_revision": "e3cad57252d996ab02463019e7f49343d739b885"
   },
   "$build/chromium_tests_builder_config": {
     "builder_config": {
diff --git a/chromium/infra/config/generated/builders/try/gpu-fyi-cq-android-arm64/properties.json b/chromium/infra/config/generated/builders/try/gpu-fyi-cq-android-arm64/properties.json
deleted file mode 100644
index 89116055875..00000000000
--- a/chromium/infra/config/generated/builders/try/gpu-fyi-cq-android-arm64/properties.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android FYI Release (Pixel 6)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.gpu.fyi",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "config": "arm64_builder_rel_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "config": "android",
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "GPU FYI Android arm64 Builder",
-                "project": "chromium-m118"
-              },
-              "run_tests_serially": true
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "GPU FYI Android arm64 Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.gpu.fyi",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "arm64_builder_rel_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "config": "android",
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "GPU FYI Android arm64 Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Android FYI Release (Pixel 6)",
-          "project": "chromium-m118"
-        }
-      ],
-      "retry_failed_shards": false
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.android",
-  "cq": "path-based",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/ios-simulator-compilator/properties.json b/chromium/infra/config/generated/builders/try/ios-simulator-compilator/properties.json
deleted file mode 100644
index 4a89bbecb19..00000000000
--- a/chromium/infra/config/generated/builders/try/ios-simulator-compilator/properties.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "ios-simulator",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb",
-                  "mac_toolchain"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "ios"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "ios"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "ios-simulator",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/code_coverage": {
-    "coverage_exclude_sources": "ios_test_files_and_test_utils",
-    "coverage_test_types": [
-      "overall",
-      "unit"
-    ],
-    "use_clang_coverage": true
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.mac",
-  "recipe": "chromium/compilator",
-  "xcode_build_version": "15a5229m"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/ios-simulator-cronet/properties.json b/chromium/infra/config/generated/builders/try/ios-simulator-cronet/properties.json
deleted file mode 100644
index a414d6d4f1a..00000000000
--- a/chromium/infra/config/generated/builders/try/ios-simulator-cronet/properties.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "ios-simulator-cronet",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-fyi-archive",
-              "builder_group": "chromium.fyi",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb",
-                  "mac_toolchain"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "ios"
-              },
-              "legacy_gclient_config": {
-                "config": "ios"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "ios-simulator-cronet",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.mac",
-  "cq": "path-based",
-  "recipe": "chromium_trybot",
-  "xcode_build_version": "15a5229m"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/ios-simulator-full-configs/properties.json b/chromium/infra/config/generated/builders/try/ios-simulator-full-configs/properties.json
deleted file mode 100644
index dc3784a183b..00000000000
--- a/chromium/infra/config/generated/builders/try/ios-simulator-full-configs/properties.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "ios-simulator-full-configs",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb",
-                  "mac_toolchain"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "ios"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "ios"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "ios-simulator-full-configs",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/code_coverage": {
-    "coverage_exclude_sources": "ios_test_files_and_test_utils",
-    "coverage_test_types": [
-      "overall",
-      "unit"
-    ],
-    "use_clang_coverage": true
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.mac",
-  "cq": "path-based",
-  "recipe": "chromium_trybot",
-  "xcode_build_version": "15a5229m"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/ios-simulator/properties.json b/chromium/infra/config/generated/builders/try/ios-simulator/properties.json
deleted file mode 100644
index d4d8700eea2..00000000000
--- a/chromium/infra/config/generated/builders/try/ios-simulator/properties.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "$build/chromium_orchestrator": {
-    "compilator": "ios-simulator-compilator",
-    "compilator_watcher_git_revision": "e6d08be3fd589d4f222dae5d18dbc972e6117b23"
-  },
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "ios-simulator",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb",
-                  "mac_toolchain"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "ios"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "ios"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "ios-simulator",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/code_coverage": {
-    "coverage_exclude_sources": "ios_test_files_and_test_utils",
-    "coverage_test_types": [
-      "overall",
-      "unit"
-    ],
-    "use_clang_coverage": true
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.mac",
-  "cq": "required",
-  "recipe": "chromium/orchestrator"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/linux-blink-rel/properties.json b/chromium/infra/config/generated/builders/try/linux-blink-rel/properties.json
deleted file mode 100644
index 387e5a6f92a..00000000000
--- a/chromium/infra/config/generated/builders/try/linux-blink-rel/properties.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "try",
-              "builder": "linux-blink-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "tryserver.blink",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "try",
-          "builder": "linux-blink-rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "retry_failed_shards": false
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.blink",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/linux-chromeos-rel/properties.json b/chromium/infra/config/generated/builders/try/linux-chromeos-rel/properties.json
index 4eea98ea045..a7e4d275b1b 100644
--- a/chromium/infra/config/generated/builders/try/linux-chromeos-rel/properties.json
+++ b/chromium/infra/config/generated/builders/try/linux-chromeos-rel/properties.json
@@ -1,7 +1,7 @@
 {
   "$build/chromium_orchestrator": {
     "compilator": "linux-chromeos-rel-compilator",
-    "compilator_watcher_git_revision": "e6d08be3fd589d4f222dae5d18dbc972e6117b23"
+    "compilator_watcher_git_revision": "e3cad57252d996ab02463019e7f49343d739b885"
   },
   "$build/chromium_tests_builder_config": {
     "builder_config": {
diff --git a/chromium/infra/config/generated/builders/try/linux-lacros-rel/properties.json b/chromium/infra/config/generated/builders/try/linux-lacros-rel/properties.json
index bdfe3f61a87..df696f1b453 100644
--- a/chromium/infra/config/generated/builders/try/linux-lacros-rel/properties.json
+++ b/chromium/infra/config/generated/builders/try/linux-lacros-rel/properties.json
@@ -1,7 +1,7 @@
 {
   "$build/chromium_orchestrator": {
     "compilator": "linux-lacros-rel-compilator",
-    "compilator_watcher_git_revision": "e6d08be3fd589d4f222dae5d18dbc972e6117b23"
+    "compilator_watcher_git_revision": "e3cad57252d996ab02463019e7f49343d739b885"
   },
   "$build/chromium_tests_builder_config": {
     "builder_config": {
diff --git a/chromium/infra/config/generated/builders/try/linux-official/properties.json b/chromium/infra/config/generated/builders/try/linux-official/properties.json
deleted file mode 100644
index e0962592aec..00000000000
--- a/chromium/infra/config/generated/builders/try/linux-official/properties.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "linux-official",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "checkout_pgo_profiles"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "linux-official",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/linux-rel-compilator/properties.json b/chromium/infra/config/generated/builders/try/linux-rel-compilator/properties.json
deleted file mode 100644
index 41d3ca506fc..00000000000
--- a/chromium/infra/config/generated/builders/try/linux-rel-compilator/properties.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "GPU Linux Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Release (NVIDIA)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "GPU Linux Builder",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "GPU Linux Builder",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Linux Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Release (NVIDIA)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Linux Tests",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/code_coverage": {
-    "coverage_test_types": [
-      "unit",
-      "overall"
-    ],
-    "use_clang_coverage": true
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.linux",
-  "recipe": "chromium/compilator"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/linux-rel/properties.json b/chromium/infra/config/generated/builders/try/linux-rel/properties.json
deleted file mode 100644
index 88085a80a71..00000000000
--- a/chromium/infra/config/generated/builders/try/linux-rel/properties.json
+++ /dev/null
@@ -1,173 +0,0 @@
-{
-  "$build/chromium_orchestrator": {
-    "compilator": "linux-rel-compilator",
-    "compilator_watcher_git_revision": "e6d08be3fd589d4f222dae5d18dbc972e6117b23"
-  },
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "GPU Linux Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Release (NVIDIA)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "GPU Linux Builder",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "GPU Linux Builder",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Linux Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Release (NVIDIA)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Linux Tests",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/code_coverage": {
-    "coverage_test_types": [
-      "unit",
-      "overall"
-    ],
-    "use_clang_coverage": true
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.linux",
-  "cq": "required",
-  "recipe": "chromium/orchestrator"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/linux-wayland-rel-compilator/properties.json b/chromium/infra/config/generated/builders/try/linux-wayland-rel-compilator/properties.json
deleted file mode 100644
index 43a1dd63f8c..00000000000
--- a/chromium/infra/config/generated/builders/try/linux-wayland-rel-compilator/properties.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Builder (Wayland)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Tests (Wayland)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux Builder (Wayland)",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Builder (Wayland)",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Tests (Wayland)",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/code_coverage": {
-    "coverage_test_types": [
-      "unit",
-      "overall"
-    ],
-    "use_clang_coverage": true
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.linux",
-  "recipe": "chromium/compilator"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/linux-wayland-rel/properties.json b/chromium/infra/config/generated/builders/try/linux-wayland-rel/properties.json
deleted file mode 100644
index a85a9d60f15..00000000000
--- a/chromium/infra/config/generated/builders/try/linux-wayland-rel/properties.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "$build/chromium_orchestrator": {
-    "compilator": "linux-wayland-rel-compilator",
-    "compilator_watcher_git_revision": "e6d08be3fd589d4f222dae5d18dbc972e6117b23"
-  },
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Builder (Wayland)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Tests (Wayland)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux Builder (Wayland)",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Builder (Wayland)",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Tests (Wayland)",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/code_coverage": {
-    "coverage_test_types": [
-      "unit",
-      "overall"
-    ],
-    "use_clang_coverage": true
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.linux",
-  "cq": "required",
-  "recipe": "chromium/orchestrator"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/linux-x64-castos-dbg/properties.json b/chromium/infra/config/generated/builders/try/linux-x64-castos-dbg/properties.json
deleted file mode 100644
index c87820ab6a4..00000000000
--- a/chromium/infra/config/generated/builders/try/linux-x64-castos-dbg/properties.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Cast Linux Debug",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "chromium_clang",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Cast Linux Debug",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.linux",
-  "cq": "path-based",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/linux-x64-castos/properties.json b/chromium/infra/config/generated/builders/try/linux-x64-castos/properties.json
deleted file mode 100644
index 8fcdde4f558..00000000000
--- a/chromium/infra/config/generated/builders/try/linux-x64-castos/properties.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Cast Linux",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_clang",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Cast Linux",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.linux",
-  "cq": "required",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/linux_chromium_asan_rel_ng-compilator/properties.json b/chromium/infra/config/generated/builders/try/linux_chromium_asan_rel_ng-compilator/properties.json
deleted file mode 100644
index 2f646599124..00000000000
--- a/chromium/infra/config/generated/builders/try/linux_chromium_asan_rel_ng-compilator/properties.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux ASan LSan Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-memory-archive",
-              "builder_group": "chromium.memory",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "lsan",
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_asan",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux ASan LSan Tests (1)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-memory-archive",
-              "builder_group": "chromium.memory",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "lsan",
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_asan",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux ASan LSan Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux ASan LSan Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Linux ASan LSan Tests (1)",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.linux",
-  "recipe": "chromium/compilator"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/linux_chromium_asan_rel_ng/properties.json b/chromium/infra/config/generated/builders/try/linux_chromium_asan_rel_ng/properties.json
deleted file mode 100644
index 6e0020c3b14..00000000000
--- a/chromium/infra/config/generated/builders/try/linux_chromium_asan_rel_ng/properties.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "$build/chromium_orchestrator": {
-    "compilator": "linux_chromium_asan_rel_ng-compilator",
-    "compilator_watcher_git_revision": "e6d08be3fd589d4f222dae5d18dbc972e6117b23"
-  },
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux ASan LSan Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-memory-archive",
-              "builder_group": "chromium.memory",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "lsan",
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_asan",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux ASan LSan Tests (1)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-memory-archive",
-              "builder_group": "chromium.memory",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "lsan",
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_asan",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux ASan LSan Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux ASan LSan Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Linux ASan LSan Tests (1)",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.linux",
-  "cq": "required",
-  "recipe": "chromium/orchestrator"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/linux_chromium_compile_dbg_ng/properties.json b/chromium/infra/config/generated/builders/try/linux_chromium_compile_dbg_ng/properties.json
deleted file mode 100644
index 4ecb7eed713..00000000000
--- a/chromium/infra/config/generated/builders/try/linux_chromium_compile_dbg_ng/properties.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Tests (dbg)(1)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Builder (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Tests (dbg)(1)",
-          "project": "chromium-m118"
-        }
-      ],
-      "is_compile_only": true
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.linux",
-  "cq": "required",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/linux_chromium_dbg_ng/properties.json b/chromium/infra/config/generated/builders/try/linux_chromium_dbg_ng/properties.json
deleted file mode 100644
index 7ddf1f1f0cf..00000000000
--- a/chromium/infra/config/generated/builders/try/linux_chromium_dbg_ng/properties.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux Tests (dbg)(1)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-linux-archive",
-              "builder_group": "chromium.linux",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Builder (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Linux Tests (dbg)(1)",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.linux",
-  "cq": "path-based",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/linux_chromium_tsan_rel_ng-compilator/properties.json b/chromium/infra/config/generated/builders/try/linux_chromium_tsan_rel_ng-compilator/properties.json
deleted file mode 100644
index 4b4ccd7bd19..00000000000
--- a/chromium/infra/config/generated/builders/try/linux_chromium_tsan_rel_ng-compilator/properties.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux TSan Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-memory-archive",
-              "builder_group": "chromium.memory",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_tsan2",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux TSan Tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-memory-archive",
-              "builder_group": "chromium.memory",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_tsan2",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux TSan Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux TSan Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Linux TSan Tests",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.linux",
-  "recipe": "chromium/compilator"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/linux_chromium_tsan_rel_ng/properties.json b/chromium/infra/config/generated/builders/try/linux_chromium_tsan_rel_ng/properties.json
deleted file mode 100644
index b67f3a4c310..00000000000
--- a/chromium/infra/config/generated/builders/try/linux_chromium_tsan_rel_ng/properties.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-  "$build/chromium_orchestrator": {
-    "compilator": "linux_chromium_tsan_rel_ng-compilator",
-    "compilator_watcher_git_revision": "e6d08be3fd589d4f222dae5d18dbc972e6117b23"
-  },
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux TSan Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-memory-archive",
-              "builder_group": "chromium.memory",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_tsan2",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Linux TSan Tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-memory-archive",
-              "builder_group": "chromium.memory",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium_tsan2",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Linux TSan Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Linux TSan Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Linux TSan Tests",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.linux",
-  "cq": "required",
-  "recipe": "chromium/orchestrator"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/linux_optional_gpu_tests_rel/properties.json b/chromium/infra/config/generated/builders/try/linux_optional_gpu_tests_rel/properties.json
deleted file mode 100644
index 649c8692672..00000000000
--- a/chromium/infra/config/generated/builders/try/linux_optional_gpu_tests_rel/properties.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "try",
-              "builder": "linux_optional_gpu_tests_rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-fyi-archive",
-              "builder_group": "tryserver.chromium.linux",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "angle_internal"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "try",
-          "builder": "linux_optional_gpu_tests_rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "retry_failed_shards": false
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.linux",
-  "cq": "path-based",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/mac-official/properties.json b/chromium/infra/config/generated/builders/try/mac-official/properties.json
deleted file mode 100644
index 03995cb495e..00000000000
--- a/chromium/infra/config/generated/builders/try/mac-official/properties.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "mac-official",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "checkout_pgo_profiles"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "mac-official",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/mac-rel-compilator/properties.json b/chromium/infra/config/generated/builders/try/mac-rel-compilator/properties.json
deleted file mode 100644
index f8b6aa93023..00000000000
--- a/chromium/infra/config/generated/builders/try/mac-rel-compilator/properties.json
+++ /dev/null
@@ -1,205 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "GPU Mac Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac Release (Intel)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "GPU Mac Builder",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac Retina Release (AMD)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "GPU Mac Builder",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac13 Tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.mac",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Mac Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "GPU Mac Builder",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Mac Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Mac Release (Intel)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Mac Retina Release (AMD)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Mac13 Tests",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/code_coverage": {
-    "coverage_test_types": [
-      "overall",
-      "unit"
-    ],
-    "use_clang_coverage": true
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.mac",
-  "recipe": "chromium/compilator"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/mac-rel/properties.json b/chromium/infra/config/generated/builders/try/mac-rel/properties.json
deleted file mode 100644
index c5d62a453b4..00000000000
--- a/chromium/infra/config/generated/builders/try/mac-rel/properties.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-  "$build/chromium_orchestrator": {
-    "compilator": "mac-rel-compilator",
-    "compilator_watcher_git_revision": "e6d08be3fd589d4f222dae5d18dbc972e6117b23"
-  },
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "GPU Mac Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac Release (Intel)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "GPU Mac Builder",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac Retina Release (AMD)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "GPU Mac Builder",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac13 Tests",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium.mac",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Mac Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "GPU Mac Builder",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Mac Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Mac Release (Intel)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Mac Retina Release (AMD)",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Mac13 Tests",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/code_coverage": {
-    "coverage_test_types": [
-      "overall",
-      "unit"
-    ],
-    "use_clang_coverage": true
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.mac",
-  "cq": "required",
-  "recipe": "chromium/orchestrator"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/mac10.15-blink-rel/properties.json b/chromium/infra/config/generated/builders/try/mac10.15-blink-rel/properties.json
deleted file mode 100644
index ace24404635..00000000000
--- a/chromium/infra/config/generated/builders/try/mac10.15-blink-rel/properties.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "try",
-              "builder": "mac10.15-blink-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "tryserver.blink",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "try",
-          "builder": "mac10.15-blink-rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "retry_failed_shards": true
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.blink",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/mac11.0-blink-rel/properties.json b/chromium/infra/config/generated/builders/try/mac11.0-blink-rel/properties.json
deleted file mode 100644
index c3793666b3d..00000000000
--- a/chromium/infra/config/generated/builders/try/mac11.0-blink-rel/properties.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "try",
-              "builder": "mac11.0-blink-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "tryserver.blink",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "try",
-          "builder": "mac11.0-blink-rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "retry_failed_shards": true
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.blink",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/mac11.0.arm64-blink-rel/properties.json b/chromium/infra/config/generated/builders/try/mac11.0.arm64-blink-rel/properties.json
deleted file mode 100644
index 03acad65bd9..00000000000
--- a/chromium/infra/config/generated/builders/try/mac11.0.arm64-blink-rel/properties.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "try",
-              "builder": "mac11.0.arm64-blink-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-fyi-archive",
-              "builder_group": "tryserver.blink",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 32
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "try",
-          "builder": "mac11.0.arm64-blink-rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "retry_failed_shards": true
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.blink",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/mac12.0-blink-rel/properties.json b/chromium/infra/config/generated/builders/try/mac12.0-blink-rel/properties.json
deleted file mode 100644
index f1ea8a4ef61..00000000000
--- a/chromium/infra/config/generated/builders/try/mac12.0-blink-rel/properties.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "try",
-              "builder": "mac12.0-blink-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "tryserver.blink",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "try",
-          "builder": "mac12.0-blink-rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "retry_failed_shards": false
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.blink",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/mac12.0.arm64-blink-rel/properties.json b/chromium/infra/config/generated/builders/try/mac12.0.arm64-blink-rel/properties.json
deleted file mode 100644
index a80222767b0..00000000000
--- a/chromium/infra/config/generated/builders/try/mac12.0.arm64-blink-rel/properties.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "try",
-              "builder": "mac12.0.arm64-blink-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "tryserver.blink",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "try",
-          "builder": "mac12.0.arm64-blink-rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "retry_failed_shards": true
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.blink",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/mac13-blink-rel/properties.json b/chromium/infra/config/generated/builders/try/mac13-blink-rel/properties.json
deleted file mode 100644
index dd21978060a..00000000000
--- a/chromium/infra/config/generated/builders/try/mac13-blink-rel/properties.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "try",
-              "builder": "mac13-blink-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "tryserver.blink",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "try",
-          "builder": "mac13-blink-rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "retry_failed_shards": false
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.blink",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/mac13.arm64-blink-rel/properties.json b/chromium/infra/config/generated/builders/try/mac13.arm64-blink-rel/properties.json
deleted file mode 100644
index b6c4d4483c6..00000000000
--- a/chromium/infra/config/generated/builders/try/mac13.arm64-blink-rel/properties.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "try",
-              "builder": "mac13.arm64-blink-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "tryserver.blink",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "try",
-          "builder": "mac13.arm64-blink-rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "retry_failed_shards": true
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.blink",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/mac_chromium_compile_dbg_ng/properties.json b/chromium/infra/config/generated/builders/try/mac_chromium_compile_dbg_ng/properties.json
deleted file mode 100644
index 93426dcfbf5..00000000000
--- a/chromium/infra/config/generated/builders/try/mac_chromium_compile_dbg_ng/properties.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Mac13 Tests (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-mac-archive",
-              "builder_group": "chromium.mac",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "mac"
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Mac Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Mac Builder (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Mac13 Tests (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "is_compile_only": true
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.mac",
-  "cq": "required",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/mac_optional_gpu_tests_rel/properties.json b/chromium/infra/config/generated/builders/try/mac_optional_gpu_tests_rel/properties.json
deleted file mode 100644
index 4f987974b7c..00000000000
--- a/chromium/infra/config/generated/builders/try/mac_optional_gpu_tests_rel/properties.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "try",
-              "builder": "mac_optional_gpu_tests_rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-fyi-archive",
-              "builder_group": "tryserver.chromium.mac",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "angle_internal"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "try",
-          "builder": "mac_optional_gpu_tests_rel",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.mac",
-  "cq": "path-based",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/try-nougat-phone-tester/properties.json b/chromium/infra/config/generated/builders/try/try-nougat-phone-tester/properties.json
deleted file mode 100644
index d39db9a0513..00000000000
--- a/chromium/infra/config/generated/builders/try/try-nougat-phone-tester/properties.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Android arm64 Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Nougat Phone Tester",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-android-archive",
-              "builder_group": "chromium.android",
-              "execution_mode": "TEST",
-              "legacy_android_config": {
-                "config": "main_builder_mb"
-              },
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "download_xr_test_apks"
-                ],
-                "build_config": "Debug",
-                "config": "android",
-                "target_bits": 64,
-                "target_platform": "android"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "android"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Android arm64 Builder (dbg)",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Android arm64 Builder (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Nougat Phone Tester",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.android",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/win-official/properties.json b/chromium/infra/config/generated/builders/try/win-official/properties.json
deleted file mode 100644
index 6e8c0fbb5c8..00000000000
--- a/chromium/infra/config/generated/builders/try/win-official/properties.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "win-official",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "checkout_pgo_profiles"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "win-official",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/win-rel-compilator/properties.json b/chromium/infra/config/generated/builders/try/win-rel-compilator/properties.json
deleted file mode 100644
index 8b3c72483fa..00000000000
--- a/chromium/infra/config/generated/builders/try/win-rel-compilator/properties.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "GPU Win x64 Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Win x64 Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-win-archive",
-              "builder_group": "chromium.win",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Win10 Tests x64",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-win-archive",
-              "builder_group": "chromium.win",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Win x64 Builder",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Win10 x64 Release (NVIDIA)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "GPU Win x64 Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "GPU Win x64 Builder",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Win x64 Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Win10 Tests x64",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Win10 x64 Release (NVIDIA)",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/code_coverage": {
-    "coverage_test_types": [
-      "unit",
-      "overall"
-    ],
-    "use_clang_coverage": true
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.win",
-  "recipe": "chromium/compilator"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/win-rel/properties.json b/chromium/infra/config/generated/builders/try/win-rel/properties.json
deleted file mode 100644
index 685269936ae..00000000000
--- a/chromium/infra/config/generated/builders/try/win-rel/properties.json
+++ /dev/null
@@ -1,177 +0,0 @@
-{
-  "$build/chromium_orchestrator": {
-    "compilator": "win-rel-compilator",
-    "compilator_watcher_git_revision": "e6d08be3fd589d4f222dae5d18dbc972e6117b23"
-  },
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "GPU Win x64 Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Win x64 Builder",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-win-archive",
-              "builder_group": "chromium.win",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Win10 Tests x64",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-win-archive",
-              "builder_group": "chromium.win",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "Win x64 Builder",
-                "project": "chromium-m118"
-              }
-            }
-          },
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Win10 x64 Release (NVIDIA)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-archive",
-              "builder_group": "chromium.gpu",
-              "execution_mode": "TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64,
-                "target_platform": "win"
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "use_clang_coverage"
-                ],
-                "config": "chromium"
-              },
-              "parent": {
-                "bucket": "ci",
-                "builder": "GPU Win x64 Builder",
-                "project": "chromium-m118"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "GPU Win x64 Builder",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Win x64 Builder",
-          "project": "chromium-m118"
-        }
-      ],
-      "builder_ids_in_scope_for_testing": [
-        {
-          "bucket": "ci",
-          "builder": "Win10 Tests x64",
-          "project": "chromium-m118"
-        },
-        {
-          "bucket": "ci",
-          "builder": "Win10 x64 Release (NVIDIA)",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/code_coverage": {
-    "coverage_test_types": [
-      "unit",
-      "overall"
-    ],
-    "use_clang_coverage": true
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.win",
-  "cq": "required",
-  "recipe": "chromium/orchestrator"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/win10.20h2-blink-rel/properties.json b/chromium/infra/config/generated/builders/try/win10.20h2-blink-rel/properties.json
deleted file mode 100644
index ab4eca7ec19..00000000000
--- a/chromium/infra/config/generated/builders/try/win10.20h2-blink-rel/properties.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "try",
-              "builder": "win10.20h2-blink-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-fyi-archive",
-              "builder_group": "tryserver.blink",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 32
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "try",
-          "builder": "win10.20h2-blink-rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "retry_failed_shards": false
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.blink",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/win11-arm64-blink-rel/properties.json b/chromium/infra/config/generated/builders/try/win11-arm64-blink-rel/properties.json
deleted file mode 100644
index fdd6b13ec80..00000000000
--- a/chromium/infra/config/generated/builders/try/win11-arm64-blink-rel/properties.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "try",
-              "builder": "win11-arm64-blink-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "tryserver.blink",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "try",
-          "builder": "win11-arm64-blink-rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "retry_failed_shards": true
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.blink",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/win11-blink-rel/properties.json b/chromium/infra/config/generated/builders/try/win11-blink-rel/properties.json
deleted file mode 100644
index 7dee2884692..00000000000
--- a/chromium/infra/config/generated/builders/try/win11-blink-rel/properties.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "try",
-              "builder": "win11-blink-rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "tryserver.blink",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "try",
-          "builder": "win11-blink-rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "retry_failed_shards": true
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.blink",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/win32-official/properties.json b/chromium/infra/config/generated/builders/try/win32-official/properties.json
deleted file mode 100644
index 3f528dac4b8..00000000000
--- a/chromium/infra/config/generated/builders/try/win32-official/properties.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "win32-official",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "builder_group": "chromium",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "config": "chromium",
-                "target_bits": 32
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "checkout_pgo_profiles"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "win32-official",
-          "project": "chromium-m118"
-        }
-      ]
-    }
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/win_chromium_compile_dbg_ng/properties.json b/chromium/infra/config/generated/builders/try/win_chromium_compile_dbg_ng/properties.json
deleted file mode 100644
index 5ff08acc58b..00000000000
--- a/chromium/infra/config/generated/builders/try/win_chromium_compile_dbg_ng/properties.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "ci",
-              "builder": "Win Builder (dbg)",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-win-archive",
-              "builder_group": "chromium.win",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Debug",
-                "config": "chromium",
-                "target_bits": 32
-              },
-              "legacy_gclient_config": {
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "ci",
-          "builder": "Win Builder (dbg)",
-          "project": "chromium-m118"
-        }
-      ],
-      "is_compile_only": true
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 500,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.win",
-  "cq": "required",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/builders/try/win_optional_gpu_tests_rel/properties.json b/chromium/infra/config/generated/builders/try/win_optional_gpu_tests_rel/properties.json
deleted file mode 100644
index 947a16ea601..00000000000
--- a/chromium/infra/config/generated/builders/try/win_optional_gpu_tests_rel/properties.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "$build/chromium_tests_builder_config": {
-    "builder_config": {
-      "builder_db": {
-        "entries": [
-          {
-            "builder_id": {
-              "bucket": "try",
-              "builder": "win_optional_gpu_tests_rel",
-              "project": "chromium-m118"
-            },
-            "builder_spec": {
-              "build_gs_bucket": "chromium-gpu-fyi-archive",
-              "builder_group": "tryserver.chromium.win",
-              "execution_mode": "COMPILE_AND_TEST",
-              "legacy_chromium_config": {
-                "apply_configs": [
-                  "mb"
-                ],
-                "build_config": "Release",
-                "config": "chromium",
-                "target_bits": 64
-              },
-              "legacy_gclient_config": {
-                "apply_configs": [
-                  "angle_internal"
-                ],
-                "config": "chromium"
-              }
-            }
-          }
-        ]
-      },
-      "builder_ids": [
-        {
-          "bucket": "try",
-          "builder": "win_optional_gpu_tests_rel",
-          "project": "chromium-m118"
-        }
-      ],
-      "retry_failed_shards": false
-    }
-  },
-  "$build/flakiness": {
-    "check_for_flakiness": true,
-    "check_for_flakiness_with_resultdb": true
-  },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "jobs": 150,
-    "metrics_project": "chromium-reclient-metrics",
-    "scandeps_server": true
-  },
-  "$recipe_engine/resultdb/test_presentation": {
-    "column_keys": [],
-    "grouping_keys": [
-      "status",
-      "v.test_suite"
-    ]
-  },
-  "builder_group": "tryserver.chromium.win",
-  "cq": "path-based",
-  "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/chromium/infra/config/generated/cq-usage/default.cfg b/chromium/infra/config/generated/cq-usage/default.cfg
index fbfd088b492..27a54f05f12 100644
--- a/chromium/infra/config/generated/cq-usage/default.cfg
+++ b/chromium/infra/config/generated/cq-usage/default.cfg
@@ -16,27 +16,6 @@ config_groups {
   verifiers {
     tryjob {
       builders {
-        name: "chromium-m118/try/android-12-x64-rel"
-      }
-      builders {
-        name: "chromium-m118/try/android-arm64-rel"
-      }
-      builders {
-        name: "chromium-m118/try/android-binary-size"
-      }
-      builders {
-        name: "chromium-m118/try/android-nougat-x86-rel"
-      }
-      builders {
-        name: "chromium-m118/try/android-x64-cast"
-      }
-      builders {
-        name: "chromium-m118/try/android_compile_dbg"
-      }
-      builders {
-        name: "chromium-m118/try/android_cronet"
-      }
-      builders {
         name: "chromium-m118/try/chromeos-amd64-generic-rel"
       }
       builders {
@@ -53,9 +32,6 @@ config_groups {
         name: "chromium-m118/try/fuchsia-x64-cast-receiver-rel"
       }
       builders {
-        name: "chromium-m118/try/ios-simulator"
-      }
-      builders {
         name: "chromium-m118/try/lacros-amd64-generic-rel"
       }
       builders {
@@ -70,42 +46,6 @@ config_groups {
       builders {
         name: "chromium-m118/try/linux-lacros-rel"
       }
-      builders {
-        name: "chromium-m118/try/linux-libfuzzer-asan-rel"
-      }
-      builders {
-        name: "chromium-m118/try/linux-rel"
-      }
-      builders {
-        name: "chromium-m118/try/linux-wayland-rel"
-      }
-      builders {
-        name: "chromium-m118/try/linux-x64-castos"
-      }
-      builders {
-        name: "chromium-m118/try/linux_chromium_asan_rel_ng"
-      }
-      builders {
-        name: "chromium-m118/try/linux_chromium_compile_dbg_ng"
-      }
-      builders {
-        name: "chromium-m118/try/linux_chromium_tsan_rel_ng"
-      }
-      builders {
-        name: "chromium-m118/try/mac-rel"
-      }
-      builders {
-        name: "chromium-m118/try/mac_chromium_compile_dbg_ng"
-      }
-      builders {
-        name: "chromium-m118/try/win-libfuzzer-asan-rel"
-      }
-      builders {
-        name: "chromium-m118/try/win-rel"
-      }
-      builders {
-        name: "chromium-m118/try/win_chromium_compile_dbg_ng"
-      }
       retry_config {
         single_quota: 1
         global_quota: 2
diff --git a/chromium/infra/config/generated/cq-usage/full.cfg b/chromium/infra/config/generated/cq-usage/full.cfg
index 9bc53c9f60a..d6c88b96c6f 100644
--- a/chromium/infra/config/generated/cq-usage/full.cfg
+++ b/chromium/infra/config/generated/cq-usage/full.cfg
@@ -16,594 +16,6 @@ config_groups {
   verifiers {
     tryjob {
       builders {
-        name: "chromium-m118/try/android-12-x64-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android-12-x64-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android-arm64-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android-arm64-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android-binary-size"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android-binary-size/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android-cronet-arm-dbg"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/cronet/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/grpc_support/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/android/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/config/android/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/cronet/ios/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android-cronet-arm-dbg/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android-cronet-x86-dbg-10-tests"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/cronet/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/grpc_support/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/android/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/config/android/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/cronet/ios/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android-cronet-x86-dbg-10-tests/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android-nougat-x86-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android-nougat-x86-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android-pie-arm64-dbg"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/android/features/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/android/java/src/org/chromium/chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/android/javatests/src/org/chromium/chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/android/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/webxr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/browser/xr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "device/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/cardboard/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/openxr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/gvr-android-sdk/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/arcore-android-sdk/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/arcore-android-sdk-client/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android-pie-arm64-dbg/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android-x64-cast"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android-x64-cast/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android_compile_dbg"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android_compile_dbg/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android_compile_x64_dbg"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/android/java/src/org/chromium/chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/browser/xr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sandbox/linux/seccomp-bpf/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sandbox/linux/seccomp-bpf-helpers/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sandbox/linux/system_headers/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sandbox/linux/tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/gvr-android-sdk/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android_compile_x64_dbg/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android_compile_x86_dbg"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/android/java/src/org/chromium/chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/browser/xr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sandbox/linux/seccomp-bpf/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sandbox/linux/seccomp-bpf-helpers/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sandbox/linux/system_headers/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sandbox/linux/tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/gvr-android-sdk/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android_compile_x86_dbg/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android_cronet"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android_cronet/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android_optional_gpu_tests_rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "cc/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/browser/xr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/viz/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/test/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/audio/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/base/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/capture/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/filters/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/mojo/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/renderers/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/video/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "services/viz/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/buildbot/tryserver.chromium.android.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/trigger_scripts/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/mediastream/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webcodecs/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/platform/graphics/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/clang/scripts/update.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/mb/mb_config_expectations/tryserver.chromium.android.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ui/gl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".*\\.md"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android_optional_gpu_tests_rel/.+"
-        }
-      }
-      builders {
         name: "chromium-m118/try/chromeos-amd64-generic-dbg"
         location_filters {
           gerrit_host_regexp: ".*"
@@ -678,306 +90,6 @@ config_groups {
         disable_reuse: true
       }
       builders {
-        name: "chromium-m118/try/dawn-linux-x64-deps-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/test/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/buildbot/chromium.dawn.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/external/wpt/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/wpt_internal/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/WebGPUExpectations"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/dawn/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/webgpu-cts/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/clang/scripts/update.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ui/gl/features.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/dawn-linux-x64-deps-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/dawn-mac-x64-deps-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/test/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/buildbot/chromium.dawn.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/external/wpt/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/wpt_internal/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/WebGPUExpectations"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/dawn/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/webgpu-cts/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/clang/scripts/update.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ui/gl/features.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/dawn-mac-x64-deps-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/dawn-win10-x64-deps-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/test/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/buildbot/chromium.dawn.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/external/wpt/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/wpt_internal/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/WebGPUExpectations"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/dawn/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/webgpu-cts/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/clang/scripts/update.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ui/gl/features.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/dawn-win10-x64-deps-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/dawn-win10-x86-deps-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/test/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/buildbot/chromium.dawn.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/external/wpt/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/wpt_internal/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/WebGPUExpectations"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/dawn/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/webgpu-cts/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/clang/scripts/update.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ui/gl/features.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/dawn-win10-x86-deps-rel/.+"
-        }
-      }
-      builders {
         name: "chromium-m118/try/fuchsia-arm64-cast-receiver-rel"
         location_filters {
           gerrit_host_regexp: ".*"
@@ -1078,243 +190,6 @@ config_groups {
         }
       }
       builders {
-        name: "chromium-m118/try/gpu-fyi-cq-android-arm64"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "cc/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/browser/xr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/viz/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/test/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/audio/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/base/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/capture/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/filters/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/mojo/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/renderers/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/video/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "services/viz/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/buildbot/chromium.gpu.fyi.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/trigger_scripts/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/mediastream/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webcodecs/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/platform/graphics/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/clang/scripts/update.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/mb/mb_config_expectations/tryserver.chromium.android.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ui/gl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".*\\.md"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/gpu-fyi-cq-android-arm64/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/ios-simulator"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/ios-simulator/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/ios-simulator-cronet"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/cronet/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/grpc_support/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ios/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/cronet/android/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/ios-simulator-cronet/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/ios-simulator-full-configs"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ios/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/ios-simulator-full-configs/.+"
-        }
-      }
-      builders {
         name: "chromium-m118/try/lacros-amd64-generic-rel"
         location_filters {
           gerrit_host_regexp: ".*"
@@ -1414,744 +289,6 @@ config_groups {
           path_regexp: "infra/config/generated/builders/try/linux-lacros-rel/.+"
         }
       }
-      builders {
-        name: "chromium-m118/try/linux-libfuzzer-asan-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux-libfuzzer-asan-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/linux-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/linux-wayland-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux-wayland-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/linux-x64-castos"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux-x64-castos/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/linux-x64-castos-dbg"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chromecast/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux-x64-castos-dbg/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/linux_chromium_asan_rel_ng"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux_chromium_asan_rel_ng/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/linux_chromium_compile_dbg_ng"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux_chromium_compile_dbg_ng/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/linux_chromium_dbg_ng"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.*check_gn_headers.*"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux_chromium_dbg_ng/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/linux_chromium_tsan_rel_ng"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux_chromium_tsan_rel_ng/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/linux_optional_gpu_tests_rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/browser/xr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/test/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/audio/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/base/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/capture/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/filters/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/mojo/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/renderers/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/video/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/buildbot/tryserver.chromium.linux.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/trigger_scripts/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/mediastream/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webcodecs/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/platform/graphics/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/clang/scripts/update.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/mb/mb_config_expectations/tryserver.chromium.linux.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ui/gl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".*\\.md"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux_optional_gpu_tests_rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/mac-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/mac-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/mac_chromium_compile_dbg_ng"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/mac_chromium_compile_dbg_ng/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/mac_optional_gpu_tests_rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/browser/xr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/test/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/audio/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/base/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/capture/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/filters/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/mojo/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/renderers/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/video/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "services/shape_detection/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/buildbot/tryserver.chromium.mac.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/trigger_scripts/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/mediastream/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webcodecs/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/platform/graphics/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/clang/scripts/update.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/mb/mb_config_expectations/tryserver.chromium.mac.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ui/gl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".*\\.md"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/mac_optional_gpu_tests_rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/win-libfuzzer-asan-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/win-libfuzzer-asan-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/win-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/win-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/win_chromium_compile_dbg_ng"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/win_chromium_compile_dbg_ng/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/win_optional_gpu_tests_rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/media/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/cdm/renderer/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/browser/xr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/test/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "device/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/audio/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/base/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/capture/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/cdm/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/filters/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/mojo/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/renderers/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/video/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "services/webnn/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/buildbot/tryserver.chromium.win.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/trigger_scripts/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/mediastream/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webcodecs/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/xr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/platform/graphics/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/clang/scripts/update.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/mb/mb_config_expectations/tryserver.chromium.win.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ui/gl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".*\\.md"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/win_optional_gpu_tests_rel/.+"
-        }
-      }
       retry_config {
         single_quota: 1
         global_quota: 2
diff --git a/chromium/infra/config/generated/health-specs/health-specs.json b/chromium/infra/config/generated/health-specs/health-specs.json
index 390b102c6bc..afdcf726f78 100644
--- a/chromium/infra/config/generated/health-specs/health-specs.json
+++ b/chromium/infra/config/generated/health-specs/health-specs.json
@@ -15,156 +15,6 @@
   },
   "thresholds": {
     "ci": {
-      "Android Release (Nexus 5X)": {
-        "_default": "_default"
-      },
-      "Android WebView N (dbg)": {
-        "_default": "_default"
-      },
-      "Android WebView O (dbg)": {
-        "_default": "_default"
-      },
-      "Android WebView P (dbg)": {
-        "_default": "_default"
-      },
-      "Android arm Builder (dbg)": {
-        "_default": "_default"
-      },
-      "Android arm64 Builder (dbg)": {
-        "_default": "_default"
-      },
-      "Android arm64 Builder All Targets (dbg)": {
-        "_default": "_default"
-      },
-      "Android x64 Builder (dbg)": {
-        "_default": "_default"
-      },
-      "Android x64 Builder All Targets (dbg)": {
-        "_default": "_default"
-      },
-      "Android x86 Builder (dbg)": {
-        "_default": "_default"
-      },
-      "Cast Android (dbg)": {
-        "_default": "_default"
-      },
-      "Dawn Linux x64 DEPS Builder": {
-        "_default": "_default"
-      },
-      "Dawn Linux x64 DEPS Release (Intel UHD 630)": {
-        "_default": "_default"
-      },
-      "Dawn Linux x64 DEPS Release (NVIDIA)": {
-        "_default": "_default"
-      },
-      "Dawn Mac x64 DEPS Builder": {
-        "_default": "_default"
-      },
-      "Dawn Mac x64 DEPS Release (AMD)": {
-        "_default": "_default"
-      },
-      "Dawn Mac x64 DEPS Release (Intel)": {
-        "_default": "_default"
-      },
-      "Dawn Win10 x64 DEPS Builder": {
-        "_default": "_default"
-      },
-      "Dawn Win10 x64 DEPS Release (Intel)": {
-        "_default": "_default"
-      },
-      "Dawn Win10 x64 DEPS Release (NVIDIA)": {
-        "_default": "_default"
-      },
-      "Dawn Win10 x86 DEPS Builder": {
-        "_default": "_default"
-      },
-      "Dawn Win10 x86 DEPS Release (Intel)": {
-        "_default": "_default"
-      },
-      "Dawn Win10 x86 DEPS Release (NVIDIA)": {
-        "_default": "_default"
-      },
-      "GPU Linux Builder": {
-        "_default": "_default"
-      },
-      "GPU Mac Builder": {
-        "_default": "_default"
-      },
-      "GPU Win x64 Builder": {
-        "_default": "_default"
-      },
-      "Linux Release (NVIDIA)": {
-        "_default": "_default"
-      },
-      "Mac Builder": {
-        "_default": "_default"
-      },
-      "Mac Builder (dbg)": {
-        "_default": "_default"
-      },
-      "Mac Release (Intel)": {
-        "_default": "_default"
-      },
-      "Mac Retina Release (AMD)": {
-        "_default": "_default"
-      },
-      "Mac10.15 Tests": {
-        "_default": "_default"
-      },
-      "Mac11 Tests": {
-        "_default": "_default"
-      },
-      "Mac12 Tests": {
-        "_default": "_default"
-      },
-      "Mac13 Tests": {
-        "_default": "_default"
-      },
-      "Mac13 Tests (dbg)": {
-        "_default": "_default"
-      },
-      "Nougat Phone Tester": {
-        "_default": "_default"
-      },
-      "Oreo Phone Tester": {
-        "_default": "_default"
-      },
-      "Win10 x64 Release (NVIDIA)": {
-        "_default": "_default"
-      },
-      "android-12-x64-rel": {
-        "_default": "_default"
-      },
-      "android-cronet-arm-dbg": {
-        "_default": "_default"
-      },
-      "android-cronet-arm-rel": {
-        "_default": "_default"
-      },
-      "android-cronet-mainline-clang-x86-dbg": {
-        "_default": "_default"
-      },
-      "android-cronet-x64-dbg": {
-        "_default": "_default"
-      },
-      "android-cronet-x86-dbg": {
-        "_default": "_default"
-      },
-      "android-cronet-x86-dbg-10-tests": {
-        "_default": "_default"
-      },
-      "android-nougat-x86-rel": {
-        "_default": "_default"
-      },
-      "android-official": {
-        "_default": "_default"
-      },
-      "android-pie-arm64-dbg": {
-        "_default": "_default"
-      },
-      "android-pie-arm64-rel": {
-        "_default": "_default"
-      },
       "chromeos-amd64-generic-dbg": {
         "build_time": {
           "p50_mins": 60
@@ -266,12 +116,6 @@
       "fuchsia-official": {
         "_default": "_default"
       },
-      "ios-simulator": {
-        "_default": "_default"
-      },
-      "ios-simulator-full-configs": {
-        "_default": "_default"
-      },
       "lacros-amd64-generic-rel": {
         "build_time": {
           "p50_mins": 60
@@ -383,41 +227,6 @@
         "pending_time": {
           "p50_mins": 20
         }
-      },
-      "linux-official": {
-        "build_time": {
-          "p50_mins": 240
-        },
-        "fail_rate": {
-          "average": 0.2
-        },
-        "infra_fail_rate": {
-          "average": 0.05
-        },
-        "pending_time": {
-          "p50_mins": 20
-        }
-      },
-      "mac-arm64-rel": {
-        "_default": "_default"
-      },
-      "mac-official": {
-        "_default": "_default"
-      },
-      "mac11-arm64-rel-tests": {
-        "_default": "_default"
-      },
-      "mac12-arm64-rel-tests": {
-        "_default": "_default"
-      },
-      "mac13-arm64-rel-tests": {
-        "_default": "_default"
-      },
-      "win-official": {
-        "_default": "_default"
-      },
-      "win32-official": {
-        "_default": "_default"
       }
     }
   }
diff --git a/chromium/infra/config/generated/luci/commit-queue.cfg b/chromium/infra/config/generated/luci/commit-queue.cfg
index 65293374ed6..03efe895cf6 100644
--- a/chromium/infra/config/generated/luci/commit-queue.cfg
+++ b/chromium/infra/config/generated/luci/commit-queue.cfg
@@ -34,684 +34,6 @@ config_groups {
         owner_whitelist_group: "project-chromium-robot-committers"
       }
       builders {
-        name: "chrome-m118/try/linux-chrome"
-        includable_only: true
-        result_visibility: COMMENT_LEVEL_RESTRICTED
-        owner_whitelist_group: "googlers"
-        owner_whitelist_group: "project-chromium-robot-committers"
-      }
-      builders {
-        name: "chrome-m118/try/linux-pgo"
-        includable_only: true
-        result_visibility: COMMENT_LEVEL_RESTRICTED
-        owner_whitelist_group: "googlers"
-        owner_whitelist_group: "project-chromium-robot-committers"
-      }
-      builders {
-        name: "chrome-m118/try/mac-arm-pgo"
-        includable_only: true
-        result_visibility: COMMENT_LEVEL_RESTRICTED
-        owner_whitelist_group: "googlers"
-        owner_whitelist_group: "project-chromium-robot-committers"
-      }
-      builders {
-        name: "chrome-m118/try/mac-chrome"
-        includable_only: true
-        result_visibility: COMMENT_LEVEL_RESTRICTED
-        owner_whitelist_group: "googlers"
-        owner_whitelist_group: "project-chromium-robot-committers"
-      }
-      builders {
-        name: "chrome-m118/try/mac-pgo"
-        includable_only: true
-        result_visibility: COMMENT_LEVEL_RESTRICTED
-        owner_whitelist_group: "googlers"
-        owner_whitelist_group: "project-chromium-robot-committers"
-      }
-      builders {
-        name: "chrome-m118/try/win-arm64-pgo"
-        includable_only: true
-        result_visibility: COMMENT_LEVEL_RESTRICTED
-        owner_whitelist_group: "googlers"
-        owner_whitelist_group: "project-chromium-robot-committers"
-      }
-      builders {
-        name: "chrome-m118/try/win-chrome"
-        includable_only: true
-        result_visibility: COMMENT_LEVEL_RESTRICTED
-        owner_whitelist_group: "googlers"
-        owner_whitelist_group: "project-chromium-robot-committers"
-      }
-      builders {
-        name: "chrome-m118/try/win32-pgo"
-        includable_only: true
-        result_visibility: COMMENT_LEVEL_RESTRICTED
-        owner_whitelist_group: "googlers"
-        owner_whitelist_group: "project-chromium-robot-committers"
-      }
-      builders {
-        name: "chrome-m118/try/win64-chrome"
-        includable_only: true
-        result_visibility: COMMENT_LEVEL_RESTRICTED
-        owner_whitelist_group: "googlers"
-        owner_whitelist_group: "project-chromium-robot-committers"
-      }
-      builders {
-        name: "chrome-m118/try/win64-pgo"
-        includable_only: true
-        result_visibility: COMMENT_LEVEL_RESTRICTED
-        owner_whitelist_group: "googlers"
-        owner_whitelist_group: "project-chromium-robot-committers"
-      }
-      builders {
-        name: "chromium-m118/try/android-12-x64-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android-12-x64-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android-12-x64-rel-compilator"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/android-arm64-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android-arm64-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android-arm64-rel-compilator"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/android-binary-size"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android-binary-size/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android-cronet-arm-dbg"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/cronet/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/grpc_support/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/android/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/config/android/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/cronet/ios/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android-cronet-arm-dbg/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android-cronet-x86-dbg-10-tests"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/cronet/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/grpc_support/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/android/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/config/android/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/cronet/ios/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android-cronet-x86-dbg-10-tests/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android-nougat-x86-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android-nougat-x86-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android-nougat-x86-rel-compilator"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/android-official"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/android-oreo-arm64-dbg"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/android-pie-arm64-dbg"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/android/features/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/android/java/src/org/chromium/chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/android/javatests/src/org/chromium/chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/android/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/webxr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/browser/xr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "device/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/cardboard/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/openxr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/gvr-android-sdk/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/arcore-android-sdk/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/arcore-android-sdk-client/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android-pie-arm64-dbg/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android-x64-cast"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android-x64-cast/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android_compile_dbg"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android_compile_dbg/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android_compile_x64_dbg"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/android/java/src/org/chromium/chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/browser/xr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sandbox/linux/seccomp-bpf/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sandbox/linux/seccomp-bpf-helpers/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sandbox/linux/system_headers/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sandbox/linux/tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/gvr-android-sdk/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android_compile_x64_dbg/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android_compile_x86_dbg"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/android/java/src/org/chromium/chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/browser/xr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sandbox/linux/seccomp-bpf/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sandbox/linux/seccomp-bpf-helpers/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sandbox/linux/system_headers/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sandbox/linux/tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/gvr-android-sdk/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android_compile_x86_dbg/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android_cronet"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android_cronet/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/android_optional_gpu_tests_rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "cc/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/browser/xr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/viz/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/test/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/audio/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/base/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/capture/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/filters/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/mojo/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/renderers/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/video/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "services/viz/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/buildbot/tryserver.chromium.android.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/trigger_scripts/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/mediastream/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webcodecs/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/platform/graphics/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/clang/scripts/update.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/mb/mb_config_expectations/tryserver.chromium.android.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ui/gl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".*\\.md"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/android_optional_gpu_tests_rel/.+"
-        }
-      }
-      builders {
         name: "chromium-m118/try/chromeos-amd64-generic-dbg"
         location_filters {
           gerrit_host_regexp: ".*"
@@ -806,306 +128,6 @@ config_groups {
         disable_reuse: true
       }
       builders {
-        name: "chromium-m118/try/dawn-linux-x64-deps-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/test/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/buildbot/chromium.dawn.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/external/wpt/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/wpt_internal/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/WebGPUExpectations"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/dawn/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/webgpu-cts/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/clang/scripts/update.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ui/gl/features.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/dawn-linux-x64-deps-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/dawn-mac-x64-deps-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/test/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/buildbot/chromium.dawn.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/external/wpt/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/wpt_internal/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/WebGPUExpectations"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/dawn/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/webgpu-cts/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/clang/scripts/update.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ui/gl/features.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/dawn-mac-x64-deps-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/dawn-win10-x64-deps-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/test/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/buildbot/chromium.dawn.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/external/wpt/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/wpt_internal/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/WebGPUExpectations"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/dawn/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/webgpu-cts/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/clang/scripts/update.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ui/gl/features.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/dawn-win10-x64-deps-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/dawn-win10-x86-deps-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/test/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/buildbot/chromium.dawn.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/external/wpt/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/wpt_internal/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/web_tests/WebGPUExpectations"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/dawn/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/webgpu-cts/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/clang/scripts/update.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ui/gl/features.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/dawn-win10-x86-deps-rel/.+"
-        }
-      }
-      builders {
         name: "chromium-m118/try/fuchsia-arm64-cast-receiver-rel"
         location_filters {
           gerrit_host_regexp: ".*"
@@ -1218,247 +240,6 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "chromium-m118/try/gpu-fyi-cq-android-arm64"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "cc/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/browser/xr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/viz/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/test/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/audio/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/base/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/capture/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/filters/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/mojo/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/renderers/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/video/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "services/viz/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/buildbot/chromium.gpu.fyi.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/trigger_scripts/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/mediastream/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webcodecs/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/platform/graphics/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/clang/scripts/update.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/mb/mb_config_expectations/tryserver.chromium.android.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ui/gl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".*\\.md"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/gpu-fyi-cq-android-arm64/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/ios-simulator"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/ios-simulator/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/ios-simulator-compilator"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/ios-simulator-cronet"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/cronet/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/grpc_support/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ios/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/cronet/android/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/ios-simulator-cronet/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/ios-simulator-full-configs"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ios/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/ios-simulator-full-configs/.+"
-        }
-      }
-      builders {
         name: "chromium-m118/try/lacros-amd64-generic-rel"
         location_filters {
           gerrit_host_regexp: ".*"
@@ -1511,18 +292,6 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "chromium-m118/try/linux-afl-asan-rel"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/linux-blink-rel"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/linux-centipede-asan-rel"
-        includable_only: true
-      }
-      builders {
         name: "chromium-m118/try/linux-chromeos-compile-dbg"
         location_filters {
           gerrit_host_regexp: ".*"
@@ -1594,829 +363,6 @@ config_groups {
         name: "chromium-m118/try/linux-lacros-rel-compilator"
         includable_only: true
       }
-      builders {
-        name: "chromium-m118/try/linux-libfuzzer-asan-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux-libfuzzer-asan-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/linux-official"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/linux-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/linux-rel-compilator"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/linux-wayland-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux-wayland-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/linux-wayland-rel-compilator"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/linux-x64-castos"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux-x64-castos/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/linux-x64-castos-dbg"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chromecast/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux-x64-castos-dbg/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/linux_chromium_asan_rel_ng"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux_chromium_asan_rel_ng/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/linux_chromium_asan_rel_ng-compilator"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/linux_chromium_compile_dbg_ng"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux_chromium_compile_dbg_ng/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/linux_chromium_dbg_ng"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.*check_gn_headers.*"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux_chromium_dbg_ng/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/linux_chromium_tsan_rel_ng"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux_chromium_tsan_rel_ng/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/linux_chromium_tsan_rel_ng-compilator"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/linux_optional_gpu_tests_rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/browser/xr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/test/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/audio/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/base/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/capture/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/filters/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/mojo/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/renderers/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/video/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/buildbot/tryserver.chromium.linux.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/trigger_scripts/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/mediastream/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webcodecs/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/platform/graphics/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/clang/scripts/update.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/mb/mb_config_expectations/tryserver.chromium.linux.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ui/gl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".*\\.md"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/linux_optional_gpu_tests_rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/mac-official"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/mac-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/mac-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/mac-rel-compilator"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/mac10.15-blink-rel"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/mac11.0-blink-rel"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/mac11.0.arm64-blink-rel"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/mac12.0-blink-rel"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/mac12.0.arm64-blink-rel"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/mac13-blink-rel"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/mac13.arm64-blink-rel"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/mac_chromium_compile_dbg_ng"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/mac_chromium_compile_dbg_ng/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/mac_optional_gpu_tests_rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/browser/xr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/test/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/audio/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/base/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/capture/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/filters/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/mojo/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/renderers/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/video/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "services/shape_detection/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/buildbot/tryserver.chromium.mac.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/trigger_scripts/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/mediastream/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webcodecs/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/platform/graphics/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/clang/scripts/update.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/mb/mb_config_expectations/tryserver.chromium.mac.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ui/gl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".*\\.md"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/mac_optional_gpu_tests_rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/try-nougat-phone-tester"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/win-libfuzzer-asan-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/win-libfuzzer-asan-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/win-official"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/win-rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/win-rel/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/win-rel-compilator"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/win10.20h2-blink-rel"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/win11-arm64-blink-rel"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/win11-blink-rel"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/win32-official"
-        includable_only: true
-      }
-      builders {
-        name: "chromium-m118/try/win_chromium_compile_dbg_ng"
-        cancel_stale: NO
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/win_chromium_compile_dbg_ng/.+"
-        }
-      }
-      builders {
-        name: "chromium-m118/try/win_optional_gpu_tests_rel"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/media/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "chrome/browser/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "components/cdm/renderer/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/browser/xr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "content/test/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "device/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/audio/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/base/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/capture/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/cdm/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/filters/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/mojo/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/renderers/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "media/video/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "services/webnn/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/buildbot/tryserver.chromium.win.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "testing/trigger_scripts/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/vr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/mediastream/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webcodecs/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/webgpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/modules/xr/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "third_party/blink/renderer/platform/graphics/gpu/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/clang/scripts/update.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/mb/mb_config_expectations/tryserver.chromium.win.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "ui/gl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".*\\.md"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "docs/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "infra/config/generated/builders/try/win_optional_gpu_tests_rel/.+"
-        }
-      }
       retry_config {
         single_quota: 1
         global_quota: 2
@@ -2426,16 +372,4 @@ config_groups {
       }
     }
   }
-  additional_modes {
-    name: "QUICK_DRY_RUN"
-    cq_label_value: 1
-    triggering_label: "Quick-Run"
-    triggering_value: 1
-  }
-  tryjob_experiments {
-    name: "chromium_rts.dry_run_rts"
-    condition {
-      owner_group_allowlist: "rts-on-dry-run"
-    }
-  }
 }
diff --git a/chromium/infra/config/generated/luci/cr-buildbucket.cfg b/chromium/infra/config/generated/luci/cr-buildbucket.cfg
index 54bbba6857f..045ddf37ea6 100644
--- a/chromium/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/chromium/infra/config/generated/luci/cr-buildbucket.cfg
@@ -8,6455 +8,6 @@ buckets {
   name: "ci"
   swarming {
     builders {
-      name: "Android FYI Release (Pixel 6)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Android FYI Release (Pixel 6)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.gpu.fyi",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 21600
-      build_numbers: YES
-      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Android Release (Nexus 5X)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Android Release (Nexus 5X)/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Android Release (Nexus 5X)/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.gpu",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Android WebView N (dbg)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Android WebView N (dbg)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Android WebView O (dbg)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Android WebView O (dbg)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Android WebView P (dbg)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Android WebView P (dbg)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Android arm Builder (dbg)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Android arm Builder (dbg)/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Android arm Builder (dbg)/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 14400
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Android arm64 Builder (dbg)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Android arm64 Builder (dbg)/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Android arm64 Builder (dbg)/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 25200
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Android arm64 Builder All Targets (dbg)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:Android arm64 Builder All Targets (dbg)"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Android arm64 Builder All Targets (dbg)/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Android arm64 Builder All Targets (dbg)/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 25200
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "builder:"
-        dimensions: "builderless:1"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Android x64 Builder (dbg)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:Android x64 Builder (dbg)"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Android x64 Builder (dbg)/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Android x64 Builder (dbg)/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 25200
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "builder:"
-        dimensions: "builderless:1"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Android x64 Builder All Targets (dbg)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:high"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Android x64 Builder All Targets (dbg)/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Android x64 Builder All Targets (dbg)/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 25200
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Android x86 Builder (dbg)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:high"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Android x86 Builder (dbg)/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Android x86 Builder (dbg)/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 21600
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Cast Android (dbg)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Cast Android (dbg)/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Cast Android (dbg)/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Cast Linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Cast Linux/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Cast Linux/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.linux",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Cast Linux Debug"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Cast Linux Debug/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Cast Linux Debug/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.linux",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Dawn Linux x64 DEPS Builder"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Dawn Linux x64 DEPS Builder/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Dawn Linux x64 DEPS Builder/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.dawn",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Dawn Linux x64 DEPS Release (Intel UHD 630)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release (Intel UHD 630)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.dawn",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Dawn Linux x64 DEPS Release (NVIDIA)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release (NVIDIA)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.dawn",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Dawn Mac x64 DEPS Builder"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Dawn Mac x64 DEPS Builder/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Dawn Mac x64 DEPS Builder/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.dawn",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Dawn Mac x64 DEPS Release (AMD)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release (AMD)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.dawn",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Dawn Mac x64 DEPS Release (Intel)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release (Intel)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.dawn",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Dawn Win10 x64 DEPS Builder"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Builder/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Builder/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.dawn",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Dawn Win10 x64 DEPS Release (Intel)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release (Intel)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.dawn",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Dawn Win10 x64 DEPS Release (NVIDIA)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release (NVIDIA)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.dawn",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Dawn Win10 x86 DEPS Builder"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Builder/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Builder/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.dawn",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Dawn Win10 x86 DEPS Release (Intel)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release (Intel)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.dawn",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Dawn Win10 x86 DEPS Release (NVIDIA)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release (NVIDIA)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.dawn",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "GPU FYI Android arm64 Builder"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/GPU FYI Android arm64 Builder/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/GPU FYI Android arm64 Builder/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.gpu.fyi",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 21600
-      build_numbers: YES
-      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "GPU Linux Builder"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/GPU Linux Builder/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/GPU Linux Builder/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.gpu",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "GPU Mac Builder"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/GPU Mac Builder/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/GPU Mac Builder/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.gpu",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "GPU Win x64 Builder"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/GPU Win x64 Builder/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/GPU Win x64 Builder/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.gpu",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Linux ASan LSan Builder"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Linux ASan LSan Builder/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Linux ASan LSan Builder/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.memory",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Linux ASan LSan Tests (1)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Linux ASan LSan Tests (1)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.memory",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Linux ASan Tests (sandboxed)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Linux ASan Tests (sandboxed)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.memory",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Linux Builder"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Linux Builder/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Linux Builder/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.linux",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Linux Builder (Wayland)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Linux Builder (Wayland)/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Linux Builder (Wayland)/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.linux",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Linux Builder (dbg)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Linux Builder (dbg)/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Linux Builder (dbg)/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.linux",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Linux Release (NVIDIA)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Linux Release (NVIDIA)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.gpu",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Linux TSan Builder"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Linux TSan Builder/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Linux TSan Builder/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.memory",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Linux TSan Tests"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Linux TSan Tests/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Linux TSan Tests/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.memory",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Linux Tests"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Linux Tests/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.linux",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_text_artifacts"
-          text_artifacts {
-            predicate {
-              content_type_regexp: "snippet"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Linux Tests (Wayland)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Linux Tests (Wayland)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.linux",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Linux Tests (dbg)(1)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Linux Tests (dbg)(1)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.linux",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Mac Builder"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:Mac Builder"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Mac Builder/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Mac Builder/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.mac",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "builder:"
-        dimensions: "builderless:1"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Mac Builder (dbg)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:Mac Builder (dbg)"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Mac Builder (dbg)/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Mac Builder (dbg)/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.mac",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "builder:"
-        dimensions: "builderless:1"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Mac Release (Intel)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Mac Release (Intel)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.gpu",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Mac Retina Release (AMD)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Mac Retina Release (AMD)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.gpu",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Mac10.15 Tests"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Mac10.15 Tests/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.mac",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Mac11 Tests"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Mac11 Tests/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.mac",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Mac12 Tests"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Mac12 Tests/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.mac",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Mac13 Tests"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Mac13 Tests/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.mac",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Mac13 Tests (dbg)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Mac13 Tests (dbg)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.mac",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Nougat Phone Tester"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Nougat Phone Tester/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Oreo Phone Tester"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Oreo Phone Tester/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Win Builder"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:Win Builder"
-      dimensions: "cores:32"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Win Builder/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Win Builder/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.win",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "builder:"
-        dimensions: "builderless:1"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Win Builder (dbg)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:Win Builder (dbg)"
-      dimensions: "cores:32"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Win Builder (dbg)/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Win Builder (dbg)/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.win",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "builder:"
-        dimensions: "builderless:1"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Win x64 Builder"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:Win x64 Builder"
-      dimensions: "cores:32"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Win x64 Builder/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Win x64 Builder/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.win",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "builder:"
-        dimensions: "builderless:1"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Win10 Tests x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:Win10 Tests x64"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Win10 Tests x64/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/Win10 Tests x64/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.win",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "builder:"
-        dimensions: "builderless:1"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "Win10 x64 Release (NVIDIA)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Win10 x64 Release (NVIDIA)/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.gpu",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "android-12-x64-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/android-12-x64-rel/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/android-12-x64-rel/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 14400
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "android-cronet-arm-dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/android-cronet-arm-dbg/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/android-cronet-arm-dbg/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "android-cronet-arm-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/android-cronet-arm-rel/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/android-cronet-arm-rel/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "android-cronet-mainline-clang-x86-dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/android-cronet-mainline-clang-x86-dbg/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/android-cronet-mainline-clang-x86-dbg/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "android-cronet-x64-dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/android-cronet-x64-dbg/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/android-cronet-x64-dbg/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "android-cronet-x86-dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/android-cronet-x86-dbg/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/android-cronet-x86-dbg/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "android-cronet-x86-dbg-10-tests"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/android-cronet-x86-dbg-10-tests/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "android-nougat-x86-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/android-nougat-x86-rel/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/android-nougat-x86-rel/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 14400
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "android-official"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:android-official"
-      dimensions: "cores:32"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/android-official/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/android-official/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 25200
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "builder:"
-        dimensions: "builderless:1"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "android-pie-arm64-dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/android-pie-arm64-dbg/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "android-pie-arm64-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/android-pie-arm64-rel/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/android-pie-arm64-rel/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 14400
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
       name: "chromeos-amd64-generic-dbg"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
@@ -7155,7 +706,7 @@ buckets {
         '  "led_builder_is_bootstrapped": true,'
         '  "recipe": "chromium",'
         '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
+        '    "fuchsia"'
         '  ]'
         '}'
       execution_timeout_secs: 10800
@@ -7249,7 +800,7 @@ buckets {
         '  "led_builder_is_bootstrapped": true,'
         '  "recipe": "chromium",'
         '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
+        '    "fuchsia"'
         '  ]'
         '}'
       execution_timeout_secs: 10800
@@ -7341,7 +892,7 @@ buckets {
         '  "led_builder_is_bootstrapped": true,'
         '  "recipe": "chromium",'
         '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
+        '    "fuchsia"'
         '  ]'
         '}'
       execution_timeout_secs: 36000
@@ -7436,7 +987,7 @@ buckets {
         '  "led_builder_is_bootstrapped": true,'
         '  "recipe": "chromium",'
         '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
+        '    "fuchsia"'
         '  ]'
         '}'
       execution_timeout_secs: 10800
@@ -7530,7 +1081,7 @@ buckets {
         '  "led_builder_is_bootstrapped": true,'
         '  "recipe": "chromium",'
         '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
+        '    "fuchsia"'
         '  ]'
         '}'
       execution_timeout_secs: 10800
@@ -7584,294 +1135,6 @@ buckets {
       }
     }
     builders {
-      name: "ios-simulator"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:ios-simulator"
-      dimensions: "cpu:arm64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/ios-simulator/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/ios-simulator/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.mac",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      caches {
-        name: "xcode_ios_15a5229m"
-        path: "xcode_ios_15a5229m.app"
-      }
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "builder:"
-        dimensions: "builderless:1"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "ios-simulator-cronet"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:ios-simulator-cronet"
-      dimensions: "cpu:x86-64"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/ios-simulator-cronet/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/ios-simulator-cronet/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.fyi",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      priority: 35
-      execution_timeout_secs: 36000
-      caches {
-        name: "xcode_ios_15a5229m"
-        path: "xcode_ios_15a5229m.app"
-      }
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "builder:"
-        dimensions: "builderless:1"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "ios-simulator-full-configs"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:ios-simulator-full-configs"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/ios-simulator-full-configs/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/ios-simulator-full-configs/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.mac",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      caches {
-        name: "xcode_ios_15a5229m"
-        path: "xcode_ios_15a5229m.app"
-      }
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "builder:"
-        dimensions: "builderless:1"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
       name: "lacros-amd64-generic-rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
@@ -8619,748 +1882,6 @@ buckets {
         dimensions: "pool:luci.chromium.try"
       }
     }
-    builders {
-      name: "linux-official"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:linux-official"
-      dimensions: "cores:32"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/linux-official/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/linux-official/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 25200
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "builder:"
-        dimensions: "builderless:1"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "mac-arm64-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:mac-arm64-rel"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/mac-arm64-rel/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/mac-arm64-rel/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.mac",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "builder:"
-        dimensions: "builderless:1"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "mac-official"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:mac-official"
-      dimensions: "cpu:arm64"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/mac-official/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/mac-official/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 54000
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "builder:"
-        dimensions: "builderless:1"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "mac11-arm64-rel-tests"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/mac11-arm64-rel-tests/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.mac",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "mac12-arm64-rel-tests"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/mac12-arm64-rel-tests/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.mac",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "mac13-arm64-rel-tests"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/mac13-arm64-rel-tests/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.mac",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "free_space:"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "win-official"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:win-official"
-      dimensions: "cores:32"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/win-official/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/win-official/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 25200
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "builder:"
-        dimensions: "builderless:1"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
-    builders {
-      name: "win32-official"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:win32-official"
-      dimensions: "cores:32"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.chromium.ci"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/win32-official/properties.json",'
-        '    "shadow_properties_file": "infra/config/generated/builders/ci/win32-official/shadow-properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chrome_browser_release"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 25200
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      shadow_builder_adjustments {
-        service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-        pool: "luci.chromium.try"
-        dimensions: "builder:"
-        dimensions: "builderless:1"
-        dimensions: "pool:luci.chromium.try"
-      }
-    }
   }
   shadow: "ci.shadow"
 }
@@ -9369,7 +1890,6 @@ buckets {
   constraints {
     pools: "luci.chromium.try"
     service_accounts: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-    service_accounts: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
   }
   dynamic_builder_template {}
 }
@@ -9380,1655 +1900,6 @@ buckets {
   name: "try"
   swarming {
     builders {
-      name: "android-12-x64-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:4"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/android-12-x64-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "cq": "required",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/orchestrator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-orchestrator@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This is the orchestrator half of an orchestrator + compilator pair of builders. The compilator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/android-12-x64-rel-compilator\">android-12-x64-rel-compilator</a>."
-    }
-    builders {
-      name: "android-12-x64-rel-compilator"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:32"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/android-12-x64-rel-compilator/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/compilator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This is the compilator half of an orchestrator + compilator pair of builders. The orchestrator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/android-12-x64-rel\">android-12-x64-rel</a>."
-    }
-    builders {
-      name: "android-arm64-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:4"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/android-arm64-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "cq": "required",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/orchestrator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-orchestrator@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This builder may trigger tests on multiple Android versions.<br/>This is the orchestrator half of an orchestrator + compilator pair of builders. The compilator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/android-arm64-rel-compilator\">android-arm64-rel-compilator</a>."
-    }
-    builders {
-      name: "android-arm64-rel-compilator"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:32"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/android-arm64-rel-compilator/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/compilator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This is the compilator half of an orchestrator + compilator pair of builders. The orchestrator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/android-arm64-rel\">android-arm64-rel</a>."
-    }
-    builders {
-      name: "android-binary-size"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:16"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/binary_size": {'
-        '    "analyze_targets": ['
-        '      "//chrome/android:monochrome_public_minimal_apks",'
-        '      "//chrome/android:trichrome_minimal_apks",'
-        '      "//chrome/android:validate_expectations",'
-        '      "//tools/binary_size:binary_size_trybot_py"'
-        '    ],'
-        '    "compile_targets": ['
-        '      "monochrome_public_minimal_apks",'
-        '      "monochrome_static_initializers",'
-        '      "trichrome_minimal_apks",'
-        '      "validate_expectations"'
-        '    ]'
-        '  },'
-        '  "$build/flakiness": {'
-        '    "check_for_flakiness": true,'
-        '    "check_for_flakiness_with_resultdb": true'
-        '  },'
-        '  "$build/reclient": {'
-        '    "instance": "rbe-chromium-untrusted",'
-        '    "jobs": 500,'
-        '    "metrics_project": "chromium-reclient-metrics",'
-        '    "scandeps_server": true'
-        '  },'
-        '  "$recipe_engine/resultdb/test_presentation": {'
-        '    "column_keys": [],'
-        '    "grouping_keys": ['
-        '      "status",'
-        '      "v.test_suite"'
-        '    ]'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "cq": "required",'
-        '  "recipe": "binary_size_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "android-cronet-arm-dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/android-cronet-arm-dbg/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "cq": "path-based",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "android-cronet-x86-dbg-10-tests"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/android-cronet-x86-dbg-10-tests/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "cq": "path-based",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "android-nougat-x86-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:4"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/android-nougat-x86-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "cq": "required",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/orchestrator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-orchestrator@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium.add_one_test_shard"
-        value: 10
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This is the orchestrator half of an orchestrator + compilator pair of builders. The compilator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/android-nougat-x86-rel-compilator\">android-nougat-x86-rel-compilator</a>."
-    }
-    builders {
-      name: "android-nougat-x86-rel-compilator"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:32"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/android-nougat-x86-rel-compilator/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/compilator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This is the compilator half of an orchestrator + compilator pair of builders. The orchestrator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/android-nougat-x86-rel\">android-nougat-x86-rel</a>."
-    }
-    builders {
-      name: "android-official"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:32"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/android-official/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "android-oreo-arm64-dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/android-oreo-arm64-dbg/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "android-pie-arm64-dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:android-pie-arm64-dbg"
-      dimensions: "cores:16"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/android-pie-arm64-dbg/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "cq": "path-based",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "android-x64-cast"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/android-x64-cast/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "cq": "required",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "android_compile_dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:16"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/android_compile_dbg/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "cq": "required",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "android_compile_x64_dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:16"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/android_compile_x64_dbg/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "cq": "path-based",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "android_compile_x86_dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:16"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/android_compile_x86_dbg/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "cq": "path-based",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "android_cronet"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/android_cronet/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "cq": "required",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "android_optional_gpu_tests_rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:android_optional_gpu_tests_rel"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/android_optional_gpu_tests_rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "cq": "path-based",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 21600
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
       name: "chromeos-amd64-generic-dbg"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
@@ -11844,362 +2715,6 @@ buckets {
       }
     }
     builders {
-      name: "dawn-linux-x64-deps-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:dawn-linux-x64-deps-rel"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/dawn-linux-x64-deps-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.dawn",'
-        '  "cq": "path-based",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "dawn-mac-x64-deps-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:dawn-mac-x64-deps-rel"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/dawn-mac-x64-deps-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.dawn",'
-        '  "cq": "path-based",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "dawn-win10-x64-deps-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:dawn-win10-x64-deps-rel"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/dawn-win10-x64-deps-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.dawn",'
-        '  "cq": "path-based",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "dawn-win10-x86-deps-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:dawn-win10-x86-deps-rel"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/dawn-win10-x86-deps-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.dawn",'
-        '  "cq": "path-based",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
       name: "fuchsia-arm64-cast-receiver-rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
@@ -12876,470 +3391,6 @@ buckets {
       }
     }
     builders {
-      name: "gpu-fyi-cq-android-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:gpu-fyi-cq-android-arm64"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/gpu-fyi-cq-android-arm64/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "cq": "path-based",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 21600
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "ios-simulator"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/ios-simulator/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.mac",'
-        '  "cq": "required",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/orchestrator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-orchestrator@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium.add_one_test_shard"
-        value: 10
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This is the orchestrator half of an orchestrator + compilator pair of builders. The compilator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/ios-simulator-compilator\">ios-simulator-compilator</a>."
-    }
-    builders {
-      name: "ios-simulator-compilator"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:ios-simulator-compilator"
-      dimensions: "cpu:arm64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/ios-simulator-compilator/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.mac",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/compilator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      caches {
-        name: "xcode_ios_15a5229m"
-        path: "xcode_ios_15a5229m.app"
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This is the compilator half of an orchestrator + compilator pair of builders. The orchestrator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/ios-simulator\">ios-simulator</a>."
-    }
-    builders {
-      name: "ios-simulator-cronet"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:ios-simulator-cronet"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/ios-simulator-cronet/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.mac",'
-        '  "cq": "path-based",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      caches {
-        name: "xcode_ios_15a5229m"
-        path: "xcode_ios_15a5229m.app"
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "ios-simulator-full-configs"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:ios-simulator-full-configs"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/ios-simulator-full-configs/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.mac",'
-        '  "cq": "path-based",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      caches {
-        name: "xcode_ios_15a5229m"
-        path: "xcode_ios_15a5229m.app"
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
       name: "lacros-amd64-generic-rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
@@ -13792,260 +3843,6 @@ buckets {
       }
     }
     builders {
-      name: "linux-afl-asan-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/reclient": {'
-        '    "instance": "rbe-chromium-untrusted",'
-        '    "metrics_project": "chromium-reclient-metrics",'
-        '    "scandeps_server": true'
-        '  },'
-        '  "$recipe_engine/resultdb/test_presentation": {'
-        '    "column_keys": [],'
-        '    "grouping_keys": ['
-        '      "status",'
-        '      "v.test_suite"'
-        '    ]'
-        '  },'
-        '  "builder_group": "tryserver.chromium.linux",'
-        '  "recipe": "chromium/fuzz"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "linux-blink-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/linux-blink-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.blink",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "linux-centipede-asan-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/reclient": {'
-        '    "instance": "rbe-chromium-untrusted",'
-        '    "metrics_project": "chromium-reclient-metrics",'
-        '    "scandeps_server": true'
-        '  },'
-        '  "$recipe_engine/resultdb/test_presentation": {'
-        '    "column_keys": [],'
-        '    "grouping_keys": ['
-        '      "status",'
-        '      "v.test_suite"'
-        '    ]'
-        '  },'
-        '  "builder_group": "tryserver.chromium.linux",'
-        '  "recipe": "chromium/fuzz"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
       name: "linux-chromeos-compile-dbg"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
@@ -14594,3453 +4391,6 @@ buckets {
       }
       description_html: "This is the compilator half of an orchestrator + compilator pair of builders. The orchestrator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/linux-lacros-rel\">linux-lacros-rel</a>."
     }
-    builders {
-      name: "linux-libfuzzer-asan-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/flakiness": {'
-        '    "check_for_flakiness": true,'
-        '    "check_for_flakiness_with_resultdb": true'
-        '  },'
-        '  "$build/reclient": {'
-        '    "instance": "rbe-chromium-untrusted",'
-        '    "metrics_project": "chromium-reclient-metrics",'
-        '    "scandeps_server": true'
-        '  },'
-        '  "$recipe_engine/resultdb/test_presentation": {'
-        '    "column_keys": [],'
-        '    "grouping_keys": ['
-        '      "status",'
-        '      "v.test_suite"'
-        '    ]'
-        '  },'
-        '  "builder_group": "tryserver.chromium.linux",'
-        '  "cq": "required",'
-        '  "recipe": "chromium/fuzz"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "linux-official"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:32"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/linux-official/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "linux-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/linux-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.linux",'
-        '  "cq": "required",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/orchestrator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-orchestrator@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium.add_one_test_shard"
-        value: 10
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This is the orchestrator half of an orchestrator + compilator pair of builders. The compilator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/linux-rel-compilator\">linux-rel-compilator</a>."
-    }
-    builders {
-      name: "linux-rel-compilator"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/linux-rel-compilator/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.linux",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/compilator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This is the compilator half of an orchestrator + compilator pair of builders. The orchestrator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/linux-rel\">linux-rel</a>."
-    }
-    builders {
-      name: "linux-wayland-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/linux-wayland-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.linux",'
-        '  "cq": "required",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/orchestrator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-orchestrator@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This is the orchestrator half of an orchestrator + compilator pair of builders. The compilator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/linux-wayland-rel-compilator\">linux-wayland-rel-compilator</a>."
-    }
-    builders {
-      name: "linux-wayland-rel-compilator"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/linux-wayland-rel-compilator/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.linux",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/compilator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This is the compilator half of an orchestrator + compilator pair of builders. The orchestrator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/linux-wayland-rel\">linux-wayland-rel</a>."
-    }
-    builders {
-      name: "linux-x64-castos"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/linux-x64-castos/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.linux",'
-        '  "cq": "required",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "linux-x64-castos-dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/linux-x64-castos-dbg/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.linux",'
-        '  "cq": "path-based",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "linux_chromium_asan_rel_ng"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/linux_chromium_asan_rel_ng/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.linux",'
-        '  "cq": "required",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/orchestrator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-orchestrator@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium.add_one_test_shard"
-        value: 10
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This is the orchestrator half of an orchestrator + compilator pair of builders. The compilator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/linux_chromium_asan_rel_ng-compilator\">linux_chromium_asan_rel_ng-compilator</a>."
-    }
-    builders {
-      name: "linux_chromium_asan_rel_ng-compilator"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/linux_chromium_asan_rel_ng-compilator/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.linux",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/compilator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This is the compilator half of an orchestrator + compilator pair of builders. The orchestrator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/linux_chromium_asan_rel_ng\">linux_chromium_asan_rel_ng</a>."
-    }
-    builders {
-      name: "linux_chromium_compile_dbg_ng"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/linux_chromium_compile_dbg_ng/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.linux",'
-        '  "cq": "required",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      caches {
-        name: "builder"
-        path: "linux_debug"
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "linux_chromium_dbg_ng"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/linux_chromium_dbg_ng/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.linux",'
-        '  "cq": "path-based",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      caches {
-        name: "builder"
-        path: "linux_debug"
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "linux_chromium_tsan_rel_ng"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/linux_chromium_tsan_rel_ng/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.linux",'
-        '  "cq": "required",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/orchestrator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-orchestrator@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium.add_one_test_shard"
-        value: 10
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This is the orchestrator half of an orchestrator + compilator pair of builders. The compilator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/linux_chromium_tsan_rel_ng-compilator\">linux_chromium_tsan_rel_ng-compilator</a>."
-    }
-    builders {
-      name: "linux_chromium_tsan_rel_ng-compilator"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/linux_chromium_tsan_rel_ng-compilator/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.linux",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/compilator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This is the compilator half of an orchestrator + compilator pair of builders. The orchestrator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/linux_chromium_tsan_rel_ng\">linux_chromium_tsan_rel_ng</a>."
-    }
-    builders {
-      name: "linux_optional_gpu_tests_rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:linux_optional_gpu_tests_rel"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/linux_optional_gpu_tests_rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.linux",'
-        '  "cq": "path-based",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 21600
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "mac-official"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:mac-official"
-      dimensions: "cpu:arm64"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/mac-official/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 54000
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "mac-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/mac-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.mac",'
-        '  "cq": "required",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/orchestrator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-orchestrator@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium.add_one_test_shard"
-        value: 10
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This is the orchestrator half of an orchestrator + compilator pair of builders. The compilator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/mac-rel-compilator\">mac-rel-compilator</a>."
-    }
-    builders {
-      name: "mac-rel-compilator"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/mac-rel-compilator/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.mac",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/compilator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This is the compilator half of an orchestrator + compilator pair of builders. The orchestrator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/mac-rel\">mac-rel</a>."
-    }
-    builders {
-      name: "mac10.15-blink-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/mac10.15-blink-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.blink",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "mac11.0-blink-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:mac11.0-blink-rel"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/mac11.0-blink-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.blink",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "mac11.0.arm64-blink-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/mac11.0.arm64-blink-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.blink",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "mac12.0-blink-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/mac12.0-blink-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.blink",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "mac12.0.arm64-blink-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/mac12.0.arm64-blink-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.blink",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "mac13-blink-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/mac13-blink-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.blink",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "mac13.arm64-blink-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/mac13.arm64-blink-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.blink",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "mac_chromium_compile_dbg_ng"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/mac_chromium_compile_dbg_ng/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.mac",'
-        '  "cq": "required",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "mac_optional_gpu_tests_rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:mac_optional_gpu_tests_rel"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/mac_optional_gpu_tests_rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.mac",'
-        '  "cq": "path-based",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 21600
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "try-nougat-phone-tester"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/try-nougat-phone-tester/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "win-libfuzzer-asan-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:win-libfuzzer-asan-rel"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/flakiness": {'
-        '    "check_for_flakiness": true,'
-        '    "check_for_flakiness_with_resultdb": true'
-        '  },'
-        '  "$build/reclient": {'
-        '    "instance": "rbe-chromium-untrusted",'
-        '    "jobs": 500,'
-        '    "metrics_project": "chromium-reclient-metrics",'
-        '    "scandeps_server": true'
-        '  },'
-        '  "$recipe_engine/resultdb/test_presentation": {'
-        '    "column_keys": [],'
-        '    "grouping_keys": ['
-        '      "status",'
-        '      "v.test_suite"'
-        '    ]'
-        '  },'
-        '  "builder_group": "tryserver.chromium.win",'
-        '  "cq": "required",'
-        '  "recipe": "chromium/fuzz"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "win-official"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:32"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/win-official/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 21600
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "win-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-22.04"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/win-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.win",'
-        '  "cq": "required",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/orchestrator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-orchestrator@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium.add_one_test_shard"
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This is the orchestrator half of an orchestrator + compilator pair of builders. The compilator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/win-rel-compilator\">win-rel-compilator</a>."
-    }
-    builders {
-      name: "win-rel-compilator"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:16"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/win-rel-compilator/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.win",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium/compilator"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 240
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-      description_html: "This is the compilator half of an orchestrator + compilator pair of builders. The orchestrator is <a href=\"https://ci.chromium.org/p/chromium-m118/builders/try/win-rel\">win-rel</a>."
-    }
-    builders {
-      name: "win10.20h2-blink-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/win10.20h2-blink-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.blink",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "win11-arm64-blink-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/win11-arm64-blink-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.blink",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "win11-blink-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/win11-blink-rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.blink",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "win32-official"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:32"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/win32-official/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 21600
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "win_chromium_compile_dbg_ng"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:win_chromium_compile_dbg_ng"
-      dimensions: "cores:16"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.chromium.try"
-      dimensions: "ssd:1"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/win_chromium_compile_dbg_ng/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.win",'
-        '  "cq": "required",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
-    builders {
-      name: "win_optional_gpu_tests_rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:win_optional_gpu_tests_rel"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/try/win_optional_gpu_tests_rel/properties.json",'
-        '    "top_level_project": {'
-        '      "ref": "refs/branch-heads/5993",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "tryserver.chromium.win",'
-        '  "cq": "path-based",'
-        '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 21600
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      build_numbers: YES
-      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium_swarming.expose_merge_script_failures"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
   }
   shadow: "try.shadow"
 }
diff --git a/chromium/infra/config/generated/luci/luci-milo.cfg b/chromium/infra/config/generated/luci/luci-milo.cfg
index 1533ad4f7d2..cb0b664a566 100644
--- a/chromium/infra/config/generated/luci/luci-milo.cfg
+++ b/chromium/infra/config/generated/luci/luci-milo.cfg
@@ -11,161 +11,11 @@ consoles {
   refs: "regexp:refs/branch-heads/5993"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-official"
-    category: "chromium|android"
-    short_name: "off"
-  }
-  builders {
     name: "buildbucket/luci.chromium-m118.ci/fuchsia-official"
     category: "chromium|fuchsia"
     short_name: "off"
   }
   builders {
-    name: "buildbucket/luci.chromium-m118.ci/linux-official"
-    category: "chromium|linux"
-    short_name: "off"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/mac-official"
-    category: "chromium|mac"
-    short_name: "off"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/win32-official"
-    category: "chromium|win|off"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/win-official"
-    category: "chromium|win|off"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Win Builder"
-    category: "chromium.win|release|builder"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Win x64 Builder"
-    category: "chromium.win|release|builder"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Win10 Tests x64"
-    category: "chromium.win|release|tester"
-    short_name: "w10"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Win Builder (dbg)"
-    category: "chromium.win|debug|builder"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac Builder"
-    category: "chromium.mac|release"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac10.15 Tests"
-    category: "chromium.mac|release"
-    short_name: "15"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/mac11-arm64-rel-tests"
-    category: "chromium.mac|release|arm64"
-    short_name: "11"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/mac12-arm64-rel-tests"
-    category: "chromium.mac|release|arm64"
-    short_name: "12"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/mac13-arm64-rel-tests"
-    category: "chromium.mac|release|arm64"
-    short_name: "13"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/mac-arm64-rel"
-    category: "chromium.mac|release|arm64"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac Builder (dbg)"
-    category: "chromium.mac|debug"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac13 Tests (dbg)"
-    category: "chromium.mac|debug"
-    short_name: "13"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/ios-simulator"
-    category: "chromium.mac|ios|default"
-    short_name: "sim"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/ios-simulator-full-configs"
-    category: "chromium.mac|ios|default"
-    short_name: "ful"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac11 Tests"
-    category: "chromium.mac|mac"
-    short_name: "11"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac12 Tests"
-    category: "chromium.mac|mac"
-    short_name: "12"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac13 Tests"
-    category: "chromium.mac|mac"
-    short_name: "13"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Builder"
-    category: "chromium.linux|release"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Tests"
-    category: "chromium.linux|release"
-    short_name: "tst"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Builder (Wayland)"
-    category: "chromium.linux|release"
-    short_name: "bld-wl"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Tests (Wayland)"
-    category: "chromium.linux|release"
-    short_name: "tst-wl"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Builder (dbg)"
-    category: "chromium.linux|debug|builder"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Tests (dbg)(1)"
-    category: "chromium.linux|debug|tester"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Cast Linux"
-    category: "chromium.linux|cast"
-    short_name: "vid"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Cast Linux Debug"
-    category: "chromium.linux|cast"
-    short_name: "dbg"
-  }
-  builders {
     name: "buildbucket/luci.chromium-m118.ci/linux-chromeos-rel"
     category: "chromium.chromiumos|default"
     short_name: "rel"
@@ -241,116 +91,6 @@ consoles {
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-cronet-arm-dbg"
-    category: "chromium.android|cronet|arm"
-    short_name: "dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-cronet-arm-rel"
-    category: "chromium.android|cronet|arm"
-    short_name: "rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-cronet-x86-dbg"
-    category: "chromium.android|cronet|x86"
-    short_name: "dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-cronet-x64-dbg"
-    category: "chromium.android|cronet|x64"
-    short_name: "dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-cronet-mainline-clang-x86-dbg"
-    category: "chromium.android|cronet|mainline_clang|x86"
-    short_name: "dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-cronet-x86-dbg-10-tests"
-    category: "chromium.android|cronet|test"
-    short_name: "10"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android arm Builder (dbg)"
-    category: "chromium.android|builder|arm"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android arm64 Builder (dbg)"
-    category: "chromium.android|builder|arm"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android arm64 Builder All Targets (dbg)"
-    category: "chromium.android|builder|arm"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android x86 Builder (dbg)"
-    category: "chromium.android|builder|x86"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android x64 Builder (dbg)"
-    category: "chromium.android|builder|x86"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android x64 Builder All Targets (dbg)"
-    category: "chromium.android|builder|x86"
-    short_name: "64-all"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Nougat Phone Tester"
-    category: "chromium.android|tester|phone"
-    short_name: "N"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Oreo Phone Tester"
-    category: "chromium.android|tester|phone"
-    short_name: "O"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-pie-arm64-dbg"
-    category: "chromium.android|tester|phone"
-    short_name: "P"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android WebView N (dbg)"
-    category: "chromium.android|tester|webview"
-    short_name: "N"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android WebView O (dbg)"
-    category: "chromium.android|tester|webview"
-    short_name: "O"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android WebView P (dbg)"
-    category: "chromium.android|tester|webview"
-    short_name: "P"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-pie-arm64-rel"
-    category: "chromium.android|on_cq"
-    short_name: "P"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Cast Android (dbg)"
-    category: "chromium.android|on_cq"
-    short_name: "cst"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-12-x64-rel"
-    category: "chromium.android|on_cq|x64"
-    short_name: "12"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-nougat-x86-rel"
-    category: "chromium.android|on_cq|x86"
-    short_name: "N"
-  }
-  builders {
     name: "buildbucket/luci.chromium-m118.ci/fuchsia-arm64-rel"
     category: "chromium.fuchsia|release"
     short_name: "arm64"
@@ -370,138 +110,6 @@ consoles {
     category: "chromium.fuchsia|cast-receiver"
     short_name: "x64"
   }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux TSan Builder"
-    category: "chromium.memory|linux|TSan v2"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux TSan Tests"
-    category: "chromium.memory|linux|TSan v2"
-    short_name: "tst"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux ASan LSan Builder"
-    category: "chromium.memory|linux|asan lsan"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux ASan LSan Tests (1)"
-    category: "chromium.memory|linux|asan lsan"
-    short_name: "tst"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux ASan Tests (sandboxed)"
-    category: "chromium.memory|linux|asan lsan"
-    short_name: "sbx"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Linux x64 DEPS Builder"
-    category: "chromium.dawn|DEPS|Linux|Builder"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Linux x64 DEPS Release (Intel UHD 630)"
-    category: "chromium.dawn|DEPS|Linux|Intel"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
-    category: "chromium.dawn|DEPS|Linux|Nvidia"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Mac x64 DEPS Builder"
-    category: "chromium.dawn|DEPS|Mac|Builder"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Mac x64 DEPS Release (AMD)"
-    category: "chromium.dawn|DEPS|Mac|AMD"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Mac x64 DEPS Release (Intel)"
-    category: "chromium.dawn|DEPS|Mac|Intel"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Win10 x86 DEPS Builder"
-    category: "chromium.dawn|DEPS|Windows|Builder"
-    short_name: "x86"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Win10 x64 DEPS Builder"
-    category: "chromium.dawn|DEPS|Windows|Builder"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Win10 x86 DEPS Release (Intel)"
-    category: "chromium.dawn|DEPS|Windows|Intel"
-    short_name: "x86"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Win10 x64 DEPS Release (Intel)"
-    category: "chromium.dawn|DEPS|Windows|Intel"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
-    category: "chromium.dawn|DEPS|Windows|Nvidia"
-    short_name: "x86"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
-    category: "chromium.dawn|DEPS|Windows|Nvidia"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/GPU Win x64 Builder"
-    category: "chromium.gpu|Windows"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Win10 x64 Release (NVIDIA)"
-    category: "chromium.gpu|Windows"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/GPU Mac Builder"
-    category: "chromium.gpu|Mac"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac Release (Intel)"
-    category: "chromium.gpu|Mac"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac Retina Release (AMD)"
-    category: "chromium.gpu|Mac"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/GPU Linux Builder"
-    category: "chromium.gpu|Linux"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Release (NVIDIA)"
-    category: "chromium.gpu|Linux"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android Release (Nexus 5X)"
-    category: "chromium.gpu|Android"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/ios-simulator-cronet"
-    category: "chromium.fyi|cronet"
-    short_name: "intel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/GPU FYI Android arm64 Builder"
-    category: "chromium.gpu.fyi|Android|Builder"
-    short_name: "arm64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android FYI Release (Pixel 6)"
-    category: "chromium.gpu.fyi|Android|S64|ARM"
-    short_name: "P6"
-  }
   header {
     oncalls {
       name: "Chromium Branches"
@@ -514,13 +122,7 @@ consoles {
     }
     console_groups {
       console_ids: "chromium-m118/chromium"
-      console_ids: "chromium-m118/chromium.win"
-      console_ids: "chromium-m118/chromium.mac"
-      console_ids: "chromium-m118/chromium.linux"
       console_ids: "chromium-m118/chromium.chromiumos"
-      console_ids: "chromium-m118/chromium.memory"
-      console_ids: "chromium-m118/chromium.gpu"
-      console_ids: "chromium-m118/chromium.android"
     }
   }
 }
@@ -531,91 +133,6 @@ consoles {
   refs: "regexp:refs/branch-heads/5993"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m118.ci/Win x64 Builder"
-    category: "chromium.win|release|builder"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Win10 Tests x64"
-    category: "chromium.win|release|tester"
-    short_name: "w10"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Win Builder (dbg)"
-    category: "chromium.win|debug|builder"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac Builder"
-    category: "chromium.mac|release"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac10.15 Tests"
-    category: "chromium.mac|release"
-    short_name: "15"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac Builder (dbg)"
-    category: "chromium.mac|debug"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac13 Tests (dbg)"
-    category: "chromium.mac|debug"
-    short_name: "13"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/ios-simulator"
-    category: "chromium.mac|ios|default"
-    short_name: "sim"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/ios-simulator-full-configs"
-    category: "chromium.mac|ios|default"
-    short_name: "ful"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Builder"
-    category: "chromium.linux|release"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Tests"
-    category: "chromium.linux|release"
-    short_name: "tst"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Builder (Wayland)"
-    category: "chromium.linux|release"
-    short_name: "bld-wl"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Tests (Wayland)"
-    category: "chromium.linux|release"
-    short_name: "tst-wl"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Builder (dbg)"
-    category: "chromium.linux|debug|builder"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Tests (dbg)(1)"
-    category: "chromium.linux|debug|tester"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Cast Linux"
-    category: "chromium.linux|cast"
-    short_name: "vid"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Cast Linux Debug"
-    category: "chromium.linux|cast"
-    short_name: "dbg"
-  }
-  builders {
     name: "buildbucket/luci.chromium-m118.ci/linux-chromeos-rel"
     category: "chromium.chromiumos|default"
     short_name: "rel"
@@ -676,86 +193,6 @@ consoles {
     short_name: "dbg"
   }
   builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-cronet-arm-dbg"
-    category: "chromium.android|cronet|arm"
-    short_name: "dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-cronet-arm-rel"
-    category: "chromium.android|cronet|arm"
-    short_name: "rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android arm Builder (dbg)"
-    category: "chromium.android|builder|arm"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android arm64 Builder (dbg)"
-    category: "chromium.android|builder|arm"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android arm64 Builder All Targets (dbg)"
-    category: "chromium.android|builder|arm"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android x86 Builder (dbg)"
-    category: "chromium.android|builder|x86"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android x64 Builder (dbg)"
-    category: "chromium.android|builder|x86"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android x64 Builder All Targets (dbg)"
-    category: "chromium.android|builder|x86"
-    short_name: "64-all"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Nougat Phone Tester"
-    category: "chromium.android|tester|phone"
-    short_name: "N"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Oreo Phone Tester"
-    category: "chromium.android|tester|phone"
-    short_name: "O"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-pie-arm64-dbg"
-    category: "chromium.android|tester|phone"
-    short_name: "P"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android WebView N (dbg)"
-    category: "chromium.android|tester|webview"
-    short_name: "N"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android WebView O (dbg)"
-    category: "chromium.android|tester|webview"
-    short_name: "O"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android WebView P (dbg)"
-    category: "chromium.android|tester|webview"
-    short_name: "P"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-pie-arm64-rel"
-    category: "chromium.android|on_cq"
-    short_name: "P"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Cast Android (dbg)"
-    category: "chromium.android|on_cq"
-    short_name: "cst"
-  }
-  builders {
     name: "buildbucket/luci.chromium-m118.ci/fuchsia-arm64-rel"
     category: "chromium.fuchsia|release"
     short_name: "arm64"
@@ -775,128 +212,6 @@ consoles {
     category: "chromium.fuchsia|cast-receiver"
     short_name: "x64"
   }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux TSan Builder"
-    category: "chromium.memory|linux|TSan v2"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux TSan Tests"
-    category: "chromium.memory|linux|TSan v2"
-    short_name: "tst"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux ASan LSan Builder"
-    category: "chromium.memory|linux|asan lsan"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux ASan LSan Tests (1)"
-    category: "chromium.memory|linux|asan lsan"
-    short_name: "tst"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux ASan Tests (sandboxed)"
-    category: "chromium.memory|linux|asan lsan"
-    short_name: "sbx"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Linux x64 DEPS Builder"
-    category: "chromium.dawn|DEPS|Linux|Builder"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Linux x64 DEPS Release (Intel UHD 630)"
-    category: "chromium.dawn|DEPS|Linux|Intel"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
-    category: "chromium.dawn|DEPS|Linux|Nvidia"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Mac x64 DEPS Builder"
-    category: "chromium.dawn|DEPS|Mac|Builder"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Mac x64 DEPS Release (AMD)"
-    category: "chromium.dawn|DEPS|Mac|AMD"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Mac x64 DEPS Release (Intel)"
-    category: "chromium.dawn|DEPS|Mac|Intel"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Win10 x86 DEPS Builder"
-    category: "chromium.dawn|DEPS|Windows|Builder"
-    short_name: "x86"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Win10 x64 DEPS Builder"
-    category: "chromium.dawn|DEPS|Windows|Builder"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Win10 x86 DEPS Release (Intel)"
-    category: "chromium.dawn|DEPS|Windows|Intel"
-    short_name: "x86"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Win10 x64 DEPS Release (Intel)"
-    category: "chromium.dawn|DEPS|Windows|Intel"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
-    category: "chromium.dawn|DEPS|Windows|Nvidia"
-    short_name: "x86"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
-    category: "chromium.dawn|DEPS|Windows|Nvidia"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/GPU Win x64 Builder"
-    category: "chromium.gpu|Windows"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Win10 x64 Release (NVIDIA)"
-    category: "chromium.gpu|Windows"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/GPU Mac Builder"
-    category: "chromium.gpu|Mac"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac Release (Intel)"
-    category: "chromium.gpu|Mac"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac Retina Release (AMD)"
-    category: "chromium.gpu|Mac"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/GPU Linux Builder"
-    category: "chromium.gpu|Linux"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Release (NVIDIA)"
-    category: "chromium.gpu|Linux"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android Release (Nexus 5X)"
-    category: "chromium.gpu|Android"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/ios-simulator-cronet"
-    category: "chromium.fyi|cronet"
-    short_name: "intel"
-  }
   header {
     oncalls {
       name: "Chromium Branches"
@@ -909,13 +224,7 @@ consoles {
     }
     console_groups {
       console_ids: "chromium-m118/chromium"
-      console_ids: "chromium-m118/chromium.win"
-      console_ids: "chromium-m118/chromium.mac"
-      console_ids: "chromium-m118/chromium.linux"
       console_ids: "chromium-m118/chromium.chromiumos"
-      console_ids: "chromium-m118/chromium.memory"
-      console_ids: "chromium-m118/chromium.gpu"
-      console_ids: "chromium-m118/chromium.android"
     }
   }
 }
@@ -931,54 +240,6 @@ consoles {
   id: "try"
   name: "Chromium M118 CQ Console"
   builders {
-    name: "buildbucket/luci.chromium-m118.try/android-12-x64-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-12-x64-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-arm64-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-arm64-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-binary-size"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-cronet-arm-dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-cronet-x86-dbg-10-tests"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-nougat-x86-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-nougat-x86-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-pie-arm64-dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-x64-cast"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android_compile_dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android_compile_x64_dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android_compile_x86_dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android_cronet"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android_optional_gpu_tests_rel"
-  }
-  builders {
     name: "buildbucket/luci.chromium-m118.try/chromeos-amd64-generic-dbg"
   }
   builders {
@@ -1000,18 +261,6 @@ consoles {
     name: "buildbucket/luci.chromium-m118.try/chromium_presubmit"
   }
   builders {
-    name: "buildbucket/luci.chromium-m118.try/dawn-linux-x64-deps-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/dawn-mac-x64-deps-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/dawn-win10-x64-deps-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/dawn-win10-x86-deps-rel"
-  }
-  builders {
     name: "buildbucket/luci.chromium-m118.try/fuchsia-arm64-cast-receiver-rel"
   }
   builders {
@@ -1027,21 +276,6 @@ consoles {
     name: "buildbucket/luci.chromium-m118.try/fuchsia-x64-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m118.try/gpu-fyi-cq-android-arm64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/ios-simulator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/ios-simulator-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/ios-simulator-cronet"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/ios-simulator-full-configs"
-  }
-  builders {
     name: "buildbucket/luci.chromium-m118.try/lacros-amd64-generic-rel"
   }
   builders {
@@ -1054,9 +288,6 @@ consoles {
     name: "buildbucket/luci.chromium-m118.try/lacros-arm64-generic-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-blink-rel"
-  }
-  builders {
     name: "buildbucket/luci.chromium-m118.try/linux-chromeos-compile-dbg"
   }
   builders {
@@ -1071,75 +302,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium-m118.try/linux-lacros-rel-compilator"
   }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-libfuzzer-asan-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-wayland-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-wayland-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-x64-castos"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-x64-castos-dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_chromium_asan_rel_ng"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_chromium_asan_rel_ng-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_chromium_compile_dbg_ng"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_chromium_dbg_ng"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_chromium_tsan_rel_ng"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_chromium_tsan_rel_ng-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_optional_gpu_tests_rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac_chromium_compile_dbg_ng"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac_optional_gpu_tests_rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win-libfuzzer-asan-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win_chromium_compile_dbg_ng"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win_optional_gpu_tests_rel"
-  }
   builder_view_only: true
 }
 consoles {
@@ -1149,35 +311,10 @@ consoles {
   refs: "regexp:refs/branch-heads/5993"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-official"
-    category: "android"
-    short_name: "off"
-  }
-  builders {
     name: "buildbucket/luci.chromium-m118.ci/fuchsia-official"
     category: "fuchsia"
     short_name: "off"
   }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/linux-official"
-    category: "linux"
-    short_name: "off"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/mac-official"
-    category: "mac"
-    short_name: "off"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/win32-official"
-    category: "win|off"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/win-official"
-    category: "win|off"
-    short_name: "64"
-  }
   header {
     oncalls {
       name: "Chromium Branches"
@@ -1190,156 +327,12 @@ consoles {
     }
     console_groups {
       console_ids: "chromium-m118/chromium"
-      console_ids: "chromium-m118/chromium.win"
-      console_ids: "chromium-m118/chromium.mac"
-      console_ids: "chromium-m118/chromium.linux"
       console_ids: "chromium-m118/chromium.chromiumos"
-      console_ids: "chromium-m118/chromium.memory"
-      console_ids: "chromium-m118/chromium.gpu"
-      console_ids: "chromium-m118/chromium.android"
     }
   }
   include_experimental_builds: true
 }
 consoles {
-  id: "chromium.android"
-  name: "chromium.android"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/5993"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-cronet-arm-dbg"
-    category: "cronet|arm"
-    short_name: "dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-cronet-arm-rel"
-    category: "cronet|arm"
-    short_name: "rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-cronet-x86-dbg"
-    category: "cronet|x86"
-    short_name: "dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-cronet-x64-dbg"
-    category: "cronet|x64"
-    short_name: "dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-cronet-mainline-clang-x86-dbg"
-    category: "cronet|mainline_clang|x86"
-    short_name: "dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-cronet-x86-dbg-10-tests"
-    category: "cronet|test"
-    short_name: "10"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android arm Builder (dbg)"
-    category: "builder|arm"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android arm64 Builder (dbg)"
-    category: "builder|arm"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android arm64 Builder All Targets (dbg)"
-    category: "builder|arm"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android x86 Builder (dbg)"
-    category: "builder|x86"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android x64 Builder (dbg)"
-    category: "builder|x86"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android x64 Builder All Targets (dbg)"
-    category: "builder|x86"
-    short_name: "64-all"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Nougat Phone Tester"
-    category: "tester|phone"
-    short_name: "N"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Oreo Phone Tester"
-    category: "tester|phone"
-    short_name: "O"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-pie-arm64-dbg"
-    category: "tester|phone"
-    short_name: "P"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android WebView N (dbg)"
-    category: "tester|webview"
-    short_name: "N"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android WebView O (dbg)"
-    category: "tester|webview"
-    short_name: "O"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android WebView P (dbg)"
-    category: "tester|webview"
-    short_name: "P"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-pie-arm64-rel"
-    category: "on_cq"
-    short_name: "P"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Cast Android (dbg)"
-    category: "on_cq"
-    short_name: "cst"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-12-x64-rel"
-    category: "on_cq|x64"
-    short_name: "12"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/android-nougat-x86-rel"
-    category: "on_cq|x86"
-    short_name: "N"
-  }
-  header {
-    oncalls {
-      name: "Chromium Branches"
-      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-branch-sheriff"
-    }
-    oncalls {
-      name: "Trooper"
-      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-ops-client-infra"
-      show_primary_secondary_labels: true
-    }
-    console_groups {
-      console_ids: "chromium-m118/chromium"
-      console_ids: "chromium-m118/chromium.win"
-      console_ids: "chromium-m118/chromium.mac"
-      console_ids: "chromium-m118/chromium.linux"
-      console_ids: "chromium-m118/chromium.chromiumos"
-      console_ids: "chromium-m118/chromium.memory"
-      console_ids: "chromium-m118/chromium.gpu"
-      console_ids: "chromium-m118/chromium.android"
-    }
-  }
-}
-consoles {
   id: "chromium.chromiumos"
   name: "chromium.chromiumos"
   repo_url: "https://chromium.googlesource.com/chromium/src"
@@ -1432,101 +425,7 @@ consoles {
     }
     console_groups {
       console_ids: "chromium-m118/chromium"
-      console_ids: "chromium-m118/chromium.win"
-      console_ids: "chromium-m118/chromium.mac"
-      console_ids: "chromium-m118/chromium.linux"
-      console_ids: "chromium-m118/chromium.chromiumos"
-      console_ids: "chromium-m118/chromium.memory"
-      console_ids: "chromium-m118/chromium.gpu"
-      console_ids: "chromium-m118/chromium.android"
-    }
-  }
-}
-consoles {
-  id: "chromium.dawn"
-  name: "chromium.dawn"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/5993"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Linux x64 DEPS Builder"
-    category: "DEPS|Linux|Builder"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Linux x64 DEPS Release (Intel UHD 630)"
-    category: "DEPS|Linux|Intel"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
-    category: "DEPS|Linux|Nvidia"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Mac x64 DEPS Builder"
-    category: "DEPS|Mac|Builder"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Mac x64 DEPS Release (AMD)"
-    category: "DEPS|Mac|AMD"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Mac x64 DEPS Release (Intel)"
-    category: "DEPS|Mac|Intel"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Win10 x86 DEPS Builder"
-    category: "DEPS|Windows|Builder"
-    short_name: "x86"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Win10 x64 DEPS Builder"
-    category: "DEPS|Windows|Builder"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Win10 x86 DEPS Release (Intel)"
-    category: "DEPS|Windows|Intel"
-    short_name: "x86"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Win10 x64 DEPS Release (Intel)"
-    category: "DEPS|Windows|Intel"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
-    category: "DEPS|Windows|Nvidia"
-    short_name: "x86"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
-    category: "DEPS|Windows|Nvidia"
-    short_name: "x64"
-  }
-  header {
-    oncalls {
-      name: "Chromium Branches"
-      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-branch-sheriff"
-    }
-    oncalls {
-      name: "Trooper"
-      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-ops-client-infra"
-      show_primary_secondary_labels: true
-    }
-    console_groups {
-      console_ids: "chromium-m118/chromium"
-      console_ids: "chromium-m118/chromium.win"
-      console_ids: "chromium-m118/chromium.mac"
-      console_ids: "chromium-m118/chromium.linux"
       console_ids: "chromium-m118/chromium.chromiumos"
-      console_ids: "chromium-m118/chromium.memory"
-      console_ids: "chromium-m118/chromium.gpu"
-      console_ids: "chromium-m118/chromium.android"
     }
   }
 }
@@ -1568,13 +467,7 @@ consoles {
     }
     console_groups {
       console_ids: "chromium-m118/chromium"
-      console_ids: "chromium-m118/chromium.win"
-      console_ids: "chromium-m118/chromium.mac"
-      console_ids: "chromium-m118/chromium.linux"
       console_ids: "chromium-m118/chromium.chromiumos"
-      console_ids: "chromium-m118/chromium.memory"
-      console_ids: "chromium-m118/chromium.gpu"
-      console_ids: "chromium-m118/chromium.android"
     }
   }
 }
@@ -1584,71 +477,6 @@ consoles {
   repo_url: "https://chromium.googlesource.com/chromium/src"
   refs: "regexp:refs/branch-heads/5993"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/ios-simulator-cronet"
-    category: "cronet"
-    short_name: "intel"
-  }
-  header {
-    oncalls {
-      name: "Chromium Branches"
-      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-branch-sheriff"
-    }
-    oncalls {
-      name: "Trooper"
-      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-ops-client-infra"
-      show_primary_secondary_labels: true
-    }
-    console_groups {
-      console_ids: "chromium-m118/chromium"
-      console_ids: "chromium-m118/chromium.win"
-      console_ids: "chromium-m118/chromium.mac"
-      console_ids: "chromium-m118/chromium.linux"
-      console_ids: "chromium-m118/chromium.chromiumos"
-      console_ids: "chromium-m118/chromium.memory"
-      console_ids: "chromium-m118/chromium.gpu"
-      console_ids: "chromium-m118/chromium.android"
-    }
-  }
-}
-consoles {
-  id: "chromium.gpu"
-  name: "chromium.gpu"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/5993"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/GPU Win x64 Builder"
-    category: "Windows"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Win10 x64 Release (NVIDIA)"
-    category: "Windows"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/GPU Mac Builder"
-    category: "Mac"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac Release (Intel)"
-    category: "Mac"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac Retina Release (AMD)"
-    category: "Mac"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/GPU Linux Builder"
-    category: "Linux"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Release (NVIDIA)"
-    category: "Linux"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android Release (Nexus 5X)"
-    category: "Android"
-  }
   header {
     oncalls {
       name: "Chromium Branches"
@@ -1661,313 +489,7 @@ consoles {
     }
     console_groups {
       console_ids: "chromium-m118/chromium"
-      console_ids: "chromium-m118/chromium.win"
-      console_ids: "chromium-m118/chromium.mac"
-      console_ids: "chromium-m118/chromium.linux"
       console_ids: "chromium-m118/chromium.chromiumos"
-      console_ids: "chromium-m118/chromium.memory"
-      console_ids: "chromium-m118/chromium.gpu"
-      console_ids: "chromium-m118/chromium.android"
-    }
-  }
-}
-consoles {
-  id: "chromium.gpu.fyi"
-  name: "chromium.gpu.fyi"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/5993"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/GPU FYI Android arm64 Builder"
-    category: "Android|Builder"
-    short_name: "arm64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Android FYI Release (Pixel 6)"
-    category: "Android|S64|ARM"
-    short_name: "P6"
-  }
-  header {
-    oncalls {
-      name: "Chromium Branches"
-      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-branch-sheriff"
-    }
-    oncalls {
-      name: "Trooper"
-      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-ops-client-infra"
-      show_primary_secondary_labels: true
-    }
-    console_groups {
-      console_ids: "chromium-m118/chromium"
-      console_ids: "chromium-m118/chromium.win"
-      console_ids: "chromium-m118/chromium.mac"
-      console_ids: "chromium-m118/chromium.linux"
-      console_ids: "chromium-m118/chromium.chromiumos"
-      console_ids: "chromium-m118/chromium.memory"
-      console_ids: "chromium-m118/chromium.gpu"
-      console_ids: "chromium-m118/chromium.android"
-    }
-  }
-}
-consoles {
-  id: "chromium.linux"
-  name: "chromium.linux"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/5993"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Builder"
-    category: "release"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Tests"
-    category: "release"
-    short_name: "tst"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Builder (Wayland)"
-    category: "release"
-    short_name: "bld-wl"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Tests (Wayland)"
-    category: "release"
-    short_name: "tst-wl"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Builder (dbg)"
-    category: "debug|builder"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux Tests (dbg)(1)"
-    category: "debug|tester"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Cast Linux"
-    category: "cast"
-    short_name: "vid"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Cast Linux Debug"
-    category: "cast"
-    short_name: "dbg"
-  }
-  header {
-    oncalls {
-      name: "Chromium Branches"
-      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-branch-sheriff"
-    }
-    oncalls {
-      name: "Trooper"
-      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-ops-client-infra"
-      show_primary_secondary_labels: true
-    }
-    console_groups {
-      console_ids: "chromium-m118/chromium"
-      console_ids: "chromium-m118/chromium.win"
-      console_ids: "chromium-m118/chromium.mac"
-      console_ids: "chromium-m118/chromium.linux"
-      console_ids: "chromium-m118/chromium.chromiumos"
-      console_ids: "chromium-m118/chromium.memory"
-      console_ids: "chromium-m118/chromium.gpu"
-      console_ids: "chromium-m118/chromium.android"
-    }
-  }
-}
-consoles {
-  id: "chromium.mac"
-  name: "chromium.mac"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/5993"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac Builder"
-    category: "release"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac10.15 Tests"
-    category: "release"
-    short_name: "15"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/mac11-arm64-rel-tests"
-    category: "release|arm64"
-    short_name: "11"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/mac12-arm64-rel-tests"
-    category: "release|arm64"
-    short_name: "12"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/mac13-arm64-rel-tests"
-    category: "release|arm64"
-    short_name: "13"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/mac-arm64-rel"
-    category: "release|arm64"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac Builder (dbg)"
-    category: "debug"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac13 Tests (dbg)"
-    category: "debug"
-    short_name: "13"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/ios-simulator"
-    category: "ios|default"
-    short_name: "sim"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/ios-simulator-full-configs"
-    category: "ios|default"
-    short_name: "ful"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac11 Tests"
-    category: "mac"
-    short_name: "11"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac12 Tests"
-    category: "mac"
-    short_name: "12"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Mac13 Tests"
-    category: "mac"
-    short_name: "13"
-  }
-  header {
-    oncalls {
-      name: "Chromium Branches"
-      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-branch-sheriff"
-    }
-    oncalls {
-      name: "Trooper"
-      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-ops-client-infra"
-      show_primary_secondary_labels: true
-    }
-    console_groups {
-      console_ids: "chromium-m118/chromium"
-      console_ids: "chromium-m118/chromium.win"
-      console_ids: "chromium-m118/chromium.mac"
-      console_ids: "chromium-m118/chromium.linux"
-      console_ids: "chromium-m118/chromium.chromiumos"
-      console_ids: "chromium-m118/chromium.memory"
-      console_ids: "chromium-m118/chromium.gpu"
-      console_ids: "chromium-m118/chromium.android"
-    }
-  }
-}
-consoles {
-  id: "chromium.memory"
-  name: "chromium.memory"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/5993"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux TSan Builder"
-    category: "linux|TSan v2"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux TSan Tests"
-    category: "linux|TSan v2"
-    short_name: "tst"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux ASan LSan Builder"
-    category: "linux|asan lsan"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux ASan LSan Tests (1)"
-    category: "linux|asan lsan"
-    short_name: "tst"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Linux ASan Tests (sandboxed)"
-    category: "linux|asan lsan"
-    short_name: "sbx"
-  }
-  header {
-    oncalls {
-      name: "Chromium Branches"
-      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-branch-sheriff"
-    }
-    oncalls {
-      name: "Trooper"
-      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-ops-client-infra"
-      show_primary_secondary_labels: true
-    }
-    console_groups {
-      console_ids: "chromium-m118/chromium"
-      console_ids: "chromium-m118/chromium.win"
-      console_ids: "chromium-m118/chromium.mac"
-      console_ids: "chromium-m118/chromium.linux"
-      console_ids: "chromium-m118/chromium.chromiumos"
-      console_ids: "chromium-m118/chromium.memory"
-      console_ids: "chromium-m118/chromium.gpu"
-      console_ids: "chromium-m118/chromium.android"
-    }
-  }
-}
-consoles {
-  id: "chromium.win"
-  name: "chromium.win"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/5993"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Win Builder"
-    category: "release|builder"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Win x64 Builder"
-    category: "release|builder"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Win10 Tests x64"
-    category: "release|tester"
-    short_name: "w10"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.ci/Win Builder (dbg)"
-    category: "debug|builder"
-    short_name: "32"
-  }
-  header {
-    oncalls {
-      name: "Chromium Branches"
-      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-branch-sheriff"
-    }
-    oncalls {
-      name: "Trooper"
-      url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-ops-client-infra"
-      show_primary_secondary_labels: true
-    }
-    console_groups {
-      console_ids: "chromium-m118/chromium"
-      console_ids: "chromium-m118/chromium.win"
-      console_ids: "chromium-m118/chromium.mac"
-      console_ids: "chromium-m118/chromium.linux"
-      console_ids: "chromium-m118/chromium.chromiumos"
-      console_ids: "chromium-m118/chromium.memory"
-      console_ids: "chromium-m118/chromium.gpu"
-      console_ids: "chromium-m118/chromium.android"
     }
   }
 }
@@ -1975,60 +497,6 @@ consoles {
   id: "luci.chromium.try"
   name: "luci.chromium.try"
   builders {
-    name: "buildbucket/luci.chromium-m118.try/android-12-x64-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-12-x64-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-arm64-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-arm64-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-binary-size"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-cronet-arm-dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-cronet-x86-dbg-10-tests"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-nougat-x86-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-nougat-x86-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-official"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-oreo-arm64-dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-pie-arm64-dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-x64-cast"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android_compile_dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android_compile_x64_dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android_compile_x86_dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android_cronet"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android_optional_gpu_tests_rel"
-  }
-  builders {
     name: "buildbucket/luci.chromium-m118.try/chromeos-amd64-generic-dbg"
   }
   builders {
@@ -2056,18 +524,6 @@ consoles {
     name: "buildbucket/luci.chromium-m118.try/chromium_presubmit"
   }
   builders {
-    name: "buildbucket/luci.chromium-m118.try/dawn-linux-x64-deps-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/dawn-mac-x64-deps-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/dawn-win10-x64-deps-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/dawn-win10-x86-deps-rel"
-  }
-  builders {
     name: "buildbucket/luci.chromium-m118.try/fuchsia-arm64-cast-receiver-rel"
   }
   builders {
@@ -2089,21 +545,6 @@ consoles {
     name: "buildbucket/luci.chromium-m118.try/fuchsia-x64-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m118.try/gpu-fyi-cq-android-arm64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/ios-simulator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/ios-simulator-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/ios-simulator-cronet"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/ios-simulator-full-configs"
-  }
-  builders {
     name: "buildbucket/luci.chromium-m118.try/lacros-amd64-generic-rel"
   }
   builders {
@@ -2119,15 +560,6 @@ consoles {
     name: "buildbucket/luci.chromium-m118.try/lacros-arm64-generic-rel"
   }
   builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-afl-asan-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-centipede-asan-rel"
-  }
-  builders {
     name: "buildbucket/luci.chromium-m118.try/linux-chromeos-compile-dbg"
   }
   builders {
@@ -2145,243 +577,14 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium-m118.try/linux-lacros-rel-compilator"
   }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-libfuzzer-asan-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-official"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-wayland-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-wayland-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-x64-castos"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-x64-castos-dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_chromium_asan_rel_ng"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_chromium_asan_rel_ng-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_chromium_compile_dbg_ng"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_chromium_dbg_ng"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_chromium_tsan_rel_ng"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_chromium_tsan_rel_ng-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_optional_gpu_tests_rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac-official"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac10.15-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac11.0-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac11.0.arm64-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac12.0-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac12.0.arm64-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac13-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac13.arm64-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac_chromium_compile_dbg_ng"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac_optional_gpu_tests_rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/try-nougat-phone-tester"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win-libfuzzer-asan-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win-official"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win10.20h2-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win11-arm64-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win11-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win32-official"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win_chromium_compile_dbg_ng"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win_optional_gpu_tests_rel"
-  }
-  builder_view_only: true
-}
-consoles {
-  id: "tryserver.blink"
-  name: "tryserver.blink"
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac10.15-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac11.0-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac11.0.arm64-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac12.0-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac12.0.arm64-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac13-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac13.arm64-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win10.20h2-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win11-arm64-blink-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win11-blink-rel"
-  }
   builder_view_only: true
 }
 consoles {
   id: "tryserver.chromium"
   name: "tryserver.chromium"
   builders {
-    name: "buildbucket/luci.chromium-m118.try/android-official"
-  }
-  builders {
     name: "buildbucket/luci.chromium-m118.try/fuchsia-official"
   }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-official"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac-official"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win-official"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win32-official"
-  }
-  builder_view_only: true
-}
-consoles {
-  id: "tryserver.chromium.android"
-  name: "tryserver.chromium.android"
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-12-x64-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-12-x64-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-arm64-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-arm64-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-binary-size"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-cronet-arm-dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-cronet-x86-dbg-10-tests"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-nougat-x86-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-nougat-x86-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-oreo-arm64-dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-pie-arm64-dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android-x64-cast"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android_compile_dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android_compile_x64_dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android_compile_x86_dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android_cronet"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/android_optional_gpu_tests_rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/gpu-fyi-cq-android-arm64"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/try-nougat-phone-tester"
-  }
   builder_view_only: true
 }
 consoles {
@@ -2447,23 +650,6 @@ consoles {
   builder_view_only: true
 }
 consoles {
-  id: "tryserver.chromium.dawn"
-  name: "tryserver.chromium.dawn"
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/dawn-linux-x64-deps-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/dawn-mac-x64-deps-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/dawn-win10-x64-deps-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/dawn-win10-x86-deps-rel"
-  }
-  builder_view_only: true
-}
-consoles {
   id: "tryserver.chromium.fuchsia"
   name: "tryserver.chromium.fuchsia"
   builders {
@@ -2486,106 +672,4 @@ consoles {
   }
   builder_view_only: true
 }
-consoles {
-  id: "tryserver.chromium.linux"
-  name: "tryserver.chromium.linux"
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-afl-asan-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-centipede-asan-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-libfuzzer-asan-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-wayland-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-wayland-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-x64-castos"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux-x64-castos-dbg"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_chromium_asan_rel_ng"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_chromium_asan_rel_ng-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_chromium_compile_dbg_ng"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_chromium_dbg_ng"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_chromium_tsan_rel_ng"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_chromium_tsan_rel_ng-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/linux_optional_gpu_tests_rel"
-  }
-  builder_view_only: true
-}
-consoles {
-  id: "tryserver.chromium.mac"
-  name: "tryserver.chromium.mac"
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/ios-simulator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/ios-simulator-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/ios-simulator-cronet"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/ios-simulator-full-configs"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac_chromium_compile_dbg_ng"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/mac_optional_gpu_tests_rel"
-  }
-  builder_view_only: true
-}
-consoles {
-  id: "tryserver.chromium.win"
-  name: "tryserver.chromium.win"
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win-libfuzzer-asan-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win-rel"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win-rel-compilator"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win_chromium_compile_dbg_ng"
-  }
-  builders {
-    name: "buildbucket/luci.chromium-m118.try/win_optional_gpu_tests_rel"
-  }
-  builder_view_only: true
-}
 logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/chromium.svg"
diff --git a/chromium/infra/config/generated/luci/luci-notify.cfg b/chromium/infra/config/generated/luci/luci-notify.cfg
index 3d64e9e7a30..3698bd143f4 100644
--- a/chromium/infra/config/generated/luci/luci-notify.cfg
+++ b/chromium/infra/config/generated/luci/luci-notify.cfg
@@ -11,630 +11,6 @@ notifiers {
   notifications {
     on_new_status: INFRA_FAILURE
   }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Android Release (Nexus 5X)"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Android arm Builder (dbg)"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Android arm64 Builder All Targets (dbg)"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Cast Android (dbg)"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Cast Linux"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Cast Linux Debug"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "GPU Linux Builder"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "GPU Mac Builder"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "GPU Win x64 Builder"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Linux ASan LSan Builder"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Linux ASan LSan Tests (1)"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Linux ASan Tests (sandboxed)"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Linux Builder"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Linux Builder (Wayland)"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Linux Builder (dbg)"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Linux Release (NVIDIA)"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Linux TSan Builder"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Linux TSan Tests"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Linux Tests"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Linux Tests (Wayland)"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Linux Tests (dbg)(1)"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Mac Builder"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Mac Builder (dbg)"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Mac Release (Intel)"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Mac Retina Release (AMD)"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Mac10.15 Tests"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Mac11 Tests"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Mac12 Tests"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Mac13 Tests"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Mac13 Tests (dbg)"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Win Builder"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Win Builder (dbg)"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Win x64 Builder"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Win10 Tests x64"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "Win10 x64 Release (NVIDIA)"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "android-12-x64-rel"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: FAILURE
-    on_new_status: INFRA_FAILURE
-    on_new_status: SUCCESS
-    email {
-      recipients: "cronet-sheriff@grotations.appspotmail.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "android-cronet-arm-dbg"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: FAILURE
-    on_new_status: INFRA_FAILURE
-    on_new_status: SUCCESS
-    email {
-      recipients: "cronet-sheriff@grotations.appspotmail.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "android-cronet-arm-rel"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: FAILURE
-    on_new_status: INFRA_FAILURE
-    on_new_status: SUCCESS
-    email {
-      recipients: "cronet-sheriff@grotations.appspotmail.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "android-cronet-mainline-clang-x86-dbg"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: FAILURE
-    on_new_status: INFRA_FAILURE
-    on_new_status: SUCCESS
-    email {
-      recipients: "cronet-sheriff@grotations.appspotmail.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "android-cronet-x64-dbg"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: FAILURE
-    on_new_status: INFRA_FAILURE
-    on_new_status: SUCCESS
-    email {
-      recipients: "cronet-sheriff@grotations.appspotmail.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "android-cronet-x86-dbg"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: FAILURE
-    on_new_status: INFRA_FAILURE
-    on_new_status: SUCCESS
-    email {
-      recipients: "cronet-sheriff@grotations.appspotmail.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "android-cronet-x86-dbg-10-tests"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "android-nougat-x86-rel"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "android-pie-arm64-rel"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
   builders {
     bucket: "ci"
     name: "chromeos-amd64-generic-dbg"
@@ -804,47 +180,6 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "ios-simulator"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: FAILURE
-    on_new_status: INFRA_FAILURE
-    on_new_status: SUCCESS
-    email {
-      recipients: "cronet-sheriff@grotations.appspotmail.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "ios-simulator-cronet"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "ios-simulator-full-configs"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
     name: "lacros-amd64-generic-rel"
     repository: "https://chromium.googlesource.com/chromium/src"
   }
@@ -901,17 +236,4 @@ notifiers {
     repository: "https://chromium.googlesource.com/chromium/src"
   }
 }
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  notifications {
-    on_new_status: INFRA_FAILURE
-  }
-  builders {
-    bucket: "ci"
-    name: "mac-arm64-rel"
-    repository: "https://chromium.googlesource.com/chromium/src"
-  }
-}
 tree_closing_enabled: true
diff --git a/chromium/infra/config/generated/luci/luci-scheduler.cfg b/chromium/infra/config/generated/luci/luci-scheduler.cfg
index 0d4dd60c9a8..3a77105be04 100644
--- a/chromium/infra/config/generated/luci/luci-scheduler.cfg
+++ b/chromium/infra/config/generated/luci/luci-scheduler.cfg
@@ -5,627 +5,6 @@
 #   https://config.luci.app/schemas/projects:luci-scheduler.cfg
 
 job {
-  id: "Android FYI Release (Pixel 6)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Android FYI Release (Pixel 6)"
-  }
-}
-job {
-  id: "Android Release (Nexus 5X)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Android Release (Nexus 5X)"
-  }
-}
-job {
-  id: "Android WebView N (dbg)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Android WebView N (dbg)"
-  }
-}
-job {
-  id: "Android WebView O (dbg)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Android WebView O (dbg)"
-  }
-}
-job {
-  id: "Android WebView P (dbg)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Android WebView P (dbg)"
-  }
-}
-job {
-  id: "Android arm Builder (dbg)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Android arm Builder (dbg)"
-  }
-}
-job {
-  id: "Android arm64 Builder (dbg)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Android arm64 Builder (dbg)"
-  }
-}
-job {
-  id: "Android arm64 Builder All Targets (dbg)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Android arm64 Builder All Targets (dbg)"
-  }
-}
-job {
-  id: "Android x64 Builder (dbg)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Android x64 Builder (dbg)"
-  }
-}
-job {
-  id: "Android x64 Builder All Targets (dbg)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Android x64 Builder All Targets (dbg)"
-  }
-}
-job {
-  id: "Android x86 Builder (dbg)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Android x86 Builder (dbg)"
-  }
-}
-job {
-  id: "Cast Android (dbg)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Cast Android (dbg)"
-  }
-}
-job {
-  id: "Cast Linux"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Cast Linux"
-  }
-}
-job {
-  id: "Cast Linux Debug"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Cast Linux Debug"
-  }
-}
-job {
-  id: "Dawn Linux x64 DEPS Builder"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Dawn Linux x64 DEPS Builder"
-  }
-}
-job {
-  id: "Dawn Linux x64 DEPS Release (Intel UHD 630)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Dawn Linux x64 DEPS Release (Intel UHD 630)"
-  }
-}
-job {
-  id: "Dawn Linux x64 DEPS Release (NVIDIA)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Dawn Linux x64 DEPS Release (NVIDIA)"
-  }
-}
-job {
-  id: "Dawn Mac x64 DEPS Builder"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Dawn Mac x64 DEPS Builder"
-  }
-}
-job {
-  id: "Dawn Mac x64 DEPS Release (AMD)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Dawn Mac x64 DEPS Release (AMD)"
-  }
-}
-job {
-  id: "Dawn Mac x64 DEPS Release (Intel)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Dawn Mac x64 DEPS Release (Intel)"
-  }
-}
-job {
-  id: "Dawn Win10 x64 DEPS Builder"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Dawn Win10 x64 DEPS Builder"
-  }
-}
-job {
-  id: "Dawn Win10 x64 DEPS Release (Intel)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Dawn Win10 x64 DEPS Release (Intel)"
-  }
-}
-job {
-  id: "Dawn Win10 x64 DEPS Release (NVIDIA)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Dawn Win10 x64 DEPS Release (NVIDIA)"
-  }
-}
-job {
-  id: "Dawn Win10 x86 DEPS Builder"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Dawn Win10 x86 DEPS Builder"
-  }
-}
-job {
-  id: "Dawn Win10 x86 DEPS Release (Intel)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Dawn Win10 x86 DEPS Release (Intel)"
-  }
-}
-job {
-  id: "Dawn Win10 x86 DEPS Release (NVIDIA)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Dawn Win10 x86 DEPS Release (NVIDIA)"
-  }
-}
-job {
-  id: "GPU FYI Android arm64 Builder"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "GPU FYI Android arm64 Builder"
-  }
-}
-job {
-  id: "GPU Linux Builder"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "GPU Linux Builder"
-  }
-}
-job {
-  id: "GPU Mac Builder"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "GPU Mac Builder"
-  }
-}
-job {
-  id: "GPU Win x64 Builder"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "GPU Win x64 Builder"
-  }
-}
-job {
-  id: "Linux ASan LSan Builder"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Linux ASan LSan Builder"
-  }
-}
-job {
-  id: "Linux ASan LSan Tests (1)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Linux ASan LSan Tests (1)"
-  }
-}
-job {
-  id: "Linux ASan Tests (sandboxed)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Linux ASan Tests (sandboxed)"
-  }
-}
-job {
-  id: "Linux Builder"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Linux Builder"
-  }
-}
-job {
-  id: "Linux Builder (Wayland)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Linux Builder (Wayland)"
-  }
-}
-job {
-  id: "Linux Builder (dbg)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Linux Builder (dbg)"
-  }
-}
-job {
-  id: "Linux Release (NVIDIA)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Linux Release (NVIDIA)"
-  }
-}
-job {
-  id: "Linux TSan Builder"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Linux TSan Builder"
-  }
-}
-job {
-  id: "Linux TSan Tests"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Linux TSan Tests"
-  }
-}
-job {
-  id: "Linux Tests"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Linux Tests"
-  }
-}
-job {
-  id: "Linux Tests (Wayland)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Linux Tests (Wayland)"
-  }
-}
-job {
-  id: "Linux Tests (dbg)(1)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Linux Tests (dbg)(1)"
-  }
-}
-job {
-  id: "Mac Builder"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Mac Builder"
-  }
-}
-job {
-  id: "Mac Builder (dbg)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Mac Builder (dbg)"
-  }
-}
-job {
-  id: "Mac Release (Intel)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Mac Release (Intel)"
-  }
-}
-job {
-  id: "Mac Retina Release (AMD)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Mac Retina Release (AMD)"
-  }
-}
-job {
-  id: "Mac10.15 Tests"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Mac10.15 Tests"
-  }
-}
-job {
-  id: "Mac11 Tests"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Mac11 Tests"
-  }
-}
-job {
-  id: "Mac12 Tests"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Mac12 Tests"
-  }
-}
-job {
-  id: "Mac13 Tests"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Mac13 Tests"
-  }
-}
-job {
-  id: "Mac13 Tests (dbg)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Mac13 Tests (dbg)"
-  }
-}
-job {
-  id: "Nougat Phone Tester"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Nougat Phone Tester"
-  }
-}
-job {
-  id: "Oreo Phone Tester"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Oreo Phone Tester"
-  }
-}
-job {
-  id: "Win Builder"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Win Builder"
-  }
-}
-job {
-  id: "Win Builder (dbg)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Win Builder (dbg)"
-  }
-}
-job {
-  id: "Win x64 Builder"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Win x64 Builder"
-  }
-}
-job {
-  id: "Win10 Tests x64"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Win10 Tests x64"
-  }
-}
-job {
-  id: "Win10 x64 Release (NVIDIA)"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "Win10 x64 Release (NVIDIA)"
-  }
-}
-job {
-  id: "android-12-x64-rel"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "android-12-x64-rel"
-  }
-}
-job {
-  id: "android-cronet-arm-dbg"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "android-cronet-arm-dbg"
-  }
-}
-job {
-  id: "android-cronet-arm-rel"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "android-cronet-arm-rel"
-  }
-}
-job {
-  id: "android-cronet-mainline-clang-x86-dbg"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "android-cronet-mainline-clang-x86-dbg"
-  }
-}
-job {
-  id: "android-cronet-x64-dbg"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "android-cronet-x64-dbg"
-  }
-}
-job {
-  id: "android-cronet-x86-dbg"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "android-cronet-x86-dbg"
-  }
-}
-job {
-  id: "android-cronet-x86-dbg-10-tests"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "android-cronet-x86-dbg-10-tests"
-  }
-}
-job {
-  id: "android-nougat-x86-rel"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "android-nougat-x86-rel"
-  }
-}
-job {
-  id: "android-official"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "android-official"
-  }
-}
-job {
-  id: "android-pie-arm64-dbg"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "android-pie-arm64-dbg"
-  }
-}
-job {
-  id: "android-pie-arm64-rel"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "android-pie-arm64-rel"
-  }
-}
-job {
   id: "chromeos-amd64-generic-dbg"
   realm: "ci"
   buildbucket {
@@ -734,33 +113,6 @@ job {
   }
 }
 job {
-  id: "ios-simulator"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "ios-simulator"
-  }
-}
-job {
-  id: "ios-simulator-cronet"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "ios-simulator-cronet"
-  }
-}
-job {
-  id: "ios-simulator-full-configs"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "ios-simulator-full-configs"
-  }
-}
-job {
   id: "lacros-amd64-generic-rel"
   realm: "ci"
   buildbucket {
@@ -832,118 +184,9 @@ job {
     builder: "linux-lacros-tester-rel"
   }
 }
-job {
-  id: "linux-official"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "linux-official"
-  }
-}
-job {
-  id: "mac-arm64-rel"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "mac-arm64-rel"
-  }
-}
-job {
-  id: "mac-official"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "mac-official"
-  }
-}
-job {
-  id: "mac11-arm64-rel-tests"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "mac11-arm64-rel-tests"
-  }
-}
-job {
-  id: "mac12-arm64-rel-tests"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "mac12-arm64-rel-tests"
-  }
-}
-job {
-  id: "mac13-arm64-rel-tests"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "mac13-arm64-rel-tests"
-  }
-}
-job {
-  id: "win-official"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "win-official"
-  }
-}
-job {
-  id: "win32-official"
-  realm: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "win32-official"
-  }
-}
 trigger {
   id: "chromium-gitiles-trigger"
   realm: "ci"
-  triggers: "Android Release (Nexus 5X)"
-  triggers: "Android arm Builder (dbg)"
-  triggers: "Android arm64 Builder (dbg)"
-  triggers: "Android arm64 Builder All Targets (dbg)"
-  triggers: "Android x64 Builder (dbg)"
-  triggers: "Android x64 Builder All Targets (dbg)"
-  triggers: "Android x86 Builder (dbg)"
-  triggers: "Cast Android (dbg)"
-  triggers: "Cast Linux"
-  triggers: "Cast Linux Debug"
-  triggers: "Dawn Linux x64 DEPS Builder"
-  triggers: "Dawn Mac x64 DEPS Builder"
-  triggers: "Dawn Win10 x64 DEPS Builder"
-  triggers: "Dawn Win10 x86 DEPS Builder"
-  triggers: "GPU FYI Android arm64 Builder"
-  triggers: "GPU Linux Builder"
-  triggers: "GPU Mac Builder"
-  triggers: "GPU Win x64 Builder"
-  triggers: "Linux ASan LSan Builder"
-  triggers: "Linux Builder"
-  triggers: "Linux Builder (Wayland)"
-  triggers: "Linux Builder (dbg)"
-  triggers: "Linux TSan Builder"
-  triggers: "Mac Builder"
-  triggers: "Mac Builder (dbg)"
-  triggers: "Win Builder"
-  triggers: "Win Builder (dbg)"
-  triggers: "Win x64 Builder"
-  triggers: "android-12-x64-rel"
-  triggers: "android-cronet-arm-dbg"
-  triggers: "android-cronet-arm-rel"
-  triggers: "android-cronet-mainline-clang-x86-dbg"
-  triggers: "android-cronet-x64-dbg"
-  triggers: "android-cronet-x86-dbg"
-  triggers: "android-nougat-x86-rel"
-  triggers: "android-official"
-  triggers: "android-pie-arm64-rel"
   triggers: "chromeos-amd64-generic-dbg"
   triggers: "chromeos-amd64-generic-lacros-dbg"
   triggers: "chromeos-amd64-generic-rel"
@@ -956,9 +199,6 @@ trigger {
   triggers: "fuchsia-official"
   triggers: "fuchsia-x64-cast-receiver-rel"
   triggers: "fuchsia-x64-rel"
-  triggers: "ios-simulator"
-  triggers: "ios-simulator-cronet"
-  triggers: "ios-simulator-full-configs"
   triggers: "lacros-amd64-generic-rel"
   triggers: "lacros-arm-generic-rel"
   triggers: "lacros-arm64-generic-rel"
@@ -966,11 +206,6 @@ trigger {
   triggers: "linux-chromeos-rel"
   triggers: "linux-lacros-builder-rel"
   triggers: "linux-lacros-dbg"
-  triggers: "linux-official"
-  triggers: "mac-arm64-rel"
-  triggers: "mac-official"
-  triggers: "win-official"
-  triggers: "win32-official"
   gitiles {
     repo: "https://chromium.googlesource.com/chromium/src"
     refs: "regexp:refs/branch-heads/5993"
diff --git a/chromium/infra/config/generated/luci/project.cfg b/chromium/infra/config/generated/luci/project.cfg
index 7204539653b..52c63c0872a 100644
--- a/chromium/infra/config/generated/luci/project.cfg
+++ b/chromium/infra/config/generated/luci/project.cfg
@@ -7,7 +7,7 @@
 name: "chromium-m118"
 access: "group:all"
 lucicfg {
-  version: "1.40.0"
+  version: "1.42.1"
   package_dir: "../.."
   config_dir: "generated/luci"
   entry_point: "main.star"
diff --git a/chromium/infra/config/generated/luci/realms.cfg b/chromium/infra/config/generated/luci/realms.cfg
index 8349c519539..3284fc04fee 100644
--- a/chromium/infra/config/generated/luci/realms.cfg
+++ b/chromium/infra/config/generated/luci/realms.cfg
@@ -76,7 +76,6 @@ realms {
   bindings {
     role: "role/buildbucket.builderServiceAccount"
     principals: "user:chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-    principals: "user:chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
   }
   bindings {
     role: "role/buildbucket.owner"
@@ -117,51 +116,7 @@ realms {
     conditions {
       restrict {
         attribute: "scheduler.job.name"
-        values: "Android WebView N (dbg)"
-        values: "Android WebView O (dbg)"
-        values: "Android WebView P (dbg)"
-        values: "Linux ASan LSan Tests (1)"
-        values: "Linux ASan Tests (sandboxed)"
-        values: "Linux Release (NVIDIA)"
-        values: "Linux TSan Tests"
-        values: "Linux Tests"
-        values: "Linux Tests (Wayland)"
-        values: "Linux Tests (dbg)(1)"
-        values: "Mac Release (Intel)"
-        values: "Mac Retina Release (AMD)"
-        values: "Mac10.15 Tests"
-        values: "Mac11 Tests"
-        values: "Mac12 Tests"
-        values: "Mac13 Tests"
-        values: "Mac13 Tests (dbg)"
-        values: "Nougat Phone Tester"
-        values: "Oreo Phone Tester"
-        values: "Win10 Tests x64"
-        values: "Win10 x64 Release (NVIDIA)"
-        values: "android-cronet-x86-dbg-10-tests"
-        values: "android-pie-arm64-dbg"
         values: "linux-lacros-tester-rel"
-        values: "mac11-arm64-rel-tests"
-        values: "mac12-arm64-rel-tests"
-        values: "mac13-arm64-rel-tests"
-      }
-    }
-  }
-  bindings {
-    role: "role/scheduler.triggerer"
-    principals: "user:chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-    conditions {
-      restrict {
-        attribute: "scheduler.job.name"
-        values: "Android FYI Release (Pixel 6)"
-        values: "Dawn Linux x64 DEPS Release (Intel UHD 630)"
-        values: "Dawn Linux x64 DEPS Release (NVIDIA)"
-        values: "Dawn Mac x64 DEPS Release (AMD)"
-        values: "Dawn Mac x64 DEPS Release (Intel)"
-        values: "Dawn Win10 x64 DEPS Release (Intel)"
-        values: "Dawn Win10 x64 DEPS Release (NVIDIA)"
-        values: "Dawn Win10 x86 DEPS Release (Intel)"
-        values: "Dawn Win10 x86 DEPS Release (NVIDIA)"
       }
     }
   }
@@ -183,7 +138,6 @@ realms {
   bindings {
     role: "role/buildbucket.builderServiceAccount"
     principals: "user:chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-    principals: "user:chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
   }
 }
 realms {
@@ -223,7 +177,6 @@ realms {
     role: "role/buildbucket.builderServiceAccount"
     principals: "user:chromium-orchestrator@chops-service-accounts.iam.gserviceaccount.com"
     principals: "user:chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-    principals: "user:chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
   }
   bindings {
     role: "role/buildbucket.owner"
@@ -238,7 +191,6 @@ realms {
     principals: "group:project-chromium-tryjob-access"
     principals: "group:service-account-chromeperf"
     principals: "group:service-account-cq"
-    principals: "project:dawn"
     principals: "user:dawn-automated-expectations@chops-service-accounts.iam.gserviceaccount.com"
     principals: "user:findit-for-me@appspot.gserviceaccount.com"
     principals: "user:tricium-prod@appspot.gserviceaccount.com"
diff --git a/chromium/infra/config/generated/testing/variants.pyl b/chromium/infra/config/generated/testing/variants.pyl
index 419e6c9d727..8657f29f129 100644
--- a/chromium/infra/config/generated/testing/variants.pyl
+++ b/chromium/infra/config/generated/testing/variants.pyl
@@ -42,64 +42,64 @@
   },
   'LACROS_VERSION_SKEW_CANARY': {
     'identifier': 'Lacros version skew testing ash canary',
-    'description': 'Run with ash-chrome version 120.0.6089.0',
+    'description': 'Run with ash-chrome version 121.0.6152.0',
     'args': [
-      '--ash-chrome-path-override=../../lacros_version_skew_tests_v120.0.6089.0/test_ash_chrome',
+      '--ash-chrome-path-override=../../lacros_version_skew_tests_v121.0.6152.0/test_ash_chrome',
     ],
     'swarming': {
       'cipd_packages': [
         {
           'cipd_package': 'chromium/testing/linux-ash-chromium/x86_64/ash.zip',
-          'location': 'lacros_version_skew_tests_v120.0.6089.0',
-          'revision': 'version:120.0.6089.0',
+          'location': 'lacros_version_skew_tests_v121.0.6152.0',
+          'revision': 'version:121.0.6152.0',
         },
       ],
     },
   },
   'LACROS_VERSION_SKEW_DEV': {
     'identifier': 'Lacros version skew testing ash dev',
-    'description': 'Run with ash-chrome version 119.0.6045.16',
+    'description': 'Run with ash-chrome version 121.0.6126.0',
     'args': [
-      '--ash-chrome-path-override=../../lacros_version_skew_tests_v119.0.6045.16/test_ash_chrome',
+      '--ash-chrome-path-override=../../lacros_version_skew_tests_v121.0.6126.0/test_ash_chrome',
     ],
     'swarming': {
       'cipd_packages': [
         {
           'cipd_package': 'chromium/testing/linux-ash-chromium/x86_64/ash.zip',
-          'location': 'lacros_version_skew_tests_v119.0.6045.16',
-          'revision': 'version:119.0.6045.16',
+          'location': 'lacros_version_skew_tests_v121.0.6126.0',
+          'revision': 'version:121.0.6126.0',
         },
       ],
     },
   },
   'LACROS_VERSION_SKEW_BETA': {
     'identifier': 'Lacros version skew testing ash beta',
-    'description': 'Run with ash-chrome version 119.0.6045.38',
+    'description': 'Run with ash-chrome version 120.0.6099.25',
     'args': [
-      '--ash-chrome-path-override=../../lacros_version_skew_tests_v119.0.6045.38/test_ash_chrome',
+      '--ash-chrome-path-override=../../lacros_version_skew_tests_v120.0.6099.25/test_ash_chrome',
     ],
     'swarming': {
       'cipd_packages': [
         {
           'cipd_package': 'chromium/testing/linux-ash-chromium/x86_64/ash.zip',
-          'location': 'lacros_version_skew_tests_v119.0.6045.38',
-          'revision': 'version:119.0.6045.38',
+          'location': 'lacros_version_skew_tests_v120.0.6099.25',
+          'revision': 'version:120.0.6099.25',
         },
       ],
     },
   },
   'LACROS_VERSION_SKEW_STABLE': {
     'identifier': 'Lacros version skew testing ash stable',
-    'description': 'Run with ash-chrome version 118.0.5993.106',
+    'description': 'Run with ash-chrome version 119.0.6045.158',
     'args': [
-      '--ash-chrome-path-override=../../lacros_version_skew_tests_v118.0.5993.106/test_ash_chrome',
+      '--ash-chrome-path-override=../../lacros_version_skew_tests_v119.0.6045.158/test_ash_chrome',
     ],
     'swarming': {
       'cipd_packages': [
         {
           'cipd_package': 'chromium/testing/linux-ash-chromium/x86_64/ash.zip',
-          'location': 'lacros_version_skew_tests_v118.0.5993.106',
-          'revision': 'version:118.0.5993.106',
+          'location': 'lacros_version_skew_tests_v119.0.6045.158',
+          'revision': 'version:119.0.6045.158',
         },
       ],
     },
@@ -416,7 +416,7 @@
     'enabled': False,
     'skylab': {
       'cros_board': 'dedede',
-      'cros_img': 'dedede-release/R119-15633.10.0',
+      'cros_img': 'dedede-release/R121-15678.0.0',
     },
   },
   'CROS_DEDEDE_RELEASE_BETA': {
@@ -424,14 +424,15 @@
     'enabled': False,
     'skylab': {
       'cros_board': 'dedede',
-      'cros_img': 'dedede-release/R119-15633.13.0',
+      'cros_img': 'dedede-release/R120-15662.16.0',
     },
   },
   'CROS_DEDEDE_RELEASE_STABLE': {
     'identifier': 'DEDEDE_RELEASE_STABLE',
+    'enabled': False,
     'skylab': {
       'cros_board': 'dedede',
-      'cros_img': 'dedede-release/R118-15604.45.0',
+      'cros_img': 'dedede-release/R119-15633.44.0',
     },
   },
   'CROS_PUFF_RELEASE_LKGM': {
@@ -448,7 +449,7 @@
     'enabled': False,
     'skylab': {
       'cros_board': 'puff',
-      'cros_img': 'puff-release/R119-15633.10.0',
+      'cros_img': 'puff-release/R121-15678.0.0',
       'dut_pool': 'chrome',
     },
   },
@@ -457,7 +458,7 @@
     'enabled': False,
     'skylab': {
       'cros_board': 'puff',
-      'cros_img': 'puff-release/R119-15633.13.0',
+      'cros_img': 'puff-release/R120-15662.16.0',
       'dut_pool': 'chrome',
     },
   },
@@ -465,7 +466,7 @@
     'identifier': 'PUFF_RELEASE_STABLE',
     'skylab': {
       'cros_board': 'puff',
-      'cros_img': 'puff-release/R118-15604.45.0',
+      'cros_img': 'puff-release/R118-15604.57.0',
       'dut_pool': 'chrome',
     },
   },
@@ -492,7 +493,7 @@
     'enabled': False,
     'skylab': {
       'cros_board': 'hana',
-      'cros_img': 'hana-release/R119-15633.10.0',
+      'cros_img': 'hana-release/R121-15678.0.0',
     },
   },
   'CROS_HANA_RELEASE_BETA': {
@@ -500,14 +501,15 @@
     'enabled': False,
     'skylab': {
       'cros_board': 'hana',
-      'cros_img': 'hana-release/R119-15633.13.0',
+      'cros_img': 'hana-release/R120-15662.16.0',
     },
   },
   'CROS_HANA_RELEASE_STABLE': {
     'identifier': 'HANA_RELEASE_STABLE',
+    'enabled': False,
     'skylab': {
       'cros_board': 'hana',
-      'cros_img': 'hana-release/R118-15604.45.0',
+      'cros_img': 'hana-release/R119-15633.44.0',
     },
   },
   'CROS_JACUZZI_RELEASE_LKGM': {
@@ -523,7 +525,7 @@
     'enabled': False,
     'skylab': {
       'cros_board': 'jacuzzi',
-      'cros_img': 'jacuzzi-release/R119-15633.10.0',
+      'cros_img': 'jacuzzi-release/R121-15678.0.0',
     },
   },
   'CROS_JACUZZI_RELEASE_BETA': {
@@ -531,7 +533,7 @@
     'enabled': False,
     'skylab': {
       'cros_board': 'jacuzzi',
-      'cros_img': 'jacuzzi-release/R119-15633.13.0',
+      'cros_img': 'jacuzzi-release/R120-15662.16.0',
     },
   },
   'CROS_JACUZZI_RELEASE_CHROME_FROM_TLS_ASH_LKGM': {
@@ -545,9 +547,10 @@
   },
   'CROS_JACUZZI_RELEASE_STABLE': {
     'identifier': 'JACUZZI_RELEASE_STABLE',
+    'enabled': False,
     'skylab': {
       'cros_board': 'jacuzzi',
-      'cros_img': 'jacuzzi-release/R118-15604.45.0',
+      'cros_img': 'jacuzzi-release/R119-15633.44.0',
     },
   },
   'CROS_JACUZZI_PUBLIC_LKGM': {
@@ -613,7 +616,7 @@
     'enabled': False,
     'skylab': {
       'cros_board': 'octopus',
-      'cros_img': 'octopus-release/R119-15633.10.0',
+      'cros_img': 'octopus-release/R121-15678.0.0',
     },
   },
   'CROS_OCTOPUS_RELEASE_BETA': {
@@ -621,14 +624,15 @@
     'enabled': False,
     'skylab': {
       'cros_board': 'octopus',
-      'cros_img': 'octopus-release/R119-15633.13.0',
+      'cros_img': 'octopus-release/R120-15662.16.0',
     },
   },
   'CROS_OCTOPUS_RELEASE_STABLE': {
     'identifier': 'OCTOPUS_RELEASE_STABLE',
+    'enabled': False,
     'skylab': {
       'cros_board': 'octopus',
-      'cros_img': 'octopus-release/R118-15604.45.0',
+      'cros_img': 'octopus-release/R119-15633.44.0',
     },
   },
   'CROS_STRONGBAD_RELEASE_LKGM': {
@@ -644,7 +648,7 @@
     'enabled': False,
     'skylab': {
       'cros_board': 'strongbad',
-      'cros_img': 'strongbad-release/R119-15633.10.0',
+      'cros_img': 'strongbad-release/R121-15678.0.0',
     },
   },
   'CROS_STRONGBAD_RELEASE_BETA': {
@@ -652,14 +656,15 @@
     'enabled': False,
     'skylab': {
       'cros_board': 'strongbad',
-      'cros_img': 'strongbad-release/R119-15633.13.0',
+      'cros_img': 'strongbad-release/R120-15662.16.0',
     },
   },
   'CROS_STRONGBAD_RELEASE_STABLE': {
     'identifier': 'STRONGBAD_RELEASE_STABLE',
+    'enabled': False,
     'skylab': {
       'cros_board': 'strongbad',
-      'cros_img': 'strongbad-release/R118-15604.45.0',
+      'cros_img': 'strongbad-release/R119-15633.44.0',
     },
   },
   'CROS_TROGDOR_RELEASE_ASH_LKGM': {
diff --git a/chromium/infra/config/lib/orchestrator.star b/chromium/infra/config/lib/orchestrator.star
index b57af9d798d..39d75ae2a59 100644
--- a/chromium/infra/config/lib/orchestrator.star
+++ b/chromium/infra/config/lib/orchestrator.star
@@ -16,7 +16,7 @@ load("./builder_config.star", _ = "builder_config")  # @unused
 
 # infra/infra git revision to use for the compilator_watcher luciexe sub_build
 # Used by chromium orchestrators
-_COMPILATOR_WATCHER_GIT_REVISION = "e6d08be3fd589d4f222dae5d18dbc972e6117b23"
+_COMPILATOR_WATCHER_GIT_REVISION = "e3cad57252d996ab02463019e7f49343d739b885"
 
 # Nodes for the definition of an orchestrator builder
 _ORCHESTRATOR = nodes.create_bucket_scoped_node_type("orchestrator")
diff --git a/chromium/infra/config/settings.json b/chromium/infra/config/settings.json
index a0c06c31a04..bf91a310333 100644
--- a/chromium/infra/config/settings.json
+++ b/chromium/infra/config/settings.json
@@ -5,33 +5,13 @@
     "chrome_project": "chrome-m118",
     "is_main": false,
     "platforms": {
-        "android": {
-            "description": "beta/stable",
-            "sheriff_rotation": "chrome_browser_release"
-        },
         "cros": {
             "description": "beta/stable",
             "sheriff_rotation": "chrome_browser_release"
         },
         "fuchsia": {
-            "description": "beta/stable",
-            "sheriff_rotation": "chrome_browser_release"
-        },
-        "ios": {
-            "description": "beta/stable",
-            "sheriff_rotation": "chrome_browser_release"
-        },
-        "linux": {
-            "description": "beta/stable",
-            "sheriff_rotation": "chrome_browser_release"
-        },
-        "mac": {
-            "description": "beta/stable",
-            "sheriff_rotation": "chrome_browser_release"
-        },
-        "windows": {
-            "description": "beta/stable",
-            "sheriff_rotation": "chrome_browser_release"
+            "description": "fuchsia extended support",
+            "sheriff_rotation": "fuchsia"
         }
     }
 }
diff --git a/chromium/infra/config/subprojects/chromium/ci/chromium.mac.star b/chromium/infra/config/subprojects/chromium/ci/chromium.mac.star
index 675f8e23f8c..896d06c1f90 100644
--- a/chromium/infra/config/subprojects/chromium/ci/chromium.mac.star
+++ b/chromium/infra/config/subprojects/chromium/ci/chromium.mac.star
@@ -536,6 +536,7 @@ ios_builder(
         ),
         build_gs_bucket = "chromium-mac-archive",
     ),
+    cpu = cpu.ARM64,
     console_view_entry = [
         consoles.console_view_entry(
             category = "ios|default",
diff --git a/chromium/infra/config/subprojects/chromium/try.star b/chromium/infra/config/subprojects/chromium/try.star
index 7e9d4673943..bb945517510 100644
--- a/chromium/infra/config/subprojects/chromium/try.star
+++ b/chromium/infra/config/subprojects/chromium/try.star
@@ -114,16 +114,7 @@ luci.cq_group(
             groups = "project-chromium-tryjob-access",
         ),
     ],
-    additional_modes = [
-        cq.run_mode(cq.MODE_QUICK_DRY_RUN, 1, "Quick-Run", 1),
-    ],
     tree_status_host = "chromium-status.appspot.com" if settings.is_main else None,
-    tryjob_experiments = [
-        cq.tryjob_experiment(
-            name = "chromium_rts.dry_run_rts",
-            owner_group_allowlist = ["rts-on-dry-run"],
-        ),
-    ],
 )
 
 # Declare a CQ group that watches all branch heads, excluding the active
diff --git a/chromium/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star b/chromium/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star
index 7474c7a405f..20036023e45 100644
--- a/chromium/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star
+++ b/chromium/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star
@@ -466,6 +466,7 @@ ios_builder(
     mirrors = [
         "ci/ios-simulator-full-configs",
     ],
+    cpu = cpu.ARM64,
     coverage_exclude_sources = "ios_test_files_and_test_utils",
     coverage_test_types = ["overall", "unit"],
     main_list_view = "try",
diff --git a/chromium/infra/config/targets/cros-skylab-variants.json b/chromium/infra/config/targets/cros-skylab-variants.json
index fd303374c08..19b7d751f25 100644
--- a/chromium/infra/config/targets/cros-skylab-variants.json
+++ b/chromium/infra/config/targets/cros-skylab-variants.json
@@ -22,8 +22,8 @@
   "CROS_DEDEDE_RELEASE_DEV": {
     "skylab": {
       "cros_board": "dedede",
-      "cros_chrome_version": "119.0.6045.16",
-      "cros_img": "dedede-release/R119-15633.10.0"
+      "cros_chrome_version": "121.0.6126.0",
+      "cros_img": "dedede-release/R121-15678.0.0"
     },
     "enabled": false,
     "identifier": "DEDEDE_RELEASE_DEV"
@@ -31,8 +31,8 @@
   "CROS_DEDEDE_RELEASE_BETA": {
     "skylab": {
       "cros_board": "dedede",
-      "cros_chrome_version": "119.0.6045.23",
-      "cros_img": "dedede-release/R119-15633.13.0"
+      "cros_chrome_version": "120.0.6099.25",
+      "cros_img": "dedede-release/R120-15662.16.0"
     },
     "enabled": false,
     "identifier": "DEDEDE_RELEASE_BETA"
@@ -40,10 +40,10 @@
   "CROS_DEDEDE_RELEASE_STABLE": {
     "skylab": {
       "cros_board": "dedede",
-      "cros_chrome_version": "118.0.5993.86",
-      "cros_img": "dedede-release/R118-15604.45.0"
+      "cros_chrome_version": "119.0.6045.158",
+      "cros_img": "dedede-release/R119-15633.44.0"
     },
-    "enabled": true,
+    "enabled": false,
     "identifier": "DEDEDE_RELEASE_STABLE"
   },
   "CROS_PUFF_RELEASE_LKGM": {
@@ -60,8 +60,8 @@
   "CROS_PUFF_RELEASE_DEV": {
     "skylab": {
       "cros_board": "puff",
-      "cros_chrome_version": "119.0.6045.16",
-      "cros_img": "puff-release/R119-15633.10.0",
+      "cros_chrome_version": "121.0.6126.0",
+      "cros_img": "puff-release/R121-15678.0.0",
       "dut_pool": "chrome"
     },
     "enabled": false,
@@ -70,8 +70,8 @@
   "CROS_PUFF_RELEASE_BETA": {
     "skylab": {
       "cros_board": "puff",
-      "cros_chrome_version": "119.0.6045.23",
-      "cros_img": "puff-release/R119-15633.13.0",
+      "cros_chrome_version": "120.0.6099.25",
+      "cros_img": "puff-release/R120-15662.16.0",
       "dut_pool": "chrome"
     },
     "enabled": false,
@@ -80,8 +80,8 @@
   "CROS_PUFF_RELEASE_STABLE": {
     "skylab": {
       "cros_board": "puff",
-      "cros_chrome_version": "118.0.5993.86",
-      "cros_img": "puff-release/R118-15604.45.0",
+      "cros_chrome_version": "118.0.5993.124",
+      "cros_img": "puff-release/R118-15604.57.0",
       "dut_pool": "chrome"
     },
     "enabled": true,
@@ -112,8 +112,8 @@
   "CROS_HANA_RELEASE_DEV": {
     "skylab": {
       "cros_board": "hana",
-      "cros_chrome_version": "119.0.6045.16",
-      "cros_img": "hana-release/R119-15633.10.0"
+      "cros_chrome_version": "121.0.6126.0",
+      "cros_img": "hana-release/R121-15678.0.0"
     },
     "enabled": false,
     "identifier": "HANA_RELEASE_DEV"
@@ -121,8 +121,8 @@
   "CROS_HANA_RELEASE_BETA": {
     "skylab": {
       "cros_board": "hana",
-      "cros_chrome_version": "119.0.6045.23",
-      "cros_img": "hana-release/R119-15633.13.0"
+      "cros_chrome_version": "120.0.6099.25",
+      "cros_img": "hana-release/R120-15662.16.0"
     },
     "enabled": false,
     "identifier": "HANA_RELEASE_BETA"
@@ -130,10 +130,10 @@
   "CROS_HANA_RELEASE_STABLE": {
     "skylab": {
       "cros_board": "hana",
-      "cros_chrome_version": "118.0.5993.86",
-      "cros_img": "hana-release/R118-15604.45.0"
+      "cros_chrome_version": "119.0.6045.158",
+      "cros_img": "hana-release/R119-15633.44.0"
     },
-    "enabled": true,
+    "enabled": false,
     "identifier": "HANA_RELEASE_STABLE"
   },
   "CROS_JACUZZI_RELEASE_LKGM": {
@@ -149,8 +149,8 @@
   "CROS_JACUZZI_RELEASE_DEV": {
     "skylab": {
       "cros_board": "jacuzzi",
-      "cros_chrome_version": "119.0.6045.16",
-      "cros_img": "jacuzzi-release/R119-15633.10.0"
+      "cros_chrome_version": "121.0.6126.0",
+      "cros_img": "jacuzzi-release/R121-15678.0.0"
     },
     "enabled": false,
     "identifier": "JACUZZI_RELEASE_DEV"
@@ -158,8 +158,8 @@
   "CROS_JACUZZI_RELEASE_BETA": {
     "skylab": {
       "cros_board": "jacuzzi",
-      "cros_chrome_version": "119.0.6045.23",
-      "cros_img": "jacuzzi-release/R119-15633.13.0"
+      "cros_chrome_version": "120.0.6099.25",
+      "cros_img": "jacuzzi-release/R120-15662.16.0"
     },
     "enabled": false,
     "identifier": "JACUZZI_RELEASE_BETA"
@@ -177,10 +177,10 @@
   "CROS_JACUZZI_RELEASE_STABLE": {
     "skylab": {
       "cros_board": "jacuzzi",
-      "cros_chrome_version": "118.0.5993.86",
-      "cros_img": "jacuzzi-release/R118-15604.45.0"
+      "cros_chrome_version": "119.0.6045.158",
+      "cros_img": "jacuzzi-release/R119-15633.44.0"
     },
-    "enabled": true,
+    "enabled": false,
     "identifier": "JACUZZI_RELEASE_STABLE"
   },
   "CROS_JACUZZI_PUBLIC_LKGM": {
@@ -257,8 +257,8 @@
   "CROS_OCTOPUS_RELEASE_DEV": {
     "skylab": {
       "cros_board": "octopus",
-      "cros_chrome_version": "119.0.6045.16",
-      "cros_img": "octopus-release/R119-15633.10.0"
+      "cros_chrome_version": "121.0.6126.0",
+      "cros_img": "octopus-release/R121-15678.0.0"
     },
     "enabled": false,
     "identifier": "OCTOPUS_RELEASE_DEV"
@@ -266,8 +266,8 @@
   "CROS_OCTOPUS_RELEASE_BETA": {
     "skylab": {
       "cros_board": "octopus",
-      "cros_chrome_version": "119.0.6045.23",
-      "cros_img": "octopus-release/R119-15633.13.0"
+      "cros_chrome_version": "120.0.6099.25",
+      "cros_img": "octopus-release/R120-15662.16.0"
     },
     "enabled": false,
     "identifier": "OCTOPUS_RELEASE_BETA"
@@ -275,10 +275,10 @@
   "CROS_OCTOPUS_RELEASE_STABLE": {
     "skylab": {
       "cros_board": "octopus",
-      "cros_chrome_version": "118.0.5993.86",
-      "cros_img": "octopus-release/R118-15604.45.0"
+      "cros_chrome_version": "119.0.6045.158",
+      "cros_img": "octopus-release/R119-15633.44.0"
     },
-    "enabled": true,
+    "enabled": false,
     "identifier": "OCTOPUS_RELEASE_STABLE"
   },
   "CROS_STRONGBAD_RELEASE_LKGM": {
@@ -294,8 +294,8 @@
   "CROS_STRONGBAD_RELEASE_DEV": {
     "skylab": {
       "cros_board": "strongbad",
-      "cros_chrome_version": "119.0.6045.16",
-      "cros_img": "strongbad-release/R119-15633.10.0"
+      "cros_chrome_version": "121.0.6126.0",
+      "cros_img": "strongbad-release/R121-15678.0.0"
     },
     "enabled": false,
     "identifier": "strongbad_RELEASE_DEV"
@@ -303,8 +303,8 @@
   "CROS_STRONGBAD_RELEASE_BETA": {
     "skylab": {
       "cros_board": "strongbad",
-      "cros_chrome_version": "119.0.6045.23",
-      "cros_img": "strongbad-release/R119-15633.13.0"
+      "cros_chrome_version": "120.0.6099.25",
+      "cros_img": "strongbad-release/R120-15662.16.0"
     },
     "enabled": false,
     "identifier": "STRONGBAD_RELEASE_BETA"
@@ -312,10 +312,10 @@
   "CROS_STRONGBAD_RELEASE_STABLE": {
     "skylab": {
       "cros_board": "strongbad",
-      "cros_chrome_version": "118.0.5993.86",
-      "cros_img": "strongbad-release/R118-15604.45.0"
+      "cros_chrome_version": "119.0.6045.158",
+      "cros_img": "strongbad-release/R119-15633.44.0"
     },
-    "enabled": true,
+    "enabled": false,
     "identifier": "STRONGBAD_RELEASE_STABLE"
   },
   "CROS_TROGDOR_RELEASE_ASH_LKGM": {
diff --git a/chromium/infra/config/targets/lacros-version-skew-variants.json b/chromium/infra/config/targets/lacros-version-skew-variants.json
index 76a112aea2c..1976c4397b5 100644
--- a/chromium/infra/config/targets/lacros-version-skew-variants.json
+++ b/chromium/infra/config/targets/lacros-version-skew-variants.json
@@ -1,64 +1,64 @@
 {
   "LACROS_VERSION_SKEW_CANARY": {
     "args": [
-      "--ash-chrome-path-override=../../lacros_version_skew_tests_v120.0.6089.0/test_ash_chrome"
+      "--ash-chrome-path-override=../../lacros_version_skew_tests_v121.0.6152.0/test_ash_chrome"
     ],
-    "description": "Run with ash-chrome version 120.0.6089.0",
+    "description": "Run with ash-chrome version 121.0.6152.0",
     "identifier": "Lacros version skew testing ash canary",
     "swarming": {
       "cipd_packages": [
         {
           "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-          "location": "lacros_version_skew_tests_v120.0.6089.0",
-          "revision": "version:120.0.6089.0"
+          "location": "lacros_version_skew_tests_v121.0.6152.0",
+          "revision": "version:121.0.6152.0"
         }
       ]
     }
   },
   "LACROS_VERSION_SKEW_DEV": {
     "args": [
-      "--ash-chrome-path-override=../../lacros_version_skew_tests_v119.0.6045.16/test_ash_chrome"
+      "--ash-chrome-path-override=../../lacros_version_skew_tests_v121.0.6126.0/test_ash_chrome"
     ],
-    "description": "Run with ash-chrome version 119.0.6045.16",
+    "description": "Run with ash-chrome version 121.0.6126.0",
     "identifier": "Lacros version skew testing ash dev",
     "swarming": {
       "cipd_packages": [
         {
           "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-          "location": "lacros_version_skew_tests_v119.0.6045.16",
-          "revision": "version:119.0.6045.16"
+          "location": "lacros_version_skew_tests_v121.0.6126.0",
+          "revision": "version:121.0.6126.0"
         }
       ]
     }
   },
   "LACROS_VERSION_SKEW_BETA": {
     "args": [
-      "--ash-chrome-path-override=../../lacros_version_skew_tests_v119.0.6045.38/test_ash_chrome"
+      "--ash-chrome-path-override=../../lacros_version_skew_tests_v120.0.6099.25/test_ash_chrome"
     ],
-    "description": "Run with ash-chrome version 119.0.6045.38",
+    "description": "Run with ash-chrome version 120.0.6099.25",
     "identifier": "Lacros version skew testing ash beta",
     "swarming": {
       "cipd_packages": [
         {
           "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-          "location": "lacros_version_skew_tests_v119.0.6045.38",
-          "revision": "version:119.0.6045.38"
+          "location": "lacros_version_skew_tests_v120.0.6099.25",
+          "revision": "version:120.0.6099.25"
         }
       ]
     }
   },
   "LACROS_VERSION_SKEW_STABLE": {
     "args": [
-      "--ash-chrome-path-override=../../lacros_version_skew_tests_v118.0.5993.106/test_ash_chrome"
+      "--ash-chrome-path-override=../../lacros_version_skew_tests_v119.0.6045.158/test_ash_chrome"
     ],
-    "description": "Run with ash-chrome version 118.0.5993.106",
+    "description": "Run with ash-chrome version 119.0.6045.158",
     "identifier": "Lacros version skew testing ash stable",
     "swarming": {
       "cipd_packages": [
         {
           "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-          "location": "lacros_version_skew_tests_v118.0.5993.106",
-          "revision": "version:118.0.5993.106"
+          "location": "lacros_version_skew_tests_v119.0.6045.158",
+          "revision": "version:119.0.6045.158"
         }
       ]
     }
diff --git a/chromium/ipc/ipc_mojo_bootstrap.cc b/chromium/ipc/ipc_mojo_bootstrap.cc
index 7a7ededd03f..c642de4a00c 100644
--- a/chromium/ipc/ipc_mojo_bootstrap.cc
+++ b/chromium/ipc/ipc_mojo_bootstrap.cc
@@ -793,13 +793,12 @@ class ChannelAssociatedGroupController
         // handle.
         DCHECK(!endpoint->client());
         DCHECK(endpoint->peer_closed());
-        MarkClosedAndMaybeRemove(endpoint);
+        MarkClosed(endpoint);
       } else {
-        MarkPeerClosedAndMaybeRemove(endpoint);
+        MarkPeerClosed(endpoint);
       }
     }
-
-    DCHECK(endpoints_.empty());
+    endpoints_.clear();
 
     GetMemoryDumpProvider().RemoveController(this);
   }
@@ -844,15 +843,19 @@ class ChannelAssociatedGroupController
     base::AutoLock locker(lock_);
     encountered_error_ = true;
 
+    std::vector<uint32_t> endpoints_to_remove;
     std::vector<scoped_refptr<Endpoint>> endpoints_to_notify;
     for (auto iter = endpoints_.begin(); iter != endpoints_.end();) {
       Endpoint* endpoint = iter->second.get();
       ++iter;
 
-      if (endpoint->client())
+      if (endpoint->client()) {
         endpoints_to_notify.push_back(endpoint);
+      }
 
-      MarkPeerClosedAndMaybeRemove(endpoint);
+      if (MarkPeerClosed(endpoint)) {
+        endpoints_to_remove.push_back(endpoint->id());
+      }
     }
 
     for (auto& endpoint : endpoints_to_notify) {
@@ -861,6 +864,10 @@ class ChannelAssociatedGroupController
       if (endpoint->client())
         NotifyEndpointOfError(endpoint.get(), false /* force_async */);
     }
+
+    for (uint32_t id : endpoints_to_remove) {
+      endpoints_.erase(id);
+    }
   }
 
   void NotifyEndpointOfError(Endpoint* endpoint, bool force_async) {
@@ -899,19 +906,33 @@ class ChannelAssociatedGroupController
     NotifyEndpointOfError(endpoint, false /* force_async */);
   }
 
-  void MarkClosedAndMaybeRemove(Endpoint* endpoint) {
+  // Marks `endpoint` as closed and returns true if and only if its peer was
+  // also already closed.
+  bool MarkClosed(Endpoint* endpoint) {
     lock_.AssertAcquired();
     endpoint->set_closed();
-    if (endpoint->closed() && endpoint->peer_closed())
-      endpoints_.erase(endpoint->id());
+    return endpoint->peer_closed();
   }
 
-  void MarkPeerClosedAndMaybeRemove(Endpoint* endpoint) {
+  // Marks `endpoint` as having a closed peer and returns true if and only if
+  // `endpoint` itself was also already closed.
+  bool MarkPeerClosed(Endpoint* endpoint) {
     lock_.AssertAcquired();
     endpoint->set_peer_closed();
     endpoint->SignalSyncMessageEvent();
-    if (endpoint->closed() && endpoint->peer_closed())
+    return endpoint->closed();
+  }
+
+  void MarkClosedAndMaybeRemove(Endpoint* endpoint) {
+    if (MarkClosed(endpoint)) {
       endpoints_.erase(endpoint->id());
+    }
+  }
+
+  void MarkPeerClosedAndMaybeRemove(Endpoint* endpoint) {
+    if (MarkPeerClosed(endpoint)) {
+      endpoints_.erase(endpoint->id());
+    }
   }
 
   Endpoint* FindOrInsertEndpoint(mojo::InterfaceId id, bool* inserted) {
diff --git a/chromium/mojo/public/tools/bindings/generators/mojom_ts_generator.py b/chromium/mojo/public/tools/bindings/generators/mojom_ts_generator.py
index d8e0cf30486..1c437961528 100644
--- a/chromium/mojo/public/tools/bindings/generators/mojom_ts_generator.py
+++ b/chromium/mojo/public/tools/bindings/generators/mojom_ts_generator.py
@@ -175,8 +175,10 @@ def _GetWebUiModulePath(module):
   path. Otherwise, returned paths always end in a '/' and begin with either
   `chrome://resources/` or a '/'."""
   path = module.metadata.get('webui_module_path')
-  if path is None or path == '/':
-    return path
+  if path is None:
+    return None
+  if path == '' or path == '/':
+    return '/'
   if _IsAbsoluteChromeResourcesPath(path):
     return path.rstrip('/') + '/'
   return '/{}/'.format(path.strip('/'))
diff --git a/chromium/net/http/transport_security_state_static.pins b/chromium/net/http/transport_security_state_static.pins
index 05d948ffd4a..23551995ba9 100644
--- a/chromium/net/http/transport_security_state_static.pins
+++ b/chromium/net/http/transport_security_state_static.pins
@@ -43,9 +43,9 @@
 #   hash function for preloaded entries again (we have already done so once).
 #
 
-# Last updated: 2023-10-26 12:55 UTC
+# Last updated: 2023-11-13 12:54 UTC
 PinsListTimestamp
-1698324907
+1699880080
 
 TestSPKI
 sha256/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/chromium/net/http/transport_security_state_static_pins.json b/chromium/net/http/transport_security_state_static_pins.json
index b2b9802ef3e..9eeee02c1c0 100644
--- a/chromium/net/http/transport_security_state_static_pins.json
+++ b/chromium/net/http/transport_security_state_static_pins.json
@@ -31,7 +31,7 @@
 // the 'static_spki_hashes' and 'bad_static_spki_hashes' fields in 'pinsets'
 // refer to, and the timestamp at which the pins list was last updated.
 //
-// Last updated: 2023-10-26 12:55 UTC
+// Last updated: 2023-11-13 12:54 UTC
 //
 {
   "pinsets": [
diff --git a/chromium/skia/ext/skia_commit_hash.h b/chromium/skia/ext/skia_commit_hash.h
index 1c69fdf6c9a..f5a69cedb97 100644
--- a/chromium/skia/ext/skia_commit_hash.h
+++ b/chromium/skia/ext/skia_commit_hash.h
@@ -3,6 +3,6 @@
 #ifndef SKIA_EXT_SKIA_COMMIT_HASH_H_
 #define SKIA_EXT_SKIA_COMMIT_HASH_H_
 
-#define SKIA_COMMIT_HASH "bd56a010b6941116cd1900276bf5201f9a9c73da"
+#define SKIA_COMMIT_HASH "7754f9f8257ad0872b7bb04d969452b74bb0c0bc"
 
 #endif  // SKIA_EXT_SKIA_COMMIT_HASH_H_
diff --git a/chromium/third_party/androidx/BUILD.gn b/chromium/third_party/androidx/BUILD.gn
index ef620fc283b..0ebcfe2e4dc 100644
--- a/chromium/third_party/androidx/BUILD.gn
+++ b/chromium/third_party/androidx/BUILD.gn
@@ -8,7 +8,7 @@ import("customizations.gni")
 if (!limit_android_deps) {
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   androidx_android_aar_prebuilt("androidx_activity_activity_java") {
-    aar_path = "libs/androidx_activity_activity/activity-1.8.0-SNAPSHOT.aar"
+    aar_path = "libs/androidx_activity_activity/activity-1.9.0-SNAPSHOT.aar"
     info_path =
         "libs/androidx_activity_activity/androidx_activity_activity.info"
     enable_bytecode_checks = false
@@ -99,6 +99,7 @@ if (!limit_android_deps) {
       ":androidx_collection_collection_jvm_java",
       ":androidx_concurrent_concurrent_futures_java",
       ":androidx_core_core_java",
+      "//third_party/android_deps:com_google_auto_service_auto_service_annotations_java",
       "//third_party/android_deps:com_google_guava_listenablefuture_java",
     ]
   }
@@ -156,7 +157,7 @@ if (!limit_android_deps) {
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   androidx_android_aar_prebuilt("androidx_benchmark_benchmark_junit4_java") {
-    aar_path = "libs/androidx_benchmark_benchmark_junit4/benchmark-junit4-1.2.0-SNAPSHOT.aar"
+    aar_path = "libs/androidx_benchmark_benchmark_junit4/benchmark-junit4-1.3.0-SNAPSHOT.aar"
     info_path = "libs/androidx_benchmark_benchmark_junit4/androidx_benchmark_benchmark_junit4.info"
     enable_bytecode_checks = false
     testonly = true
@@ -173,7 +174,7 @@ if (!limit_android_deps) {
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   androidx_android_aar_prebuilt("androidx_benchmark_benchmark_macro_java") {
-    aar_path = "libs/androidx_benchmark_benchmark_macro/benchmark-macro-1.2.0-SNAPSHOT.aar"
+    aar_path = "libs/androidx_benchmark_benchmark_macro/benchmark-macro-1.3.0-SNAPSHOT.aar"
     info_path = "libs/androidx_benchmark_benchmark_macro/androidx_benchmark_benchmark_macro.info"
     enable_bytecode_checks = false
     testonly = true
@@ -196,7 +197,7 @@ if (!limit_android_deps) {
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   androidx_android_aar_prebuilt(
       "androidx_benchmark_benchmark_macro_junit4_java") {
-    aar_path = "libs/androidx_benchmark_benchmark_macro_junit4/benchmark-macro-junit4-1.2.0-SNAPSHOT.aar"
+    aar_path = "libs/androidx_benchmark_benchmark_macro_junit4/benchmark-macro-junit4-1.3.0-SNAPSHOT.aar"
     info_path = "libs/androidx_benchmark_benchmark_macro_junit4/androidx_benchmark_benchmark_macro_junit4.info"
     enable_bytecode_checks = false
     testonly = true
@@ -232,7 +233,7 @@ if (!limit_android_deps) {
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   androidx_android_aar_prebuilt("androidx_browser_browser_java") {
-    aar_path = "libs/androidx_browser_browser/browser-1.7.0-SNAPSHOT.aar"
+    aar_path = "libs/androidx_browser_browser/browser-1.8.0-SNAPSHOT.aar"
     info_path = "libs/androidx_browser_browser/androidx_browser_browser.info"
     enable_bytecode_checks = false
     deps = [
@@ -439,6 +440,7 @@ if (!limit_android_deps) {
     enable_bytecode_checks = false
     testonly = true
     deps = [
+      ":androidx_core_core_ktx_java",
       ":androidx_fragment_fragment_ktx_java",
       ":androidx_fragment_fragment_testing_manifest_java",
       ":androidx_test_core_java",
@@ -877,14 +879,14 @@ if (!limit_android_deps) {
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   androidx_android_aar_prebuilt("androidx_room_room_runtime_java") {
-    aar_path = "libs/androidx_room_room_runtime/room-runtime-2.6.0-SNAPSHOT.aar"
+    aar_path = "libs/androidx_room_room_runtime/room-runtime-2.7.0-SNAPSHOT.aar"
     info_path =
         "libs/androidx_room_room_runtime/androidx_room_room_runtime.info"
     enable_bytecode_checks = false
     deps = [
       ":androidx_annotation_annotation_experimental_java",
       ":androidx_arch_core_core_runtime_java",
-      ":androidx_room_room_common_java",
+      ":androidx_room_room_common_jvm_java",
       ":androidx_sqlite_sqlite_framework_java",
       ":androidx_sqlite_sqlite_java",
     ]
@@ -1252,12 +1254,14 @@ if (!limit_android_deps) {
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   androidx_android_aar_prebuilt("androidx_work_work_runtime_java") {
-    aar_path = "libs/androidx_work_work_runtime/work-runtime-2.9.0-SNAPSHOT.aar"
+    aar_path =
+        "libs/androidx_work_work_runtime/work-runtime-2.10.0-SNAPSHOT.aar"
     info_path =
         "libs/androidx_work_work_runtime/androidx_work_work_runtime.info"
     enable_bytecode_checks = false
     deps = [
       ":androidx_annotation_annotation_experimental_java",
+      ":androidx_concurrent_concurrent_futures_java",
       ":androidx_core_core_java",
       ":androidx_lifecycle_lifecycle_livedata_java",
       ":androidx_lifecycle_lifecycle_service_java",
@@ -1273,7 +1277,7 @@ if (!limit_android_deps) {
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   androidx_android_aar_prebuilt("androidx_activity_activity_ktx_java") {
     aar_path =
-        "libs/androidx_activity_activity_ktx/activity-ktx-1.8.0-SNAPSHOT.aar"
+        "libs/androidx_activity_activity_ktx/activity-ktx-1.9.0-SNAPSHOT.aar"
     info_path = "libs/androidx_activity_activity_ktx/androidx_activity_activity_ktx.info"
     enable_bytecode_checks = false
 
@@ -1314,7 +1318,7 @@ if (!limit_android_deps) {
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   androidx_android_aar_prebuilt("androidx_benchmark_benchmark_common_java") {
-    aar_path = "libs/androidx_benchmark_benchmark_common/benchmark-common-1.2.0-SNAPSHOT.aar"
+    aar_path = "libs/androidx_benchmark_benchmark_common/benchmark-common-1.3.0-SNAPSHOT.aar"
     info_path = "libs/androidx_benchmark_benchmark_common/androidx_benchmark_benchmark_common.info"
     enable_bytecode_checks = false
 
@@ -1714,9 +1718,10 @@ if (!limit_android_deps) {
   }
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-  androidx_java_prebuilt("androidx_room_room_common_java") {
-    jar_path = "libs/androidx_room_room_common/room-common-2.6.0-SNAPSHOT.jar"
-    output_name = "androidx_room_room_common"
+  androidx_java_prebuilt("androidx_room_room_common_jvm_java") {
+    jar_path =
+        "libs/androidx_room_room_common_jvm/room-common-jvm-2.7.0-SNAPSHOT.jar"
+    output_name = "androidx_room_room_common_jvm"
     supports_android = true
     enable_bytecode_checks = false
 
@@ -1728,13 +1733,13 @@ if (!limit_android_deps) {
     ]
     deps = [
       ":androidx_annotation_annotation_jvm_java",
-      "//third_party/android_deps:org_jetbrains_kotlin_kotlin_stdlib_jdk8_java",
+      "//third_party/kotlin_stdlib:kotlin_stdlib_java",
     ]
   }
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   androidx_android_aar_prebuilt("androidx_room_room_ktx_java") {
-    aar_path = "libs/androidx_room_room_ktx/room-ktx-2.6.0-SNAPSHOT.aar"
+    aar_path = "libs/androidx_room_room_ktx/room-ktx-2.7.0-SNAPSHOT.aar"
     info_path = "libs/androidx_room_room_ktx/androidx_room_room_ktx.info"
     enable_bytecode_checks = false
 
@@ -1745,7 +1750,7 @@ if (!limit_android_deps) {
       "//third_party/android_deps:*",
     ]
     deps = [
-      ":androidx_room_room_common_java",
+      ":androidx_room_room_common_jvm_java",
       ":androidx_room_room_runtime_java",
       "//third_party/android_deps:org_jetbrains_kotlinx_kotlinx_coroutines_android_java",
       "//third_party/kotlin_stdlib:kotlin_stdlib_java",
@@ -1793,7 +1798,7 @@ if (!limit_android_deps) {
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   androidx_android_aar_prebuilt("androidx_sqlite_sqlite_java") {
-    aar_path = "libs/androidx_sqlite_sqlite/sqlite-2.4.0-SNAPSHOT.aar"
+    aar_path = "libs/androidx_sqlite_sqlite/sqlite-2.5.0-SNAPSHOT.aar"
     info_path = "libs/androidx_sqlite_sqlite/androidx_sqlite_sqlite.info"
     enable_bytecode_checks = false
 
@@ -1811,7 +1816,7 @@ if (!limit_android_deps) {
 
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   androidx_android_aar_prebuilt("androidx_sqlite_sqlite_framework_java") {
-    aar_path = "libs/androidx_sqlite_sqlite_framework/sqlite-framework-2.4.0-SNAPSHOT.aar"
+    aar_path = "libs/androidx_sqlite_sqlite_framework/sqlite-framework-2.5.0-SNAPSHOT.aar"
     info_path = "libs/androidx_sqlite_sqlite_framework/androidx_sqlite_sqlite_framework.info"
     enable_bytecode_checks = false
 
diff --git a/chromium/third_party/androidx/libs/androidx_core_core/androidx_core_core.info b/chromium/third_party/androidx/libs/androidx_core_core/androidx_core_core.info
index 5089e13e608..40a31cf8cc6 100644
--- a/chromium/third_party/androidx/libs/androidx_core_core/androidx_core_core.info
+++ b/chromium/third_party/androidx/libs/androidx_core_core/androidx_core_core.info
@@ -148,7 +148,6 @@ resources = [
   "res/layout/notification_action.xml",
   "res/layout/ime_secondary_split_test_activity.xml",
   "res/layout/notification_template_icon_group.xml",
-  "res/layout/notification_template_custom_big.xml",
   "res/layout/notification_template_part_chronometer.xml",
   "res/layout/custom_dialog.xml",
   "res/values-da/values-da.xml",
diff --git a/chromium/third_party/androidx/libs/androidx_slidingpanelayout_slidingpanelayout/androidx_slidingpanelayout_slidingpanelayout.info b/chromium/third_party/androidx/libs/androidx_slidingpanelayout_slidingpanelayout/androidx_slidingpanelayout_slidingpanelayout.info
index bca85127dc5..94493085e19 100644
--- a/chromium/third_party/androidx/libs/androidx_slidingpanelayout_slidingpanelayout/androidx_slidingpanelayout_slidingpanelayout.info
+++ b/chromium/third_party/androidx/libs/androidx_slidingpanelayout_slidingpanelayout/androidx_slidingpanelayout_slidingpanelayout.info
@@ -6,7 +6,7 @@ assets = []
 has_classes_jar = true
 has_native_libraries = false
 has_proguard_flags = false
-has_r_text_file = false
+has_r_text_file = true
 is_manifest_empty = true
 manifest_package = "androidx.slidingpanelayout"
 resources = [
diff --git a/chromium/third_party/blink/public/strings/translations/blink_strings_pa.xtb b/chromium/third_party/blink/public/strings/translations/blink_strings_pa.xtb
index 08afcc3f305..01cfd7ce995 100644
--- a/chromium/third_party/blink/public/strings/translations/blink_strings_pa.xtb
+++ b/chromium/third_party/blink/public/strings/translations/blink_strings_pa.xtb
@@ -64,7 +64,7 @@
 <translation id="4664250907885839816">'<ph name="ATSIGN" />' ਤੋਂ ਬਾਅਦ ਇੱਕ ਭਾਗ ਵਿੱਚ ਚਿੰਨ੍ਹ '<ph name="INVALIDCHARACTER" />' ਨਹੀਂ ਹੋਣਾ ਚਾਹੀਦਾ।</translation>
 <translation id="4718048029184481307">ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ ਮੋਡ ਵਿੱਚ ਚੱਲ ਰਿਹਾ ਹੈ</translation>
 <translation id="4748357248530471599">ਡਿਸਪਲੇ ਕੱਟਆਊਟ ਪੂਰੀ ਸਕ੍ਰੀਨ 'ਤੇ ਟੌਗਲ ਕਰੋ</translation>
-<translation id="4763480195061959176">ਵੀਡਿਓ</translation>
+<translation id="4763480195061959176">ਵੀਡੀਓ</translation>
 <translation id="4812940957355064477">ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਨੰਬਰ ਦਰਜ ਕਰੋ।</translation>
 <translation id="4912200001568447310">ਮੌਜੂਦਾ ਆਈਟਮ</translation>
 <translation id="4915360478455618802">ਸਮਾਂ ਚੋਣਕਾਰ ਦਿਖਾਓ</translation>
diff --git a/chromium/third_party/blink/renderer/core/fetch/body.cc b/chromium/third_party/blink/renderer/core/fetch/body.cc
index 86aac83becd..4f396c124a1 100644
--- a/chromium/third_party/blink/renderer/core/fetch/body.cc
+++ b/chromium/third_party/blink/renderer/core/fetch/body.cc
@@ -135,8 +135,13 @@ class BodyFormDataConsumer final : public BodyConsumerBase {
 
   void DidFetchDataLoadedString(const String& string) override {
     auto* formData = MakeGarbageCollected<FormData>();
-    for (const auto& pair : URLSearchParams::Create(string)->Params())
+    // URLSearchParams::Create() returns an on-heap object, but it can be
+    // garbage collected, so making it a persistent variable on the stack
+    // mitigates use-after-free scenarios. See crbug.com/1497997.
+    Persistent<URLSearchParams> search_params = URLSearchParams::Create(string);
+    for (const auto& pair : search_params->Params()) {
       formData->append(pair.first, pair.second);
+    }
     DidFetchDataLoadedFormData(formData);
   }
 };
diff --git a/chromium/third_party/blink/renderer/modules/webaudio/realtime_audio_destination_handler.cc b/chromium/third_party/blink/renderer/modules/webaudio/realtime_audio_destination_handler.cc
index 6781dcff462..c27eb3ac07f 100644
--- a/chromium/third_party/blink/renderer/modules/webaudio/realtime_audio_destination_handler.cc
+++ b/chromium/third_party/blink/renderer/modules/webaudio/realtime_audio_destination_handler.cc
@@ -118,12 +118,21 @@ void RealtimeAudioDestinationHandler::SetChannelCount(
   uint32_t old_channel_count = ChannelCount();
   AudioHandler::SetChannelCount(channel_count, exception_state);
 
-  // Stop, re-create and start the destination to apply the new channel count.
-  if (ChannelCount() != old_channel_count && !exception_state.HadException()) {
-    StopPlatformDestination();
-    CreatePlatformDestination();
-    StartPlatformDestination();
+  // After the context is closed, changing channel count will be ignored
+  // because it will trigger the recreation of the platform destination. This
+  // in turn can activate the audio rendering thread.
+  AudioContext* context = static_cast<AudioContext*>(Context());
+  CHECK(context);
+  if (context->ContextState() == AudioContext::kClosed ||
+      ChannelCount() == old_channel_count ||
+      exception_state.HadException()) {
+    return;
   }
+
+  // Stop, re-create and start the destination to apply the new channel count.
+  StopPlatformDestination();
+  CreatePlatformDestination();
+  StartPlatformDestination();
 }
 
 void RealtimeAudioDestinationHandler::StartRendering() {
@@ -396,6 +405,17 @@ void RealtimeAudioDestinationHandler::SetSinkDescriptor(
                   GetCallbackBufferSize()));
   DCHECK(IsMainThread());
 
+  // After the context is closed, `SetSinkDescriptor` request will be ignored
+  // because it will trigger the recreation of the platform destination. This in
+  // turn can activate the audio rendering thread.
+  AudioContext* context = static_cast<AudioContext*>(Context());
+  CHECK(context);
+  if (context->ContextState() == AudioContext::kClosed) {
+    std::move(callback).Run(
+        media::OutputDeviceStatus::OUTPUT_DEVICE_STATUS_ERROR_INTERNAL);
+    return;
+  }
+
   // Create a pending AudioDestination to replace the current one.
   scoped_refptr<AudioDestination> pending_platform_destination =
       AudioDestination::Create(
diff --git a/chromium/third_party/libavif/src/src/read.c b/chromium/third_party/libavif/src/src/read.c
index 3d8ffe28810..e3bad9833d6 100644
--- a/chromium/third_party/libavif/src/src/read.c
+++ b/chromium/third_party/libavif/src/src/read.c
@@ -769,6 +769,8 @@ static void avifMetaDestroy(avifMeta * meta)
     avifFree(meta);
 }
 
+// CAUTION: This function could potentially resize the meta->items array thereby invalidating all existing pointers that are being
+// stored locally. So if this function is being called, exercise caution in the caller to not use invalid pointers.
 static avifDecoderItem * avifMetaFindItem(avifMeta * meta, uint32_t itemID)
 {
     if (itemID == 0) {
@@ -1417,7 +1419,7 @@ static avifBool avifDecoderGenerateImageGridTiles(avifDecoder * decoder, avifIma
 
     if (tilesAvailable != grid->rows * grid->columns) {
         avifDiagnosticsPrintf(&decoder->diag,
-                              "Grid image of dimensions %ux%u requires %u tiles, and only %u were found",
+                              "Grid image of dimensions %ux%u requires %u tiles, but %u were found",
                               grid->columns,
                               grid->rows,
                               grid->rows * grid->columns,
@@ -3614,17 +3616,20 @@ static avifBool avifDecoderItemIsAlphaAux(avifDecoderItem * item, uint32_t color
     return auxCProp && isAlphaURN(auxCProp->u.auxC.auxType);
 }
 
-// Finds the alpha item whose parent item is colorItem and sets it in the alphaItem output parameter. Returns AVIF_RESULT_OK on
-// success. Note that *alphaItem can be NULL even if the return value is AVIF_RESULT_OK. If the colorItem is a grid and the alpha
-// item is represented as a set of auxl items to each color tile, then a fake item will be created and *isAlphaItemInInput will be
-// set to AVIF_FALSE. In this case, the alpha item merely exists to hold the locations of the alpha tile items. The data of this
-// item need not be read and the pixi property cannot be validated. Otherwise, *isAlphaItemInInput will be set to AVIF_TRUE when
-// *alphaItem is not NULL.
+// Finds the alpha item whose parent item is *colorItemPtr and sets it in the alphaItem output parameter. Returns AVIF_RESULT_OK
+// on success. Note that *alphaItem can be NULL even if the return value is AVIF_RESULT_OK. If the *colorItemPtr is a grid and the
+// alpha item is represented as a set of auxl items to each color tile, then a fake item will be created and *isAlphaItemInInput
+// will be set to AVIF_FALSE. In this case, the alpha item merely exists to hold the locations of the alpha tile items. The data
+// of this item need not be read and the pixi property cannot be validated. Otherwise, *isAlphaItemInInput will be set to
+// AVIF_TRUE when *alphaItem is not NULL. If the data->meta->items array is resized, then the value in *colorItemPtr could become
+// invalid. This function also resets *colorItemPtr to the right value if an alpha item was found and added to the data->meta->items
+// array.
 static avifResult avifDecoderDataFindAlphaItem(avifDecoderData * data,
-                                               avifDecoderItem * colorItem,
+                                               avifDecoderItem ** colorItemPtr,
                                                avifDecoderItem ** alphaItem,
                                                avifBool * isAlphaItemInInput)
 {
+    const avifDecoderItem * colorItem = *colorItemPtr;
     for (uint32_t itemIndex = 0; itemIndex < data->meta->items.count; ++itemIndex) {
         avifDecoderItem * item = &data->meta->items.item[itemIndex];
         if (avifDecoderItemShouldBeSkipped(item)) {
@@ -3659,27 +3664,53 @@ static avifResult avifDecoderDataFindAlphaItem(avifDecoderData * data,
             maxItemID = item->id;
         }
         if (item->dimgForID == colorItem->id) {
+            avifBool seenAlphaForCurrentItem = AVIF_FALSE;
             for (uint32_t j = 0; j < colorItem->meta->items.count; ++j) {
                 avifDecoderItem * auxlItem = &colorItem->meta->items.item[j];
                 if (avifDecoderItemIsAlphaAux(auxlItem, item->id)) {
+                    if (seenAlphaForCurrentItem || auxlItem->dimgForID != 0) {
+                        // One of the following invalid cases:
+                        // * Multiple items are claiming to be the alpha auxiliary of the current item.
+                        // * Alpha auxiliary is dimg for another item.
+                        avifFree(alphaItemIndices);
+                        *alphaItem = NULL;
+                        *isAlphaItemInInput = AVIF_FALSE;
+                        return AVIF_RESULT_INVALID_IMAGE_GRID;
+                    }
                     alphaItemIndices[alphaItemCount++] = j;
+                    seenAlphaForCurrentItem = AVIF_TRUE;
                 }
             }
+            if (!seenAlphaForCurrentItem) {
+                // No alpha auxiliary item was found for the current item. Treat this as an image without alpha.
+                avifFree(alphaItemIndices);
+                *alphaItem = NULL;
+                *isAlphaItemInInput = AVIF_FALSE;
+                return AVIF_RESULT_OK;
+            }
         }
     }
-    if (alphaItemCount != colorItemCount) {
-        // Not all the color items had an alpha auxiliary attached to it. Report this case as an image without alpha channel.
-        avifFree(alphaItemIndices);
-        *alphaItem = NULL;
-        *isAlphaItemInInput = AVIF_FALSE;
-        return AVIF_RESULT_OK;
+    assert(alphaItemCount == colorItemCount);
+
+    int colorItemIndex = -1;
+    for (uint32_t i = 0; i < data->meta->items.count; ++i) {
+        if (colorItem->id == data->meta->items.item[i].id) {
+            colorItemIndex = i;
+            break;
+        }
     }
+    assert(colorItemIndex >= 0);
+
     *alphaItem = avifMetaFindItem(colorItem->meta, maxItemID + 1);
     if (*alphaItem == NULL) {
         avifFree(alphaItemIndices);
         *isAlphaItemInInput = AVIF_FALSE;
         return AVIF_RESULT_OUT_OF_MEMORY;
     }
+    // avifMetaFindItem() could invalidate all existing item pointers. So reset the colorItem pointers.
+    *colorItemPtr = &data->meta->items.item[colorItemIndex];
+    colorItem = *colorItemPtr;
+
     memcpy((*alphaItem)->type, "grid", 4);
     (*alphaItem)->width = colorItem->width;
     (*alphaItem)->height = colorItem->height;
@@ -3918,6 +3949,16 @@ avifResult avifDecoderReset(avifDecoder * decoder)
                                                 decoder->imageDimensionLimit,
                                                 data->diag),
                           AVIF_RESULT_INVALID_IMAGE_GRID);
+            // Validate that there are exactly the same number of dimg items to form the grid.
+            uint32_t dimgItemCount = 0;
+            for (uint32_t i = 0; i < colorItem->meta->items.count; ++i) {
+                if (colorItem->meta->items.item[i].dimgForID == colorItem->id) {
+                    ++dimgItemCount;
+                }
+            }
+            if (dimgItemCount != data->color.grid.rows * data->color.grid.columns) {
+                return AVIF_RESULT_INVALID_IMAGE_GRID;
+            }
             colorCodecType = avifDecoderItemGetGridCodecType(colorItem);
             if (colorCodecType == AVIF_CODEC_TYPE_UNKNOWN) {
                 return AVIF_RESULT_INVALID_IMAGE_GRID;
@@ -3929,7 +3970,7 @@ avifResult avifDecoderReset(avifDecoder * decoder)
 
         avifBool isAlphaItemInInput;
         avifDecoderItem * alphaItem;
-        AVIF_CHECKRES(avifDecoderDataFindAlphaItem(data, colorItem, &alphaItem, &isAlphaItemInInput));
+        AVIF_CHECKRES(avifDecoderDataFindAlphaItem(data, &colorItem, &alphaItem, &isAlphaItemInInput));
         avifCodecType alphaCodecType = AVIF_CODEC_TYPE_UNKNOWN;
         if (alphaItem) {
             if (!memcmp(alphaItem->type, "grid", 4)) {
diff --git a/chromium/third_party/node/node_modules.tar.gz.sha1 b/chromium/third_party/node/node_modules.tar.gz.sha1
index 9831a23b4fe..72e8c2e85aa 100644
--- a/chromium/third_party/node/node_modules.tar.gz.sha1
+++ b/chromium/third_party/node/node_modules.tar.gz.sha1
@@ -1 +1 @@
-371a12f660e11fb759f277aed43beb7395cf6cd9
+568deed98af8f745cb52c84c35a6e39da82cec79
diff --git a/chromium/third_party/openscreen/src/BUILD.gn b/chromium/third_party/openscreen/src/BUILD.gn
index 0c6df78dd8b..468e864f6f1 100644
--- a/chromium/third_party/openscreen/src/BUILD.gn
+++ b/chromium/third_party/openscreen/src/BUILD.gn
@@ -24,7 +24,6 @@ group("gn_all") {
     "third_party/boringssl",
     "third_party/googleurl",
     "third_party/jsoncpp",
-    "third_party/mozilla",
     "third_party/quiche",
     "third_party/tinycbor",
     "tools/cddl($host_toolchain)",
diff --git a/chromium/third_party/openscreen/src/DEPS b/chromium/third_party/openscreen/src/DEPS
index 7941f0af0b7..3e32d90d661 100644
--- a/chromium/third_party/openscreen/src/DEPS
+++ b/chromium/third_party/openscreen/src/DEPS
@@ -258,9 +258,7 @@ include_rules = [
   '+absl/strings/str_join.h',
   '+absl/strings/str_replace.h',
   '+absl/strings/str_split.h',
-  '+absl/strings/string_view.h',
   '+absl/strings/substitute.h',
-  '+absl/types/optional.h',
   '+absl/types/variant.h',
 
   # Similar to abseil, don't include boringssl using root path.  Instead,
diff --git a/chromium/third_party/openscreen/src/PRESUBMIT.py b/chromium/third_party/openscreen/src/PRESUBMIT.py
index 0e462935148..28a4b5a29eb 100755
--- a/chromium/third_party/openscreen/src/PRESUBMIT.py
+++ b/chromium/third_party/openscreen/src/PRESUBMIT.py
@@ -124,9 +124,35 @@ def _CheckNoexceptOnMove(filename, clean_lines, linenum, error):
                          error_to_return, False)
 
 
+# Matches "namespace <foo> {". Since we only check one line at a time, we
+# need to call this twice.
+_RE_PATTERN_UNNESTED_NAMESPACE = re.compile(
+    r'namespace +\w+ +\{')
+
+
+def _CheckUnnestedNamespaces(filename, clean_lines, linenum, error):
+    """Checks that nestable namespaces are nested.
+
+    filename: The name of the current file.
+    clean_lines: A CleansedLines instance containing the file.
+    linenum: The number of the line to check.
+    error: The function to call with any errors found.
+    """
+
+    # If we have a match for a namespace on this line, check the next line for
+    # an nestable namespace declaration.
+    re = _RE_PATTERN_UNNESTED_NAMESPACE
+    if re.match(clean_lines.elided[linenum]):
+        cpplint_args = CpplintArgs(filename, clean_lines, linenum + 1, error)
+        error_to_return = Error('runtime/nested_namespace',
+                                'Please nest namespaces when possible.')
+        _CheckNoRegexMatches(re, cpplint_args, error_to_return)
+
+
 # Gives additional debug information whenever a linting error occurs.
 _CPPLINT_VERBOSE_LEVEL = 4
 
+
 # - We disable c++11 header checks since Open Screen allows them.
 # - We disable whitespace/braces because of various false positives.
 # - There are some false positives with 'explicit' checks, but it's useful
@@ -145,8 +171,10 @@ def _CheckChangeLintsClean(input_api, output_api):
     ]
 
     for file_name in files:
-        cpplint.ProcessFile(file_name, _CPPLINT_VERBOSE_LEVEL,
-                            [_CheckNoexceptOnMove, _CheckNoValueDchecks])
+        cpplint.ProcessFile(file_name, _CPPLINT_VERBOSE_LEVEL, [
+            _CheckNoexceptOnMove, _CheckNoValueDchecks,
+            _CheckUnnestedNamespaces
+        ])
 
     if cpplint._cpplint_state.error_count:
         if input_api.is_committing:
@@ -161,8 +189,8 @@ def _CheckChangeLintsClean(input_api, output_api):
 def _CheckLuciCfgLint(input_api, output_api):
     """Check that the luci configs pass the linter."""
     path = os.path.join('infra', 'config', 'global', 'main.star')
-    pred = lambda f : os.path.samefile(f.AbsoluteLocalPath(), path)
-    if not input_api.AffectedSourceFiles(pred):
+    if not input_api.AffectedSourceFiles(
+            lambda f: os.path.samefile(f.AbsoluteLocalPath(), path)):
         return []
 
     result = []
diff --git a/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_parsed_certificate.cc b/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_parsed_certificate.cc
index cfda3d29610..536e26c747f 100644
--- a/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_parsed_certificate.cc
+++ b/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_parsed_certificate.cc
@@ -6,6 +6,7 @@
 
 #include <openssl/x509v3.h>
 
+#include <cstring>
 #include <memory>
 #include <string>
 #include <utility>
@@ -15,8 +16,7 @@
 #include "util/crypto/certificate_utils.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 const EVP_MD* MapDigestAlgorithm(DigestAlgorithm algorithm) {
@@ -170,5 +170,4 @@ void BoringSSLParsedCertificate::SetNotAfterTimeForTesting(time_t not_after) {
                 not_after);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_parsed_certificate.h b/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_parsed_certificate.h
index 07273c21f95..b9e2d4feef7 100644
--- a/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_parsed_certificate.h
+++ b/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_parsed_certificate.h
@@ -14,8 +14,7 @@
 #include "platform/base/error.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class BoringSSLParsedCertificate final : public ParsedCertificate {
  public:
@@ -53,7 +52,6 @@ class BoringSSLParsedCertificate final : public ParsedCertificate {
   bssl::UniquePtr<X509> cert_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_CERTIFICATE_BORINGSSL_PARSED_CERTIFICATE_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_trust_store.cc b/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_trust_store.cc
index 841c23cd766..c8ebf031080 100644
--- a/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_trust_store.cc
+++ b/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_trust_store.cc
@@ -15,6 +15,7 @@
 #include <chrono>
 #include <memory>
 #include <string>
+#include <string_view>
 #include <utility>
 
 #include "absl/strings/str_cat.h"
@@ -24,8 +25,7 @@
 #include "util/crypto/pem_helpers.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 // -------------------------------------------------------------------------
@@ -315,7 +315,7 @@ X509* ParseX509Der(const std::string& der) {
 
 // static
 std::unique_ptr<TrustStore> TrustStore::CreateInstanceFromPemFile(
-    absl::string_view file_path) {
+    std::string_view file_path) {
   std::vector<std::string> der_certs = ReadCertificatesFromPemFile(file_path);
   std::vector<bssl::UniquePtr<X509>> certs;
   certs.reserve(der_certs.size());
@@ -534,5 +534,4 @@ BoringSSLTrustStore::FindCertificatePath(
   return result_path;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_trust_store.h b/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_trust_store.h
index 1c81e9400cc..ef32cc9dc46 100644
--- a/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_trust_store.h
+++ b/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_trust_store.h
@@ -13,8 +13,7 @@
 
 #include "cast/common/public/trust_store.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class BoringSSLTrustStore final : public TrustStore {
  public:
@@ -31,7 +30,6 @@ class BoringSSLTrustStore final : public TrustStore {
   std::vector<bssl::UniquePtr<X509>> certs_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_CERTIFICATE_BORINGSSL_TRUST_STORE_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_util.cc b/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_util.cc
index f8549883c37..fcf042faff7 100644
--- a/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_util.cc
+++ b/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_util.cc
@@ -5,18 +5,17 @@
 #include "cast/common/certificate/boringssl_util.h"
 
 #include <cstdint>
+#include <string_view>
 
-#include "absl/strings/string_view.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 // Parse the data in |time| at |index| as a two-digit ascii number. Note this
 // function assumes the caller already did a bounds check and checked the inputs
 // are digits.
-uint8_t ParseAsn1TimeDoubleDigit(absl::string_view time, size_t index) {
+uint8_t ParseAsn1TimeDoubleDigit(std::string_view time, size_t index) {
   OSP_DCHECK_LT(index + 1, time.size());
   OSP_DCHECK('0' <= time[index] && time[index] <= '9');
   OSP_DCHECK('0' <= time[index + 1] && time[index + 1] <= '9');
@@ -30,7 +29,7 @@ bool ParseAsn1GeneralizedTime(ASN1_GENERALIZEDTIME* time, DateTime* out) {
       31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31,
   };
 
-  absl::string_view time_str{
+  std::string_view time_str{
       reinterpret_cast<const char*>(ASN1_STRING_get0_data(time)),
       static_cast<size_t>(ASN1_STRING_length(time))};
   if (time_str.size() != 15) {
@@ -122,5 +121,4 @@ ErrorOr<DateTime> GetNotAfterTime(X509* cert) {
   return result;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_util.h b/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_util.h
index c359322c594..c817e163dd9 100644
--- a/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_util.h
+++ b/chromium/third_party/openscreen/src/cast/common/certificate/boringssl_util.h
@@ -12,8 +12,7 @@
 #include "platform/base/error.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 bool VerifySignedData(const EVP_MD* digest,
                       EVP_PKEY* public_key,
@@ -23,7 +22,6 @@ bool VerifySignedData(const EVP_MD* digest,
 ErrorOr<DateTime> GetNotBeforeTime(X509* cert);
 ErrorOr<DateTime> GetNotAfterTime(X509* cert);
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_CERTIFICATE_BORINGSSL_UTIL_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/certificate/cast_cert_validator.cc b/chromium/third_party/openscreen/src/cast/common/certificate/cast_cert_validator.cc
index aae8e105ccc..b6c83928102 100644
--- a/chromium/third_party/openscreen/src/cast/common/certificate/cast_cert_validator.cc
+++ b/chromium/third_party/openscreen/src/cast/common/certificate/cast_cert_validator.cc
@@ -17,8 +17,7 @@
 #include "cast/common/public/trust_store.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 // Returns the OID for the Audio-Only Cast policy
@@ -95,5 +94,4 @@ Error VerifyDeviceCert(const std::vector<std::string>& der_certs,
   return Error::Code::kNone;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/certificate/cast_cert_validator.h b/chromium/third_party/openscreen/src/cast/common/certificate/cast_cert_validator.h
index 946f09d19de..b076ab672df 100644
--- a/chromium/third_party/openscreen/src/cast/common/certificate/cast_cert_validator.h
+++ b/chromium/third_party/openscreen/src/cast/common/certificate/cast_cert_validator.h
@@ -13,8 +13,7 @@
 #include "platform/base/error.h"
 #include "platform/base/macros.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class CastCRL;
 class ParsedCertificate;
@@ -79,7 +78,6 @@ enum class CRLPolicy {
     CRLPolicy crl_policy,
     TrustStore* trust_store);
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_CERTIFICATE_CAST_CERT_VALIDATOR_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/certificate/cast_cert_validator_unittest.cc b/chromium/third_party/openscreen/src/cast/common/certificate/cast_cert_validator_unittest.cc
index c4743eb0f8b..afd2b9c0584 100644
--- a/chromium/third_party/openscreen/src/cast/common/certificate/cast_cert_validator_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/common/certificate/cast_cert_validator_unittest.cc
@@ -16,8 +16,7 @@
 #include "platform/test/paths.h"
 #include "util/crypto/pem_helpers.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 enum TrustStoreDependency {
@@ -614,5 +613,4 @@ TEST(VerifyCastDeviceCertTest, TimeDateConversionValidate) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/certificate/cast_crl.cc b/chromium/third_party/openscreen/src/cast/common/certificate/cast_crl.cc
index 32b956b4dfd..74f8b52b3a7 100644
--- a/chromium/third_party/openscreen/src/cast/common/certificate/cast_crl.cc
+++ b/chromium/third_party/openscreen/src/cast/common/certificate/cast_crl.cc
@@ -8,7 +8,6 @@
 
 #include <memory>
 
-#include "absl/strings/string_view.h"
 #include "cast/common/certificate/date_time.h"
 #include "cast/common/public/parsed_certificate.h"
 #include "cast/common/public/trust_store.h"
@@ -17,8 +16,7 @@
 #include "util/osp_logging.h"
 #include "util/span_util.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 enum CrlVersion {
@@ -200,5 +198,4 @@ std::unique_ptr<CastCRL> ParseAndVerifyCRL(const std::string& crl_proto,
   return nullptr;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/certificate/cast_crl.h b/chromium/third_party/openscreen/src/cast/common/certificate/cast_crl.h
index 8f02ca3efec..d97fed65ef9 100644
--- a/chromium/third_party/openscreen/src/cast/common/certificate/cast_crl.h
+++ b/chromium/third_party/openscreen/src/cast/common/certificate/cast_crl.h
@@ -15,8 +15,7 @@
 #include "cast/common/certificate/proto/revocation.pb.h"
 #include "platform/base/macros.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // TODO(crbug.com/openscreen/90): Remove these after Chromium is migrated to
 // openscreen::cast
@@ -87,7 +86,6 @@ std::unique_ptr<CastCRL> ParseAndVerifyCRL(const std::string& crl_proto,
                                            const DateTime& time,
                                            TrustStore* trust_store);
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_CERTIFICATE_CAST_CRL_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/certificate/cast_crl_unittest.cc b/chromium/third_party/openscreen/src/cast/common/certificate/cast_crl_unittest.cc
index 3fc10f83aa6..310d44a1373 100644
--- a/chromium/third_party/openscreen/src/cast/common/certificate/cast_crl_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/common/certificate/cast_crl_unittest.cc
@@ -14,8 +14,7 @@
 #include "testing/util/read_file.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // TODO(crbug.com/openscreen/90): Remove these after Chromium is migrated to
 // openscreen::cast
@@ -200,5 +199,4 @@ TEST(CastCertificateTest, TestSuite1) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/certificate/date_time.cc b/chromium/third_party/openscreen/src/cast/common/certificate/date_time.cc
index 2467b9ca52c..be4790b7774 100644
--- a/chromium/third_party/openscreen/src/cast/common/certificate/date_time.cc
+++ b/chromium/third_party/openscreen/src/cast/common/certificate/date_time.cc
@@ -6,8 +6,7 @@
 
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 bool operator<(const DateTime& a, const DateTime& b) {
   if (a.year < b.year) {
@@ -97,5 +96,4 @@ std::chrono::seconds DateTimeToSeconds(const DateTime& time) {
   return std::chrono::seconds(sec);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/certificate/date_time.h b/chromium/third_party/openscreen/src/cast/common/certificate/date_time.h
index 2268ae06695..dbaad5e2ea3 100644
--- a/chromium/third_party/openscreen/src/cast/common/certificate/date_time.h
+++ b/chromium/third_party/openscreen/src/cast/common/certificate/date_time.h
@@ -11,8 +11,7 @@
 
 #include "cast/common/public/certificate_types.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 bool operator<(const DateTime& a, const DateTime& b);
 bool operator>(const DateTime& a, const DateTime& b);
@@ -21,7 +20,6 @@ bool DateTimeFromSeconds(uint64_t seconds, DateTime* time);
 // |time| is assumed to be valid.
 std::chrono::seconds DateTimeToSeconds(const DateTime& time);
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_CERTIFICATE_DATE_TIME_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/certificate/testing/test_helpers.cc b/chromium/third_party/openscreen/src/cast/common/certificate/testing/test_helpers.cc
index 9bf48f07dcf..4c86d67789e 100644
--- a/chromium/third_party/openscreen/src/cast/common/certificate/testing/test_helpers.cc
+++ b/chromium/third_party/openscreen/src/cast/common/certificate/testing/test_helpers.cc
@@ -12,8 +12,7 @@
 #include "absl/strings/match.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace testing {
 
 SignatureTestData::SignatureTestData() = default;
@@ -24,7 +23,7 @@ SignatureTestData::~SignatureTestData() {
   OPENSSL_free(sha256.data());
 }
 
-SignatureTestData ReadSignatureTestData(absl::string_view filename) {
+SignatureTestData ReadSignatureTestData(std::string_view filename) {
   FILE* fp = fopen(filename.data(), "r");
   OSP_DCHECK(fp);
   SignatureTestData result = {};
@@ -56,5 +55,4 @@ SignatureTestData ReadSignatureTestData(absl::string_view filename) {
 }
 
 }  // namespace testing
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/certificate/testing/test_helpers.h b/chromium/third_party/openscreen/src/cast/common/certificate/testing/test_helpers.h
index 7f63c68dd9e..f8066eb8552 100644
--- a/chromium/third_party/openscreen/src/cast/common/certificate/testing/test_helpers.h
+++ b/chromium/third_party/openscreen/src/cast/common/certificate/testing/test_helpers.h
@@ -5,11 +5,11 @@
 #ifndef CAST_COMMON_CERTIFICATE_TESTING_TEST_HELPERS_H_
 #define CAST_COMMON_CERTIFICATE_TESTING_TEST_HELPERS_H_
 
-#include "absl/strings/string_view.h"
+#include <string_view>
+
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace testing {
 
 class SignatureTestData {
@@ -22,10 +22,9 @@ class SignatureTestData {
   ByteBuffer sha256;
 };
 
-SignatureTestData ReadSignatureTestData(absl::string_view filename);
+SignatureTestData ReadSignatureTestData(std::string_view filename);
 
 }  // namespace testing
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_CERTIFICATE_TESTING_TEST_HELPERS_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/cast_message_handler.h b/chromium/third_party/openscreen/src/cast/common/channel/cast_message_handler.h
index 21127afcb6a..b2ecddcaa99 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/cast_message_handler.h
+++ b/chromium/third_party/openscreen/src/cast/common/channel/cast_message_handler.h
@@ -7,8 +7,7 @@
 
 #include "cast/common/channel/proto/cast_channel.pb.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class CastSocket;
 class VirtualConnectionRouter;
@@ -23,7 +22,6 @@ class CastMessageHandler {
                          ::cast::channel::CastMessage message) = 0;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_CHANNEL_CAST_MESSAGE_HANDLER_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/cast_socket.cc b/chromium/third_party/openscreen/src/cast/common/channel/cast_socket.cc
index d3b7e9e0292..8ded228f23e 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/cast_socket.cc
+++ b/chromium/third_party/openscreen/src/cast/common/channel/cast_socket.cc
@@ -12,8 +12,7 @@
 #include "platform/base/span.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using ::cast::channel::CastMessage;
 using message_serialization::DeserializeResult;
@@ -101,5 +100,4 @@ void CastSocket::OnRead(TlsConnection* connection, std::vector<uint8_t> block) {
 
 int CastSocket::g_next_socket_id_ = 1;
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/cast_socket_message_port.cc b/chromium/third_party/openscreen/src/cast/common/channel/cast_socket_message_port.cc
index c5a415bdc8b..15c7a5397d7 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/cast_socket_message_port.cc
+++ b/chromium/third_party/openscreen/src/cast/common/channel/cast_socket_message_port.cc
@@ -10,8 +10,7 @@
 #include "cast/common/channel/proto/cast_channel.pb.h"
 #include "cast/common/channel/virtual_connection.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 CastSocketMessagePort::CastSocketMessagePort(VirtualConnectionRouter* router)
     : router_(router) {}
@@ -106,5 +105,4 @@ void CastSocketMessagePort::OnMessage(VirtualConnectionRouter* router,
                      GetPayload(message));
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/cast_socket_message_port.h b/chromium/third_party/openscreen/src/cast/common/channel/cast_socket_message_port.h
index 3f3e4ab0850..7b506c1caaa 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/cast_socket_message_port.h
+++ b/chromium/third_party/openscreen/src/cast/common/channel/cast_socket_message_port.h
@@ -15,8 +15,7 @@
 #include "cast/common/public/message_port.h"
 #include "util/weak_ptr.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class CastSocketMessagePort : public MessagePort, public CastMessageHandler {
  public:
@@ -51,7 +50,6 @@ class CastSocketMessagePort : public MessagePort, public CastMessageHandler {
   WeakPtr<CastSocket> socket_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_CHANNEL_CAST_SOCKET_MESSAGE_PORT_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/cast_socket_unittest.cc b/chromium/third_party/openscreen/src/cast/common/channel/cast_socket_unittest.cc
index 80fbb961a28..6b261122e4e 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/cast_socket_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/common/channel/cast_socket_unittest.cc
@@ -10,8 +10,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using ::cast::channel::CastMessage;
 
@@ -165,5 +164,4 @@ TEST_F(CastSocketTest, SanitizedAddress) {
   EXPECT_EQ(result2[1], 129);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/connection_namespace_handler.cc b/chromium/third_party/openscreen/src/cast/common/channel/connection_namespace_handler.cc
index 39a7e38ccc6..b669bda0df1 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/connection_namespace_handler.cc
+++ b/chromium/third_party/openscreen/src/cast/common/channel/connection_namespace_handler.cc
@@ -5,11 +5,12 @@
 #include "cast/common/channel/connection_namespace_handler.h"
 
 #include <algorithm>
+#include <optional>
 #include <string>
+#include <string_view>
 #include <type_traits>
 #include <utility>
 
-#include "absl/types/optional.h"
 #include "cast/common/channel/message_util.h"
 #include "cast/common/channel/proto/cast_channel.pb.h"
 #include "cast/common/channel/virtual_connection.h"
@@ -19,8 +20,7 @@
 #include "util/json/json_value.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using ::cast::channel::CastMessage;
 using ::cast::channel::CastMessage_PayloadType;
@@ -31,12 +31,12 @@ bool IsValidProtocolVersion(int version) {
   return ::cast::channel::CastMessage_ProtocolVersion_IsValid(version);
 }
 
-absl::optional<int> FindMaxProtocolVersion(const Json::Value* version,
-                                           const Json::Value* version_list) {
+std::optional<int> FindMaxProtocolVersion(const Json::Value* version,
+                                          const Json::Value* version_list) {
   using ArrayIndex = Json::Value::ArrayIndex;
   static_assert(std::is_integral<ArrayIndex>::value,
                 "Assuming ArrayIndex is integral");
-  absl::optional<int> max_version;
+  std::optional<int> max_version;
   if (version_list && version_list->isArray()) {
     max_version = ::cast::channel::CastMessage_ProtocolVersion_CASTV2_1_0;
     for (auto it = version_list->begin(), end = version_list->end(); it != end;
@@ -67,7 +67,7 @@ VirtualConnection::CloseReason GetCloseReason(
     const Json::Value& parsed_message) {
   VirtualConnection::CloseReason reason =
       VirtualConnection::CloseReason::kClosedByPeer;
-  absl::optional<int> reason_code = MaybeGetInt(
+  std::optional<int> reason_code = MaybeGetInt(
       parsed_message, JSON_EXPAND_FIND_CONSTANT_ARGS(kMessageKeyReasonCode));
   if (reason_code) {
     int code = reason_code.value();
@@ -133,7 +133,7 @@ void ConnectionNamespaceHandler::OnMessage(VirtualConnectionRouter* router,
     return;
   }
 
-  absl::optional<absl::string_view> type =
+  std::optional<std::string_view> type =
       MaybeGetString(value, JSON_EXPAND_FIND_CONSTANT_ARGS(kMessageKeyType));
   if (!type) {
     // TODO(btolsch): Some of these paths should have error reporting.  One
@@ -143,7 +143,7 @@ void ConnectionNamespaceHandler::OnMessage(VirtualConnectionRouter* router,
     return;
   }
 
-  absl::string_view type_str = type.value();
+  std::string_view type_str = type.value();
   if (type_str == kMessageTypeConnect) {
     HandleConnect(socket, std::move(message), std::move(value));
   } else if (type_str == kMessageTypeClose) {
@@ -172,7 +172,7 @@ void ConnectionNamespaceHandler::HandleConnect(CastSocket* socket,
     return;
   }
 
-  absl::optional<int> maybe_conn_type = MaybeGetInt(
+  std::optional<int> maybe_conn_type = MaybeGetInt(
       parsed_message, JSON_EXPAND_FIND_CONSTANT_ARGS(kMessageKeyConnType));
   VirtualConnection::Type conn_type = VirtualConnection::Type::kStrong;
   if (maybe_conn_type) {
@@ -189,7 +189,7 @@ void ConnectionNamespaceHandler::HandleConnect(CastSocket* socket,
 
   data.type = conn_type;
 
-  absl::optional<absl::string_view> user_agent = MaybeGetString(
+  std::optional<std::string_view> user_agent = MaybeGetString(
       parsed_message, JSON_EXPAND_FIND_CONSTANT_ARGS(kMessageKeyUserAgent));
   if (user_agent) {
     data.user_agent = std::string(user_agent.value());
@@ -206,7 +206,7 @@ void ConnectionNamespaceHandler::HandleConnect(CastSocket* socket,
       JSON_EXPAND_FIND_CONSTANT_ARGS(kMessageKeyProtocolVersion));
   const Json::Value* version_list_value = parsed_message.find(
       JSON_EXPAND_FIND_CONSTANT_ARGS(kMessageKeyProtocolVersionList));
-  absl::optional<int> negotiated_version =
+  std::optional<int> negotiated_version =
       FindMaxProtocolVersion(version_value, version_list_value);
   if (negotiated_version) {
     data.max_protocol_version = static_cast<VirtualConnection::ProtocolVersion>(
@@ -326,5 +326,4 @@ bool ConnectionNamespaceHandler::RemoveConnection(
   return found_connection;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/connection_namespace_handler.h b/chromium/third_party/openscreen/src/cast/common/channel/connection_namespace_handler.h
index 1d42e9861d2..b9f0495ad2d 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/connection_namespace_handler.h
+++ b/chromium/third_party/openscreen/src/cast/common/channel/connection_namespace_handler.h
@@ -13,8 +13,7 @@
 #include "cast/common/channel/virtual_connection.h"
 #include "util/json/json_serialization.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class VirtualConnectionRouter;
 
@@ -93,7 +92,6 @@ class ConnectionNamespaceHandler : public CastMessageHandler {
   std::vector<PendingRequest> pending_remote_requests_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_CHANNEL_CONNECTION_NAMESPACE_HANDLER_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/connection_namespace_handler_unittest.cc b/chromium/third_party/openscreen/src/cast/common/channel/connection_namespace_handler_unittest.cc
index f04195ffa79..f0f82b11882 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/connection_namespace_handler_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/common/channel/connection_namespace_handler_unittest.cc
@@ -4,7 +4,9 @@
 
 #include "cast/common/channel/connection_namespace_handler.h"
 
+#include <optional>
 #include <string>
+#include <string_view>
 #include <utility>
 #include <vector>
 
@@ -20,8 +22,7 @@
 #include "util/json/json_value.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 using ::testing::_;
@@ -45,7 +46,7 @@ class MockVirtualConnectionPolicy
 CastMessage MakeVersionedConnectMessage(
     const std::string& source_id,
     const std::string& destination_id,
-    absl::optional<CastMessage_ProtocolVersion> version,
+    std::optional<CastMessage_ProtocolVersion> version,
     std::vector<CastMessage_ProtocolVersion> version_list) {
   CastMessage connect_message = MakeConnectMessage(source_id, destination_id);
   Json::Value message(Json::ValueType::objectValue);
@@ -105,7 +106,7 @@ class ConnectionNamespaceHandlerTest : public ::testing::Test {
                                                        CastMessage message) {
           VerifyConnectionMessage(message, source_id, destination_id);
           Json::Value value = ParseConnectionMessage(message);
-          absl::optional<absl::string_view> type = MaybeGetString(
+          std::optional<std::string_view> type = MaybeGetString(
               value, JSON_EXPAND_FIND_CONSTANT_ARGS(kMessageKeyType));
           ASSERT_TRUE(type) << message.payload_utf8();
           EXPECT_EQ(type.value(), kMessageTypeClose) << message.payload_utf8();
@@ -116,19 +117,19 @@ class ConnectionNamespaceHandlerTest : public ::testing::Test {
       MockCastSocketClient* mock_client,
       const std::string& source_id,
       const std::string& destination_id,
-      absl::optional<CastMessage_ProtocolVersion> version = absl::nullopt) {
+      std::optional<CastMessage_ProtocolVersion> version = std::nullopt) {
     EXPECT_CALL(*mock_client, OnMessage(_, _))
         .WillOnce(Invoke([&source_id, &destination_id, version](
                              CastSocket* socket, CastMessage message) {
           VerifyConnectionMessage(message, source_id, destination_id);
           Json::Value value = ParseConnectionMessage(message);
-          absl::optional<absl::string_view> type = MaybeGetString(
+          std::optional<std::string_view> type = MaybeGetString(
               value, JSON_EXPAND_FIND_CONSTANT_ARGS(kMessageKeyType));
           ASSERT_TRUE(type) << message.payload_utf8();
           EXPECT_EQ(type.value(), kMessageTypeConnected)
               << message.payload_utf8();
           if (version) {
-            absl::optional<int> message_version = MaybeGetInt(
+            std::optional<int> message_version = MaybeGetInt(
                 value,
                 JSON_EXPAND_FIND_CONSTANT_ARGS(kMessageKeyProtocolVersion));
             ASSERT_TRUE(message_version) << message.payload_utf8();
@@ -224,5 +225,4 @@ TEST_F(ConnectionNamespaceHandlerTest, CloseUnknown) {
       VirtualConnection{receiver_id_, sender_id_, socket_->socket_id()}));
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/message_framer.cc b/chromium/third_party/openscreen/src/cast/common/channel/message_framer.cc
index 1d05030504a..ca3ce4a11b1 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/message_framer.cc
+++ b/chromium/third_party/openscreen/src/cast/common/channel/message_framer.cc
@@ -13,8 +13,7 @@
 #include "util/big_endian.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace message_serialization {
 
 namespace {
@@ -65,5 +64,4 @@ ErrorOr<DeserializeResult> TryDeserialize(ByteView input) {
 }
 
 }  // namespace message_serialization
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/message_framer.h b/chromium/third_party/openscreen/src/cast/common/channel/message_framer.h
index ab696cbc117..15f60dc5233 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/message_framer.h
+++ b/chromium/third_party/openscreen/src/cast/common/channel/message_framer.h
@@ -15,8 +15,7 @@
 #include "platform/base/error.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace message_serialization {
 
 // Serializes |message_proto| into |message_data|.
@@ -36,7 +35,6 @@ struct DeserializeResult {
 ErrorOr<DeserializeResult> TryDeserialize(ByteView input);
 
 }  // namespace message_serialization
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_CHANNEL_MESSAGE_FRAMER_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/message_framer_unittest.cc b/chromium/third_party/openscreen/src/cast/common/channel/message_framer_unittest.cc
index b824f4904ec..9deda8b8649 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/message_framer_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/common/channel/message_framer_unittest.cc
@@ -15,8 +15,7 @@
 #include "util/big_endian.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace message_serialization {
 
 using ::cast::channel::CastMessage;
@@ -148,5 +147,4 @@ TEST_F(CastFramerTest, TestUnparsableBodyProto) {
 }
 
 }  // namespace message_serialization
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/message_util.cc b/chromium/third_party/openscreen/src/cast/common/channel/message_util.cc
index 2c9de7b8618..b10cb127773 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/message_util.cc
+++ b/chromium/third_party/openscreen/src/cast/common/channel/message_util.cc
@@ -16,8 +16,7 @@
 #include <TargetConditionals.h>
 #endif
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 using ::cast::channel::CastMessage;
@@ -190,5 +189,4 @@ const std::string& GetPayload(const CastMessage& message) {
                                          : message.payload_binary();
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/message_util.h b/chromium/third_party/openscreen/src/cast/common/channel/message_util.h
index 6c3efe5f086..22e4c650fa3 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/message_util.h
+++ b/chromium/third_party/openscreen/src/cast/common/channel/message_util.h
@@ -6,8 +6,8 @@
 #define CAST_COMMON_CHANNEL_MESSAGE_UTIL_H_
 
 #include <string>
+#include <string_view>
 
-#include "absl/strings/string_view.h"
 #include "cast/common/channel/proto/cast_channel.pb.h"
 #include "util/enum_name_table.h"
 
@@ -15,8 +15,7 @@ namespace Json {
 class Value;
 }
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Reserved message namespaces for internal messages.
 static constexpr char kCastInternalNamespacePrefix[] =
@@ -195,7 +194,7 @@ inline bool IsAuthMessage(const ::cast::channel::CastMessage& message) {
   return message.namespace_() == kAuthNamespace;
 }
 
-inline bool IsTransportNamespace(absl::string_view namespace_) {
+inline bool IsTransportNamespace(std::string_view namespace_) {
   return (namespace_.size() > (sizeof(kTransportNamespacePrefix) - 1)) &&
          (namespace_.find_first_of(kTransportNamespacePrefix) == 0);
 }
@@ -225,7 +224,6 @@ std::string ToString(const ::cast::channel::CastMessage& message);
 // Helper to get the actual message payload out of a cast message.
 const std::string& GetPayload(const ::cast::channel::CastMessage& message);
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_CHANNEL_MESSAGE_UTIL_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/namespace_router.cc b/chromium/third_party/openscreen/src/cast/common/channel/namespace_router.cc
index 5d6766577de..e60f968f170 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/namespace_router.cc
+++ b/chromium/third_party/openscreen/src/cast/common/channel/namespace_router.cc
@@ -8,8 +8,7 @@
 
 #include "cast/common/channel/proto/cast_channel.pb.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 NamespaceRouter::NamespaceRouter() = default;
 NamespaceRouter::~NamespaceRouter() = default;
@@ -33,5 +32,4 @@ void NamespaceRouter::OnMessage(VirtualConnectionRouter* router,
   }
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/namespace_router.h b/chromium/third_party/openscreen/src/cast/common/channel/namespace_router.h
index e9519580a61..4ec7d2af52e 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/namespace_router.h
+++ b/chromium/third_party/openscreen/src/cast/common/channel/namespace_router.h
@@ -11,8 +11,7 @@
 #include "cast/common/channel/cast_message_handler.h"
 #include "cast/common/channel/proto/cast_channel.pb.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class NamespaceRouter final : public CastMessageHandler {
  public:
@@ -31,7 +30,6 @@ class NamespaceRouter final : public CastMessageHandler {
   std::map<std::string /* namespace */, CastMessageHandler*> handlers_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_CHANNEL_NAMESPACE_ROUTER_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/namespace_router_unittest.cc b/chromium/third_party/openscreen/src/cast/common/channel/namespace_router_unittest.cc
index d71b96ce9a7..dde778ccc04 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/namespace_router_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/common/channel/namespace_router_unittest.cc
@@ -14,8 +14,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 using ::cast::channel::CastMessage;
@@ -94,5 +93,4 @@ TEST_F(NamespaceRouterTest, RemoveHandler) {
   router_.OnMessage(&vc_router_, socket(), std::move(message2));
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/testing/fake_cast_socket.h b/chromium/third_party/openscreen/src/cast/common/channel/testing/fake_cast_socket.h
index f2fcaa05f33..484af9f22cf 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/testing/fake_cast_socket.h
+++ b/chromium/third_party/openscreen/src/cast/common/channel/testing/fake_cast_socket.h
@@ -14,8 +14,7 @@
 #include "gmock/gmock.h"
 #include "platform/test/mock_tls_connection.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class MockCastSocketClient final : public CastSocket::Client {
  public:
@@ -104,7 +103,6 @@ struct FakeCastSocketPair {
   std::unique_ptr<CastSocket> peer_socket;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_CHANNEL_TESTING_FAKE_CAST_SOCKET_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/testing/mock_cast_message_handler.h b/chromium/third_party/openscreen/src/cast/common/channel/testing/mock_cast_message_handler.h
index 80413fc088c..2afac5a776b 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/testing/mock_cast_message_handler.h
+++ b/chromium/third_party/openscreen/src/cast/common/channel/testing/mock_cast_message_handler.h
@@ -9,8 +9,7 @@
 #include "cast/common/channel/proto/cast_channel.pb.h"
 #include "gmock/gmock.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class MockCastMessageHandler final : public CastMessageHandler {
  public:
@@ -22,7 +21,6 @@ class MockCastMessageHandler final : public CastMessageHandler {
               (override));
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_CHANNEL_TESTING_MOCK_CAST_MESSAGE_HANDLER_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/testing/mock_socket_error_handler.h b/chromium/third_party/openscreen/src/cast/common/channel/testing/mock_socket_error_handler.h
index 58b63da4a31..30462095063 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/testing/mock_socket_error_handler.h
+++ b/chromium/third_party/openscreen/src/cast/common/channel/testing/mock_socket_error_handler.h
@@ -9,8 +9,7 @@
 #include "gmock/gmock.h"
 #include "platform/base/error.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class MockSocketErrorHandler
     : public VirtualConnectionRouter::SocketErrorHandler {
@@ -19,7 +18,6 @@ class MockSocketErrorHandler
   MOCK_METHOD(void, OnError, (CastSocket * socket, Error error), (override));
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_CHANNEL_TESTING_MOCK_SOCKET_ERROR_HANDLER_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/virtual_connection.h b/chromium/third_party/openscreen/src/cast/common/channel/virtual_connection.h
index 82ab89ed85c..2be3a4553f9 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/virtual_connection.h
+++ b/chromium/third_party/openscreen/src/cast/common/channel/virtual_connection.h
@@ -9,8 +9,7 @@
 #include <cstdint>
 #include <string>
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Transport system on top of CastSocket that allows routing messages over a
 // single socket to different virtual endpoints (e.g. system messages vs.
@@ -113,7 +112,6 @@ inline bool operator!=(const VirtualConnection& a, const VirtualConnection& b) {
   return !(a == b);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_CHANNEL_VIRTUAL_CONNECTION_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/virtual_connection_router.cc b/chromium/third_party/openscreen/src/cast/common/channel/virtual_connection_router.cc
index 239e9ff2727..b54f482f96b 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/virtual_connection_router.cc
+++ b/chromium/third_party/openscreen/src/cast/common/channel/virtual_connection_router.cc
@@ -12,8 +12,7 @@
 #include "cast/common/channel/proto/cast_channel.pb.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using ::cast::channel::CastMessage;
 
@@ -89,25 +88,25 @@ void VirtualConnectionRouter::RemoveConnectionsBySocketId(int socket_id) {
   }
 }
 
-absl::optional<const VirtualConnection::AssociatedData*>
+std::optional<const VirtualConnection::AssociatedData*>
 VirtualConnectionRouter::GetConnectionData(
     const VirtualConnection& virtual_connection) const {
   auto socket_entry = connections_.find(virtual_connection.socket_id);
   if (socket_entry == connections_.end()) {
-    return absl::nullopt;
+    return std::nullopt;
   }
 
   auto& socket_map = socket_entry->second;
   auto local_entries = socket_map.equal_range(virtual_connection.local_id);
   if (local_entries.first == socket_map.end()) {
-    return absl::nullopt;
+    return std::nullopt;
   }
   for (auto it = local_entries.first; it != local_entries.second; ++it) {
     if (it->second.peer_id == virtual_connection.peer_id) {
       return &it->second.data;
     }
   }
-  return absl::nullopt;
+  return std::nullopt;
 }
 
 bool VirtualConnectionRouter::AddHandlerForLocalId(
@@ -233,5 +232,4 @@ void VirtualConnectionRouter::OnMessage(CastSocket* socket,
   }
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/virtual_connection_router.h b/chromium/third_party/openscreen/src/cast/common/channel/virtual_connection_router.h
index f4c587464c3..97166034a48 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/virtual_connection_router.h
+++ b/chromium/third_party/openscreen/src/cast/common/channel/virtual_connection_router.h
@@ -8,15 +8,14 @@
 #include <cstdint>
 #include <map>
 #include <memory>
+#include <optional>
 #include <string>
 
-#include "absl/types/optional.h"
 #include "cast/common/channel/proto/cast_channel.pb.h"
 #include "cast/common/channel/virtual_connection.h"
 #include "cast/common/public/cast_socket.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class CastMessageHandler;
 class ConnectionNamespaceHandler;
@@ -80,7 +79,7 @@ class VirtualConnectionRouter final : public CastSocket::Client {
   // Returns the AssociatedData for a |virtual_connection| if a connection
   // exists, nullopt otherwise. The pointer isn't stable in the long term; so,
   // if it actually needs to be stored for later, the caller should make a copy.
-  absl::optional<const VirtualConnection::AssociatedData*> GetConnectionData(
+  std::optional<const VirtualConnection::AssociatedData*> GetConnectionData(
       const VirtualConnection& virtual_connection) const;
 
   // Adds/Removes a CastMessageHandler for all messages destined for the given
@@ -139,7 +138,6 @@ class VirtualConnectionRouter final : public CastSocket::Client {
   std::map<std::string /* local_id */, CastMessageHandler*> endpoints_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_CHANNEL_VIRTUAL_CONNECTION_ROUTER_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/channel/virtual_connection_router_unittest.cc b/chromium/third_party/openscreen/src/cast/common/channel/virtual_connection_router_unittest.cc
index 85bb1d61568..6f90605ff75 100644
--- a/chromium/third_party/openscreen/src/cast/common/channel/virtual_connection_router_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/common/channel/virtual_connection_router_unittest.cc
@@ -15,8 +15,7 @@
 #include "cast/common/public/cast_socket.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 static_assert(::cast::channel::CastMessage_ProtocolVersion_CASTV2_1_0 ==
@@ -433,5 +432,4 @@ TEST_F(VirtualConnectionRouterTest, HandlesConnectionMessagesAsSpecialCase) {
   EXPECT_EQ(kConnectionNamespace, message.namespace_());
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/discovery/e2e_test/tests.cc b/chromium/third_party/openscreen/src/cast/common/discovery/e2e_test/tests.cc
index 51888c50cab..7dd57730174 100644
--- a/chromium/third_party/openscreen/src/cast/common/discovery/e2e_test/tests.cc
+++ b/chromium/third_party/openscreen/src/cast/common/discovery/e2e_test/tests.cc
@@ -29,8 +29,7 @@
 #include "util/osp_logging.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 // Maximum amount of time needed for a query to be received.
@@ -577,5 +576,4 @@ TEST_F(DiscoveryE2ETest, ValidateRefreshFlow) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/public/cast_socket.h b/chromium/third_party/openscreen/src/cast/common/public/cast_socket.h
index 567643d8e72..2bbb97d0955 100644
--- a/chromium/third_party/openscreen/src/cast/common/public/cast_socket.h
+++ b/chromium/third_party/openscreen/src/cast/common/public/cast_socket.h
@@ -18,8 +18,7 @@ class CastMessage;
 }  // namespace channel
 }  // namespace cast
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Represents a simple message-oriented socket for communicating with the Cast
 // V2 protocol.  It isn't thread-safe, so it should only be used on the same
@@ -91,7 +90,6 @@ constexpr int ToCastSocketId(CastSocket* socket) {
   return socket ? socket->socket_id() : 0;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_PUBLIC_CAST_SOCKET_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/public/cast_streaming_app_ids.cc b/chromium/third_party/openscreen/src/cast/common/public/cast_streaming_app_ids.cc
index 2e506ab39b4..f30683e31df 100644
--- a/chromium/third_party/openscreen/src/cast/common/public/cast_streaming_app_ids.cc
+++ b/chromium/third_party/openscreen/src/cast/common/public/cast_streaming_app_ids.cc
@@ -9,8 +9,7 @@
 #include "absl/strings/match.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 // clang-format off
@@ -145,5 +144,4 @@ std::vector<std::string> GetCastStreamingAppIds() {
       {GetCastStreamingAudioVideoAppId(), GetCastStreamingAudioOnlyAppId()});
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/public/cast_streaming_app_ids.h b/chromium/third_party/openscreen/src/cast/common/public/cast_streaming_app_ids.h
index 454bda0808f..44d9f559e36 100644
--- a/chromium/third_party/openscreen/src/cast/common/public/cast_streaming_app_ids.h
+++ b/chromium/third_party/openscreen/src/cast/common/public/cast_streaming_app_ids.h
@@ -8,8 +8,7 @@
 #include <string>
 #include <vector>
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Returns true only if |app_id| matches the Cast application ID for the
 // corresponding Chromium Cast Streaming receiver application.
@@ -58,7 +57,6 @@ constexpr const char* GetIosAppStreamingAudioVideoAppId() {
   return "BFD92C23";
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_PUBLIC_CAST_STREAMING_APP_IDS_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/public/cast_streaming_app_ids_unittest.cc b/chromium/third_party/openscreen/src/cast/common/public/cast_streaming_app_ids_unittest.cc
index 983412caf9c..47f30ac91a3 100644
--- a/chromium/third_party/openscreen/src/cast/common/public/cast_streaming_app_ids_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/common/public/cast_streaming_app_ids_unittest.cc
@@ -8,8 +8,7 @@
 
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 TEST(CastStreamingAppIdsTest, Test) {
   EXPECT_TRUE(IsCastStreamingAppId("0F5096E8"));
@@ -60,5 +59,4 @@ TEST(CastStreamingAppIdsTest, Test) {
   EXPECT_STREQ("BFD92C23", GetIosAppStreamingAudioVideoAppId());
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/public/certificate_types.h b/chromium/third_party/openscreen/src/cast/common/public/certificate_types.h
index c7d5dfd731f..52a0fea13d0 100644
--- a/chromium/third_party/openscreen/src/cast/common/public/certificate_types.h
+++ b/chromium/third_party/openscreen/src/cast/common/public/certificate_types.h
@@ -7,8 +7,7 @@
 
 #include <stdint.h>
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // This must be a UTC time.
 struct DateTime {
@@ -20,7 +19,6 @@ struct DateTime {
   uint8_t second;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_PUBLIC_CERTIFICATE_TYPES_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/public/message_port.h b/chromium/third_party/openscreen/src/cast/common/public/message_port.h
index 073899628ef..6e6757b6910 100644
--- a/chromium/third_party/openscreen/src/cast/common/public/message_port.h
+++ b/chromium/third_party/openscreen/src/cast/common/public/message_port.h
@@ -9,8 +9,7 @@
 
 #include "platform/base/error.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // This interface is intended to provide an abstraction for communicating
 // cast messages across a pipe with guaranteed delivery. This is used to
@@ -48,7 +47,6 @@ class MessagePort {
                            const std::string& message) = 0;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_PUBLIC_MESSAGE_PORT_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/public/parsed_certificate.h b/chromium/third_party/openscreen/src/cast/common/public/parsed_certificate.h
index c207b8f54ed..32814ff50f8 100644
--- a/chromium/third_party/openscreen/src/cast/common/public/parsed_certificate.h
+++ b/chromium/third_party/openscreen/src/cast/common/public/parsed_certificate.h
@@ -14,8 +14,7 @@
 #include "platform/base/error.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 enum class DigestAlgorithm {
   kSha1,
@@ -75,7 +74,6 @@ class ParsedCertificate {
   virtual void SetNotAfterTimeForTesting(time_t not_after) = 0;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_PUBLIC_PARSED_CERTIFICATE_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/public/receiver_info.cc b/chromium/third_party/openscreen/src/cast/common/public/receiver_info.cc
index 153721103d4..80ecd648b82 100644
--- a/chromium/third_party/openscreen/src/cast/common/public/receiver_info.cc
+++ b/chromium/third_party/openscreen/src/cast/common/public/receiver_info.cc
@@ -15,8 +15,7 @@
 #include "util/osp_logging.h"
 #include "util/span_util.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 // Maximum size for the receiver model prefix at start of MDNS service instance
@@ -193,5 +192,4 @@ ErrorOr<ReceiverInfo> DnsSdInstanceEndpointToReceiverInfo(
   return record;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/public/receiver_info.h b/chromium/third_party/openscreen/src/cast/common/public/receiver_info.h
index 2447c05b277..c4ab8badad8 100644
--- a/chromium/third_party/openscreen/src/cast/common/public/receiver_info.h
+++ b/chromium/third_party/openscreen/src/cast/common/public/receiver_info.h
@@ -13,8 +13,7 @@
 #include "discovery/dnssd/public/dns_sd_instance_endpoint.h"
 #include "platform/base/ip_address.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Constants to identify a CastV2 instance with DNS-SD.
 constexpr char kCastV2ServiceId[] = "_googlecast._tcp";
@@ -118,7 +117,6 @@ discovery::DnsSdInstance ReceiverInfoToDnsSdInstance(
 ErrorOr<ReceiverInfo> DnsSdInstanceEndpointToReceiverInfo(
     const discovery::DnsSdInstanceEndpoint& endpoint);
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_PUBLIC_RECEIVER_INFO_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/public/receiver_info_unittest.cc b/chromium/third_party/openscreen/src/cast/common/public/receiver_info_unittest.cc
index 0a53d386985..9c74db395eb 100644
--- a/chromium/third_party/openscreen/src/cast/common/public/receiver_info_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/common/public/receiver_info_unittest.cc
@@ -12,8 +12,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 constexpr NetworkInterfaceIndex kNetworkInterface = 0;
@@ -179,5 +178,4 @@ TEST(ReceiverInfoTests, ParseReceiverInfoFromRealTXT) {
   EXPECT_EQ(info.friendly_name, "⚡ Yurovision® ULTRA™");
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/public/testing/discovery_utils.cc b/chromium/third_party/openscreen/src/cast/common/public/testing/discovery_utils.cc
index acd5848fd94..32a4c28c8a9 100644
--- a/chromium/third_party/openscreen/src/cast/common/public/testing/discovery_utils.cc
+++ b/chromium/third_party/openscreen/src/cast/common/public/testing/discovery_utils.cc
@@ -10,8 +10,7 @@
 
 #include "util/stringprintf.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 const IPAddress kAddressV4 = {192, 168, 0, 0};
 const IPAddress kAddressV6 = {1, 2, 3, 4, 5, 6, 7, 8};
@@ -50,5 +49,4 @@ void CompareTxtInt(const discovery::DnsSdTxtRecord& txt,
       << "for key: '" << key << "'";
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/common/public/testing/discovery_utils.h b/chromium/third_party/openscreen/src/cast/common/public/testing/discovery_utils.h
index e7d43373c02..dd33071339d 100644
--- a/chromium/third_party/openscreen/src/cast/common/public/testing/discovery_utils.h
+++ b/chromium/third_party/openscreen/src/cast/common/public/testing/discovery_utils.h
@@ -13,8 +13,7 @@
 #include "gtest/gtest.h"
 #include "platform/base/ip_address.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Constants used for testing.
 extern const IPAddress kAddressV4;
@@ -43,7 +42,6 @@ void CompareTxtInt(const discovery::DnsSdTxtRecord& txt,
                    const std::string& key,
                    int expected);
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_PUBLIC_TESTING_DISCOVERY_UTILS_H_
diff --git a/chromium/third_party/openscreen/src/cast/common/public/trust_store.h b/chromium/third_party/openscreen/src/cast/common/public/trust_store.h
index edf6cd56418..331a7dde0cb 100644
--- a/chromium/third_party/openscreen/src/cast/common/public/trust_store.h
+++ b/chromium/third_party/openscreen/src/cast/common/public/trust_store.h
@@ -8,15 +8,14 @@
 #include <cstdint>
 #include <memory>
 #include <string>
+#include <string_view>
 #include <vector>
 
-#include "absl/strings/string_view.h"
 #include "cast/common/public/certificate_types.h"
 #include "cast/common/public/parsed_certificate.h"
 #include "platform/base/error.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // This class represents a set of certificates that form a root trust set.  The
 // only operation on this set is to check whether a given set of certificates
@@ -27,7 +26,7 @@ class TrustStore {
   using CertificatePathResult = std::vector<std::unique_ptr<ParsedCertificate>>;
 
   static std::unique_ptr<TrustStore> CreateInstanceFromPemFile(
-      absl::string_view file_path);
+      std::string_view file_path);
 
   static std::unique_ptr<TrustStore> CreateInstanceForTest(
       const std::vector<uint8_t>& trust_anchor_der);
@@ -72,7 +71,6 @@ class CastCRLTrustStore {
   static std::unique_ptr<TrustStore> Create();
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_COMMON_PUBLIC_TRUST_STORE_H_
diff --git a/chromium/third_party/openscreen/src/cast/protocol/castv2/validation.cc b/chromium/third_party/openscreen/src/cast/protocol/castv2/validation.cc
index eb4a9a18ef5..e5809daf310 100644
--- a/chromium/third_party/openscreen/src/cast/protocol/castv2/validation.cc
+++ b/chromium/third_party/openscreen/src/cast/protocol/castv2/validation.cc
@@ -20,8 +20,7 @@
 #include "util/std_util.h"
 #include "util/stringprintf.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -80,5 +79,4 @@ std::vector<Error> ValidateReceiverMessage(const Json::Value& message) {
   return Validate(message, schema);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/protocol/castv2/validation.h b/chromium/third_party/openscreen/src/cast/protocol/castv2/validation.h
index ad4fd16d714..614014bd743 100644
--- a/chromium/third_party/openscreen/src/cast/protocol/castv2/validation.h
+++ b/chromium/third_party/openscreen/src/cast/protocol/castv2/validation.h
@@ -10,8 +10,7 @@
 #include "json/value.h"
 #include "platform/base/error.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Used to validate a JSON message against a JSON schema.
 std::vector<Error> Validate(const Json::Value& document,
@@ -23,7 +22,6 @@ std::vector<Error> ValidateStreamingMessage(const Json::Value& message);
 // Used to validate receiver messages, such as LAUNCH or STOP.
 std::vector<Error> ValidateReceiverMessage(const Json::Value& message);
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_PROTOCOL_CASTV2_VALIDATION_H_
diff --git a/chromium/third_party/openscreen/src/cast/protocol/castv2/validation_unittest.cc b/chromium/third_party/openscreen/src/cast/protocol/castv2/validation_unittest.cc
index 2e4c3381148..0a095abc444 100644
--- a/chromium/third_party/openscreen/src/cast/protocol/castv2/validation_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/protocol/castv2/validation_unittest.cc
@@ -6,8 +6,8 @@
 
 #include <numeric>
 #include <string>
+#include <string_view>
 
-#include "absl/strings/string_view.h"
 #include "cast/protocol/castv2/receiver_examples/get_app_availability_data.h"
 #include "cast/protocol/castv2/receiver_examples/get_app_availability_response_data.h"
 #include "cast/protocol/castv2/receiver_examples/launch_data.h"
@@ -29,8 +29,7 @@
 #include "util/std_util.h"
 #include "util/stringprintf.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -70,7 +69,7 @@ std::string BuildSchema(const char* definitions,
   return StringPrintf(kSchemaFormat, definitions, properties, required);
 }
 
-bool TestValidate(absl::string_view document, absl::string_view schema) {
+bool TestValidate(std::string_view document, std::string_view schema) {
   ErrorOr<Json::Value> document_root = json::Parse(document);
   EXPECT_TRUE(document_root.is_value());
   ErrorOr<Json::Value> schema_root = json::Parse(schema);
@@ -155,5 +154,4 @@ TEST_P(ReceiverValidationTest, ExampleReceiverMessages) {
   EXPECT_TRUE(message_root.is_value());
   EXPECT_TRUE(ValidateReceiverMessage(message_root.value()).empty());
 }
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/receiver/application_agent.cc b/chromium/third_party/openscreen/src/cast/receiver/application_agent.cc
index fba2912e0ba..46bd1c60b57 100644
--- a/chromium/third_party/openscreen/src/cast/receiver/application_agent.cc
+++ b/chromium/third_party/openscreen/src/cast/receiver/application_agent.cc
@@ -15,8 +15,7 @@
 #include "util/json/json_serialization.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 // Returns the first app ID for the given |app|, or the empty string if there is
@@ -394,5 +393,4 @@ void ApplicationAgent::BroadcastReceiverStatus() {
 
 ApplicationAgent::Application::~Application() = default;
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/receiver/application_agent.h b/chromium/third_party/openscreen/src/cast/receiver/application_agent.h
index f5a2accca19..604793397cc 100644
--- a/chromium/third_party/openscreen/src/cast/receiver/application_agent.h
+++ b/chromium/third_party/openscreen/src/cast/receiver/application_agent.h
@@ -21,8 +21,7 @@
 #include "platform/base/ip_address.h"
 #include "util/json/json_value.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class CastSocket;
 
@@ -165,7 +164,6 @@ class ApplicationAgent final
   std::string launched_via_app_id_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_RECEIVER_APPLICATION_AGENT_H_
diff --git a/chromium/third_party/openscreen/src/cast/receiver/application_agent_unittest.cc b/chromium/third_party/openscreen/src/cast/receiver/application_agent_unittest.cc
index 53a57911b1c..a0a5bade676 100644
--- a/chromium/third_party/openscreen/src/cast/receiver/application_agent_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/receiver/application_agent_unittest.cc
@@ -25,8 +25,7 @@
 #include "testing/util/read_file.h"
 #include "util/json/json_serialization.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 using ::cast::channel::CastMessage;
@@ -656,5 +655,4 @@ TEST_F(ApplicationAgentTest, AllowsVirtualConnectionsToApp) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/receiver/channel/device_auth_namespace_handler.cc b/chromium/third_party/openscreen/src/cast/receiver/channel/device_auth_namespace_handler.cc
index 289448d19f8..6bcc51b4828 100644
--- a/chromium/third_party/openscreen/src/cast/receiver/channel/device_auth_namespace_handler.cc
+++ b/chromium/third_party/openscreen/src/cast/receiver/channel/device_auth_namespace_handler.cc
@@ -25,8 +25,7 @@ using ::cast::channel::DeviceAuthMessage;
 using ::cast::channel::HashAlgorithm;
 using ::cast::channel::SignatureAlgorithm;
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -156,5 +155,4 @@ void DeviceAuthNamespaceHandler::OnMessage(VirtualConnectionRouter* router,
   router->Send(virtual_conn, std::move(response));
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/receiver/channel/device_auth_namespace_handler.h b/chromium/third_party/openscreen/src/cast/receiver/channel/device_auth_namespace_handler.h
index 8cb31b1b761..1cfb7bbb5bf 100644
--- a/chromium/third_party/openscreen/src/cast/receiver/channel/device_auth_namespace_handler.h
+++ b/chromium/third_party/openscreen/src/cast/receiver/channel/device_auth_namespace_handler.h
@@ -13,8 +13,7 @@
 #include "cast/common/channel/cast_message_handler.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 struct DeviceCredentials {
   // The device's certificate chain in DER form, where |certs[0]| is the
@@ -54,7 +53,6 @@ class DeviceAuthNamespaceHandler final : public CastMessageHandler {
   CredentialsProvider* const creds_provider_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_RECEIVER_CHANNEL_DEVICE_AUTH_NAMESPACE_HANDLER_H_
diff --git a/chromium/third_party/openscreen/src/cast/receiver/channel/device_auth_namespace_handler_unittest.cc b/chromium/third_party/openscreen/src/cast/receiver/channel/device_auth_namespace_handler_unittest.cc
index 102f91f94c0..064e9b237c5 100644
--- a/chromium/third_party/openscreen/src/cast/receiver/channel/device_auth_namespace_handler_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/receiver/channel/device_auth_namespace_handler_unittest.cc
@@ -20,8 +20,7 @@
 #include "platform/test/paths.h"
 #include "testing/util/read_file.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 using ::cast::channel::AuthResponse;
@@ -219,5 +218,4 @@ TEST_F(DeviceAuthNamespaceHandlerTest, UnsupportedSignatureAlgorithm) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/receiver/channel/message_util.cc b/chromium/third_party/openscreen/src/cast/receiver/channel/message_util.cc
index 3fdcb47fd2d..396d0098ee9 100644
--- a/chromium/third_party/openscreen/src/cast/receiver/channel/message_util.cc
+++ b/chromium/third_party/openscreen/src/cast/receiver/channel/message_util.cc
@@ -11,8 +11,7 @@
 #include "util/json/json_value.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using ::cast::channel::CastMessage;
 
@@ -64,5 +63,4 @@ ErrorOr<CastMessage> CreateAppUnavailableResponse(int request_id,
                                        AppAvailabilityResult::kUnavailable);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/receiver/channel/message_util.h b/chromium/third_party/openscreen/src/cast/receiver/channel/message_util.h
index eb2eda06f5a..ec13c84bdeb 100644
--- a/chromium/third_party/openscreen/src/cast/receiver/channel/message_util.h
+++ b/chromium/third_party/openscreen/src/cast/receiver/channel/message_util.h
@@ -11,8 +11,7 @@
 #include "cast/common/channel/proto/cast_channel.pb.h"
 #include "platform/base/error.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Creates a message that responds to a previous app availability request with
 // ID |request_id| which declares |app_id| to have availability of either
@@ -26,7 +25,6 @@ ErrorOr<::cast::channel::CastMessage> CreateAppUnavailableResponse(
     const std::string& sender_id,
     const std::string& app_id);
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_RECEIVER_CHANNEL_MESSAGE_UTIL_H_
diff --git a/chromium/third_party/openscreen/src/cast/receiver/channel/receiver_socket_factory.cc b/chromium/third_party/openscreen/src/cast/receiver/channel/receiver_socket_factory.cc
index 0b528489359..241d2995225 100644
--- a/chromium/third_party/openscreen/src/cast/receiver/channel/receiver_socket_factory.cc
+++ b/chromium/third_party/openscreen/src/cast/receiver/channel/receiver_socket_factory.cc
@@ -6,8 +6,7 @@
 
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 ReceiverSocketFactory::Client::~Client() = default;
 
@@ -49,5 +48,4 @@ void ReceiverSocketFactory::OnError(TlsConnectionFactory* factory,
   client_->OnError(this, error);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/receiver/channel/static_credentials.cc b/chromium/third_party/openscreen/src/cast/receiver/channel/static_credentials.cc
index ad0c12aaf16..13d7b7ab54e 100644
--- a/chromium/third_party/openscreen/src/cast/receiver/channel/static_credentials.cc
+++ b/chromium/third_party/openscreen/src/cast/receiver/channel/static_credentials.cc
@@ -17,8 +17,7 @@
 #include "util/crypto/certificate_utils.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 using FileUniquePtr = std::unique_ptr<FILE, decltype(&fclose)>;
 
@@ -208,5 +207,4 @@ ErrorOr<GeneratedCredentials> GenerateCredentials(
                              root_cert.get());
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/receiver/channel/static_credentials.h b/chromium/third_party/openscreen/src/cast/receiver/channel/static_credentials.h
index bb881327081..5ddb2868e6a 100644
--- a/chromium/third_party/openscreen/src/cast/receiver/channel/static_credentials.h
+++ b/chromium/third_party/openscreen/src/cast/receiver/channel/static_credentials.h
@@ -9,13 +9,11 @@
 #include <string>
 #include <vector>
 
-#include "absl/strings/string_view.h"
 #include "cast/receiver/channel/device_auth_namespace_handler.h"
 #include "platform/base/error.h"
 #include "platform/base/tls_credentials.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class StaticCredentialsProvider final
     : public DeviceAuthNamespaceHandler::CredentialsProvider {
@@ -63,7 +61,6 @@ ErrorOr<GeneratedCredentials> GenerateCredentials(
 ErrorOr<GeneratedCredentials> GenerateCredentialsForTesting(
     const std::string& device_certificate_id);
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_RECEIVER_CHANNEL_STATIC_CREDENTIALS_H_
diff --git a/chromium/third_party/openscreen/src/cast/receiver/channel/testing/device_auth_test_helpers.cc b/chromium/third_party/openscreen/src/cast/receiver/channel/testing/device_auth_test_helpers.cc
index be7d578dae4..5dfd51cb386 100644
--- a/chromium/third_party/openscreen/src/cast/receiver/channel/testing/device_auth_test_helpers.cc
+++ b/chromium/third_party/openscreen/src/cast/receiver/channel/testing/device_auth_test_helpers.cc
@@ -13,16 +13,15 @@
 #include "gtest/gtest.h"
 #include "util/crypto/pem_helpers.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 void InitStaticCredentialsFromFiles(
     StaticCredentialsProvider* creds,
     std::unique_ptr<ParsedCertificate>* parsed_cert,
     std::unique_ptr<TrustStore>* fake_trust_store,
-    absl::string_view privkey_filename,
-    absl::string_view chain_filename,
-    absl::string_view tls_filename) {
+    std::string_view privkey_filename,
+    std::string_view chain_filename,
+    std::string_view tls_filename) {
   auto private_key = ReadKeyFromPemFile(privkey_filename);
   ASSERT_TRUE(private_key);
   std::vector<std::string> certs = ReadCertificatesFromPemFile(chain_filename);
@@ -53,5 +52,4 @@ void InitStaticCredentialsFromFiles(
   creds->tls_cert_der.assign(begin, begin + tls_cert[0].size());
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/receiver/channel/testing/device_auth_test_helpers.h b/chromium/third_party/openscreen/src/cast/receiver/channel/testing/device_auth_test_helpers.h
index 2a1947a63fa..97fa31792b2 100644
--- a/chromium/third_party/openscreen/src/cast/receiver/channel/testing/device_auth_test_helpers.h
+++ b/chromium/third_party/openscreen/src/cast/receiver/channel/testing/device_auth_test_helpers.h
@@ -6,14 +6,13 @@
 #define CAST_RECEIVER_CHANNEL_TESTING_DEVICE_AUTH_TEST_HELPERS_H_
 
 #include <memory>
+#include <string_view>
 #include <vector>
 
-#include "absl/strings/string_view.h"
 #include "cast/receiver/channel/device_auth_namespace_handler.h"
 #include "cast/receiver/channel/static_credentials.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class ParsedCertificate;
 class TrustStore;
@@ -22,11 +21,10 @@ void InitStaticCredentialsFromFiles(
     StaticCredentialsProvider* creds,
     std::unique_ptr<ParsedCertificate>* parsed_cert,
     std::unique_ptr<TrustStore>* fake_trust_store,
-    absl::string_view privkey_filename,
-    absl::string_view chain_filename,
-    absl::string_view tls_filename);
+    std::string_view privkey_filename,
+    std::string_view chain_filename,
+    std::string_view tls_filename);
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_RECEIVER_CHANNEL_TESTING_DEVICE_AUTH_TEST_HELPERS_H_
diff --git a/chromium/third_party/openscreen/src/cast/receiver/public/receiver_socket_factory.h b/chromium/third_party/openscreen/src/cast/receiver/public/receiver_socket_factory.h
index 717b1bbaafd..c401269fd2d 100644
--- a/chromium/third_party/openscreen/src/cast/receiver/public/receiver_socket_factory.h
+++ b/chromium/third_party/openscreen/src/cast/receiver/public/receiver_socket_factory.h
@@ -12,8 +12,7 @@
 #include "platform/api/tls_connection_factory.h"
 #include "platform/base/ip_address.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class ReceiverSocketFactory final : public TlsConnectionFactory::Client {
  public:
@@ -49,7 +48,6 @@ class ReceiverSocketFactory final : public TlsConnectionFactory::Client {
   CastSocket::Client* const socket_client_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_RECEIVER_PUBLIC_RECEIVER_SOCKET_FACTORY_H_
diff --git a/chromium/third_party/openscreen/src/cast/sender/cast_app_availability_tracker.cc b/chromium/third_party/openscreen/src/cast/sender/cast_app_availability_tracker.cc
index 3b7d271840d..4b155552896 100644
--- a/chromium/third_party/openscreen/src/cast/sender/cast_app_availability_tracker.cc
+++ b/chromium/third_party/openscreen/src/cast/sender/cast_app_availability_tracker.cc
@@ -6,8 +6,7 @@
 
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 CastAppAvailabilityTracker::CastAppAvailabilityTracker() = default;
 CastAppAvailabilityTracker::~CastAppAvailabilityTracker() = default;
@@ -163,5 +162,4 @@ std::vector<std::string> CastAppAvailabilityTracker::GetAvailableReceivers(
   return receiver_ids;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/sender/cast_app_availability_tracker.h b/chromium/third_party/openscreen/src/cast/sender/cast_app_availability_tracker.h
index 292f448e446..5357c8e5f43 100644
--- a/chromium/third_party/openscreen/src/cast/sender/cast_app_availability_tracker.h
+++ b/chromium/third_party/openscreen/src/cast/sender/cast_app_availability_tracker.h
@@ -13,8 +13,7 @@
 #include "cast/sender/public/cast_media_source.h"
 #include "platform/api/time.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Tracks receiver queries and their extracted Cast app IDs and their
 // availabilities on discovered receivers.
@@ -119,7 +118,6 @@ class CastAppAvailabilityTracker {
   std::map<std::string, AppAvailabilityMap> app_availabilities_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_SENDER_CAST_APP_AVAILABILITY_TRACKER_H_
diff --git a/chromium/third_party/openscreen/src/cast/sender/cast_app_availability_tracker_unittest.cc b/chromium/third_party/openscreen/src/cast/sender/cast_app_availability_tracker_unittest.cc
index f279e86ba3f..9cfcfeb8466 100644
--- a/chromium/third_party/openscreen/src/cast/sender/cast_app_availability_tracker_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/sender/cast_app_availability_tracker_unittest.cc
@@ -9,8 +9,7 @@
 #include "gtest/gtest.h"
 #include "platform/test/fake_clock.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 using ::testing::UnorderedElementsAreArray;
@@ -159,5 +158,4 @@ TEST_F(CastAppAvailabilityTrackerTest, RemoveResultsForReceiver) {
             tracker_.GetAvailableReceivers(source1));
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/sender/cast_app_discovery_service_impl.cc b/chromium/third_party/openscreen/src/cast/sender/cast_app_discovery_service_impl.cc
index dc46a45d731..2c7f214d0a6 100644
--- a/chromium/third_party/openscreen/src/cast/sender/cast_app_discovery_service_impl.cc
+++ b/chromium/third_party/openscreen/src/cast/sender/cast_app_discovery_service_impl.cc
@@ -11,8 +11,7 @@
 #include "cast/sender/public/cast_media_source.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 // The minimum time that must elapse before an app availability result can be
@@ -198,5 +197,4 @@ void CastAppDiscoveryServiceImpl::RemoveAvailabilityCallback(uint32_t id) {
   }
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/sender/cast_app_discovery_service_impl.h b/chromium/third_party/openscreen/src/cast/sender/cast_app_discovery_service_impl.h
index d5f8e65f722..b06ecc0d779 100644
--- a/chromium/third_party/openscreen/src/cast/sender/cast_app_discovery_service_impl.h
+++ b/chromium/third_party/openscreen/src/cast/sender/cast_app_discovery_service_impl.h
@@ -16,8 +16,7 @@
 #include "platform/api/time.h"
 #include "util/weak_ptr.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Keeps track of availability queries, receives receiver updates, and issues
 // app availability requests based on these signals.
@@ -90,7 +89,6 @@ class CastAppDiscoveryServiceImpl : public CastAppDiscoveryService {
   WeakPtrFactory<CastAppDiscoveryServiceImpl> weak_factory_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_SENDER_CAST_APP_DISCOVERY_SERVICE_IMPL_H_
diff --git a/chromium/third_party/openscreen/src/cast/sender/cast_app_discovery_service_impl_unittest.cc b/chromium/third_party/openscreen/src/cast/sender/cast_app_discovery_service_impl_unittest.cc
index e4a0f9ab681..99fc4831662 100644
--- a/chromium/third_party/openscreen/src/cast/sender/cast_app_discovery_service_impl_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/sender/cast_app_discovery_service_impl_unittest.cc
@@ -16,8 +16,7 @@
 #include "platform/test/fake_task_runner.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using ::cast::channel::CastMessage;
 
@@ -345,5 +344,4 @@ TEST_F(CastAppDiscoveryServiceImplTest, AvailabilityUnknownOrUnavailable) {
   AddOrUpdateReceiver(receiver_, socket_id_);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/sender/cast_platform_client.cc b/chromium/third_party/openscreen/src/cast/sender/cast_platform_client.cc
index dde5ffb133b..4bad5225b84 100644
--- a/chromium/third_party/openscreen/src/cast/sender/cast_platform_client.cc
+++ b/chromium/third_party/openscreen/src/cast/sender/cast_platform_client.cc
@@ -6,6 +6,7 @@
 
 #include <memory>
 #include <random>
+#include <string_view>
 #include <utility>
 
 #include "absl/strings/str_cat.h"
@@ -16,8 +17,7 @@
 #include "util/osp_logging.h"
 #include "util/stringprintf.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 static constexpr std::chrono::seconds kRequestTimeout = std::chrono::seconds(5);
 
@@ -45,14 +45,14 @@ CastPlatformClient::~CastPlatformClient() {
   }
 }
 
-absl::optional<int> CastPlatformClient::RequestAppAvailability(
+std::optional<int> CastPlatformClient::RequestAppAvailability(
     const std::string& receiver_id,
     const std::string& app_id,
     AppAvailabilityCallback callback) {
   auto entry = socket_id_by_receiver_id_.find(receiver_id);
   if (entry == socket_id_by_receiver_id_.end()) {
     callback(app_id, AppAvailabilityResult::kUnknown);
-    return absl::nullopt;
+    return std::nullopt;
   }
   int socket_id = entry->second;
 
@@ -132,7 +132,7 @@ void CastPlatformClient::OnMessage(VirtualConnectionRouter* router,
   }
 
   Json::Value& dict = dict_or_error.value();
-  absl::optional<int> request_id =
+  std::optional<int> request_id =
       MaybeGetInt(dict, JSON_EXPAND_FIND_CONSTANT_ARGS(kMessageKeyRequestId));
   if (request_id) {
     auto socket_map_entry = std::find_if(
@@ -166,7 +166,7 @@ void CastPlatformClient::HandleResponse(const std::string& receiver_id,
     const Json::Value* maybe_availability =
         message.find(JSON_EXPAND_FIND_CONSTANT_ARGS(kMessageKeyAvailability));
     if (maybe_availability && maybe_availability->isObject()) {
-      absl::optional<absl::string_view> result =
+      std::optional<std::string_view> result =
           MaybeGetString(*maybe_availability, &it->app_id[0],
                          &it->app_id[0] + it->app_id.size());
       if (result) {
@@ -209,5 +209,4 @@ int CastPlatformClient::GetNextRequestId() {
 // static
 int CastPlatformClient::next_request_id_ = 0;
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/sender/cast_platform_client.h b/chromium/third_party/openscreen/src/cast/sender/cast_platform_client.h
index ae7bd0ef295..db112d6f55d 100644
--- a/chromium/third_party/openscreen/src/cast/sender/cast_platform_client.h
+++ b/chromium/third_party/openscreen/src/cast/sender/cast_platform_client.h
@@ -8,17 +8,16 @@
 #include <functional>
 #include <map>
 #include <memory>
+#include <optional>
 #include <string>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "cast/common/channel/cast_message_handler.h"
 #include "cast/sender/channel/message_util.h"
 #include "util/alarm.h"
 #include "util/json/json_value.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 struct ReceiverInfo;
 class VirtualConnectionRouter;
@@ -42,9 +41,9 @@ class CastPlatformClient final : public CastMessageHandler {
 
   // Requests availability information for |app_id| from the receiver identified
   // by |receiver_id|.  |callback| will be called exactly once with a result.
-  absl::optional<int> RequestAppAvailability(const std::string& receiver_id,
-                                             const std::string& app_id,
-                                             AppAvailabilityCallback callback);
+  std::optional<int> RequestAppAvailability(const std::string& receiver_id,
+                                            const std::string& app_id,
+                                            AppAvailabilityCallback callback);
 
   // Notifies this object about general receiver connectivity or property
   // changes.
@@ -90,7 +89,6 @@ class CastPlatformClient final : public CastMessageHandler {
   TaskRunner& task_runner_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_SENDER_CAST_PLATFORM_CLIENT_H_
diff --git a/chromium/third_party/openscreen/src/cast/sender/cast_platform_client_unittest.cc b/chromium/third_party/openscreen/src/cast/sender/cast_platform_client_unittest.cc
index 2723fba20dd..0f3a965b0c0 100644
--- a/chromium/third_party/openscreen/src/cast/sender/cast_platform_client_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/sender/cast_platform_client_unittest.cc
@@ -18,8 +18,7 @@
 #include "util/json/json_serialization.h"
 #include "util/json/json_value.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using ::cast::channel::CastMessage;
 
@@ -90,12 +89,11 @@ TEST_F(CastPlatformClientTest, CancelRequest) {
                                           CastMessage message) {
         VerifyAppAvailabilityRequest(message, "AAA", &request_id, &sender_id);
       });
-  absl::optional<int> maybe_request_id =
-      platform_client_.RequestAppAvailability(
-          "receiverId1", "AAA",
-          [](const std::string& app_id, AppAvailabilityResult availability) {
-            EXPECT_TRUE(false);
-          });
+  std::optional<int> maybe_request_id = platform_client_.RequestAppAvailability(
+      "receiverId1", "AAA",
+      [](const std::string& app_id, AppAvailabilityResult availability) {
+        EXPECT_TRUE(false);
+      });
   ASSERT_TRUE(maybe_request_id);
   int local_request_id = maybe_request_id.value();
   platform_client_.CancelRequest(local_request_id);
@@ -105,5 +103,4 @@ TEST_F(CastPlatformClientTest, CancelRequest) {
   EXPECT_TRUE(peer_socket().Send(availability_response).ok());
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/sender/channel/cast_auth_util.cc b/chromium/third_party/openscreen/src/cast/sender/channel/cast_auth_util.cc
index f2ea23a8173..a27eb597ff5 100644
--- a/chromium/third_party/openscreen/src/cast/sender/channel/cast_auth_util.cc
+++ b/chromium/third_party/openscreen/src/cast/sender/channel/cast_auth_util.cc
@@ -21,8 +21,7 @@
 #include "util/osp_logging.h"
 #include "util/span_util.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using ::cast::channel::AuthResponse;
 using ::cast::channel::CastMessage;
@@ -436,5 +435,4 @@ ErrorOr<CastDeviceCertPolicy> VerifyCredentialsForTest(
                                verification_time, enforce_sha256_checking);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/sender/channel/cast_auth_util.h b/chromium/third_party/openscreen/src/cast/sender/channel/cast_auth_util.h
index 4732be890c6..0efeb9389f8 100644
--- a/chromium/third_party/openscreen/src/cast/sender/channel/cast_auth_util.h
+++ b/chromium/third_party/openscreen/src/cast/sender/channel/cast_auth_util.h
@@ -19,8 +19,7 @@ class CastMessage;
 }  // namespace channel
 }  // namespace cast
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 enum class CRLPolicy;
 struct DateTime;
@@ -103,7 +102,6 @@ ErrorOr<CastDeviceCertPolicy> VerifyCredentialsForTest(
     const DateTime& verification_time,
     bool enforce_sha256_checking = false);
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_SENDER_CHANNEL_CAST_AUTH_UTIL_H_
diff --git a/chromium/third_party/openscreen/src/cast/sender/channel/cast_auth_util_unittest.cc b/chromium/third_party/openscreen/src/cast/sender/channel/cast_auth_util_unittest.cc
index f559550a749..8d2c981ff95 100644
--- a/chromium/third_party/openscreen/src/cast/sender/channel/cast_auth_util_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/sender/channel/cast_auth_util_unittest.cc
@@ -25,8 +25,7 @@
 #include "util/osp_logging.h"
 #include "util/span_util.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // TODO(crbug.com/openscreen/90): Remove these after Chromium is migrated to
 // openscreen::cast
@@ -486,5 +485,4 @@ TEST_F(CastAuthUtilTest, CRLTestSuite) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/sender/channel/message_util.cc b/chromium/third_party/openscreen/src/cast/sender/channel/message_util.cc
index f4acb031fd7..c9e1c89c58e 100644
--- a/chromium/third_party/openscreen/src/cast/sender/channel/message_util.cc
+++ b/chromium/third_party/openscreen/src/cast/sender/channel/message_util.cc
@@ -10,8 +10,7 @@
 #include "cast/sender/channel/cast_auth_util.h"
 #include "util/json/json_serialization.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using ::cast::channel::AuthChallenge;
 using ::cast::channel::CastMessage;
@@ -66,5 +65,4 @@ ErrorOr<CastMessage> CreateAppAvailabilityRequest(const std::string& sender_id,
   return message;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/sender/channel/message_util.h b/chromium/third_party/openscreen/src/cast/sender/channel/message_util.h
index ab2fd8642cb..a5e8e2a2c23 100644
--- a/chromium/third_party/openscreen/src/cast/sender/channel/message_util.h
+++ b/chromium/third_party/openscreen/src/cast/sender/channel/message_util.h
@@ -11,8 +11,7 @@
 #include "cast/common/channel/proto/cast_channel.pb.h"
 #include "platform/base/error.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class AuthContext;
 
@@ -25,7 +24,6 @@ ErrorOr<::cast::channel::CastMessage> CreateAppAvailabilityRequest(
     int request_id,
     const std::string& app_id);
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_SENDER_CHANNEL_MESSAGE_UTIL_H_
diff --git a/chromium/third_party/openscreen/src/cast/sender/channel/sender_socket_factory.cc b/chromium/third_party/openscreen/src/cast/sender/channel/sender_socket_factory.cc
index 89233b31f43..899b6233044 100644
--- a/chromium/third_party/openscreen/src/cast/sender/channel/sender_socket_factory.cc
+++ b/chromium/third_party/openscreen/src/cast/sender/channel/sender_socket_factory.cc
@@ -14,8 +14,7 @@
 
 using ::cast::channel::CastMessage;
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 SenderSocketFactory::Client::~Client() = default;
 
@@ -203,5 +202,4 @@ void SenderSocketFactory::OnMessage(CastSocket* socket, CastMessage message) {
                        std::unique_ptr<CastSocket>(pending->socket.release()));
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/sender/public/cast_app_discovery_service.cc b/chromium/third_party/openscreen/src/cast/sender/public/cast_app_discovery_service.cc
index 44f1d941e74..78804368c36 100644
--- a/chromium/third_party/openscreen/src/cast/sender/public/cast_app_discovery_service.cc
+++ b/chromium/third_party/openscreen/src/cast/sender/public/cast_app_discovery_service.cc
@@ -4,8 +4,7 @@
 
 #include "cast/sender/public/cast_app_discovery_service.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 CastAppDiscoveryService::Subscription::Subscription(
     CastAppDiscoveryService* discovery_service,
@@ -47,5 +46,4 @@ void CastAppDiscoveryService::Subscription::Swap(Subscription& other) {
   id_ = id;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/sender/public/cast_app_discovery_service.h b/chromium/third_party/openscreen/src/cast/sender/public/cast_app_discovery_service.h
index 4c2e2866839..c366442fa2d 100644
--- a/chromium/third_party/openscreen/src/cast/sender/public/cast_app_discovery_service.h
+++ b/chromium/third_party/openscreen/src/cast/sender/public/cast_app_discovery_service.h
@@ -9,8 +9,7 @@
 
 #include "cast/common/public/receiver_info.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class CastMediaSource;
 
@@ -62,7 +61,6 @@ class CastAppDiscoveryService {
   virtual void RemoveAvailabilityCallback(uint32_t id) = 0;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_SENDER_PUBLIC_CAST_APP_DISCOVERY_SERVICE_H_
diff --git a/chromium/third_party/openscreen/src/cast/sender/public/cast_media_source.cc b/chromium/third_party/openscreen/src/cast/sender/public/cast_media_source.cc
index 6b0ab7c328c..369fb51a6cb 100644
--- a/chromium/third_party/openscreen/src/cast/sender/public/cast_media_source.cc
+++ b/chromium/third_party/openscreen/src/cast/sender/public/cast_media_source.cc
@@ -10,8 +10,7 @@
 #include "util/osp_logging.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // static
 ErrorOr<CastMediaSource> CastMediaSource::From(const std::string& source) {
@@ -44,5 +43,4 @@ bool CastMediaSource::ContainsAnyAppIdFrom(
                             app_ids.end()) != app_ids_.end();
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/sender/public/cast_media_source.h b/chromium/third_party/openscreen/src/cast/sender/public/cast_media_source.h
index dffa214edbe..ff8950be747 100644
--- a/chromium/third_party/openscreen/src/cast/sender/public/cast_media_source.h
+++ b/chromium/third_party/openscreen/src/cast/sender/public/cast_media_source.h
@@ -10,8 +10,7 @@
 
 #include "platform/base/error.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class CastMediaSource {
  public:
@@ -36,7 +35,6 @@ class CastMediaSource {
   std::vector<std::string> app_ids_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_SENDER_PUBLIC_CAST_MEDIA_SOURCE_H_
diff --git a/chromium/third_party/openscreen/src/cast/sender/public/sender_socket_factory.h b/chromium/third_party/openscreen/src/cast/sender/public/sender_socket_factory.h
index 15cb8038722..ad5fd7f6e0b 100644
--- a/chromium/third_party/openscreen/src/cast/sender/public/sender_socket_factory.h
+++ b/chromium/third_party/openscreen/src/cast/sender/public/sender_socket_factory.h
@@ -17,8 +17,7 @@
 #include "platform/base/ip_address.h"
 #include "util/serial_delete_ptr.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class AuthContext;
 class TrustStore;
@@ -117,7 +116,6 @@ class SenderSocketFactory final : public TlsConnectionFactory::Client,
   std::unique_ptr<TrustStore> crl_trust_store_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_SENDER_PUBLIC_SENDER_SOCKET_FACTORY_H_
diff --git a/chromium/third_party/openscreen/src/cast/sender/testing/test_helpers.cc b/chromium/third_party/openscreen/src/cast/sender/testing/test_helpers.cc
index 7288b07ffff..a723979af88 100644
--- a/chromium/third_party/openscreen/src/cast/sender/testing/test_helpers.cc
+++ b/chromium/third_party/openscreen/src/cast/sender/testing/test_helpers.cc
@@ -4,6 +4,8 @@
 
 #include "cast/sender/testing/test_helpers.h"
 
+#include <optional>
+#include <string_view>
 #include <utility>
 
 #include "cast/common/channel/message_util.h"
@@ -14,8 +16,7 @@
 #include "util/json/json_value.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using ::cast::channel::CastMessage;
 
@@ -44,13 +45,13 @@ void VerifyAppAvailabilityRequest(const CastMessage& message,
   ASSERT_TRUE(maybe_value);
   Json::Value& value = maybe_value.value();
 
-  absl::optional<absl::string_view> maybe_type =
+  std::optional<std::string_view> maybe_type =
       MaybeGetString(value, JSON_EXPAND_FIND_CONSTANT_ARGS(kMessageKeyType));
   ASSERT_TRUE(maybe_type);
   EXPECT_EQ(maybe_type.value(),
             CastMessageTypeToString(CastMessageType::kGetAppAvailability));
 
-  absl::optional<int> maybe_id =
+  std::optional<int> maybe_id =
       MaybeGetInt(value, JSON_EXPAND_FIND_CONSTANT_ARGS(kMessageKeyRequestId));
   ASSERT_TRUE(maybe_id);
   *request_id_out = maybe_id.value();
@@ -61,7 +62,7 @@ void VerifyAppAvailabilityRequest(const CastMessage& message,
   ASSERT_TRUE(maybe_app_ids->isArray());
   ASSERT_EQ(maybe_app_ids->size(), 1u);
   Json::Value app_id_value = maybe_app_ids->get(0u, Json::Value(""));
-  absl::optional<absl::string_view> maybe_app_id = MaybeGetString(app_id_value);
+  std::optional<std::string_view> maybe_app_id = MaybeGetString(app_id_value);
   ASSERT_TRUE(maybe_app_id);
   *app_id_out =
       std::string(maybe_app_id.value().begin(), maybe_app_id.value().end());
@@ -85,5 +86,4 @@ CastMessage CreateAppUnavailableResponseChecked(int request_id,
   return std::move(message.value());
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/sender/testing/test_helpers.h b/chromium/third_party/openscreen/src/cast/sender/testing/test_helpers.h
index f61ac066f42..0bd1a10e44f 100644
--- a/chromium/third_party/openscreen/src/cast/sender/testing/test_helpers.h
+++ b/chromium/third_party/openscreen/src/cast/sender/testing/test_helpers.h
@@ -16,8 +16,7 @@ class CastMessage;
 }  // namespace channel
 }  // namespace cast
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 void VerifyAppAvailabilityRequest(const ::cast::channel::CastMessage& message,
                                   const std::string& expected_app_id,
@@ -37,7 +36,6 @@ void VerifyAppAvailabilityRequest(const ::cast::channel::CastMessage& message,
     const std::string& sender_id,
     const std::string& app_id);
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_SENDER_TESTING_TEST_HELPERS_H_
diff --git a/chromium/third_party/openscreen/src/cast/standalone_receiver/avcodec_glue.h b/chromium/third_party/openscreen/src/cast/standalone_receiver/avcodec_glue.h
index 087b923512c..42e4bada8b2 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_receiver/avcodec_glue.h
+++ b/chromium/third_party/openscreen/src/cast/standalone_receiver/avcodec_glue.h
@@ -15,8 +15,7 @@ extern "C" {
 #include <memory>
 #include <utility>
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Macro that, for an AVFoo, generates code for:
 //
@@ -60,7 +59,6 @@ DEFINE_AV_UNIQUE_PTR(AVFrame, av_frame_alloc, av_frame_free(&obj));
 // sender.
 #define _LIBAVUTIL_OLD_CHANNEL_LAYOUT (LIBAVUTIL_VERSION_MAJOR < 57)
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STANDALONE_RECEIVER_AVCODEC_GLUE_H_
diff --git a/chromium/third_party/openscreen/src/cast/standalone_receiver/cast_service.cc b/chromium/third_party/openscreen/src/cast/standalone_receiver/cast_service.cc
index 24cd08d27b3..7c22d1825d5 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_receiver/cast_service.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_receiver/cast_service.cc
@@ -17,8 +17,7 @@
 #include "util/osp_logging.h"
 #include "util/stringprintf.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -108,5 +107,4 @@ void CastService::OnRecoverableError(Error error) {
   OSP_LOG_ERROR << "Encountered recoverable discovery error: " << error;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_receiver/decoder.cc b/chromium/third_party/openscreen/src/cast/standalone_receiver/decoder.cc
index 42fce3ee634..c034e6b22a4 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_receiver/decoder.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_receiver/decoder.cc
@@ -15,8 +15,7 @@
 #include "util/std_util.h"
 #include "util/trace_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 // The av_err2str macro uses a compound literal, which is a C99-only feature.
@@ -241,5 +240,4 @@ void Decoder::OnError(const char* what, int av_errnum, FrameId frame_id) {
   }
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_receiver/decoder.h b/chromium/third_party/openscreen/src/cast/standalone_receiver/decoder.h
index ecec5541fdd..829847f2311 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_receiver/decoder.h
+++ b/chromium/third_party/openscreen/src/cast/standalone_receiver/decoder.h
@@ -14,8 +14,7 @@
 #include "cast/streaming/frame_id.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Wraps libavcodec to decode audio or video.
 class Decoder {
@@ -93,7 +92,6 @@ class Decoder {
   std::vector<FrameId> frames_decoding_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STANDALONE_RECEIVER_DECODER_H_
diff --git a/chromium/third_party/openscreen/src/cast/standalone_receiver/dummy_player.cc b/chromium/third_party/openscreen/src/cast/standalone_receiver/dummy_player.cc
index 8f9d96c6d70..50b77083c09 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_receiver/dummy_player.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_receiver/dummy_player.cc
@@ -12,8 +12,7 @@
 #include "util/chrono_helpers.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using clock_operators::operator<<;
 
@@ -44,5 +43,4 @@ void DummyPlayer::OnFramesReady(int buffer_size) {
                << buffer_size << " bytes";
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_receiver/dummy_player.h b/chromium/third_party/openscreen/src/cast/standalone_receiver/dummy_player.h
index a833a700343..6afc293c871 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_receiver/dummy_player.h
+++ b/chromium/third_party/openscreen/src/cast/standalone_receiver/dummy_player.h
@@ -13,8 +13,7 @@
 #include "platform/api/task_runner.h"
 #include "platform/api/time.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Consumes frames from a Receiver, but does nothing other than OSP_LOG_INFO
 // each one's FrameId, timestamp and size. This is only useful for confirming a
@@ -34,7 +33,6 @@ class DummyPlayer final : public Receiver::Consumer {
   std::vector<uint8_t> buffer_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STANDALONE_RECEIVER_DUMMY_PLAYER_H_
diff --git a/chromium/third_party/openscreen/src/cast/standalone_receiver/main.cc b/chromium/third_party/openscreen/src/cast/standalone_receiver/main.cc
index c27eb779b76..748a80b02c5 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_receiver/main.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_receiver/main.cc
@@ -26,8 +26,7 @@
 #include "util/stringprintf.h"
 #include "util/trace_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 void LogUsage(const char* argv0) {
@@ -230,8 +229,7 @@ int RunStandaloneReceiver(int argc, char* argv[]) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 int main(int argc, char* argv[]) {
   return openscreen::cast::RunStandaloneReceiver(argc, argv);
diff --git a/chromium/third_party/openscreen/src/cast/standalone_receiver/mirroring_application.cc b/chromium/third_party/openscreen/src/cast/standalone_receiver/mirroring_application.cc
index 6f724259d37..845f4be0b33 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_receiver/mirroring_application.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_receiver/mirroring_application.cc
@@ -16,8 +16,7 @@
 #include "platform/api/task_runner.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 const char kMirroringDisplayName[] = "Chrome Mirroring";
 const char kRemotingRpcNamespace[] = "urn:x-cast:com.google.cast.remoting";
@@ -96,5 +95,4 @@ void MirroringApplication::OnPlaybackError(StreamingPlaybackController*,
   agent_->StopApplicationIfRunning(this);  // ApplicationAgent calls Stop().
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_audio_player.cc b/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_audio_player.cc
index 11173a2e08a..faab62ffee6 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_audio_player.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_audio_player.cc
@@ -15,8 +15,7 @@
 #include "util/osp_logging.h"
 #include "util/trace_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -236,5 +235,4 @@ SDL_AudioFormat SDLAudioPlayer::GetSDLAudioFormat(AVSampleFormat format) {
   return kSDLAudioFormatUnknown;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_audio_player.h b/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_audio_player.h
index c6de4ac592e..83bfe444a73 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_audio_player.h
+++ b/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_audio_player.h
@@ -10,8 +10,7 @@
 
 #include "cast/standalone_receiver/sdl_player_base.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Consumes frames from a Receiver, decodes them, and renders them to an
 // internally-owned SDL audio device.
@@ -58,7 +57,6 @@ class SDLAudioPlayer final : public SDLPlayerBase {
   SDL_AudioSpec device_spec_{};
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STANDALONE_RECEIVER_SDL_AUDIO_PLAYER_H_
diff --git a/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_glue.cc b/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_glue.cc
index 5dc172fb7ef..ef622bcc64c 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_glue.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_glue.cc
@@ -10,8 +10,7 @@
 #include "platform/api/time.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 SDLEventLoopProcessor::SDLEventLoopProcessor(
     TaskRunner& task_runner,
@@ -49,5 +48,4 @@ void SDLEventLoopProcessor::ProcessPendingEvents() {
   alarm_.ScheduleFromNow([this] { ProcessPendingEvents(); }, kEventPollPeriod);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_player_base.cc b/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_player_base.cc
index 6d8484d83a9..7cbc2a70f9e 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_player_base.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_player_base.cc
@@ -16,8 +16,7 @@
 #include "util/osp_logging.h"
 #include "util/trace_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 SDLPlayerBase::SDLPlayerBase(ClockNowFunctionPtr now_function,
                              TaskRunner& task_runner,
@@ -251,5 +250,4 @@ SDLPlayerBase::PendingFrame::PendingFrame(PendingFrame&&) noexcept = default;
 SDLPlayerBase::PendingFrame& SDLPlayerBase::PendingFrame::operator=(
     PendingFrame&&) noexcept = default;
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_player_base.h b/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_player_base.h
index d3d2ef74088..855d2eaffad 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_player_base.h
+++ b/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_player_base.h
@@ -19,8 +19,7 @@
 #include "platform/api/time.h"
 #include "platform/base/error.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Common base class that consumes frames from a Receiver, decodes them, and
 // plays them out via the appropriate SDL subsystem. Subclasses implement the
@@ -175,7 +174,6 @@ class SDLPlayerBase : public Receiver::Consumer, public Decoder::Client {
   static constexpr int kMaxFramesInPipeline = 8;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STANDALONE_RECEIVER_SDL_PLAYER_BASE_H_
diff --git a/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_video_player.cc b/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_video_player.cc
index 2cb2ab2ac83..08b0a40dac2 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_video_player.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_video_player.cc
@@ -12,8 +12,7 @@
 #include "util/osp_logging.h"
 #include "util/trace_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 constexpr char kVideoMediaType[] = "video";
@@ -210,5 +209,4 @@ uint32_t SDLVideoPlayer::GetSDLPixelFormat(const AVFrame& picture) {
   return SDL_PIXELFORMAT_UNKNOWN;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_video_player.h b/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_video_player.h
index a53977143fa..f1974b24a40 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_video_player.h
+++ b/chromium/third_party/openscreen/src/cast/standalone_receiver/sdl_video_player.h
@@ -10,8 +10,7 @@
 #include "cast/standalone_receiver/sdl_player_base.h"
 #include "cast/streaming/constants.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Consumes frames from a Receiver, decodes them, and renders them to a
 // SDL_Renderer.
@@ -54,7 +53,6 @@ class SDLVideoPlayer final : public SDLPlayerBase {
   SDLTextureUniquePtr texture_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STANDALONE_RECEIVER_SDL_VIDEO_PLAYER_H_
diff --git a/chromium/third_party/openscreen/src/cast/standalone_receiver/simple_remoting_receiver.cc b/chromium/third_party/openscreen/src/cast/standalone_receiver/simple_remoting_receiver.cc
index 62bfe58b4c4..b615d075b31 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_receiver/simple_remoting_receiver.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_receiver/simple_remoting_receiver.cc
@@ -9,8 +9,7 @@
 #include "cast/streaming/message_fields.h"
 #include "cast/streaming/remoting.pb.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -114,5 +113,4 @@ void SimpleRemotingReceiver::OnInitializeCallbackMessage(
   initialize_cb_ = nullptr;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_receiver/simple_remoting_receiver.h b/chromium/third_party/openscreen/src/cast/standalone_receiver/simple_remoting_receiver.h
index 3ae417ad5b3..912ae653486 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_receiver/simple_remoting_receiver.h
+++ b/chromium/third_party/openscreen/src/cast/standalone_receiver/simple_remoting_receiver.h
@@ -11,8 +11,7 @@
 #include "cast/streaming/constants.h"
 #include "cast/streaming/rpc_messenger.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // This class behaves like a pared-down version of Chrome's DemuxerStreamAdapter
 // (see
@@ -50,7 +49,6 @@ class SimpleRemotingReceiver {
   InitializeCallback initialize_cb_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STANDALONE_RECEIVER_SIMPLE_REMOTING_RECEIVER_H_
diff --git a/chromium/third_party/openscreen/src/cast/standalone_receiver/streaming_playback_controller.cc b/chromium/third_party/openscreen/src/cast/standalone_receiver/streaming_playback_controller.cc
index 9379c9dfd6f..bcdaf2cf09e 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_receiver/streaming_playback_controller.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_receiver/streaming_playback_controller.cc
@@ -16,8 +16,7 @@
 
 #include "util/trace_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 StreamingPlaybackController::Client::~Client() = default;
 
@@ -144,5 +143,4 @@ void StreamingPlaybackController::HandleKeyboardEvent(
 }
 #endif
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_receiver/streaming_playback_controller.h b/chromium/third_party/openscreen/src/cast/standalone_receiver/streaming_playback_controller.h
index 5d14357b211..0ae9c78b78d 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_receiver/streaming_playback_controller.h
+++ b/chromium/third_party/openscreen/src/cast/standalone_receiver/streaming_playback_controller.h
@@ -19,8 +19,7 @@
 #include "cast/standalone_receiver/dummy_player.h"  // nogncheck
 #endif  // defined(CAST_STANDALONE_RECEIVER_HAVE_EXTERNAL_LIBS)
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class StreamingPlaybackController final : public ReceiverSession::Client {
  public:
@@ -81,7 +80,6 @@ class StreamingPlaybackController final : public ReceiverSession::Client {
   std::unique_ptr<SimpleRemotingReceiver> remoting_receiver_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STANDALONE_RECEIVER_STREAMING_PLAYBACK_CONTROLLER_H_
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/connection_settings.h b/chromium/third_party/openscreen/src/cast/standalone_sender/connection_settings.h
index 31aaa2821c5..1043790139a 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/connection_settings.h
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/connection_settings.h
@@ -10,8 +10,7 @@
 #include "cast/streaming/constants.h"
 #include "platform/base/interface_info.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // The connection settings for a given standalone sender instance. These fields
 // are used throughout the standalone sender component to initialize state from
@@ -46,7 +45,6 @@ struct ConnectionSettings {
   VideoCodec codec;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STANDALONE_SENDER_CONNECTION_SETTINGS_H_
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/constants.h b/chromium/third_party/openscreen/src/cast/standalone_sender/constants.h
index 492c738f9e1..574f4ee32a2 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/constants.h
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/constants.h
@@ -7,8 +7,7 @@
 
 #include "util/chrono_helpers.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // How often should the congestion control logic re-evaluate the target encode
 // bitrates?
@@ -27,7 +26,6 @@ constexpr int kDefaultMaxBitrate = 5 << 20;  // 5 Mbps.
 // What is the minimum amount of bandwidth required?
 constexpr int kMinRequiredBitrate = 384 << 10;  // 384 kbps.
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STANDALONE_SENDER_CONSTANTS_H_
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/ffmpeg_glue.cc b/chromium/third_party/openscreen/src/cast/standalone_sender/ffmpeg_glue.cc
index 6698b946b8c..95fb3a72a5c 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/ffmpeg_glue.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/ffmpeg_glue.cc
@@ -9,8 +9,7 @@
 #include "util/osp_logging.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace internal {
 
 AVFormatContext* CreateAVFormatContextForFile(const char* path) {
@@ -45,5 +44,4 @@ std::string AvErrorToString(int error_num) {
   return out;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/ffmpeg_glue.h b/chromium/third_party/openscreen/src/cast/standalone_sender/ffmpeg_glue.h
index cf731ec168d..d8f25b202c7 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/ffmpeg_glue.h
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/ffmpeg_glue.h
@@ -21,8 +21,7 @@ extern "C" {
 #include <string>
 #include <utility>
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace internal {
 
@@ -78,7 +77,6 @@ std::string AvErrorToString(int error_num);
 // them).
 #define _LIBAVUTIL_OLD_CHANNEL_LAYOUT (LIBAVUTIL_VERSION_MAJOR < 57)
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STANDALONE_SENDER_FFMPEG_GLUE_H_
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/looping_file_cast_agent.cc b/chromium/third_party/openscreen/src/cast/standalone_sender/looping_file_cast_agent.cc
index ac282a5b7b5..521d6af2b3b 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/looping_file_cast_agent.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/looping_file_cast_agent.cc
@@ -4,6 +4,7 @@
 
 #include "cast/standalone_sender/looping_file_cast_agent.h"
 
+#include <optional>
 #include <string>
 #include <utility>
 #include <vector>
@@ -20,8 +21,7 @@
 #include "util/stringprintf.h"
 #include "util/trace_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 using DeviceMediaPolicy = SenderSocketFactory::DeviceMediaPolicy;
@@ -352,7 +352,7 @@ void LoopingFileCastAgent::OnStatisticsUpdated(
   if ((num_times_on_statistics_updated_called_++ % kLoggingInterval) == 0) {
     OSP_VLOG << __func__ << ": updated_stats=" << updated_stats.ToString();
   }
-  last_reported_statistics_ = absl::make_optional<SenderStats>(updated_stats);
+  last_reported_statistics_ = std::make_optional<SenderStats>(updated_stats);
 }
 
 void LoopingFileCastAgent::OnReady() {
@@ -383,15 +383,15 @@ void LoopingFileCastAgent::Shutdown() {
   if (current_session_) {
     OSP_LOG_INFO << "Stopping mirroring session...";
     current_session_.reset();
+
+    if (last_reported_statistics_) {
+      OSP_LOG_INFO << "Last reported statistics="
+                   << last_reported_statistics_->ToString();
+    }
   }
   OSP_DCHECK(message_port_.source_id().empty());
   environment_.reset();
 
-  if (last_reported_statistics_) {
-    OSP_LOG_INFO << "Last reported statistics="
-                 << last_reported_statistics_->ToString();
-  }
-
   if (platform_remote_connection_) {
     const VirtualConnection connection = *platform_remote_connection_;
     // Reset |platform_remote_connection_| because ConnectionNamespaceHandler
@@ -434,5 +434,4 @@ void LoopingFileCastAgent::Shutdown() {
   }
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/looping_file_cast_agent.h b/chromium/third_party/openscreen/src/cast/standalone_sender/looping_file_cast_agent.h
index d47e50200a1..7f6dc106493 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/looping_file_cast_agent.h
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/looping_file_cast_agent.h
@@ -7,10 +7,10 @@
 
 #include <functional>
 #include <memory>
+#include <optional>
 #include <string>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "cast/common/channel/cast_message_handler.h"
 #include "cast/common/channel/cast_socket_message_port.h"
 #include "cast/common/channel/connection_namespace_handler.h"
@@ -34,8 +34,7 @@ namespace Json {
 class Value;
 }
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // A single-use sender-side Cast Agent that manages the workflow for a mirroring
 // session, casting the content from a local file indefinitely. After being
@@ -169,7 +168,7 @@ class LoopingFileCastAgent final
   int next_request_id_ = 1;
 
   // Initialized by Connect().
-  absl::optional<ConnectionSettings> connection_settings_;
+  std::optional<ConnectionSettings> connection_settings_;
   SerialDeletePtr<ScopedWakeLock> wake_lock_;
 
   // If non-empty, this is the sessionId associated with the Cast Receiver
@@ -178,8 +177,8 @@ class LoopingFileCastAgent final
 
   // This is set once LoopingFileCastAgent has requested to start messaging to
   // the mirroring app on a Cast Receiver.
-  absl::optional<VirtualConnection> remote_connection_;
-  absl::optional<VirtualConnection> platform_remote_connection_;
+  std::optional<VirtualConnection> remote_connection_;
+  std::optional<VirtualConnection> platform_remote_connection_;
 
   CastMode cast_mode_ = CastMode::kMirroring;
 
@@ -208,10 +207,9 @@ class LoopingFileCastAgent final
   int num_times_on_statistics_updated_called_ = 0;
 
   // Last reported statistics, logged as part of shutdown.
-  absl::optional<SenderStats> last_reported_statistics_;
+  std::optional<SenderStats> last_reported_statistics_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STANDALONE_SENDER_LOOPING_FILE_CAST_AGENT_H_
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/looping_file_sender.cc b/chromium/third_party/openscreen/src/cast/standalone_sender/looping_file_sender.cc
index bac8d8caba9..20036486a75 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/looping_file_sender.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/looping_file_sender.cc
@@ -14,8 +14,7 @@
 #include "util/osp_logging.h"
 #include "util/trace_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 LoopingFileSender::LoopingFileSender(Environment* environment,
                                      ConnectionSettings settings,
@@ -242,5 +241,4 @@ std::unique_ptr<StreamingVideoEncoder> LoopingFileSender::CreateVideoEncoder(
   }
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/looping_file_sender.h b/chromium/third_party/openscreen/src/cast/standalone_sender/looping_file_sender.h
index a1666a37777..984431ae030 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/looping_file_sender.h
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/looping_file_sender.h
@@ -7,6 +7,7 @@
 
 #include <algorithm>
 #include <memory>
+#include <optional>
 #include <string>
 
 #include "cast/standalone_sender/connection_settings.h"
@@ -16,8 +17,7 @@
 #include "cast/standalone_sender/streaming_video_encoder.h"
 #include "cast/streaming/sender_session.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Plays the media file at a given path over and over again, transcoding and
 // streaming its audio/video.
@@ -90,14 +90,13 @@ class LoopingFileSender final : public SimulatedAudioCapturer::Client,
   int num_capturers_running_ = 0;
   Clock::time_point capture_begin_time_{};
   Clock::time_point latest_frame_time_{};
-  absl::optional<SimulatedAudioCapturer> audio_capturer_;
-  absl::optional<SimulatedVideoCapturer> video_capturer_;
+  std::optional<SimulatedAudioCapturer> audio_capturer_;
+  std::optional<SimulatedVideoCapturer> video_capturer_;
 
   Alarm next_task_;
   Alarm console_update_task_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STANDALONE_SENDER_LOOPING_FILE_SENDER_H_
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/main.cc b/chromium/third_party/openscreen/src/cast/standalone_sender/main.cc
index cc9c1507610..bb045cac416 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/main.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/main.cc
@@ -30,8 +30,7 @@
 #include "util/chrono_helpers.h"
 #include "util/stringprintf.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 void LogUsage(const char* argv0) {
@@ -279,8 +278,7 @@ int StandaloneSenderMain(int argc, char* argv[]) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 #endif
 
 int main(int argc, char* argv[]) {
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/receiver_chooser.cc b/chromium/third_party/openscreen/src/cast/standalone_sender/receiver_chooser.cc
index b6ed0e22db7..7dbabfa068c 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/receiver_chooser.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/receiver_chooser.cc
@@ -13,8 +13,7 @@
 #include "platform/api/time.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // NOTE: the compile requires a definition as well as the declaration
 // in the header.
@@ -123,5 +122,4 @@ void ReceiverChooser::PrintMenuAndHandleChoice() {
   std::getline(std::cin, garbage);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/receiver_chooser.h b/chromium/third_party/openscreen/src/cast/standalone_sender/receiver_chooser.h
index b732f22a621..dff579a745a 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/receiver_chooser.h
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/receiver_chooser.h
@@ -20,8 +20,7 @@
 #include "util/alarm.h"
 #include "util/chrono_helpers.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Discovers Cast Receivers on the LAN for a given network interface, and
 // provides a console menu interface for the user to choose one.
@@ -61,7 +60,6 @@ class ReceiverChooser final : public discovery::ReportingClient {
   static constexpr auto kWaitForStragglersDelay = seconds(5);
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STANDALONE_SENDER_RECEIVER_CHOOSER_H_
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/remoting_sender.cc b/chromium/third_party/openscreen/src/cast/standalone_sender/remoting_sender.cc
index ed0b9c57121..684a11aa92c 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/remoting_sender.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/remoting_sender.cc
@@ -8,8 +8,7 @@
 
 #include "cast/streaming/message_fields.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -109,5 +108,4 @@ void RemotingSender::OnPlaybackRateMessage(const RpcMessage& message) {
   client_->OnPlaybackRateChange(message.double_value());
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/remoting_sender.h b/chromium/third_party/openscreen/src/cast/standalone_sender/remoting_sender.h
index 1d53f108700..a24982fdae8 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/remoting_sender.h
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/remoting_sender.h
@@ -10,8 +10,7 @@
 #include "cast/streaming/constants.h"
 #include "cast/streaming/rpc_messenger.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // This class behaves like a pared-down version of Chrome's StreamProvider (see
 // https://source.chromium.org/chromium/chromium/src/+/main:media/remoting/stream_provider.h
@@ -69,7 +68,6 @@ class RemotingSender {
   RpcMessenger::Handle receiver_handle_ = RpcMessenger::kInvalidHandle;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STANDALONE_SENDER_REMOTING_SENDER_H_
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/simulated_capturer.cc b/chromium/third_party/openscreen/src/cast/standalone_sender/simulated_capturer.cc
index d88a49121c3..91dc75bb0a4 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/simulated_capturer.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/simulated_capturer.cc
@@ -16,8 +16,7 @@
 #include "cast/streaming/environment.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using clock_operators::operator<<;
 
@@ -105,7 +104,7 @@ void SimulatedCapturer::SetPlaybackRate(double rate) {
 void SimulatedCapturer::SetAdditionalDecoderParameters(
     AVCodecContext* decoder_context) {}
 
-absl::optional<Clock::duration> SimulatedCapturer::ProcessDecodedFrame(
+std::optional<Clock::duration> SimulatedCapturer::ProcessDecodedFrame(
     const AVFrame& frame) {
   return Clock::duration::zero();
 }
@@ -329,10 +328,10 @@ bool SimulatedAudioCapturer::EnsureResamplerIsInitializedFor(
   return true;
 }
 
-absl::optional<Clock::duration> SimulatedAudioCapturer::ProcessDecodedFrame(
+std::optional<Clock::duration> SimulatedAudioCapturer::ProcessDecodedFrame(
     const AVFrame& frame) {
   if (!EnsureResamplerIsInitializedFor(frame)) {
-    return absl::nullopt;
+    return std::nullopt;
   }
 
   const int64_t num_leftover_input_samples =
@@ -355,7 +354,7 @@ absl::optional<Clock::duration> SimulatedAudioCapturer::ProcessDecodedFrame(
     resampled_audio_.clear();
     swr_close(resampler_.get());
     OnError("swr_convert", num_samples_converted_or_error);
-    return absl::nullopt;  // Capturer is now halted.
+    return std::nullopt;  // Capturer is now halted.
   }
   resampled_audio_.resize(num_channels_ * num_samples_converted_or_error);
 
@@ -418,5 +417,4 @@ void SimulatedVideoCapturer::DeliverDataToClient(
                         reference_time);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/simulated_capturer.h b/chromium/third_party/openscreen/src/cast/standalone_sender/simulated_capturer.h
index 1d5228a3b99..eaf223b0680 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/simulated_capturer.h
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/simulated_capturer.h
@@ -7,16 +7,15 @@
 
 #include <stdint.h>
 
+#include <optional>
 #include <string>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "cast/standalone_sender/ffmpeg_glue.h"
 #include "platform/api/time.h"
 #include "util/alarm.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class Environment;
 
@@ -57,13 +56,13 @@ class SimulatedCapturer {
 
   // Performs any additional processing on the decoded frame (e.g., audio
   // resampling), and returns any adjustments to the frame's capture time (e.g.,
-  // to account for any buffering). If a fatal error occurs, absl::nullopt is
+  // to account for any buffering). If a fatal error occurs, std::nullopt is
   // returned. The default implementation does nothing.
   //
   // Mutating the `decoded_frame` is not allowed. If a subclass implementation
   // wants to deliver different data (e.g., resampled audio), it must stash the
   // data itself for the next DeliverDataToClient() call.
-  virtual absl::optional<Clock::duration> ProcessDecodedFrame(
+  virtual std::optional<Clock::duration> ProcessDecodedFrame(
       const AVFrame& decoded_frame);
 
   // Delivers the decoded frame data to the client.
@@ -106,7 +105,7 @@ class SimulatedCapturer {
 
   // The last frame's stream timestamp. This is used to detect bad stream
   // timestamps in the file.
-  absl::optional<Clock::duration> last_frame_timestamp_;
+  std::optional<Clock::duration> last_frame_timestamp_;
 
   // Used to schedule the next task to execute and when it should execute. There
   // is only ever one task scheduled/running at any time.
@@ -157,7 +156,7 @@ class SimulatedAudioCapturer final : public SimulatedCapturer {
   // Resamples the current `SimulatedCapturer::decoded_frame()` into the
   // required output format/channels/rate. The result is stored in
   // `resampled_audio_` for the next DeliverDataToClient() call.
-  absl::optional<Clock::duration> ProcessDecodedFrame(
+  std::optional<Clock::duration> ProcessDecodedFrame(
       const AVFrame& decoded_frame) final;
 
   // Called at the moment Client::OnAudioData() should be called to pass the
@@ -224,7 +223,6 @@ class SimulatedVideoCapturer final : public SimulatedCapturer {
                            Clock::time_point reference_time) final;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STANDALONE_SENDER_SIMULATED_CAPTURER_H_
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_av1_encoder.cc b/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_av1_encoder.cc
index 5b1dbb33bb7..4f6273cfdf9 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_av1_encoder.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_av1_encoder.cc
@@ -18,8 +18,7 @@
 #include "util/osp_logging.h"
 #include "util/saturate_cast.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using clock_operators::operator<<;
 
@@ -424,5 +423,4 @@ StreamingAv1Encoder::Av1ImageUniquePtr StreamingAv1Encoder::CloneAsAv1Image(
   return image;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_encoder_util.cc b/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_encoder_util.cc
index 83c5a064b70..eb7e192307a 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_encoder_util.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_encoder_util.cc
@@ -8,8 +8,7 @@
 
 #include <algorithm>
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 void CopyPlane(const uint8_t* src,
                int src_stride,
                int num_rows,
@@ -26,5 +25,4 @@ void CopyPlane(const uint8_t* src,
     src += src_stride;
   }
 }
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_encoder_util.h b/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_encoder_util.h
index b89d704b687..f2ccbc2814c 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_encoder_util.h
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_encoder_util.h
@@ -7,14 +7,12 @@
 
 #include <stdint.h>
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 void CopyPlane(const uint8_t* src,
                int src_stride,
                int num_rows,
                uint8_t* dst,
                int dst_stride);
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STANDALONE_SENDER_STREAMING_ENCODER_UTIL_H_
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_opus_encoder.cc b/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_opus_encoder.cc
index 58d1724f5f7..54be7f6e4f9 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_opus_encoder.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_opus_encoder.cc
@@ -13,8 +13,7 @@
 #include "platform/base/span.h"
 #include "util/chrono_helpers.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using clock_operators::operator<<;
 
@@ -225,5 +224,4 @@ constexpr int StreamingOpusEncoder::kDefaultCastAudioFramesPerSecond;
 // static
 constexpr int StreamingOpusEncoder::kOpusMaxPayloadSize;
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_opus_encoder.h b/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_opus_encoder.h
index 742ca10728a..5934c702a51 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_opus_encoder.h
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_opus_encoder.h
@@ -17,8 +17,7 @@ extern "C" {
 struct OpusEncoder;
 }
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Wraps the libopus encoder so that the application can stream
 // interleaved-floats audio samples to a Sender. Either mono or stereo sound is
@@ -119,7 +118,6 @@ class StreamingOpusEncoder {
   static constexpr int kOpusMaxPayloadSize = 4000;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STANDALONE_SENDER_STREAMING_OPUS_ENCODER_H_
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_video_encoder.cc b/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_video_encoder.cc
index 334ad968432..1461f4b9f59 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_video_encoder.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_video_encoder.cc
@@ -8,8 +8,7 @@
 
 #include "util/chrono_helpers.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 StreamingVideoEncoder::StreamingVideoEncoder(const Parameters& params,
                                              TaskRunner& task_runner,
@@ -56,5 +55,4 @@ void StreamingVideoEncoder::UpdateSpeedSettingForNextFrame(const Stats& stats) {
   OSP_DCHECK(std::isfinite(ideal_speed_setting_));
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_vpx_encoder.cc b/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_vpx_encoder.cc
index 30de6a6d27c..52b95e860ad 100644
--- a/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_vpx_encoder.cc
+++ b/chromium/third_party/openscreen/src/cast/standalone_sender/streaming_vpx_encoder.cc
@@ -19,8 +19,7 @@
 #include "util/osp_logging.h"
 #include "util/saturate_cast.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using clock_operators::operator<<;
 
@@ -446,5 +445,4 @@ StreamingVpxEncoder::VpxImageUniquePtr StreamingVpxEncoder::CloneAsVpxImage(
   return image;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/BUILD.gn b/chromium/third_party/openscreen/src/cast/streaming/BUILD.gn
index 6674b19e7ef..595ee5bea84 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/BUILD.gn
+++ b/chromium/third_party/openscreen/src/cast/streaming/BUILD.gn
@@ -267,6 +267,7 @@ source_set("unittests") {
     "ssrc_unittest.cc",
     "statistics_analyzer_unittest.cc",
     "statistics_collector_unittest.cc",
+    "statistics_unittest.cc",
   ]
 
   deps = [
diff --git a/chromium/third_party/openscreen/src/cast/streaming/answer_messages.cc b/chromium/third_party/openscreen/src/cast/streaming/answer_messages.cc
index dc602a70266..dfbb82aab26 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/answer_messages.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/answer_messages.cc
@@ -4,6 +4,7 @@
 
 #include "cast/streaming/answer_messages.h"
 
+#include <string_view>
 #include <utility>
 
 #include "absl/strings/str_cat.h"
@@ -13,8 +14,7 @@
 #include "util/enum_name_table.h"
 #include "util/json/json_helpers.h"
 #include "util/osp_logging.h"
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -97,7 +97,7 @@ static constexpr char kSsrcs[] = "ssrcs";
 static constexpr char kConstraints[] = "constraints";
 // Provides details about the display on the receiver.
 static constexpr char kDisplay[] = "display";
-// absl::optional array of numbers specifying the indexes of streams that will
+// std::optional array of numbers specifying the indexes of streams that will
 // send event logs through RTCP.
 static constexpr char kReceiverRtcpEventLog[] = "receiverRtcpEventLog";
 // OPtional array of numbers specifying the indexes of streams that will use
@@ -133,7 +133,7 @@ bool TryParseAspectRatioConstraint(const Json::Value& value,
 }
 
 template <typename T>
-bool ParseOptional(const Json::Value& value, absl::optional<T>* out) {
+bool ParseOptional(const Json::Value& value, std::optional<T>* out) {
   // It's fine if the value is empty.
   if (!value) {
     return true;
@@ -155,7 +155,7 @@ bool AspectRatio::TryParse(const Json::Value& value, AspectRatio* out) {
     return false;
   }
 
-  std::vector<absl::string_view> fields =
+  std::vector<std::string_view> fields =
       absl::StrSplit(parsed_value, kAspectRatioDelimiter);
   if (fields.size() != 2) {
     return false;
@@ -297,9 +297,9 @@ bool DisplayDescription::TryParse(const Json::Value& root,
   AspectRatioConstraint constraint;
   if (TryParseAspectRatioConstraint(root[kScaling], &constraint)) {
     out->aspect_ratio_constraint =
-        absl::optional<AspectRatioConstraint>(std::move(constraint));
+        std::optional<AspectRatioConstraint>(std::move(constraint));
   } else {
-    out->aspect_ratio_constraint = absl::nullopt;
+    out->aspect_ratio_constraint = std::nullopt;
   }
 
   return out->IsValid();
@@ -411,5 +411,4 @@ Json::Value Answer::ToJson() const {
   return root;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/answer_messages.h b/chromium/third_party/openscreen/src/cast/streaming/answer_messages.h
index 74cf1f3be3b..315787c93c1 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/answer_messages.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/answer_messages.h
@@ -10,19 +10,18 @@
 #include <cstdint>
 #include <initializer_list>
 #include <memory>
+#include <optional>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "cast/streaming/resolution.h"
 #include "cast/streaming/ssrc.h"
 #include "json/value.h"
 #include "platform/base/error.h"
 #include "util/simple_fraction.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // For each of the below classes, though a number of methods are shared, the use
 // of a shared base class has intentionally been avoided. This is to improve
@@ -44,7 +43,7 @@ struct AudioConstraints {
   int max_channels = 0;
   int min_bit_rate = 0;  // optional
   int max_bit_rate = 0;
-  absl::optional<std::chrono::milliseconds> max_delay = {};
+  std::optional<std::chrono::milliseconds> max_delay = {};
 };
 
 struct VideoConstraints {
@@ -52,12 +51,12 @@ struct VideoConstraints {
   Json::Value ToJson() const;
   bool IsValid() const;
 
-  absl::optional<double> max_pixels_per_second = {};
-  absl::optional<Dimensions> min_resolution = {};
+  std::optional<double> max_pixels_per_second = {};
+  std::optional<Dimensions> min_resolution = {};
   Dimensions max_dimensions = {};
   int min_bit_rate = 0;  // optional
   int max_bit_rate = 0;
-  absl::optional<std::chrono::milliseconds> max_delay = {};
+  std::optional<std::chrono::milliseconds> max_delay = {};
 };
 
 struct Constraints {
@@ -93,9 +92,9 @@ struct DisplayDescription {
 
   // May exceed, be the same, or less than those mentioned in the
   // video constraints.
-  absl::optional<Dimensions> dimensions;
-  absl::optional<AspectRatio> aspect_ratio = {};
-  absl::optional<AspectRatioConstraint> aspect_ratio_constraint = {};
+  std::optional<Dimensions> dimensions;
+  std::optional<AspectRatio> aspect_ratio = {};
+  std::optional<AspectRatioConstraint> aspect_ratio_constraint = {};
 };
 
 struct Answer {
@@ -109,8 +108,8 @@ struct Answer {
 
   // Constraints and display descriptions are optional fields, and maybe null in
   // the valid case.
-  absl::optional<Constraints> constraints;
-  absl::optional<DisplayDescription> display;
+  std::optional<Constraints> constraints;
+  std::optional<DisplayDescription> display;
   std::vector<int> receiver_rtcp_event_log;
   std::vector<int> receiver_rtcp_dscp;
 
@@ -118,7 +117,6 @@ struct Answer {
   std::vector<std::string> rtp_extensions = {};
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_ANSWER_MESSAGES_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/answer_messages_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/answer_messages_unittest.cc
index 6232f9a1b63..bb304d19627 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/answer_messages_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/answer_messages_unittest.cc
@@ -5,6 +5,7 @@
 #include "cast/streaming/answer_messages.h"
 
 #include <chrono>
+#include <string_view>
 #include <utility>
 
 #include "gmock/gmock.h"
@@ -12,8 +13,7 @@
 #include "util/chrono_helpers.h"
 #include "util/json/json_serialization.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -70,7 +70,7 @@ const Answer kValidAnswer{
     1234,                         // udp_port
     std::vector<int>{1, 2, 3},    // send_indexes
     std::vector<Ssrc>{123, 456},  // ssrcs
-    absl::optional<Constraints>(Constraints{
+    std::optional<Constraints>(Constraints{
         AudioConstraints{
             96000,              // max_sample_rate
             7,                  // max_channels
@@ -80,7 +80,7 @@ const Answer kValidAnswer{
         },                      // audio
         VideoConstraints{
             40000.0,  // max_pixels_per_second
-            absl::optional<Dimensions>(
+            std::optional<Dimensions>(
                 Dimensions{320, 480, SimpleFraction{15000, 101}}),
             Dimensions{1920, 1080, SimpleFraction{288, 2}},
             300000,             // min_bit_rate
@@ -88,10 +88,10 @@ const Answer kValidAnswer{
             milliseconds(3000)  // max_delay
         }                       // video
     }),                         // constraints
-    absl::optional<DisplayDescription>(DisplayDescription{
-        absl::optional<Dimensions>(Dimensions{640, 480, SimpleFraction{30, 1}}),
-        absl::optional<AspectRatio>(AspectRatio{16, 9}),  // aspect_ratio
-        absl::optional<AspectRatioConstraint>(
+    std::optional<DisplayDescription>(DisplayDescription{
+        std::optional<Dimensions>(Dimensions{640, 480, SimpleFraction{30, 1}}),
+        std::optional<AspectRatio>(AspectRatio{16, 9}),  // aspect_ratio
+        std::optional<AspectRatioConstraint>(
             AspectRatioConstraint::kFixed),  // scaling
     }),
     std::vector<int>{7, 8, 9},              // receiver_rtcp_event_log
@@ -102,7 +102,7 @@ const Answer kValidAnswer{
 constexpr int kValidMaxPixelsPerSecond = 1920 * 1080 * 30;
 constexpr Dimensions kValidDimensions{1920, 1080, SimpleFraction{60, 1}};
 static const VideoConstraints kValidVideoConstraints{
-    kValidMaxPixelsPerSecond, absl::optional<Dimensions>(kValidDimensions),
+    kValidMaxPixelsPerSecond, std::optional<Dimensions>(kValidDimensions),
     kValidDimensions,         300 * 1000,
     300 * 1000 * 1000,        milliseconds(3000)};
 
@@ -150,7 +150,7 @@ void ExpectEqualsValidAnswerJson(const Answer& answer) {
   EXPECT_THAT(answer.rtp_extensions, ElementsAre("adaptive_playout_delay"));
 }
 
-void ExpectFailureOnParse(absl::string_view raw_json) {
+void ExpectFailureOnParse(std::string_view raw_json) {
   ErrorOr<Json::Value> root = json::Parse(raw_json);
   // Must be a valid JSON object, but not a valid answer.
   ASSERT_TRUE(root.is_value());
@@ -162,7 +162,7 @@ void ExpectFailureOnParse(absl::string_view raw_json) {
 
 // Functions that use ASSERT_* must return void, so we use an out parameter
 // here instead of returning.
-void ExpectSuccessOnParse(absl::string_view raw_json, Answer* out = nullptr) {
+void ExpectSuccessOnParse(std::string_view raw_json, Answer* out = nullptr) {
   ErrorOr<Json::Value> root = json::Parse(raw_json);
   // Must be a valid JSON object, but not a valid answer.
   ASSERT_TRUE(root.is_value());
@@ -575,34 +575,33 @@ TEST(AnswerMessagesTest, DisplayDescriptionTryParse) {
 
 TEST(AnswerMessagesTest, DisplayDescriptionIsValid) {
   const DisplayDescription kInvalidEmptyDescription{
-      absl::optional<Dimensions>{}, absl::optional<AspectRatio>{},
-      absl::optional<AspectRatioConstraint>{}};
+      std::optional<Dimensions>{}, std::optional<AspectRatio>{},
+      std::optional<AspectRatioConstraint>{}};
 
   DisplayDescription has_valid_dimensions = kInvalidEmptyDescription;
-  has_valid_dimensions.dimensions =
-      absl::optional<Dimensions>(kValidDimensions);
+  has_valid_dimensions.dimensions = std::optional<Dimensions>(kValidDimensions);
 
   DisplayDescription has_invalid_dimensions = kInvalidEmptyDescription;
   has_invalid_dimensions.dimensions =
-      absl::optional<Dimensions>(kValidDimensions);
+      std::optional<Dimensions>(kValidDimensions);
   has_invalid_dimensions.dimensions->width = 0;
 
   DisplayDescription has_aspect_ratio = kInvalidEmptyDescription;
   has_aspect_ratio.aspect_ratio =
-      absl::optional<AspectRatio>{AspectRatio{16, 9}};
+      std::optional<AspectRatio>{AspectRatio{16, 9}};
 
   DisplayDescription has_invalid_aspect_ratio = kInvalidEmptyDescription;
   has_invalid_aspect_ratio.aspect_ratio =
-      absl::optional<AspectRatio>{AspectRatio{0, 20}};
+      std::optional<AspectRatio>{AspectRatio{0, 20}};
 
   DisplayDescription has_aspect_ratio_constraint = kInvalidEmptyDescription;
   has_aspect_ratio_constraint.aspect_ratio_constraint =
-      absl::optional<AspectRatioConstraint>(AspectRatioConstraint::kFixed);
+      std::optional<AspectRatioConstraint>(AspectRatioConstraint::kFixed);
 
   DisplayDescription has_constraint_and_dimensions =
       has_aspect_ratio_constraint;
   has_constraint_and_dimensions.dimensions =
-      absl::optional<Dimensions>(kValidDimensions);
+      std::optional<Dimensions>(kValidDimensions);
 
   DisplayDescription has_constraint_and_ratio = has_aspect_ratio_constraint;
   has_constraint_and_ratio.aspect_ratio = AspectRatio{4, 3};
@@ -619,5 +618,4 @@ TEST(AnswerMessagesTest, DisplayDescriptionIsValid) {
 // Instead of being tested here, Answer's IsValid is checked in all other
 // relevant tests.
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/bandwidth_estimator.cc b/chromium/third_party/openscreen/src/cast/streaming/bandwidth_estimator.cc
index a8b8f95d9da..59663e0112b 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/bandwidth_estimator.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/bandwidth_estimator.cc
@@ -9,8 +9,7 @@
 #include "util/osp_logging.h"
 #include "util/saturate_cast.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using clock_operators::operator<<;
 
@@ -152,5 +151,4 @@ int32_t BandwidthEstimator::FlowTracker::Sum() const {
   return saturate_cast<int32_t>(result);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/bandwidth_estimator.h b/chromium/third_party/openscreen/src/cast/streaming/bandwidth_estimator.h
index 975d1534978..09064991334 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/bandwidth_estimator.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/bandwidth_estimator.h
@@ -11,8 +11,7 @@
 
 #include "platform/api/time.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Tracks send attempts and successful receives, and then computes a total
 // network bandwith estimate.
@@ -164,7 +163,6 @@ class BandwidthEstimator {
   FlowTracker feedback_history_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_BANDWIDTH_ESTIMATOR_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/bandwidth_estimator_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/bandwidth_estimator_unittest.cc
index a5db992cd4f..5ec7a1589eb 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/bandwidth_estimator_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/bandwidth_estimator_unittest.cc
@@ -13,8 +13,7 @@
 #include "platform/api/time.h"
 #include "util/chrono_helpers.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 using clock_operators::operator<<;
@@ -228,5 +227,4 @@ TEST_F(BandwidthEstimatorTest, ClampsEstimateToMaxInt) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/capture_configs.h b/chromium/third_party/openscreen/src/cast/streaming/capture_configs.h
index c103af3d910..7913e0b8e70 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/capture_configs.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/capture_configs.h
@@ -12,8 +12,7 @@
 #include "cast/streaming/resolution.h"
 #include "util/simple_fraction.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // A configuration set that can be used by the sender to capture audio, and the
 // receiver to playback audio. Used by Cast Streaming to provide an offer to the
@@ -77,7 +76,6 @@ struct VideoCaptureConfig {
   std::string codec_parameter;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_CAPTURE_CONFIGS_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/capture_recommendations.cc b/chromium/third_party/openscreen/src/cast/streaming/capture_recommendations.cc
index cdc6843e4be..41e644caa0e 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/capture_recommendations.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/capture_recommendations.cc
@@ -10,8 +10,7 @@
 #include "cast/streaming/answer_messages.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace capture_recommendations {
 namespace {
 
@@ -139,5 +138,4 @@ Recommendations GetRecommendations(const Answer& answer) {
 }
 
 }  // namespace capture_recommendations
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/capture_recommendations.h b/chromium/third_party/openscreen/src/cast/streaming/capture_recommendations.h
index 2aaeb7a2cee..2c60a1b9ca6 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/capture_recommendations.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/capture_recommendations.h
@@ -12,8 +12,7 @@
 
 #include "cast/streaming/constants.h"
 #include "cast/streaming/resolution.h"
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 struct Answer;
 
@@ -145,7 +144,6 @@ struct Recommendations {
 Recommendations GetRecommendations(const Answer& answer);
 
 }  // namespace capture_recommendations
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_CAPTURE_RECOMMENDATIONS_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/capture_recommendations_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/capture_recommendations_unittest.cc
index b79f8cf36f9..ef43698f726 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/capture_recommendations_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/capture_recommendations_unittest.cc
@@ -4,15 +4,15 @@
 
 #include "cast/streaming/capture_recommendations.h"
 
-#include "absl/types/optional.h"
+#include <optional>
+
 #include "cast/streaming/answer_messages.h"
 #include "cast/streaming/resolution.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "util/chrono_helpers.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace capture_recommendations {
 namespace {
 
@@ -25,28 +25,28 @@ const Recommendations kDefaultRecommendations{
 const DisplayDescription kEmptyDescription{};
 
 const DisplayDescription kValidOnlyResolution{
-    Dimensions{1024, 768, SimpleFraction{60, 1}}, absl::nullopt, absl::nullopt};
+    Dimensions{1024, 768, SimpleFraction{60, 1}}, std::nullopt, std::nullopt};
 
-const DisplayDescription kValidOnlyAspectRatio{absl::nullopt, AspectRatio{4, 3},
-                                               absl::nullopt};
+const DisplayDescription kValidOnlyAspectRatio{std::nullopt, AspectRatio{4, 3},
+                                               std::nullopt};
 
 const DisplayDescription kValidOnlyAspectRatioSixteenNine{
-    absl::nullopt, AspectRatio{16, 9}, absl::nullopt};
+    std::nullopt, AspectRatio{16, 9}, std::nullopt};
 
-const DisplayDescription kValidOnlyVariable{absl::nullopt, absl::nullopt,
+const DisplayDescription kValidOnlyVariable{std::nullopt, std::nullopt,
                                             AspectRatioConstraint::kVariable};
 
-const DisplayDescription kInvalidOnlyFixed{absl::nullopt, absl::nullopt,
+const DisplayDescription kInvalidOnlyFixed{std::nullopt, std::nullopt,
                                            AspectRatioConstraint::kFixed};
 
-const DisplayDescription kValidFixedAspectRatio{
-    absl::nullopt, AspectRatio{4, 3}, AspectRatioConstraint::kFixed};
+const DisplayDescription kValidFixedAspectRatio{std::nullopt, AspectRatio{4, 3},
+                                                AspectRatioConstraint::kFixed};
 
 const DisplayDescription kValidVariableAspectRatio{
-    absl::nullopt, AspectRatio{4, 3}, AspectRatioConstraint::kVariable};
+    std::nullopt, AspectRatio{4, 3}, AspectRatioConstraint::kVariable};
 
 const DisplayDescription kValidFixedMissingAspectRatio{
-    Dimensions{1024, 768, SimpleFraction{60, 1}}, absl::nullopt,
+    Dimensions{1024, 768, SimpleFraction{60, 1}}, std::nullopt,
     AspectRatioConstraint::kFixed};
 
 const DisplayDescription kValidDisplayFhd{
@@ -285,5 +285,4 @@ TEST(CaptureRecommendationsTest, UsesIntersectionOfDisplayAndConstraints) {
 }
 
 }  // namespace capture_recommendations
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/clock_drift_smoother.cc b/chromium/third_party/openscreen/src/cast/streaming/clock_drift_smoother.cc
index d6fbbb9af8d..1f955e08e36 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/clock_drift_smoother.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/clock_drift_smoother.cc
@@ -10,8 +10,7 @@
 #include "util/osp_logging.h"
 #include "util/saturate_cast.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 constexpr Clock::time_point kNullTime = Clock::time_point::min();
@@ -78,5 +77,4 @@ void ClockDriftSmoother::Update(Clock::time_point now,
 // static
 constexpr std::chrono::seconds ClockDriftSmoother::kDefaultTimeConstant;
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/clock_drift_smoother.h b/chromium/third_party/openscreen/src/cast/streaming/clock_drift_smoother.h
index 2f3d4ec83b0..1a56d7de1d9 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/clock_drift_smoother.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/clock_drift_smoother.h
@@ -9,8 +9,7 @@
 
 #include "platform/api/time.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Tracks the jitter and drift between clocks, providing a smoothed offset.
 // Internally, a Simple IIR filter is used to maintain a running average that
@@ -52,7 +51,6 @@ class ClockDriftSmoother {
   double estimated_tick_offset_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_CLOCK_DRIFT_SMOOTHER_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/clock_offset_estimator.h b/chromium/third_party/openscreen/src/cast/streaming/clock_offset_estimator.h
index 839b2f9dcf9..48354dfdd76 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/clock_offset_estimator.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/clock_offset_estimator.h
@@ -6,14 +6,13 @@
 #define CAST_STREAMING_CLOCK_OFFSET_ESTIMATOR_H_
 
 #include <memory>
+#include <optional>
 
-#include "absl/types/optional.h"
 #include "cast/streaming/statistics.h"
 #include "cast/streaming/statistics_defines.h"
 #include "platform/base/trivial_clock_traits.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Used to estimate the offset between the Sender and Receiver clocks.
 class ClockOffsetEstimator {
@@ -29,10 +28,9 @@ class ClockOffsetEstimator {
   virtual void OnPacketEvent(const PacketEvent& packet_event) = 0;
 
   // Returns nullopt if not enough data is in yet to produce an estimate.
-  virtual absl::optional<Clock::duration> GetEstimatedOffset() const = 0;
+  virtual std::optional<Clock::duration> GetEstimatedOffset() const = 0;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_CLOCK_OFFSET_ESTIMATOR_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/clock_offset_estimator_impl.cc b/chromium/third_party/openscreen/src/cast/streaming/clock_offset_estimator_impl.cc
index 136aabf7401..0ebeceae7ad 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/clock_offset_estimator_impl.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/clock_offset_estimator_impl.cc
@@ -10,8 +10,7 @@
 
 #include "platform/base/trivial_clock_traits.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 // The lower this is, the faster we adjust to clock drift (but with more
@@ -55,13 +54,13 @@ ClockOffsetEstimatorImpl::~ClockOffsetEstimatorImpl() = default;
 void ClockOffsetEstimatorImpl::OnFrameEvent(const FrameEvent& frame_event) {
   switch (frame_event.type) {
     case StatisticsEventType::kFrameAckSent:
-      lower_bound_.SetSent(
+      frame_bound_.SetSent(
           frame_event.rtp_timestamp, 0,
           frame_event.media_type == StatisticsEventMediaType::kAudio,
           frame_event.timestamp);
       break;
     case StatisticsEventType::kFrameAckReceived:
-      lower_bound_.SetReceived(
+      frame_bound_.SetReceived(
           frame_event.rtp_timestamp, 0,
           frame_event.media_type == StatisticsEventMediaType::kAudio,
           frame_event.timestamp);
@@ -75,13 +74,13 @@ void ClockOffsetEstimatorImpl::OnFrameEvent(const FrameEvent& frame_event) {
 void ClockOffsetEstimatorImpl::OnPacketEvent(const PacketEvent& packet_event) {
   switch (packet_event.type) {
     case StatisticsEventType::kPacketSentToNetwork:
-      upper_bound_.SetSent(
+      packet_bound_.SetSent(
           packet_event.rtp_timestamp, packet_event.packet_id,
           packet_event.media_type == StatisticsEventMediaType::kAudio,
           packet_event.timestamp);
       break;
     case StatisticsEventType::kPacketReceived:
-      upper_bound_.SetReceived(
+      packet_bound_.SetReceived(
           packet_event.rtp_timestamp, packet_event.packet_id,
           packet_event.media_type == StatisticsEventMediaType::kAudio,
           packet_event.timestamp);
@@ -93,32 +92,26 @@ void ClockOffsetEstimatorImpl::OnPacketEvent(const PacketEvent& packet_event) {
 }
 
 bool ClockOffsetEstimatorImpl::GetReceiverOffsetBounds(
-    Clock::duration& lower_bound,
-    Clock::duration& upper_bound) const {
-  if (!lower_bound_.has_bound() || !upper_bound_.has_bound()) {
+    Clock::duration& frame_bound,
+    Clock::duration& packet_bound) const {
+  if (!frame_bound_.has_bound() || !packet_bound_.has_bound()) {
     return false;
   }
 
-  lower_bound = -lower_bound_.bound();
-  upper_bound = upper_bound_.bound();
+  frame_bound = -frame_bound_.bound();
+  packet_bound = packet_bound_.bound();
 
-  // Sanitize the output, we don't want the upper bound to be
-  // lower than the lower bound, make them the same.
-  if (upper_bound < lower_bound) {
-    lower_bound += (lower_bound - upper_bound) / 2;
-    upper_bound = lower_bound;
-  }
   return true;
 }
 
-absl::optional<Clock::duration> ClockOffsetEstimatorImpl::GetEstimatedOffset()
+std::optional<Clock::duration> ClockOffsetEstimatorImpl::GetEstimatedOffset()
     const {
-  Clock::duration lower_bound;
-  Clock::duration upper_bound;
-  if (!GetReceiverOffsetBounds(lower_bound, upper_bound)) {
+  Clock::duration frame_bound;
+  Clock::duration packet_bound;
+  if (!GetReceiverOffsetBounds(frame_bound, packet_bound)) {
     return {};
   }
-  return (upper_bound + lower_bound) / 2;
+  return (packet_bound + frame_bound) / 2;
 }
 
 ClockOffsetEstimatorImpl::BoundCalculator::BoundCalculator() = default;
@@ -179,5 +172,4 @@ void ClockOffsetEstimatorImpl::BoundCalculator::CheckUpdate(uint64_t key) {
   }
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/clock_offset_estimator_impl.h b/chromium/third_party/openscreen/src/cast/streaming/clock_offset_estimator_impl.h
index d7e5dfb4b62..d21f33ea986 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/clock_offset_estimator_impl.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/clock_offset_estimator_impl.h
@@ -9,16 +9,15 @@
 #include <stdint.h>
 
 #include <map>
+#include <optional>
 #include <utility>
 
-#include "absl/types/optional.h"
 #include "cast/streaming/clock_offset_estimator.h"
 #include "cast/streaming/rtp_time.h"
 #include "cast/streaming/statistics_defines.h"
 #include "platform/base/trivial_clock_traits.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // This implementation listens to two pairs of events:
 //     1. FrameAckSent / FrameAckReceived (receiver->sender)
@@ -39,11 +38,12 @@ class ClockOffsetEstimatorImpl final : public ClockOffsetEstimator {
   void OnFrameEvent(const FrameEvent& frame_event) final;
   void OnPacketEvent(const PacketEvent& packet_event) final;
 
-  bool GetReceiverOffsetBounds(Clock::duration& lower_bound,
-                               Clock::duration& upper_bound) const;
+  bool GetReceiverOffsetBounds(Clock::duration& frame_bound,
+                               Clock::duration& packet_bound) const;
 
+  // Returns the average of the offset bounds for frame and packet events.
   // Returns nullopt if not enough data is in yet to produce an estimate.
-  absl::optional<Clock::duration> GetEstimatedOffset() const final;
+  std::optional<Clock::duration> GetEstimatedOffset() const final;
 
  private:
   // This helper uses the difference between sent and received event
@@ -56,8 +56,8 @@ class ClockOffsetEstimatorImpl final : public ClockOffsetEstimator {
   // relationship.
   class BoundCalculator {
    public:
-    typedef std::pair<absl::optional<Clock::time_point>,
-                      absl::optional<Clock::time_point>>
+    typedef std::pair<std::optional<Clock::time_point>,
+                      std::optional<Clock::time_point>>
         TimeTickPair;
     typedef std::map<uint64_t, TimeTickPair> EventMap;
 
@@ -90,12 +90,11 @@ class ClockOffsetEstimatorImpl final : public ClockOffsetEstimator {
     Clock::duration bound_{};
   };
 
-  // Fixed size storage to store event times for recent frames.
-  BoundCalculator upper_bound_;
-  BoundCalculator lower_bound_;
+  // Fixed size storage to store event times for recent frames and packets.
+  BoundCalculator packet_bound_;
+  BoundCalculator frame_bound_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_CLOCK_OFFSET_ESTIMATOR_IMPL_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/clock_offset_estimator_impl_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/clock_offset_estimator_impl_unittest.cc
index 1a3c449dae0..b7821124f13 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/clock_offset_estimator_impl_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/clock_offset_estimator_impl_unittest.cc
@@ -14,8 +14,7 @@
 #include "platform/test/fake_clock.h"
 #include "util/chrono_helpers.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class ClockOffsetEstimatorImplTest : public ::testing::Test {
  public:
@@ -44,10 +43,10 @@ TEST_F(ClockOffsetEstimatorImplTest, EstimateOffset) {
   const milliseconds kTrueOffset(100);
   receiver_clock_.Advance(kTrueOffset);
 
-  Clock::duration lower_bound;
-  Clock::duration upper_bound;
+  Clock::duration frame_bound;
+  Clock::duration packet_bound;
 
-  EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(lower_bound, upper_bound));
+  EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(frame_bound, packet_bound));
 
   const RtpTimeTicks rtp_timestamp;
   FrameId frame_id = FrameId::first();
@@ -76,7 +75,7 @@ TEST_F(ClockOffsetEstimatorImplTest, EstimateOffset) {
   send_event.size = 1500;
   estimator_.OnPacketEvent(send_event);
 
-  EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(lower_bound, upper_bound));
+  EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(frame_bound, packet_bound));
 
   AdvanceClocks(milliseconds(10));
   FrameEvent ack_sent_event;
@@ -98,7 +97,7 @@ TEST_F(ClockOffsetEstimatorImplTest, EstimateOffset) {
   receive_event.size = 1500;
   estimator_.OnPacketEvent(receive_event);
 
-  EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(lower_bound, upper_bound));
+  EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(frame_bound, packet_bound));
 
   AdvanceClocks(milliseconds(30));
   FrameEvent ack_event;
@@ -109,12 +108,12 @@ TEST_F(ClockOffsetEstimatorImplTest, EstimateOffset) {
   ack_event.frame_id = frame_id;
   estimator_.OnFrameEvent(ack_event);
 
-  EXPECT_TRUE(estimator_.GetReceiverOffsetBounds(lower_bound, upper_bound));
+  EXPECT_TRUE(estimator_.GetReceiverOffsetBounds(frame_bound, packet_bound));
 
-  EXPECT_EQ(milliseconds(70), to_milliseconds(lower_bound));
-  EXPECT_EQ(milliseconds(110), to_milliseconds(upper_bound));
-  EXPECT_GE(kTrueOffset, lower_bound);
-  EXPECT_LE(kTrueOffset, upper_bound);
+  EXPECT_EQ(milliseconds(70), to_milliseconds(frame_bound));
+  EXPECT_EQ(milliseconds(110), to_milliseconds(packet_bound));
+  EXPECT_GE(kTrueOffset, frame_bound);
+  EXPECT_LE(kTrueOffset, packet_bound);
 }
 
 // Same scenario as above, but event C arrives before event B. It doesn't mean
@@ -123,10 +122,10 @@ TEST_F(ClockOffsetEstimatorImplTest, EventCArrivesBeforeEventB) {
   constexpr milliseconds kTrueOffset(100);
   receiver_clock_.Advance(kTrueOffset);
 
-  Clock::duration lower_bound;
-  Clock::duration upper_bound;
+  Clock::duration frame_bound;
+  Clock::duration packet_bound;
 
-  EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(lower_bound, upper_bound));
+  EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(frame_bound, packet_bound));
 
   const RtpTimeTicks rtp_timestamp;
   FrameId frame_id = FrameId::first();
@@ -155,7 +154,7 @@ TEST_F(ClockOffsetEstimatorImplTest, EventCArrivesBeforeEventB) {
   send_event.size = 1500;
   estimator_.OnPacketEvent(send_event);
 
-  EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(lower_bound, upper_bound));
+  EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(frame_bound, packet_bound));
 
   AdvanceClocks(milliseconds(10));
   Clock::time_point event_b_time = receiver_clock_.now();
@@ -170,7 +169,7 @@ TEST_F(ClockOffsetEstimatorImplTest, EventCArrivesBeforeEventB) {
   ack_event.frame_id = frame_id;
   estimator_.OnFrameEvent(ack_event);
 
-  EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(lower_bound, upper_bound));
+  EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(frame_bound, packet_bound));
 
   PacketEvent receive_event;
   receive_event.timestamp = event_b_time;
@@ -191,23 +190,23 @@ TEST_F(ClockOffsetEstimatorImplTest, EventCArrivesBeforeEventB) {
   ack_sent_event.frame_id = frame_id;
   estimator_.OnFrameEvent(ack_sent_event);
 
-  EXPECT_TRUE(estimator_.GetReceiverOffsetBounds(lower_bound, upper_bound));
+  EXPECT_TRUE(estimator_.GetReceiverOffsetBounds(frame_bound, packet_bound));
 
   // Note: although the bounds are measured in microseconds, we round here to
   // the nearest millisecond to avoid comparison inaccuracies due to floating
   // point representation.
-  EXPECT_EQ(milliseconds(70), to_milliseconds(lower_bound));
-  EXPECT_EQ(milliseconds(110), to_milliseconds(upper_bound));
-  EXPECT_GE(kTrueOffset, lower_bound);
-  EXPECT_LE(kTrueOffset, upper_bound);
+  EXPECT_EQ(milliseconds(70), to_milliseconds(frame_bound));
+  EXPECT_EQ(milliseconds(110), to_milliseconds(packet_bound));
+  EXPECT_GE(kTrueOffset, frame_bound);
+  EXPECT_LE(kTrueOffset, packet_bound);
 }
 
 TEST_F(ClockOffsetEstimatorImplTest, MultipleIterations) {
   constexpr milliseconds kTrueOffset(100);
   receiver_clock_.Advance(milliseconds(kTrueOffset));
 
-  Clock::duration lower_bound;
-  Clock::duration upper_bound;
+  Clock::duration frame_bound;
+  Clock::duration packet_bound;
 
   const RtpTimeTicks rtp_timestamp_a;
   FrameId frame_id_a = FrameId::first();
@@ -368,12 +367,11 @@ TEST_F(ClockOffsetEstimatorImplTest, MultipleIterations) {
   third_ack_event.frame_id = frame_id_c;
   estimator_.OnFrameEvent(third_ack_event);
 
-  EXPECT_TRUE(estimator_.GetReceiverOffsetBounds(lower_bound, upper_bound));
-  EXPECT_GT(lower_bound, milliseconds(90));
-  EXPECT_LE(lower_bound, kTrueOffset);
-  EXPECT_LT(upper_bound, milliseconds(150));
-  EXPECT_GT(upper_bound, kTrueOffset);
+  EXPECT_TRUE(estimator_.GetReceiverOffsetBounds(frame_bound, packet_bound));
+  EXPECT_GT(frame_bound, milliseconds(90));
+  EXPECT_LE(frame_bound, kTrueOffset);
+  EXPECT_LT(packet_bound, milliseconds(150));
+  EXPECT_GT(packet_bound, kTrueOffset);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_builder.cc b/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_builder.cc
index 99d9a7b49fd..76cf833fd62 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_builder.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_builder.cc
@@ -15,8 +15,7 @@
 #include "util/osp_logging.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 CompoundRtcpBuilder::CompoundRtcpBuilder(RtcpSession* session)
     : session_(session) {
@@ -128,7 +127,7 @@ void CompoundRtcpBuilder::AppendReceiverReportPacket(ByteBuffer& buffer) {
   AppendField<uint32_t>(session_->receiver_ssrc(), buffer);
   if (receiver_report_for_next_packet_) {
     receiver_report_for_next_packet_->AppendFields(buffer);
-    receiver_report_for_next_packet_ = absl::nullopt;
+    receiver_report_for_next_packet_ = std::nullopt;
   }
 }
 
@@ -319,5 +318,4 @@ void CompoundRtcpBuilder::AppendCastFeedbackAckFields(ByteBuffer& buffer) {
   acks_for_next_packet_.clear();
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_builder.h b/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_builder.h
index 28a1d2b58c7..29d9adcc484 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_builder.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_builder.h
@@ -6,18 +6,17 @@
 #define CAST_STREAMING_COMPOUND_RTCP_BUILDER_H_
 
 #include <chrono>
+#include <optional>
 #include <utility>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "cast/streaming/constants.h"
 #include "cast/streaming/frame_id.h"
 #include "cast/streaming/rtcp_common.h"
 #include "cast/streaming/rtp_defines.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class RtcpSession;
 
@@ -121,7 +120,7 @@ class CompoundRtcpBuilder {
   // Data to include in the next built RTCP packet.
   FrameId checkpoint_frame_id_ = FrameId::leader();
   std::chrono::milliseconds playout_delay_ = kDefaultTargetPlayoutDelay;
-  absl::optional<RtcpReportBlock> receiver_report_for_next_packet_;
+  std::optional<RtcpReportBlock> receiver_report_for_next_packet_;
   std::vector<PacketNack> nacks_for_next_packet_;
   std::vector<FrameId> acks_for_next_packet_;
   bool picture_loss_indicator_ = false;
@@ -131,7 +130,6 @@ class CompoundRtcpBuilder {
   uint8_t feedback_count_ = 0;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_COMPOUND_RTCP_BUILDER_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_builder_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_builder_unittest.cc
index c04c150637a..ef99bf840c9 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_builder_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_builder_unittest.cc
@@ -22,8 +22,7 @@ using testing::Mock;
 using testing::SaveArg;
 using testing::StrictMock;
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 constexpr Ssrc kSenderSsrc{1};
@@ -368,5 +367,4 @@ TEST_F(CompoundRtcpBuilderTest, WithEverythingThatCanFit) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_parser.cc b/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_parser.cc
index 39f4f10b830..70142facdce 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_parser.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_parser.cc
@@ -13,8 +13,7 @@
 #include "util/osp_logging.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -133,7 +132,7 @@ bool CompoundRtcpParser::Parse(ByteView buffer, FrameId max_feedback_frame_id) {
   // the results will be dispatched to the Client until the entire parse
   // succeeds.
   Clock::time_point receiver_reference_time = kNullTimePoint;
-  absl::optional<RtcpReportBlock> receiver_report;
+  std::optional<RtcpReportBlock> receiver_report;
   std::vector<RtcpReceiverFrameLogMessage> log_messages;
   FrameId checkpoint_frame_id;
   milliseconds target_playout_delay{};
@@ -251,7 +250,7 @@ bool CompoundRtcpParser::Parse(ByteView buffer, FrameId max_feedback_frame_id) {
 bool CompoundRtcpParser::ParseReceiverReport(
     ByteView in,
     int num_report_blocks,
-    absl::optional<RtcpReportBlock>& receiver_report) {
+    std::optional<RtcpReportBlock>& receiver_report) {
   if (in.size() < kRtcpReceiverReportSize) {
     return false;
   }
@@ -510,5 +509,4 @@ void CompoundRtcpParser::Client::OnReceiverHasFrames(
 void CompoundRtcpParser::Client::OnReceiverIsMissingPackets(
     std::vector<PacketNack> nacks) {}
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_parser.h b/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_parser.h
index 034b86a052d..1c16e472239 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_parser.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_parser.h
@@ -6,16 +6,15 @@
 #define CAST_STREAMING_COMPOUND_RTCP_PARSER_H_
 
 #include <chrono>
+#include <optional>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "cast/streaming/frame_id.h"
 #include "cast/streaming/rtcp_common.h"
 #include "cast/streaming/rtp_defines.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class RtcpSession;
 
@@ -100,7 +99,7 @@ class CompoundRtcpParser {
   // input contained the relevant field(s).
   bool ParseReceiverReport(ByteView in,
                            int num_report_blocks,
-                           absl::optional<RtcpReportBlock>& receiver_report);
+                           std::optional<RtcpReportBlock>& receiver_report);
   bool ParseApplicationDefined(
       RtcpSubtype subtype,
       ByteView in,
@@ -130,7 +129,6 @@ class CompoundRtcpParser {
   RtpTimeTicks latest_frame_log_rtp_timestamp_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_COMPOUND_RTCP_PARSER_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_parser_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_parser_unittest.cc
index 46dcb158056..afe6c5d621d 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_parser_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/compound_rtcp_parser_unittest.cc
@@ -21,8 +21,7 @@ using testing::Mock;
 using testing::SaveArg;
 using testing::StrictMock;
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 constexpr Ssrc kSenderSsrc{1};
@@ -565,5 +564,4 @@ TEST_F(CompoundRtcpParserTest, ParsesFeedbackWithAcks) {
   Mock::VerifyAndClearExpectations(client());
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/constants.h b/chromium/third_party/openscreen/src/cast/streaming/constants.h
index 76aab9219c0..ce1a736ae17 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/constants.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/constants.h
@@ -14,8 +14,7 @@
 #include <chrono>
 #include <ratio>
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Default target playout delay. The playout delay is the window of time between
 // capture from the source until presentation at the receiver.
@@ -110,7 +109,6 @@ enum class StreamType { kUnknown, kAudio, kVideo };
 
 enum class CastMode : uint8_t { kMirroring, kRemoting };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_CONSTANTS_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/encoded_frame.cc b/chromium/third_party/openscreen/src/cast/streaming/encoded_frame.cc
index c9ce53dd15b..9ea2243ae45 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/encoded_frame.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/encoded_frame.cc
@@ -4,8 +4,7 @@
 
 #include "cast/streaming/encoded_frame.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 EncodedFrame::EncodedFrame(Dependency dependency,
                            FrameId frame_id,
@@ -58,5 +57,4 @@ void EncodedFrame::CopyMetadataTo(EncodedFrame* dest) const {
   dest->capture_end_time = this->capture_end_time;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/encoded_frame.h b/chromium/third_party/openscreen/src/cast/streaming/encoded_frame.h
index ca0103fc737..fa0eb3ff03a 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/encoded_frame.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/encoded_frame.h
@@ -16,8 +16,7 @@
 #include "platform/base/macros.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // A combination of metadata and data for one encoded frame.  This can contain
 // audio data or video data or other.
@@ -117,7 +116,6 @@ struct EncodedFrame {
   OSP_DISALLOW_COPY_AND_ASSIGN(EncodedFrame);
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_ENCODED_FRAME_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/environment.cc b/chromium/third_party/openscreen/src/cast/streaming/environment.cc
index 33666ced5e8..13a677eba38 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/environment.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/environment.cc
@@ -11,8 +11,7 @@
 #include "platform/api/task_runner.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 Environment::PacketConsumer::~PacketConsumer() = default;
 
@@ -162,5 +161,4 @@ void Environment::OnRead(UdpSocket* socket,
       std::move(static_cast<std::vector<uint8_t>&>(packet)));
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/environment.h b/chromium/third_party/openscreen/src/cast/streaming/environment.h
index 850f9a284c1..ae666db5e0e 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/environment.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/environment.h
@@ -17,8 +17,7 @@
 #include "platform/base/ip_address.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Provides the common environment for operating system resources shared by
 // multiple components.
@@ -153,7 +152,6 @@ class Environment : public UdpSocket::Client {
   StatisticsCollector* statistics_collector_ = nullptr;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_ENVIRONMENT_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/expanded_value_base.h b/chromium/third_party/openscreen/src/cast/streaming/expanded_value_base.h
index 1cd98b9326f..0e9fccc3ddc 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/expanded_value_base.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/expanded_value_base.h
@@ -11,8 +11,7 @@
 
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Abstract base template class for common "sequence value" data types such as
 // RtpTimeTicks, FrameId, or PacketId which generally increment/decrement in
@@ -170,7 +169,6 @@ class ExpandedValueBase {
   FullWidthInteger value_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_EXPANDED_VALUE_BASE_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/expanded_value_base_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/expanded_value_base_unittest.cc
index 33202593083..24d5441d74d 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/expanded_value_base_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/expanded_value_base_unittest.cc
@@ -6,8 +6,7 @@
 
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -104,5 +103,4 @@ TEST(ExpandedValueBaseTest, TruncationAndExpansion) {
   }
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/frame_collector.cc b/chromium/third_party/openscreen/src/cast/streaming/frame_collector.cc
index 6d384e4b040..4061e2e8b32 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/frame_collector.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/frame_collector.cc
@@ -13,8 +13,7 @@
 #include "platform/base/span.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -157,5 +156,4 @@ void FrameCollector::Reset() {
 FrameCollector::PayloadChunk::PayloadChunk() = default;
 FrameCollector::PayloadChunk::~PayloadChunk() = default;
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/frame_collector.h b/chromium/third_party/openscreen/src/cast/streaming/frame_collector.h
index 352822f2c67..52a7b1ce0f1 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/frame_collector.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/frame_collector.h
@@ -13,8 +13,7 @@
 #include "cast/streaming/rtp_packet_parser.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Used by a Receiver to collect the parts of a frame, track what is
 // missing/complete, and assemble a complete frame.
@@ -84,7 +83,6 @@ class FrameCollector {
   std::vector<PayloadChunk> chunks_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_FRAME_COLLECTOR_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/frame_collector_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/frame_collector_unittest.cc
index 941efd7a862..64243a687f9 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/frame_collector_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/frame_collector_unittest.cc
@@ -18,8 +18,7 @@
 
 using testing::ElementsAreArray;
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 const FrameId kSomeFrameId = FrameId::first() + 39;
@@ -210,5 +209,4 @@ TEST(FrameCollectorTest, RejectsInvalidParts) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/frame_crypto.cc b/chromium/third_party/openscreen/src/cast/streaming/frame_crypto.cc
index 69787a75b5d..ea5139c41d8 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/frame_crypto.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/frame_crypto.cc
@@ -16,8 +16,7 @@
 #include "util/crypto/random_bytes.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 EncryptedFrame::EncryptedFrame() {
   data = owned_data_;
@@ -100,5 +99,4 @@ void FrameCrypto::EncryptCommon(FrameId frame_id,
                      aes_nonce.data(), ecount_buf.data(), &block_offset);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/frame_crypto.h b/chromium/third_party/openscreen/src/cast/streaming/frame_crypto.h
index 6a3bd63f5cb..d16f0aaefd4 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/frame_crypto.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/frame_crypto.h
@@ -16,8 +16,7 @@
 #include "platform/base/macros.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class FrameCollector;
 class FrameCrypto;
@@ -84,7 +83,6 @@ class FrameCrypto {
   void EncryptCommon(FrameId frame_id, ByteView in, ByteBuffer out) const;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_FRAME_CRYPTO_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/frame_crypto_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/frame_crypto_unittest.cc
index f56133bdc54..ca50bbb2a30 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/frame_crypto_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/frame_crypto_unittest.cc
@@ -13,8 +13,7 @@
 #include "platform/test/byte_view_test_util.h"
 #include "util/crypto/random_bytes.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 TEST(FrameCryptoTest, EncryptsAndDecryptsFrames) {
@@ -73,5 +72,4 @@ TEST(FrameCryptoTest, EncryptsAndDecryptsFrames) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/frame_id.cc b/chromium/third_party/openscreen/src/cast/streaming/frame_id.cc
index 700f58e3c28..3f0442703d0 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/frame_id.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/frame_id.cc
@@ -4,8 +4,7 @@
 
 #include "cast/streaming/frame_id.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 std::ostream& operator<<(std::ostream& out, const FrameId rhs) {
   return out << rhs.ToString();
@@ -18,5 +17,4 @@ std::string FrameId::ToString() const {
   return "F" + std::to_string(value());
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/frame_id.h b/chromium/third_party/openscreen/src/cast/streaming/frame_id.h
index a80233ea432..1187ca909a2 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/frame_id.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/frame_id.h
@@ -13,8 +13,7 @@
 
 #include "cast/streaming/expanded_value_base.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Forward declaration (see below).
 class FrameId;
@@ -117,7 +116,6 @@ class FrameId : public ExpandedValueBase<int64_t, FrameId> {
   friend std::ostream& operator<<(std::ostream& out, const FrameId rhs);
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_FRAME_ID_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/message_fields.cc b/chromium/third_party/openscreen/src/cast/streaming/message_fields.cc
index cb81d1b3f83..4602a69fde7 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/message_fields.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/message_fields.cc
@@ -10,8 +10,7 @@
 #include "util/enum_name_table.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 constexpr EnumNameTable<AudioCodec, 3> kAudioCodecNames{
@@ -33,7 +32,7 @@ const char* CodecToString(AudioCodec codec) {
   return GetEnumName(kAudioCodecNames, codec).value();
 }
 
-ErrorOr<AudioCodec> StringToAudioCodec(absl::string_view name) {
+ErrorOr<AudioCodec> StringToAudioCodec(std::string_view name) {
   return GetEnum(kAudioCodecNames, name);
 }
 
@@ -41,9 +40,8 @@ const char* CodecToString(VideoCodec codec) {
   return GetEnumName(kVideoCodecNames, codec).value();
 }
 
-ErrorOr<VideoCodec> StringToVideoCodec(absl::string_view name) {
+ErrorOr<VideoCodec> StringToVideoCodec(std::string_view name) {
   return GetEnum(kVideoCodecNames, name);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/message_fields.h b/chromium/third_party/openscreen/src/cast/streaming/message_fields.h
index e2cebe6ad87..d2ac8ed8c86 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/message_fields.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/message_fields.h
@@ -6,13 +6,12 @@
 #define CAST_STREAMING_MESSAGE_FIELDS_H_
 
 #include <string>
+#include <string_view>
 
-#include "absl/strings/string_view.h"
 #include "cast/streaming/constants.h"
 #include "platform/base/error.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 /// NOTE: Constants here are all taken from the Cast V2: Mirroring Control
 /// Protocol specification.
@@ -47,12 +46,11 @@ constexpr char kStatusMessageBody[] = "status";
 
 // Conversion methods for codec message fields.
 const char* CodecToString(AudioCodec codec);
-ErrorOr<AudioCodec> StringToAudioCodec(absl::string_view name);
+ErrorOr<AudioCodec> StringToAudioCodec(std::string_view name);
 
 const char* CodecToString(VideoCodec codec);
-ErrorOr<VideoCodec> StringToVideoCodec(absl::string_view name);
+ErrorOr<VideoCodec> StringToVideoCodec(std::string_view name);
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_MESSAGE_FIELDS_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/message_fields_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/message_fields_unittest.cc
index bca36ad37b2..8ff4b5fce2f 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/message_fields_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/message_fields_unittest.cc
@@ -10,8 +10,7 @@
 
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 // NOTE: We don't do an exhaustive check of all values here, to avoid
@@ -32,5 +31,4 @@ TEST(MessageFieldsTest, Identity) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/mock_compound_rtcp_parser_client.h b/chromium/third_party/openscreen/src/cast/streaming/mock_compound_rtcp_parser_client.h
index f863ff232ae..a191b115d9c 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/mock_compound_rtcp_parser_client.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/mock_compound_rtcp_parser_client.h
@@ -10,8 +10,7 @@
 #include "cast/streaming/compound_rtcp_parser.h"
 #include "gmock/gmock.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class MockCompoundRtcpParserClient : public CompoundRtcpParser::Client {
  public:
@@ -42,7 +41,6 @@ class MockCompoundRtcpParserClient : public CompoundRtcpParser::Client {
               (override));
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_MOCK_COMPOUND_RTCP_PARSER_CLIENT_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/mock_environment.cc b/chromium/third_party/openscreen/src/cast/streaming/mock_environment.cc
index f7c801bc580..790f8ef7514 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/mock_environment.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/mock_environment.cc
@@ -4,8 +4,7 @@
 
 #include "cast/streaming/mock_environment.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 MockEnvironment::MockEnvironment(ClockNowFunctionPtr now_function,
                                  TaskRunner& task_runner)
@@ -13,5 +12,4 @@ MockEnvironment::MockEnvironment(ClockNowFunctionPtr now_function,
 
 MockEnvironment::~MockEnvironment() = default;
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/mock_environment.h b/chromium/third_party/openscreen/src/cast/streaming/mock_environment.h
index 880731c2bd5..f4fa62a8083 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/mock_environment.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/mock_environment.h
@@ -8,8 +8,7 @@
 #include "cast/streaming/environment.h"
 #include "gmock/gmock.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // An Environment that can intercept all packet sends, for unit testing.
 class MockEnvironment : public Environment {
@@ -27,7 +26,6 @@ class MockEnvironment : public Environment {
               (override));
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_MOCK_ENVIRONMENT_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/ntp_time.cc b/chromium/third_party/openscreen/src/cast/streaming/ntp_time.cc
index 5583c0955b5..c8b4b541634 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/ntp_time.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/ntp_time.cc
@@ -6,8 +6,7 @@
 
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -52,5 +51,4 @@ Clock::time_point NtpTimeConverter::ToLocalTime(NtpTimestamp timestamp) const {
   return seconds_since_start + remainder;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/ntp_time.h b/chromium/third_party/openscreen/src/cast/streaming/ntp_time.h
index 77af94a6028..99b53fbea65 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/ntp_time.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/ntp_time.h
@@ -9,8 +9,7 @@
 
 #include "platform/api/time.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // NTP timestamps are 64-bit timestamps that consist of two 32-bit parts: 1) The
 // number of seconds since 1 January 1900; and 2) The fraction of the second,
@@ -69,7 +68,6 @@ class NtpTimeConverter {
   const NtpSeconds since_ntp_epoch_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_NTP_TIME_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/ntp_time_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/ntp_time_unittest.cc
index 6be6aa1d226..17e3bb7578b 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/ntp_time_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/ntp_time_unittest.cc
@@ -9,8 +9,7 @@
 #include "gtest/gtest.h"
 #include "util/chrono_helpers.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 TEST(NtpTimestampTest, SplitsIntoParts) {
   // 1 Jan 1900.
@@ -103,5 +102,4 @@ TEST(NtpTimeConverterTest, ConvertsToNtpTimeAndBack) {
   }
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/offer_messages.cc b/chromium/third_party/openscreen/src/cast/streaming/offer_messages.cc
index 7f9e87cb5eb..d1d8bbb5038 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/offer_messages.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/offer_messages.cc
@@ -9,6 +9,7 @@
 #include <algorithm>
 #include <limits>
 #include <string>
+#include <string_view>
 #include <utility>
 
 #include "absl/strings/match.h"
@@ -23,8 +24,7 @@
 #include "util/osp_logging.h"
 #include "util/stringprintf.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -137,7 +137,7 @@ bool TryParseAesHexBytes(const Json::Value& value,
   return false;
 }
 
-absl::string_view ToString(Stream::Type type) {
+std::string_view ToString(Stream::Type type) {
   switch (type) {
     case Stream::Type::kAudioSource:
       return kAudioSourceType;
@@ -436,5 +436,4 @@ bool Offer::IsValid() const {
          std::all_of(video_streams.begin(), video_streams.end(),
                      [](const VideoStream& v) { return v.IsValid(); });
 }
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/offer_messages.h b/chromium/third_party/openscreen/src/cast/streaming/offer_messages.h
index 3323cf4da7f..f8da828e326 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/offer_messages.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/offer_messages.h
@@ -9,8 +9,6 @@
 #include <string>
 #include <vector>
 
-#include "absl/strings/string_view.h"
-#include "absl/types/optional.h"
 #include "cast/streaming/message_fields.h"
 #include "cast/streaming/resolution.h"
 #include "cast/streaming/rtp_defines.h"
@@ -21,8 +19,7 @@
 
 // This file contains the implementation of the Cast V2 Mirroring Control
 // Protocol offer object definition.
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // If the target delay provided by the sender is not bounded by
 // [kMinTargetDelay, kMaxTargetDelay], it will be set to
@@ -111,7 +108,6 @@ struct Offer {
   std::vector<VideoStream> video_streams;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_OFFER_MESSAGES_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/offer_messages_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/offer_messages_unittest.cc
index 4ebf68bf02a..0b6203b4d1d 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/offer_messages_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/offer_messages_unittest.cc
@@ -5,6 +5,8 @@
 #include "cast/streaming/offer_messages.h"
 
 #include <limits>
+#include <optional>
+#include <string_view>
 #include <utility>
 
 #include "cast/streaming/rtp_defines.h"
@@ -14,8 +16,7 @@
 
 using ::testing::ElementsAre;
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -101,9 +102,8 @@ constexpr char kValidOffer[] = R"({
   ]
 })";
 
-void ExpectFailureOnParse(
-    absl::string_view body,
-    absl::optional<Error::Code> expected = absl::nullopt) {
+void ExpectFailureOnParse(std::string_view body,
+                          std::optional<Error::Code> expected = std::nullopt) {
   ErrorOr<Json::Value> root = json::Parse(body);
   ASSERT_TRUE(root.is_value()) << root.error();
 
@@ -707,5 +707,4 @@ TEST(OfferTest, FailsIfUnencrypted) {
                        Error::Code::kUnencryptedOffer);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/packet_receive_stats_tracker.cc b/chromium/third_party/openscreen/src/cast/streaming/packet_receive_stats_tracker.cc
index fd4d674bc6b..5700196422b 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/packet_receive_stats_tracker.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/packet_receive_stats_tracker.cc
@@ -6,8 +6,7 @@
 
 #include <algorithm>
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 PacketReceiveStatsTracker::PacketReceiveStatsTracker(int rtp_timebase)
     : rtp_timebase_(rtp_timebase) {}
@@ -75,5 +74,4 @@ void PacketReceiveStatsTracker::PopulateNextReport(RtcpReportBlock* report) {
   report->jitter = RtpTimeDelta::FromDuration(jitter_, rtp_timebase_);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/packet_receive_stats_tracker.h b/chromium/third_party/openscreen/src/cast/streaming/packet_receive_stats_tracker.h
index 49338241890..8539a6698e7 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/packet_receive_stats_tracker.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/packet_receive_stats_tracker.h
@@ -14,8 +14,7 @@
 #include "cast/streaming/rtp_time.h"
 #include "platform/api/time.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Maintains statistics for RTP packet arrival timing, jitter, and loss rates;
 // and then uses these to compute and set the related fields in a RTCP Receiver
@@ -102,7 +101,6 @@ class PacketReceiveStatsTracker {
   Clock::duration jitter_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_PACKET_RECEIVE_STATS_TRACKER_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/packet_receive_stats_tracker_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/packet_receive_stats_tracker_unittest.cc
index 08ba975f36b..795e3aad061 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/packet_receive_stats_tracker_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/packet_receive_stats_tracker_unittest.cc
@@ -11,8 +11,7 @@
 #include "gtest/gtest.h"
 #include "util/chrono_helpers.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 // Returns a RtcpReportBlock with all fields set to known values to see how the
@@ -199,5 +198,4 @@ TEST(PacketReceiveStatsTrackerTest, ComputesJitterCorrectly) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/packet_util.cc b/chromium/third_party/openscreen/src/cast/streaming/packet_util.cc
index 5a06cc672ba..8a0dbab77f7 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/packet_util.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/packet_util.cc
@@ -7,8 +7,7 @@
 #include "cast/streaming/rtcp_common.h"
 #include "cast/streaming/rtp_defines.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 std::pair<ApparentPacketType, Ssrc> InspectPacketForRouting(ByteView packet) {
   // Check for RTP packets first, since they are more frequent.
@@ -37,5 +36,4 @@ std::pair<ApparentPacketType, Ssrc> InspectPacketForRouting(ByteView packet) {
   return std::make_pair(ApparentPacketType::UNKNOWN, Ssrc{0});
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/packet_util.h b/chromium/third_party/openscreen/src/cast/streaming/packet_util.h
index 930323babb4..26d210123c6 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/packet_util.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/packet_util.h
@@ -11,8 +11,7 @@
 #include "platform/base/span.h"
 #include "util/big_endian.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Reads a field from the start of the given span and advances the span to point
 // just after the field.
@@ -54,7 +53,6 @@ inline ByteBuffer ReserveSpace(int num_bytes, ByteBuffer& out) {
 enum class ApparentPacketType { UNKNOWN, RTP, RTCP };
 std::pair<ApparentPacketType, Ssrc> InspectPacketForRouting(ByteView packet);
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_PACKET_UTIL_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/packet_util_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/packet_util_unittest.cc
index 8ee758e168e..cae8ed6796b 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/packet_util_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/packet_util_unittest.cc
@@ -7,8 +7,7 @@
 #include "gtest/gtest.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 // Tests that a simple RTCP packet containing only a Sender Report can be
@@ -178,5 +177,4 @@ TEST(PacketUtilTest, InspectsGarbagePacket) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/receiver.cc b/chromium/third_party/openscreen/src/cast/streaming/receiver.cc
index 37b3febda62..f52b4724481 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/receiver.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/receiver.cc
@@ -17,8 +17,7 @@
 #include "util/std_util.h"
 #include "util/trace_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using clock_operators::operator<<;
 
@@ -186,7 +185,7 @@ EncodedFrame Receiver::ConsumeNextFrame(ByteBuffer buffer) {
 
 void Receiver::OnReceivedRtpPacket(Clock::time_point arrival_time,
                                    std::vector<uint8_t> packet) {
-  const absl::optional<RtpPacketParser::ParseResult> part =
+  const std::optional<RtpPacketParser::ParseResult> part =
       rtp_parser_.Parse(packet);
   if (!part) {
     RECEIVER_LOG(WARN) << "Parsing of " << packet.size()
@@ -296,7 +295,7 @@ void Receiver::OnReceivedRtpPacket(Clock::time_point arrival_time,
 void Receiver::OnReceivedRtcpPacket(Clock::time_point arrival_time,
                                     std::vector<uint8_t> packet) {
   TRACE_DEFAULT_SCOPED(TraceCategory::kReceiver);
-  absl::optional<SenderReportParser::SenderReportWithId> parsed_report =
+  std::optional<SenderReportParser::SenderReportWithId> parsed_report =
       rtcp_parser_.Parse(packet);
   if (!parsed_report) {
     RECEIVER_LOG(WARN) << "Parsing of " << packet.size()
@@ -471,7 +470,7 @@ Receiver::PendingFrame::~PendingFrame() = default;
 
 void Receiver::PendingFrame::Reset() {
   collector.Reset();
-  estimated_capture_time = absl::nullopt;
+  estimated_capture_time = std::nullopt;
 }
 
 // static
@@ -479,5 +478,4 @@ constexpr milliseconds Receiver::kDefaultPlayerProcessingTime;
 constexpr int Receiver::kNoFramesReady;
 constexpr milliseconds Receiver::kNackFeedbackInterval;
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/receiver.h b/chromium/third_party/openscreen/src/cast/streaming/receiver.h
index e731d084a00..b267008604c 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/receiver.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/receiver.h
@@ -10,10 +10,10 @@
 #include <array>
 #include <chrono>
 #include <memory>
+#include <optional>
 #include <utility>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "cast/streaming/clock_drift_smoother.h"
 #include "cast/streaming/compound_rtcp_builder.h"
 #include "cast/streaming/environment.h"
@@ -31,8 +31,7 @@
 #include "platform/base/span.h"
 #include "util/alarm.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 struct EncodedFrame;
 class ReceiverPacketRouter;
@@ -161,7 +160,7 @@ class Receiver : public ReceiverBase {
     // at the Sender. This is computed and assigned when the RTP packet with ID
     // 0 is processed. Add the target playout delay to this to get the target
     // playout time.
-    absl::optional<Clock::time_point> estimated_capture_time;
+    std::optional<Clock::time_point> estimated_capture_time;
 
     PendingFrame();
     ~PendingFrame();
@@ -244,7 +243,7 @@ class Receiver : public ReceiverBase {
   // of playout times for the received frames, as well as ping-pong data bounced
   // back to the Sender in the Receiver Reports. It is nullopt until the first
   // parseable Sender Report is received.
-  absl::optional<SenderReportParser::SenderReportWithId> last_sender_report_;
+  std::optional<SenderReportParser::SenderReportWithId> last_sender_report_;
   Clock::time_point last_sender_report_arrival_time_;
 
   // Tracks the offset between the Receiver's [local] clock and the Sender's
@@ -306,7 +305,6 @@ class Receiver : public ReceiverBase {
   static constexpr std::chrono::milliseconds kNackFeedbackInterval{30};
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_RECEIVER_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/receiver_base.cc b/chromium/third_party/openscreen/src/cast/streaming/receiver_base.cc
index d92e7f90656..ce8177e7d0a 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/receiver_base.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/receiver_base.cc
@@ -4,8 +4,7 @@
 
 #include "cast/streaming/receiver_base.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 ReceiverBase::Consumer::~Consumer() = default;
 
@@ -13,5 +12,4 @@ ReceiverBase::ReceiverBase() = default;
 
 ReceiverBase::~ReceiverBase() = default;
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/receiver_base.h b/chromium/third_party/openscreen/src/cast/streaming/receiver_base.h
index cd6cb62a379..39a1fcddca3 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/receiver_base.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/receiver_base.h
@@ -13,8 +13,7 @@
 #include "platform/api/time.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // The Cast Streaming Receiver, a peer corresponding to some Cast Streaming
 // Sender at the other end of a network link.
@@ -107,7 +106,6 @@ class ReceiverBase {
   static constexpr int kNoFramesReady = -1;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_RECEIVER_BASE_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/receiver_constraints.cc b/chromium/third_party/openscreen/src/cast/streaming/receiver_constraints.cc
index f9510123e9e..a1d68a9ad7c 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/receiver_constraints.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/receiver_constraints.cc
@@ -13,8 +13,7 @@
 #include "util/osp_logging.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 // Calculates whether any codecs present in |second| are not present in |first|.
@@ -205,5 +204,4 @@ bool ReceiverConstraints::IsSupersetOf(const ReceiverConstraints& other) const {
          HasLessRestrictiveLimits(audio_limits, other.audio_limits);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/receiver_constraints.h b/chromium/third_party/openscreen/src/cast/streaming/receiver_constraints.h
index fbcd8b51b3f..a2f09556de0 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/receiver_constraints.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/receiver_constraints.h
@@ -12,8 +12,7 @@
 #include "cast/streaming/constants.h"
 #include "cast/streaming/resolution.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Information about the display the receiver is attached to.
 struct Display {
@@ -170,7 +169,6 @@ class ReceiverConstraints {
   std::unique_ptr<RemotingConstraints> remoting;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_RECEIVER_CONSTRAINTS_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/receiver_constraints_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/receiver_constraints_unittest.cc
index 68a94ea521a..ea72cec376e 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/receiver_constraints_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/receiver_constraints_unittest.cc
@@ -9,8 +9,7 @@
 #include "cast/streaming/constants.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 TEST(ReceiverConstraintsTest, VideoLimitsIsSupersetOf) {
   VideoLimits first{};
@@ -253,5 +252,4 @@ TEST(ReceiverConstraintsTest, ReceiverConstraintsIsSupersetOf) {
   EXPECT_FALSE(second.IsSupersetOf(first));
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/receiver_message.cc b/chromium/third_party/openscreen/src/cast/streaming/receiver_message.cc
index f874404163c..f8509932aaf 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/receiver_message.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/receiver_message.cc
@@ -7,7 +7,6 @@
 #include <utility>
 
 #include "absl/strings/ascii.h"
-#include "absl/types/optional.h"
 #include "cast/streaming/message_fields.h"
 #include "json/reader.h"
 #include "json/writer.h"
@@ -19,8 +18,7 @@
 #include "util/osp_logging.h"
 #include "util/stringprintf.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -70,14 +68,14 @@ bool TryParseCapability(const Json::Value& value, MediaCapability* out) {
 
 }  // namespace
 
-ReceiverError::ReceiverError(int code, absl::string_view description)
+ReceiverError::ReceiverError(int code, std::string_view description)
     : code(code), description(description) {
   if (code >= kOpenscreenErrorOffset) {
     openscreen_code = static_cast<Error::Code>(code - kOpenscreenErrorOffset);
   }
 }
 
-ReceiverError::ReceiverError(Error::Code code, absl::string_view description)
+ReceiverError::ReceiverError(Error::Code code, std::string_view description)
     : code(static_cast<int>(code) + kOpenscreenErrorOffset),
       openscreen_code(code),
       description(description) {}
@@ -281,5 +279,4 @@ ErrorOr<Json::Value> ReceiverMessage::ToJson() const {
   return root;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/receiver_message.h b/chromium/third_party/openscreen/src/cast/streaming/receiver_message.h
index 48259a89cbf..11a88c696e6 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/receiver_message.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/receiver_message.h
@@ -6,17 +6,17 @@
 #define CAST_STREAMING_RECEIVER_MESSAGE_H_
 
 #include <memory>
+#include <optional>
 #include <string>
+#include <string_view>
 #include <vector>
 
-#include "absl/strings/string_view.h"
 #include "absl/types/variant.h"
 #include "cast/streaming/answer_messages.h"
 #include "json/value.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 enum class MediaCapability {
   kAudio,
@@ -47,8 +47,8 @@ struct ReceiverCapability {
 // To avoid collisions with legacy error values, all Open Screen receiver errors
 // are offset.
 struct ReceiverError {
-  explicit ReceiverError(int code, absl::string_view description = "");
-  explicit ReceiverError(Error::Code code, absl::string_view description = "");
+  explicit ReceiverError(int code, std::string_view description = "");
+  explicit ReceiverError(Error::Code code, std::string_view description = "");
   explicit ReceiverError(Error error);
 
   ReceiverError(const ReceiverError&);
@@ -69,7 +69,7 @@ struct ReceiverError {
   int32_t code = -1;
 
   // Parsed openscreen::Error code. May be nullopt if not a match.
-  absl::optional<Error::Code> openscreen_code;
+  std::optional<Error::Code> openscreen_code;
 
   // Error description.
   std::string description;
@@ -109,7 +109,6 @@ struct ReceiverMessage {
       body;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_RECEIVER_MESSAGE_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/receiver_message_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/receiver_message_unittest.cc
index 3729b15f773..6f38e28182f 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/receiver_message_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/receiver_message_unittest.cc
@@ -8,8 +8,7 @@
 #include "gtest/gtest.h"
 #include "util/json/json_serialization.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 TEST(ReceiverMessageTest, ReceiverErrorConstructors) {
   const ReceiverError kOpenscreenError(Error::Code::kNoStreamSelected,
@@ -47,5 +46,4 @@ TEST(ReceiverMessageTest, ReceiverErrorToError) {
             ReceiverError(1234, "message two").ToError());
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/receiver_packet_router.cc b/chromium/third_party/openscreen/src/cast/streaming/receiver_packet_router.cc
index 58ee11cafd6..919cd016804 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/receiver_packet_router.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/receiver_packet_router.cc
@@ -12,8 +12,7 @@
 #include "util/osp_logging.h"
 #include "util/stringprintf.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 ReceiverPacketRouter::ReceiverPacketRouter(Environment* environment)
     : environment_(environment) {
@@ -100,5 +99,4 @@ void ReceiverPacketRouter::OnReceivedPacket(const IPEndpoint& source,
   }
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/receiver_packet_router.h b/chromium/third_party/openscreen/src/cast/streaming/receiver_packet_router.h
index 2a939237a31..d1911e069a0 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/receiver_packet_router.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/receiver_packet_router.h
@@ -15,8 +15,7 @@
 #include "platform/base/span.h"
 #include "util/flat_map.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class Receiver;
 
@@ -55,7 +54,6 @@ class ReceiverPacketRouter final : public Environment::PacketConsumer {
   FlatMap<Ssrc, Receiver*> receivers_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_RECEIVER_PACKET_ROUTER_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/receiver_session.cc b/chromium/third_party/openscreen/src/cast/streaming/receiver_session.cc
index d2e7b1aef11..2078836e0a4 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/receiver_session.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/receiver_session.cc
@@ -23,8 +23,7 @@
 #include "util/osp_logging.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 template <typename Stream, typename Codec>
@@ -446,7 +445,7 @@ Answer ReceiverSession::ConstructAnswer(const PendingOffer& properties) {
       if (limit.codec == properties.selected_video->codec ||
           limit.applies_to_all_codecs) {
         constraints.video = VideoConstraints{
-            limit.max_pixels_per_second, absl::nullopt, /* min dimensions */
+            limit.max_pixels_per_second, std::nullopt, /* min dimensions */
             limit.max_dimensions,        limit.min_bit_rate,
             limit.max_bit_rate,          limit.max_delay,
         };
@@ -455,10 +454,10 @@ Answer ReceiverSession::ConstructAnswer(const PendingOffer& properties) {
     }
   }
 
-  absl::optional<DisplayDescription> display;
+  std::optional<DisplayDescription> display;
   if (constraints_.display_description) {
     const auto* d = constraints_.display_description.get();
-    display = DisplayDescription{d->dimensions, absl::nullopt,
+    display = DisplayDescription{d->dimensions, std::nullopt,
                                  d->can_scale_content
                                      ? AspectRatioConstraint::kVariable
                                      : AspectRatioConstraint::kFixed};
@@ -466,7 +465,7 @@ Answer ReceiverSession::ConstructAnswer(const PendingOffer& properties) {
 
   // Only set the constraints in the answer if they are valid (meaning we
   // successfully found limits above).
-  absl::optional<Constraints> answer_constraints;
+  std::optional<Constraints> answer_constraints;
   if (constraints.IsValid()) {
     answer_constraints = std::move(constraints);
   }
@@ -511,5 +510,4 @@ void ReceiverSession::SendErrorAnswerReply(const std::string& sender_id,
   }
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/receiver_session.h b/chromium/third_party/openscreen/src/cast/streaming/receiver_session.h
index 4cc04e5b908..2b2b6256ddd 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/receiver_session.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/receiver_session.h
@@ -22,8 +22,7 @@
 #include "cast/streaming/session_config.h"
 #include "cast/streaming/session_messenger.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class Environment;
 class Receiver;
@@ -246,7 +245,6 @@ class ReceiverSession final : public Environment::SocketSubscriber {
   std::unique_ptr<RpcMessenger> rpc_messenger_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_RECEIVER_SESSION_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/receiver_session_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/receiver_session_unittest.cc
index 82db2d0f0a9..af9fb1e8fdc 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/receiver_session_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/receiver_session_unittest.cc
@@ -24,8 +24,7 @@ using ::testing::NiceMock;
 using ::testing::Return;
 using ::testing::StrictMock;
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -1028,5 +1027,4 @@ TEST_F(ReceiverSessionTest, HandlesRpcMessage) {
   ASSERT_TRUE(received_initialize_message);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/receiver_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/receiver_unittest.cc
index dc361ccadc6..7889df2385d 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/receiver_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/receiver_unittest.cc
@@ -47,8 +47,7 @@ using testing::Gt;
 using testing::Invoke;
 using testing::SaveArg;
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 // Receiver configuration.
@@ -855,5 +854,4 @@ TEST_F(ReceiverTest, DropsLateFrames) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/remoting_capabilities.h b/chromium/third_party/openscreen/src/cast/streaming/remoting_capabilities.h
index 30b37aad5f7..42273677b29 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/remoting_capabilities.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/remoting_capabilities.h
@@ -8,8 +8,7 @@
 #include <string>
 #include <vector>
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Audio capabilities are how receivers indicate support for remoting codecs--
 // as remoting does not include the actual codec in the OFFER message.
@@ -55,7 +54,6 @@ struct RemotingCapabilities {
   std::vector<VideoCapability> video;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_REMOTING_CAPABILITIES_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/resolution.cc b/chromium/third_party/openscreen/src/cast/streaming/resolution.cc
index fc0eb4d9cb6..d9a778bc318 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/resolution.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/resolution.cc
@@ -13,8 +13,7 @@
 #include "util/json/json_helpers.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -118,5 +117,4 @@ bool Dimensions::IsSupersetOf(const Dimensions& other) const {
   return ToResolution().IsSupersetOf(other.ToResolution());
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/resolution.h b/chromium/third_party/openscreen/src/cast/streaming/resolution.h
index a553ae0a976..804bf89b905 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/resolution.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/resolution.h
@@ -10,12 +10,10 @@
 #ifndef CAST_STREAMING_RESOLUTION_H_
 #define CAST_STREAMING_RESOLUTION_H_
 
-#include "absl/types/optional.h"
 #include "json/value.h"
 #include "util/simple_fraction.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // A resolution in pixels.
 struct Resolution {
@@ -64,7 +62,6 @@ struct Dimensions {
   SimpleFraction frame_rate{0, 1};
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_RESOLUTION_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/rpc_messenger.cc b/chromium/third_party/openscreen/src/cast/streaming/rpc_messenger.cc
index de4814917a2..8fedb6c2652 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/rpc_messenger.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/rpc_messenger.cc
@@ -10,8 +10,7 @@
 
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -102,5 +101,4 @@ WeakPtr<RpcMessenger> RpcMessenger::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/rpc_messenger.h b/chromium/third_party/openscreen/src/cast/streaming/rpc_messenger.h
index ab44845430f..b0c4fac5b72 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/rpc_messenger.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/rpc_messenger.h
@@ -5,6 +5,7 @@
 #ifndef CAST_STREAMING_RPC_MESSENGER_H_
 #define CAST_STREAMING_RPC_MESSENGER_H_
 
+#include <functional>
 #include <memory>
 #include <string>
 #include <utility>
@@ -14,8 +15,7 @@
 #include "util/flat_map.h"
 #include "util/weak_ptr.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Processes incoming and outgoing RPC messages and links them to desired
 // components on both end points. For outgoing messages, the messenger
@@ -105,7 +105,6 @@ class RpcMessenger {
   WeakPtrFactory<RpcMessenger> weak_factory_{this};
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_RPC_MESSENGER_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/rpc_messenger_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/rpc_messenger_unittest.cc
index a912ab5cfa4..f3e4d80541c 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/rpc_messenger_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/rpc_messenger_unittest.cc
@@ -17,8 +17,7 @@ using testing::_;
 using testing::Invoke;
 using testing::Return;
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 class FakeMessenger {
@@ -158,5 +157,4 @@ TEST_F(RpcMessengerTest, Registration) {
   ASSERT_FALSE(rpc_messenger_->IsRegisteredForTesting(handle));
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/rtcp_common.cc b/chromium/third_party/openscreen/src/cast/streaming/rtcp_common.cc
index a886c668a34..3b9747bfdb4 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/rtcp_common.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/rtcp_common.cc
@@ -10,8 +10,7 @@
 #include "cast/streaming/packet_util.h"
 #include "util/saturate_cast.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 RtcpCommonHeader::RtcpCommonHeader() = default;
 RtcpCommonHeader::~RtcpCommonHeader() = default;
@@ -63,22 +62,22 @@ void RtcpCommonHeader::AppendFields(ByteBuffer& buffer) const {
 }
 
 // static
-absl::optional<RtcpCommonHeader> RtcpCommonHeader::Parse(ByteView buffer) {
+std::optional<RtcpCommonHeader> RtcpCommonHeader::Parse(ByteView buffer) {
   if (buffer.size() < kRtcpCommonHeaderSize) {
-    return absl::nullopt;
+    return std::nullopt;
   }
 
   const uint8_t byte0 = ConsumeField<uint8_t>(buffer);
   if ((byte0 >> kRtcpReportCountFieldNumBits) !=
       kRtcpRequiredVersionAndPaddingBits) {
-    return absl::nullopt;
+    return std::nullopt;
   }
   const uint8_t report_count_or_subtype =
       byte0 & FieldBitmask<uint8_t>(kRtcpReportCountFieldNumBits);
 
   const uint8_t byte1 = ConsumeField<uint8_t>(buffer);
   if (!IsRtcpPacketType(byte1)) {
-    return absl::nullopt;
+    return std::nullopt;
   }
 
   // Optionally set |header.with.report_count| or |header.with.subtype|,
@@ -205,14 +204,14 @@ void RtcpReportBlock::SetDelaySinceLastReport(
 }
 
 // static
-absl::optional<RtcpReportBlock> RtcpReportBlock::ParseOne(ByteView buffer,
-                                                          int report_count,
-                                                          Ssrc ssrc) {
+std::optional<RtcpReportBlock> RtcpReportBlock::ParseOne(ByteView buffer,
+                                                         int report_count,
+                                                         Ssrc ssrc) {
   if (static_cast<int>(buffer.size()) < (kRtcpReportBlockSize * report_count)) {
-    return absl::nullopt;
+    return std::nullopt;
   }
 
-  absl::optional<RtcpReportBlock> result;
+  std::optional<RtcpReportBlock> result;
   for (int block = 0; block < report_count; ++block) {
     if (ConsumeField<uint32_t>(buffer) != ssrc) {
       // Skip-over report block meant for some other recipient.
@@ -241,5 +240,4 @@ absl::optional<RtcpReportBlock> RtcpReportBlock::ParseOne(ByteView buffer,
 RtcpSenderReport::RtcpSenderReport() = default;
 RtcpSenderReport::~RtcpSenderReport() = default;
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/rtcp_common.h b/chromium/third_party/openscreen/src/cast/streaming/rtcp_common.h
index ea5bf927c51..dc5047d8d33 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/rtcp_common.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/rtcp_common.h
@@ -7,10 +7,10 @@
 
 #include <stdint.h>
 
+#include <optional>
 #include <tuple>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "cast/streaming/frame_id.h"
 #include "cast/streaming/ntp_time.h"
 #include "cast/streaming/rtp_defines.h"
@@ -19,8 +19,7 @@
 #include "cast/streaming/statistics_defines.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 struct RtcpCommonHeader {
   RtcpCommonHeader();
@@ -49,7 +48,7 @@ struct RtcpCommonHeader {
 
   // Parse from the 4-byte wire format in |buffer|. Returns nullopt if the data
   // is corrupt.
-  static absl::optional<RtcpCommonHeader> Parse(ByteView buffer);
+  static std::optional<RtcpCommonHeader> Parse(ByteView buffer);
 };
 
 // The middle 32-bits of the 64-bit NtpTimestamp field from the Sender Reports.
@@ -126,9 +125,9 @@ struct RtcpReportBlock {
   // Scans the wire-format report blocks in |buffer|, searching for one with the
   // matching |ssrc| and, if found, returns the parse result. Returns nullopt if
   // the data is corrupt or no report block with the matching SSRC was found.
-  static absl::optional<RtcpReportBlock> ParseOne(ByteView buffer,
-                                                  int report_count,
-                                                  Ssrc ssrc);
+  static std::optional<RtcpReportBlock> ParseOne(ByteView buffer,
+                                                 int report_count,
+                                                 Ssrc ssrc);
 };
 
 struct RtcpSenderReport {
@@ -152,7 +151,7 @@ struct RtcpSenderReport {
 
   // The report block, if present. While the RTCP spec allows for zero or
   // multiple reports, Cast Streaming only uses zero or one.
-  absl::optional<RtcpReportBlock> report_block;
+  std::optional<RtcpReportBlock> report_block;
 };
 
 // A pair of IDs that refers to a specific missing packet within a frame. If
@@ -199,7 +198,6 @@ struct RtcpReceiverFrameLogMessage {
   std::vector<RtcpReceiverEventLogMessage> messages;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_RTCP_COMMON_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/rtcp_common_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/rtcp_common_unittest.cc
index d7d3bcfb30d..25f07c73437 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/rtcp_common_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/rtcp_common_unittest.cc
@@ -12,8 +12,7 @@
 #include "platform/base/span.h"
 #include "util/chrono_helpers.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 template <typename T>
@@ -298,5 +297,4 @@ TEST(RtcpCommonTest, ComputesDelayForReportBlocks) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/rtcp_session.cc b/chromium/third_party/openscreen/src/cast/streaming/rtcp_session.cc
index 25a67028246..d52a7502fa6 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/rtcp_session.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/rtcp_session.cc
@@ -6,8 +6,7 @@
 
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 RtcpSession::RtcpSession(Ssrc sender_ssrc,
                          Ssrc receiver_ssrc,
@@ -23,5 +22,4 @@ RtcpSession::RtcpSession(Ssrc sender_ssrc,
 
 RtcpSession::~RtcpSession() = default;
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/rtcp_session.h b/chromium/third_party/openscreen/src/cast/streaming/rtcp_session.h
index e6197745bb2..9e174e3e580 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/rtcp_session.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/rtcp_session.h
@@ -8,8 +8,7 @@
 #include "cast/streaming/ntp_time.h"
 #include "cast/streaming/ssrc.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Session-level configuration and shared components for the RTCP messaging
 // associated with a single Cast RTP stream. Multiple packet serialization and
@@ -39,7 +38,6 @@ class RtcpSession {
   NtpTimeConverter ntp_converter_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_RTCP_SESSION_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/rtp_defines.cc b/chromium/third_party/openscreen/src/cast/streaming/rtp_defines.cc
index 3fe5053626a..bc0bae23700 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/rtp_defines.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/rtp_defines.cc
@@ -6,8 +6,7 @@
 
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 RtpPayloadType GetPayloadType(AudioCodec codec, bool use_android_rtp_hack) {
   if (use_android_rtp_hack) {
@@ -111,5 +110,4 @@ bool IsRtcpPacketType(uint8_t raw_byte) {
   return false;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/rtp_defines.h b/chromium/third_party/openscreen/src/cast/streaming/rtp_defines.h
index 53019a93995..13e3cb89878 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/rtp_defines.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/rtp_defines.h
@@ -9,8 +9,7 @@
 
 #include "cast/streaming/constants.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Note: Cast Streaming uses a subset of the messages in the RTP/RTCP
 // specification, but also adds some of its own extensions. See:
@@ -378,7 +377,6 @@ constexpr int kRtcpReceiverFrameLogMessageHeaderSize = 8;
 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 constexpr int kRtcpReceiverFrameLogMessageBlockSize = 4;
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_RTP_DEFINES_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/rtp_packet_parser.cc b/chromium/third_party/openscreen/src/cast/streaming/rtp_packet_parser.cc
index 535f139ef78..1ce063eb586 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/rtp_packet_parser.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/rtp_packet_parser.cc
@@ -10,19 +10,18 @@
 #include "cast/streaming/packet_util.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 RtpPacketParser::RtpPacketParser(Ssrc sender_ssrc)
     : sender_ssrc_(sender_ssrc), highest_rtp_frame_id_(FrameId::first()) {}
 
 RtpPacketParser::~RtpPacketParser() = default;
 
-absl::optional<RtpPacketParser::ParseResult> RtpPacketParser::Parse(
+std::optional<RtpPacketParser::ParseResult> RtpPacketParser::Parse(
     ByteView buffer) {
   if (buffer.size() < kRtpPacketMinValidSize ||
       ConsumeField<uint8_t>(buffer) != kRtpRequiredFirstByte) {
-    return absl::nullopt;
+    return std::nullopt;
   }
 
   // RTP header elements.
@@ -34,7 +33,7 @@ absl::optional<RtpPacketParser::ParseResult> RtpPacketParser::Parse(
   const uint8_t payload_type =
       ConsumeField<uint8_t>(buffer) & kRtpPayloadTypeMask;
   if (!IsRtpPayloadType(payload_type)) {
-    return absl::nullopt;
+    return std::nullopt;
   }
   ParseResult result;
   result.payload_type = static_cast<RtpPayloadType>(payload_type);
@@ -42,7 +41,7 @@ absl::optional<RtpPacketParser::ParseResult> RtpPacketParser::Parse(
   result.rtp_timestamp =
       last_parsed_rtp_timestamp_.Expand(ConsumeField<uint32_t>(buffer));
   if (ConsumeField<uint32_t>(buffer) != sender_ssrc_) {
-    return absl::nullopt;
+    return std::nullopt;
   }
 
   // Cast-specific header elements.
@@ -55,14 +54,14 @@ absl::optional<RtpPacketParser::ParseResult> RtpPacketParser::Parse(
   result.packet_id = ConsumeField<uint16_t>(buffer);
   result.max_packet_id = ConsumeField<uint16_t>(buffer);
   if (result.max_packet_id == kAllPacketsLost) {
-    return absl::nullopt;  // Packet ID cannot be the special value.
+    return std::nullopt;  // Packet ID cannot be the special value.
   }
   if (result.packet_id > result.max_packet_id) {
-    return absl::nullopt;
+    return std::nullopt;
   }
   if (has_referenced_frame_id) {
     if (buffer.empty()) {
-      return absl::nullopt;
+      return std::nullopt;
     }
     result.referenced_frame_id =
         result.frame_id.Expand(ConsumeField<uint8_t>(buffer));
@@ -77,18 +76,18 @@ absl::optional<RtpPacketParser::ParseResult> RtpPacketParser::Parse(
   // Zero or more Cast extensions.
   for (size_t i = 0; i < num_cast_extensions; ++i) {
     if (buffer.size() < sizeof(uint16_t)) {
-      return absl::nullopt;
+      return std::nullopt;
     }
     const uint16_t type_and_size = ConsumeField<uint16_t>(buffer);
     const uint8_t type = type_and_size >> kNumExtensionDataSizeFieldBits;
     const size_t size =
         type_and_size & FieldBitmask<uint16_t>(kNumExtensionDataSizeFieldBits);
     if (buffer.size() < size) {
-      return absl::nullopt;
+      return std::nullopt;
     }
     if (type == kAdaptiveLatencyRtpExtensionType) {
       if (size != sizeof(uint16_t)) {
-        return absl::nullopt;
+        return std::nullopt;
       }
       result.new_playout_delay =
           std::chrono::milliseconds(ReadBigEndian<uint16_t>(buffer.data()));
@@ -111,5 +110,4 @@ absl::optional<RtpPacketParser::ParseResult> RtpPacketParser::Parse(
 RtpPacketParser::ParseResult::ParseResult() = default;
 RtpPacketParser::ParseResult::~ParseResult() = default;
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/rtp_packet_parser.h b/chromium/third_party/openscreen/src/cast/streaming/rtp_packet_parser.h
index 9e41078df0e..db5d9ca2f68 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/rtp_packet_parser.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/rtp_packet_parser.h
@@ -6,16 +6,15 @@
 #define CAST_STREAMING_RTP_PACKET_PARSER_H_
 
 #include <chrono>
+#include <optional>
 
-#include "absl/types/optional.h"
 #include "cast/streaming/frame_id.h"
 #include "cast/streaming/rtp_defines.h"
 #include "cast/streaming/rtp_time.h"
 #include "cast/streaming/ssrc.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Parses RTP packets for all frames in the same Cast RTP stream. One
 // RtpPacketParser instance should be used for all RTP packets having the same
@@ -56,8 +55,8 @@ class RtpPacketParser {
 
   // Parses the packet. The caller should use InspectPacketForRouting()
   // beforehand to ensure that the packet is meant to be parsed by this
-  // instance. Returns absl::nullopt if the |packet| was corrupt.
-  absl::optional<ParseResult> Parse(ByteView packet);
+  // instance. Returns std::nullopt if the |packet| was corrupt.
+  std::optional<ParseResult> Parse(ByteView packet);
 
  private:
   const Ssrc sender_ssrc_;
@@ -72,7 +71,6 @@ class RtpPacketParser {
   FrameId highest_rtp_frame_id_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_RTP_PACKET_PARSER_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/rtp_packet_parser_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/rtp_packet_parser_unittest.cc
index ce3599069eb..d8af3c35e5b 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/rtp_packet_parser_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/rtp_packet_parser_unittest.cc
@@ -11,8 +11,7 @@
 
 using testing::ElementsAreArray;
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 // Tests that a simple packet for a key frame can be parsed.
@@ -299,5 +298,4 @@ TEST(RtpPacketParserTest, RejectsPacketWithBadFramePacketIds) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/rtp_packetizer.cc b/chromium/third_party/openscreen/src/cast/streaming/rtp_packetizer.cc
index fff98b8a273..1ad7fe541c6 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/rtp_packetizer.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/rtp_packetizer.cc
@@ -14,8 +14,7 @@
 #include "util/integer_division.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -115,7 +114,8 @@ ByteBuffer RtpPacketizer::GeneratePacket(const EncryptedFrame& frame,
   OSP_DCHECK_EQ(buffer.data() + data_chunk_size, packet.end());
 
   // Copy the encrypted payload data into the packet.
-  memcpy(buffer.data(), frame.data.data() + data_chunk_start, data_chunk_size);
+  auto data_chunk = frame.data.subspan(data_chunk_start, data_chunk_size);
+  std::copy(data_chunk.begin(), data_chunk.end(), buffer.data());
 
   return packet;
 }
@@ -134,5 +134,4 @@ int RtpPacketizer::ComputeNumberOfPackets(const EncryptedFrame& frame) const {
   return num_packets <= int{kMaxAllowedFramePacketId} ? num_packets : -1;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/rtp_packetizer.h b/chromium/third_party/openscreen/src/cast/streaming/rtp_packetizer.h
index 8222a615021..87c56d2d21e 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/rtp_packetizer.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/rtp_packetizer.h
@@ -12,8 +12,7 @@
 #include "cast/streaming/ssrc.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Transforms a logical sequence of EncryptedFrames into RTP packets for
 // transmission. A single instance of RtpPacketizer should be used for all the
@@ -75,7 +74,6 @@ class RtpPacketizer {
   uint16_t sequence_number_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_RTP_PACKETIZER_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/rtp_packetizer_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/rtp_packetizer_unittest.cc
index 7fa284f56e6..8cf44bdfe4c 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/rtp_packetizer_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/rtp_packetizer_unittest.cc
@@ -6,8 +6,8 @@
 
 #include <chrono>
 #include <memory>
+#include <optional>
 
-#include "absl/types/optional.h"
 #include "cast/streaming/frame_crypto.h"
 #include "cast/streaming/rtp_defines.h"
 #include "cast/streaming/rtp_packet_parser.h"
@@ -19,8 +19,7 @@
 
 using testing::ElementsAreArray;
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -135,9 +134,9 @@ class RtpPacketizerTest : public testing::Test {
                             kMaxRtpPacketSizeForIpv4UdpOnEthernet};
   RtpPacketParser parser_{ssrc_};
 
-  // absl::nullopt until the random starting sequence number, from the first
+  // std::nullopt until the random starting sequence number, from the first
   // packet generated by TestGeneratePacket(), is known.
-  absl::optional<uint16_t> last_sequence_number_;
+  std::optional<uint16_t> last_sequence_number_;
 };
 
 // Tests that all packets are generated for one key frame, followed by 9 "delta"
@@ -208,5 +207,4 @@ TEST_F(RtpPacketizerTest, GeneratesPacketForRetransmission) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/rtp_time.cc b/chromium/third_party/openscreen/src/cast/streaming/rtp_time.cc
index 2a7fcb1bf73..459c7c9d709 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/rtp_time.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/rtp_time.cc
@@ -6,8 +6,7 @@
 
 #include <sstream>
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 std::ostream& operator<<(std::ostream& out, const RtpTimeDelta rhs) {
   if (rhs.value_ >= 0)
@@ -21,5 +20,4 @@ std::ostream& operator<<(std::ostream& out, const RtpTimeTicks rhs) {
   return out << "RTP@" << rhs.value_;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/rtp_time.h b/chromium/third_party/openscreen/src/cast/streaming/rtp_time.h
index cdc9626bcff..f42e8daf658 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/rtp_time.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/rtp_time.h
@@ -17,8 +17,7 @@
 #include "platform/api/time.h"
 #include "util/saturate_cast.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Forward declarations (see below).
 class RtpTimeDelta;
@@ -253,7 +252,6 @@ class RtpTimeTicks : public ExpandedValueBase<int64_t, RtpTimeTicks> {
   friend std::ostream& operator<<(std::ostream& out, const RtpTimeTicks rhs);
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_RTP_TIME_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/rtp_time_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/rtp_time_unittest.cc
index e2c17341cff..482d6f12d5c 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/rtp_time_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/rtp_time_unittest.cc
@@ -9,8 +9,7 @@
 #include "gtest/gtest.h"
 #include "util/chrono_helpers.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Tests that conversions between std::chrono durations and RtpTimeDelta are
 // accurate.  Note that this implicitly tests the conversions to/from
@@ -70,5 +69,4 @@ TEST(RtpTimeDeltaTest, ConversionToAndFromDurations) {
                 .ToDuration<microseconds>(kTimebase));
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/sender.cc b/chromium/third_party/openscreen/src/cast/streaming/sender.cc
index 9988cc4df30..d7f23f7cddf 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/sender.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/sender.cc
@@ -18,8 +18,7 @@
 #include "util/std_util.h"
 #include "util/trace_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using clock_operators::operator<<;
 
@@ -100,6 +99,7 @@ void DispatchFrameLogMessages(
     return;
   }
 
+  const Clock::time_point now = environment.now();
   const StatisticsEventMediaType media_type = ToMediaType(stream_type);
   for (const RtcpReceiverFrameLogMessage& log_message : messages) {
     for (const RtcpReceiverEventLogMessage& event_message :
@@ -108,6 +108,7 @@ void DispatchFrameLogMessages(
         case StatisticsEventType::kPacketReceived: {
           PacketEvent event;
           event.timestamp = event_message.timestamp;
+          event.received_timestamp = now;
           event.type = event_message.type;
           event.media_type = media_type;
           event.rtp_timestamp = log_message.rtp_timestamp;
@@ -121,6 +122,7 @@ void DispatchFrameLogMessages(
         case StatisticsEventType::kFramePlayedOut: {
           FrameEvent event;
           event.timestamp = event_message.timestamp;
+          event.received_timestamp = now;
           event.type = event_message.type;
           event.media_type = media_type;
           event.rtp_timestamp = log_message.rtp_timestamp;
@@ -731,5 +733,4 @@ Sender::Observer::~Observer() = default;
 Sender::PendingFrameSlot::PendingFrameSlot() = default;
 Sender::PendingFrameSlot::~PendingFrameSlot() = default;
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/sender.h b/chromium/third_party/openscreen/src/cast/streaming/sender.h
index 4e3b09766ea..30a7bf66672 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/sender.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/sender.h
@@ -9,6 +9,7 @@
 
 #include <array>
 #include <chrono>
+#include <optional>
 #include <vector>
 
 #include "cast/streaming/compound_rtcp_parser.h"
@@ -26,8 +27,7 @@
 #include "platform/base/span.h"
 #include "util/yet_another_bit_vector.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class Environment;
 
@@ -185,7 +185,7 @@ class Sender final : public SenderPacketRouter::Sender,
   // fully received at the other end.
   struct PendingFrameSlot {
     // The frame to send, or nullopt if this slot is not in use.
-    absl::optional<EncryptedFrame> frame;
+    std::optional<EncryptedFrame> frame;
 
     // Represents which packets need to be sent. Elements are indexed by
     // FramePacketId. A set bit means a packet needs to be sent (or re-sent).
@@ -342,7 +342,6 @@ class Sender final : public SenderPacketRouter::Sender,
   std::vector<FrameId> pending_cancellations_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_SENDER_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/sender_message.cc b/chromium/third_party/openscreen/src/cast/streaming/sender_message.cc
index 0eff138af09..a5c7bda99fe 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/sender_message.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/sender_message.cc
@@ -13,8 +13,7 @@
 #include "util/json/json_helpers.h"
 #include "util/json/json_serialization.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -109,5 +108,4 @@ ErrorOr<Json::Value> SenderMessage::ToJson() const {
   return root;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/sender_message.h b/chromium/third_party/openscreen/src/cast/streaming/sender_message.h
index 13da5936b7c..fcc5f86c2db 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/sender_message.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/sender_message.h
@@ -15,8 +15,7 @@
 #include "platform/base/error.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 struct SenderMessage {
  public:
@@ -48,7 +47,6 @@ struct SenderMessage {
       body;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_SENDER_MESSAGE_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/sender_packet_router.cc b/chromium/third_party/openscreen/src/cast/streaming/sender_packet_router.cc
index 3c04a911daa..d43f3279ac6 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/sender_packet_router.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/sender_packet_router.cc
@@ -15,8 +15,7 @@
 #include "util/saturate_cast.h"
 #include "util/stringprintf.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using clock_operators::operator<<;
 
@@ -272,5 +271,4 @@ constexpr milliseconds SenderPacketRouter::kDefaultBurstInterval;
 // static
 constexpr Clock::time_point SenderPacketRouter::kNever;
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/sender_packet_router.h b/chromium/third_party/openscreen/src/cast/streaming/sender_packet_router.h
index 4da543ab95d..66761124263 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/sender_packet_router.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/sender_packet_router.h
@@ -19,8 +19,7 @@
 #include "platform/base/span.h"
 #include "util/alarm.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Manages network packet transmission for one or more Senders, directing each
 // inbound packet to a specific Sender instance, pacing the transmission of
@@ -197,7 +196,6 @@ class SenderPacketRouter : public BandwidthEstimator,
   Clock::time_point last_burst_time_ = Clock::time_point::min();
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_SENDER_PACKET_ROUTER_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/sender_packet_router_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/sender_packet_router_unittest.cc
index 5e6adccab04..bfb2b53fb9b 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/sender_packet_router_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/sender_packet_router_unittest.cc
@@ -24,8 +24,7 @@ using testing::Invoke;
 using testing::Mock;
 using testing::Return;
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 const IPEndpoint kRemoteEndpoint{
@@ -592,5 +591,4 @@ TEST_F(SenderPacketRouterTest, SchedulesAndTransmitsAccountingForPriority) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/sender_report_builder.cc b/chromium/third_party/openscreen/src/cast/streaming/sender_report_builder.cc
index 902ae113ae2..ef8407846b7 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/sender_report_builder.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/sender_report_builder.cc
@@ -7,8 +7,7 @@
 #include "cast/streaming/packet_util.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 SenderReportBuilder::SenderReportBuilder(RtcpSession* session)
     : session_(session) {
@@ -79,5 +78,4 @@ Clock::time_point SenderReportBuilder::GetRecentReportTime(
   return session_->ntp_converter().ToLocalTime(reconstructed);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/sender_report_builder.h b/chromium/third_party/openscreen/src/cast/streaming/sender_report_builder.h
index 827bfa90535..9306d9d2c67 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/sender_report_builder.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/sender_report_builder.h
@@ -15,8 +15,7 @@
 #include "platform/api/time.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Builds RTCP packets containing one Sender Report.
 class SenderReportBuilder {
@@ -45,7 +44,6 @@ class SenderReportBuilder {
   RtcpSession* const session_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_SENDER_REPORT_BUILDER_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/sender_report_parser.cc b/chromium/third_party/openscreen/src/cast/streaming/sender_report_parser.cc
index aa0cc858db0..924b29dc9b1 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/sender_report_parser.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/sender_report_parser.cc
@@ -7,8 +7,7 @@
 #include "cast/streaming/packet_util.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 SenderReportParser::SenderReportWithId::SenderReportWithId() = default;
 SenderReportParser::SenderReportWithId::~SenderReportWithId() = default;
@@ -20,9 +19,9 @@ SenderReportParser::SenderReportParser(RtcpSession* session)
 
 SenderReportParser::~SenderReportParser() = default;
 
-absl::optional<SenderReportParser::SenderReportWithId>
-SenderReportParser::Parse(ByteView buffer) {
-  absl::optional<SenderReportWithId> sender_report;
+std::optional<SenderReportParser::SenderReportWithId> SenderReportParser::Parse(
+    ByteView buffer) {
+  std::optional<SenderReportWithId> sender_report;
 
   // The data contained in |buffer| can be a "compound packet," which means that
   // it can be the concatenation of multiple RTCP packets. The loop here
@@ -30,11 +29,11 @@ SenderReportParser::Parse(ByteView buffer) {
   while (!buffer.empty()) {
     const auto header = RtcpCommonHeader::Parse(buffer);
     if (!header) {
-      return absl::nullopt;
+      return std::nullopt;
     }
     buffer.remove_prefix(kRtcpCommonHeaderSize);
     if (static_cast<int>(buffer.size()) < header->payload_size) {
-      return absl::nullopt;
+      return std::nullopt;
     }
     auto chunk = buffer.subspan(0, header->payload_size);
     buffer.remove_prefix(header->payload_size);
@@ -44,7 +43,7 @@ SenderReportParser::Parse(ByteView buffer) {
       continue;
     }
     if (header->payload_size < kRtcpSenderReportSize) {
-      return absl::nullopt;
+      return std::nullopt;
     }
     if (ConsumeField<uint32_t>(chunk) != session_->sender_ssrc()) {
       continue;
@@ -71,5 +70,4 @@ SenderReportParser::Parse(ByteView buffer) {
   return sender_report;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/sender_report_parser.h b/chromium/third_party/openscreen/src/cast/streaming/sender_report_parser.h
index a8d7cc35fa0..34e574186dd 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/sender_report_parser.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/sender_report_parser.h
@@ -5,15 +5,15 @@
 #ifndef CAST_STREAMING_SENDER_REPORT_PARSER_H_
 #define CAST_STREAMING_SENDER_REPORT_PARSER_H_
 
-#include "absl/types/optional.h"
+#include <optional>
+
 #include "cast/streaming/rtcp_common.h"
 #include "cast/streaming/rtcp_session.h"
 #include "cast/streaming/rtp_defines.h"
 #include "cast/streaming/rtp_time.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Parses RTCP packets from a Sender to extract Sender Reports. Ignores anything
 // else, since that is all a Receiver would be interested in.
@@ -35,7 +35,7 @@ class SenderReportParser {
   // Parses the RTCP |packet|, and returns a parsed sender report if the packet
   // contained one. Returns nullopt if the data is corrupt or the packet did not
   // contain a sender report.
-  absl::optional<SenderReportWithId> Parse(ByteView packet);
+  std::optional<SenderReportWithId> Parse(ByteView packet);
 
  private:
   RtcpSession* const session_;
@@ -45,7 +45,6 @@ class SenderReportParser {
   RtpTimeTicks last_parsed_rtp_timestamp_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_SENDER_REPORT_PARSER_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/sender_report_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/sender_report_unittest.cc
index 140349ee40f..59f241ae48a 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/sender_report_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/sender_report_unittest.cc
@@ -9,8 +9,7 @@
 #include "gtest/gtest.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 constexpr Ssrc kSenderSsrc{1};
@@ -186,5 +185,4 @@ TEST_F(SenderReportTest, ComputesTimePointsFromReportIds) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/sender_session.cc b/chromium/third_party/openscreen/src/cast/streaming/sender_session.cc
index 8944f370b57..9b1f92c6309 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/sender_session.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/sender_session.cc
@@ -27,8 +27,7 @@
 #include "util/osp_logging.h"
 #include "util/stringprintf.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 // Default error message for a bad CAPABILITIES_RESPONSE message.
@@ -547,5 +546,4 @@ void SenderSession::SendRpcMessage(std::vector<uint8_t> message_body) {
   }
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/sender_session.h b/chromium/third_party/openscreen/src/cast/streaming/sender_session.h
index 3b1dc42cfeb..a48b11b7f55 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/sender_session.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/sender_session.h
@@ -26,8 +26,7 @@
 #include "json/value.h"
 #include "util/json/json_serialization.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class Environment;
 class Sender;
@@ -289,7 +288,6 @@ class SenderSession final {
   SenderStatsClient* stats_client_ = nullptr;
 };  // namespace cast
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_SENDER_SESSION_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/sender_session_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/sender_session_unittest.cc
index ef0c425d09e..71bc6786773 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/sender_session_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/sender_session_unittest.cc
@@ -26,8 +26,7 @@ using ::testing::NiceMock;
 using ::testing::Return;
 using ::testing::StrictMock;
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 constexpr char kMalformedAnswerMessage[] = R"({
@@ -640,5 +639,4 @@ TEST_F(SenderSessionTest, SuccessfulGetCapabilitiesRequest) {
   EXPECT_THAT(capabilities.video, testing::ElementsAre(VideoCapability::kVp8));
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/sender_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/sender_unittest.cc
index 8f801a79f83..05af24ea696 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/sender_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/sender_unittest.cc
@@ -15,7 +15,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "cast/streaming/compound_rtcp_builder.h"
 #include "cast/streaming/constants.h"
 #include "cast/streaming/encoded_frame.h"
@@ -53,8 +52,7 @@ using testing::Return;
 using testing::Sequence;
 using testing::StrictMock;
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 // Sender configuration.
@@ -244,7 +242,7 @@ class MockReceiver : public Environment::PacketConsumer {
     EXPECT_NE(ApparentPacketType::UNKNOWN, type_and_ssrc.first);
     EXPECT_EQ(kSenderSsrc, type_and_ssrc.second);
     if (type_and_ssrc.first == ApparentPacketType::RTP) {
-      const absl::optional<RtpPacketParser::ParseResult> part_of_frame =
+      const std::optional<RtpPacketParser::ParseResult> part_of_frame =
           rtp_parser_.Parse(packet);
       ASSERT_TRUE(part_of_frame);
 
@@ -260,7 +258,7 @@ class MockReceiver : public Environment::PacketConsumer {
       OnRtpPacket(*part_of_frame);
       CollectRtpPacket(*part_of_frame, std::move(packet));
     } else if (type_and_ssrc.first == ApparentPacketType::RTCP) {
-      absl::optional<SenderReportParser::SenderReportWithId> report =
+      std::optional<SenderReportParser::SenderReportWithId> report =
           sender_report_parser_.Parse(packet);
       ASSERT_TRUE(report);
       OnSenderReport(*report);
@@ -1206,5 +1204,4 @@ TEST_F(SenderTest, ResendsMissingFrames) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/session_config.cc b/chromium/third_party/openscreen/src/cast/streaming/session_config.cc
index 7f502198c02..b695ebd07d8 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/session_config.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/session_config.cc
@@ -7,8 +7,7 @@
 #include <algorithm>
 #include <utility>
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -50,5 +49,4 @@ bool SessionConfig::IsValid() const {
          std::any_of(aes_secret_key.begin(), aes_secret_key.end(), IsNonZero) &&
          std::any_of(aes_iv_mask.begin(), aes_iv_mask.end(), IsNonZero);
 }
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/session_config.h b/chromium/third_party/openscreen/src/cast/streaming/session_config.h
index 1b99affecbb..7abf4c8a2bb 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/session_config.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/session_config.h
@@ -12,8 +12,7 @@
 #include "cast/streaming/constants.h"
 #include "cast/streaming/ssrc.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // Common streaming configuration, established from the OFFER/ANSWER exchange,
 // that the Sender and Receiver are both assuming.
@@ -62,7 +61,6 @@ struct SessionConfig final {
   StreamType stream_type = StreamType::kUnknown;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_SESSION_CONFIG_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/session_messenger.cc b/chromium/third_party/openscreen/src/cast/streaming/session_messenger.cc
index eec6e4f107f..367eb4d9f70 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/session_messenger.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/session_messenger.cc
@@ -12,8 +12,7 @@
 #include "util/json/json_serialization.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -298,5 +297,4 @@ void ReceiverSessionMessenger::OnError(Error error) {
   ReportError(error);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/session_messenger.h b/chromium/third_party/openscreen/src/cast/streaming/session_messenger.h
index 3a8e98a5042..37f67694f94 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/session_messenger.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/session_messenger.h
@@ -10,7 +10,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "absl/types/variant.h"
 #include "cast/common/public/message_port.h"
 #include "cast/streaming/answer_messages.h"
@@ -22,8 +21,7 @@
 #include "util/flat_map.h"
 #include "util/weak_ptr.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // A message port interface designed specifically for use by the Receiver
 // and Sender session classes.
@@ -136,7 +134,6 @@ class ReceiverSessionMessenger final : public SessionMessenger {
   FlatMap<SenderMessage::Type, RequestCallback> callbacks_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_SESSION_MESSENGER_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/session_messenger_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/session_messenger_unittest.cc
index fcb2142d67b..da5d95bd150 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/session_messenger_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/session_messenger_unittest.cc
@@ -12,8 +12,7 @@
 #include "platform/test/fake_clock.h"
 #include "platform/test/fake_task_runner.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 using ::testing::ElementsAre;
 
@@ -603,5 +602,4 @@ TEST_F(SessionMessengerTest, UnknownNamespaceMessagesGetDropped) {
   ASSERT_TRUE(message_store_.receiver_messages.empty());
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/ssrc.cc b/chromium/third_party/openscreen/src/cast/streaming/ssrc.cc
index ce698221b17..6b9bee926ee 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/ssrc.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/ssrc.cc
@@ -8,8 +8,7 @@
 
 #include "platform/api/time.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -40,5 +39,4 @@ int ComparePriority(Ssrc ssrc_a, Ssrc ssrc_b) {
   return static_cast<int>(ssrc_a) - static_cast<int>(ssrc_b);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/ssrc.h b/chromium/third_party/openscreen/src/cast/streaming/ssrc.h
index 7cada7f3005..a48690fd7fb 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/ssrc.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/ssrc.h
@@ -7,8 +7,7 @@
 
 #include <stdint.h>
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // A Synchronization Source is a 32-bit opaque identifier used in RTP packets
 // for identifying the source (or recipient) of a logical sequence of encoded
@@ -33,7 +32,6 @@ Ssrc GenerateSsrc(bool higher_priority);
 //   ret > 0: Stream |ssrc_b| has higher priority.
 int ComparePriority(Ssrc ssrc_a, Ssrc ssrc_b);
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_SSRC_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/ssrc_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/ssrc_unittest.cc
index 18f357af6e4..22c0a2ad064 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/ssrc_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/ssrc_unittest.cc
@@ -9,8 +9,7 @@
 #include "gtest/gtest.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 namespace {
 
 TEST(SsrcTest, GeneratesUniqueAndPrioritizedSsrcs) {
@@ -51,5 +50,4 @@ TEST(SsrcTest, GeneratesUniqueAndPrioritizedSsrcs) {
 }
 
 }  // namespace
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/statistics.cc b/chromium/third_party/openscreen/src/cast/streaming/statistics.cc
index d41711368d6..8347feb039c 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/statistics.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/statistics.cc
@@ -13,8 +13,7 @@
 #include "util/json/json_serialization.h"
 #include "util/stringprintf.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -46,38 +45,38 @@ Json::Value ArrayToJson(
 const EnumNameTable<StatisticType,
                     static_cast<size_t>(StatisticType::kNumTypes)>
     kStatisticTypeNames = {
-        {{"kEnqueueFps", StatisticType::kEnqueueFps},
-         {"kAvgCaptureLatencyMs", StatisticType::kAvgCaptureLatencyMs},
-         {"kAvgEncodeTimeMs", StatisticType::kAvgEncodeTimeMs},
-         {"kAvgQueueingLatencyMs", StatisticType::kAvgQueueingLatencyMs},
-         {"kAvgNetworkLatencyMs", StatisticType::kAvgNetworkLatencyMs},
-         {"kAvgPacketLatencyMs", StatisticType::kAvgPacketLatencyMs},
-         {"kAvgFrameLatencyMs", StatisticType::kAvgFrameLatencyMs},
-         {"kAvgEndToEndLatencyMs", StatisticType::kAvgEndToEndLatencyMs},
-         {"kEncodeRateKbps", StatisticType::kEncodeRateKbps},
-         {"kPacketTransmissionRateKbps",
+        {{"EnqueueFps", StatisticType::kEnqueueFps},
+         {"AvgCaptureLatencyMs", StatisticType::kAvgCaptureLatencyMs},
+         {"AvgEncodeTimeMs", StatisticType::kAvgEncodeTimeMs},
+         {"AvgQueueingLatencyMs", StatisticType::kAvgQueueingLatencyMs},
+         {"AvgNetworkLatencyMs", StatisticType::kAvgNetworkLatencyMs},
+         {"AvgPacketLatencyMs", StatisticType::kAvgPacketLatencyMs},
+         {"AvgFrameLatencyMs", StatisticType::kAvgFrameLatencyMs},
+         {"AvgEndToEndLatencyMs", StatisticType::kAvgEndToEndLatencyMs},
+         {"EncodeRateKbps", StatisticType::kEncodeRateKbps},
+         {"PacketTransmissionRateKbps",
           StatisticType::kPacketTransmissionRateKbps},
-         {"kTimeSinceLastReceiverResponseMs",
+         {"TimeSinceLastReceiverResponseMs",
           StatisticType::kTimeSinceLastReceiverResponseMs},
-         {"kNumFramesCaptured", StatisticType::kNumFramesCaptured},
-         {"kNumFramesDroppedByEncoder",
+         {"NumFramesCaptured", StatisticType::kNumFramesCaptured},
+         {"NumFramesDroppedByEncoder",
           StatisticType::kNumFramesDroppedByEncoder},
-         {"kNumLateFrames", StatisticType::kNumLateFrames},
-         {"kNumPacketsSent", StatisticType::kNumPacketsSent},
-         {"kNumPacketsReceived", StatisticType::kNumPacketsReceived},
-         {"kFirstEventTimeMs", StatisticType::kFirstEventTimeMs},
-         {"kLastEventTimeMs", StatisticType::kLastEventTimeMs}}};
+         {"NumLateFrames", StatisticType::kNumLateFrames},
+         {"NumPacketsSent", StatisticType::kNumPacketsSent},
+         {"NumPacketsReceived", StatisticType::kNumPacketsReceived},
+         {"FirstEventTimeMs", StatisticType::kFirstEventTimeMs},
+         {"LastEventTimeMs", StatisticType::kLastEventTimeMs}}};
 
 const EnumNameTable<HistogramType,
                     static_cast<size_t>(HistogramType::kNumTypes)>
     kHistogramTypeNames = {
-        {{"kCaptureLatencyMs", HistogramType::kCaptureLatencyMs},
-         {"kEncodeTimeMs", HistogramType::kEncodeTimeMs},
-         {"kQueueingLatencyMs", HistogramType::kQueueingLatencyMs},
-         {"kNetworkLatencyMs", HistogramType::kNetworkLatencyMs},
-         {"kPacketLatencyMs", HistogramType::kPacketLatencyMs},
-         {"kEndToEndLatencyMs", HistogramType::kEndToEndLatencyMs},
-         {"kFrameLatenessMs", HistogramType::kFrameLatenessMs}}};
+        {{"CaptureLatencyMs", HistogramType::kCaptureLatencyMs},
+         {"EncodeTimeMs", HistogramType::kEncodeTimeMs},
+         {"QueueingLatencyMs", HistogramType::kQueueingLatencyMs},
+         {"NetworkLatencyMs", HistogramType::kNetworkLatencyMs},
+         {"PacketLatencyMs", HistogramType::kPacketLatencyMs},
+         {"EndToEndLatencyMs", HistogramType::kEndToEndLatencyMs},
+         {"FrameLatenessMs", HistogramType::kFrameLatenessMs}}};
 
 SimpleHistogram::SimpleHistogram() = default;
 SimpleHistogram::SimpleHistogram(int64_t min, int64_t max, int64_t width)
@@ -87,18 +86,17 @@ SimpleHistogram::SimpleHistogram(int64_t min, int64_t max, int64_t width)
   OSP_CHECK_EQ(0, (max - min) % width);
 }
 
-SimpleHistogram::SimpleHistogram(int64_t min,
-                                 int64_t max,
-                                 int64_t width,
-                                 std::vector<int> buckets)
-    : min(min), max(max), width(width), buckets(buckets) {}
-
 SimpleHistogram::SimpleHistogram(const SimpleHistogram&) = default;
 SimpleHistogram::SimpleHistogram(SimpleHistogram&&) noexcept = default;
 SimpleHistogram& SimpleHistogram::operator=(const SimpleHistogram&) = default;
 SimpleHistogram& SimpleHistogram::operator=(SimpleHistogram&&) = default;
 SimpleHistogram::~SimpleHistogram() = default;
 
+bool SimpleHistogram::operator==(const SimpleHistogram& other) const {
+  return min == other.min && max == other.max && width == other.width &&
+         buckets == other.buckets;
+}
+
 void SimpleHistogram::Add(int64_t sample) {
   if (sample < min) {
     ++buckets.front();
@@ -115,16 +113,17 @@ void SimpleHistogram::Reset() {
   buckets.assign(buckets.size(), 0);
 }
 
-SimpleHistogram SimpleHistogram::Copy() {
-  return SimpleHistogram(min, max, width, buckets);
-}
-
 Json::Value SimpleHistogram::ToJson() const {
-  Json::Value out;
-  out["min"] = min;
-  out["max"] = max;
-  out["width"] = width;
-  out["buckets"] = json::PrimitiveVectorToJson(buckets);
+  // Nest the bucket values in an array instead of a dictionary, so we sort
+  // numerically instead of alphabetically.
+  Json::Value out(Json::ValueType::arrayValue);
+  for (size_t i = 0; i < buckets.size(); ++i) {
+    if (buckets[i] != 0) {
+      Json::Value entry;
+      entry[GetBucketName(i)] = buckets[i];
+      out.append(entry);
+    }
+  }
   return out;
 }
 
@@ -132,6 +131,30 @@ std::string SimpleHistogram::ToString() const {
   return json::Stringify(ToJson()).value();
 }
 
+SimpleHistogram::SimpleHistogram(int64_t min,
+                                 int64_t max,
+                                 int64_t width,
+                                 std::vector<int> buckets)
+    : SimpleHistogram(min, max, width) {
+  this->buckets = std::move(buckets);
+}
+
+std::string SimpleHistogram::GetBucketName(size_t index) const {
+  if (index == 0) {
+    return "<" + std::to_string(min);
+  }
+
+  if (index == buckets.size() - 1) {
+    return ">=" + std::to_string(max);
+  }
+
+  // See the constructor comment for an example of how these bucket bounds
+  // are calculated.
+  const int bucket_min = min + width * (index - 1);
+  const int bucket_max = min + index * width - 1;
+  return StringPrintf("%d-%d", bucket_min, bucket_max);
+}
+
 Json::Value SenderStats::ToJson() const {
   Json::Value out;
   out["audio_statistics"] = ArrayToJson(audio_statistics, kStatisticTypeNames);
@@ -147,5 +170,4 @@ std::string SenderStats::ToString() const {
 
 SenderStatsClient::~SenderStatsClient() {}
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/statistics.h b/chromium/third_party/openscreen/src/cast/streaming/statistics.h
index b06f840f181..90d0af60fa7 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/statistics.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/statistics.h
@@ -18,8 +18,7 @@
 #include "platform/api/time.h"
 #include "util/enum_name_table.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 enum class StatisticType {
   // Frame enqueuing rate.
@@ -56,7 +55,8 @@ enum class StatisticType {
   // Packet transmission bitrate in kbps.
   kPacketTransmissionRateKbps,
 
-  // Duration in milliseconds since last receiver response.
+  // Duration in milliseconds since the estimated last time the receiver sent
+  // a response.
   kTimeSinceLastReceiverResponseMs,
 
   // Number of frames captured.
@@ -128,20 +128,20 @@ struct SimpleHistogram {
   // Overflow bucket: >= max
   // |min| must be less than |max|.
   // |width| must divide |max - min| evenly.
+  SimpleHistogram(int64_t min, int64_t max, int64_t width);
 
   SimpleHistogram();
-  SimpleHistogram(int64_t min, int64_t max, int64_t width);
   SimpleHistogram(const SimpleHistogram&);
   SimpleHistogram(SimpleHistogram&&) noexcept;
   SimpleHistogram& operator=(const SimpleHistogram&);
   SimpleHistogram& operator=(SimpleHistogram&&);
   ~SimpleHistogram();
 
+  bool operator==(const SimpleHistogram&) const;
+
   void Add(int64_t sample);
   void Reset();
 
-  // Creates a copy of this histogram with same min, max, width, and samples.
-  SimpleHistogram Copy();
   Json::Value ToJson() const;
   std::string ToString() const;
 
@@ -155,6 +155,8 @@ struct SimpleHistogram {
                   int64_t max,
                   int64_t width,
                   std::vector<int> buckets);
+
+  std::string GetBucketName(size_t index) const;
 };
 
 struct SenderStats {
@@ -192,7 +194,6 @@ class SenderStatsClient {
   virtual ~SenderStatsClient();
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_STATISTICS_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/statistics_analyzer.cc b/chromium/third_party/openscreen/src/cast/streaming/statistics_analyzer.cc
index fcfcda7bf53..81d10c55331 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/statistics_analyzer.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/statistics_analyzer.cc
@@ -9,13 +9,11 @@
 #include "platform/base/trivial_clock_traits.h"
 #include "util/chrono_helpers.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
-constexpr Clock::duration kStatisticsAnalysisInverval =
-    std::chrono::milliseconds(500);
+constexpr Clock::duration kAnalysisInterval = std::chrono::milliseconds(500);
 
 constexpr size_t kMaxRecentPacketInfoMapSize = 1000;
 constexpr size_t kMaxRecentFrameInfoMapSize = 200;
@@ -23,11 +21,11 @@ constexpr size_t kMaxRecentFrameInfoMapSize = 200;
 constexpr int kDefaultMaxLatencyBucketMs = 800;
 constexpr int kDefaultBucketWidthMs = 20;
 
-double InMilliseconds(const Clock::duration duration) {
+double InMilliseconds(Clock::duration duration) {
   return static_cast<double>(to_milliseconds(duration).count());
 }
 
-bool IsReceiverEvent(const StatisticsEventType event) {
+bool IsReceiverEvent(StatisticsEventType event) {
   return event == StatisticsEventType::kFrameAckSent ||
          event == StatisticsEventType::kFrameDecoded ||
          event == StatisticsEventType::kFramePlayedOut ||
@@ -53,17 +51,16 @@ StatisticsAnalyzer::StatisticsAnalyzer(
 StatisticsAnalyzer::~StatisticsAnalyzer() = default;
 
 void StatisticsAnalyzer::ScheduleAnalysis() {
-  const Clock::time_point next_analysis_time =
-      now_() + kStatisticsAnalysisInverval;
+  Clock::time_point next_analysis_time = now_() + kAnalysisInterval;
   alarm_.Schedule([this] { AnalyzeStatistics(); }, next_analysis_time);
 }
 
 void StatisticsAnalyzer::InitHistograms() {
-  for (auto& histogram : audio_histograms_) {
+  for (auto& histogram : histograms_.audio) {
     histogram =
         SimpleHistogram(0, kDefaultMaxLatencyBucketMs, kDefaultBucketWidthMs);
   }
-  for (auto& histogram : video_histograms_) {
+  for (auto& histogram : histograms_.video) {
     histogram =
         SimpleHistogram(0, kDefaultMaxLatencyBucketMs, kDefaultBucketWidthMs);
   }
@@ -85,64 +82,55 @@ void StatisticsAnalyzer::SendStatistics() {
   stats_client_->OnStatisticsUpdated(SenderStats{
       .audio_statistics =
           ConstructStatisticsList(end_time, StatisticsEventMediaType::kAudio),
-      .audio_histograms = GetAudioHistograms(),
+      .audio_histograms = histograms_.audio,
       .video_statistics =
           ConstructStatisticsList(end_time, StatisticsEventMediaType::kVideo),
-      .video_histograms = GetVideoHistograms()});
+      .video_histograms = histograms_.video});
 }
 
 void StatisticsAnalyzer::ProcessFrameEvents(
-    const std::vector<FrameEvent> frame_events) {
+    const std::vector<FrameEvent>& frame_events) {
   for (FrameEvent frame_event : frame_events) {
     offset_estimator_->OnFrameEvent(frame_event);
 
-    FrameStatsMap* frame_stats_map =
-        GetFrameStatsMapForMediaType(frame_event.media_type);
-    if (frame_stats_map) {
-      auto it = frame_stats_map->find(frame_event.type);
-      if (it == frame_stats_map->end()) {
-        frame_stats_map->insert(std::make_pair(
-            frame_event.type,
-            FrameStatsAggregate{.event_counter = 1,
-                                .sum_size = frame_event.size,
-                                .sum_delay = frame_event.delay_delta}));
-      } else {
-        ++(it->second.event_counter);
-        it->second.sum_size += frame_event.size;
-        it->second.sum_delay += frame_event.delay_delta;
-      }
+    FrameStatsMap& frame_stats_map = frame_stats_.Get(frame_event.media_type);
+    auto it = frame_stats_map.find(frame_event.type);
+    if (it == frame_stats_map.end()) {
+      frame_stats_map.insert(std::make_pair(
+          frame_event.type,
+          FrameStatsAggregate{.event_counter = 1,
+                              .sum_size = frame_event.size,
+                              .sum_delay = frame_event.delay_delta}));
+    } else {
+      ++(it->second.event_counter);
+      it->second.sum_size += frame_event.size;
+      it->second.sum_delay += frame_event.delay_delta;
     }
 
-    RecordEventTimes(frame_event.timestamp, frame_event.media_type,
-                     IsReceiverEvent(frame_event.type));
-
+    RecordEventTimes(frame_event);
     RecordFrameLatencies(frame_event);
   }
 }
 
 void StatisticsAnalyzer::ProcessPacketEvents(
-    const std::vector<PacketEvent> packet_events) {
+    const std::vector<PacketEvent>& packet_events) {
   for (PacketEvent packet_event : packet_events) {
     offset_estimator_->OnPacketEvent(packet_event);
 
-    PacketStatsMap* packet_stats_map =
-        GetPacketStatsMapForMediaType(packet_event.media_type);
-    if (packet_stats_map) {
-      auto it = packet_stats_map->find(packet_event.type);
-      if (it == packet_stats_map->end()) {
-        packet_stats_map->insert(std::make_pair(
-            packet_event.type,
-            PacketStatsAggregate{.event_counter = 1,
-                                 .sum_size = packet_event.size}));
-      } else {
-        ++(it->second.event_counter);
-        it->second.sum_size += packet_event.size;
-      }
+    PacketStatsMap& packet_stats_map =
+        packet_stats_.Get(packet_event.media_type);
+    auto it = packet_stats_map.find(packet_event.type);
+    if (it == packet_stats_map.end()) {
+      packet_stats_map.insert(
+          std::make_pair(packet_event.type,
+                         PacketStatsAggregate{.event_counter = 1,
+                                              .sum_size = packet_event.size}));
+    } else {
+      ++(it->second.event_counter);
+      it->second.sum_size += packet_event.size;
     }
 
-    RecordEventTimes(packet_event.timestamp, packet_event.media_type,
-                     IsReceiverEvent(packet_event.type));
-
+    RecordEventTimes(packet_event);
     if (packet_event.type == StatisticsEventType::kPacketSentToNetwork ||
         packet_event.type == StatisticsEventType::kPacketReceived) {
       RecordPacketLatencies(packet_event);
@@ -153,23 +141,25 @@ void StatisticsAnalyzer::ProcessPacketEvents(
   }
 }
 
-void StatisticsAnalyzer::RecordFrameLatencies(const FrameEvent frame_event) {
-  FrameInfoMap* frame_infos =
-      GetRecentFrameInfosForMediaType(frame_event.media_type);
-  if (!frame_infos) {
+void StatisticsAnalyzer::RecordFrameLatencies(const FrameEvent& frame_event) {
+  FrameInfoMap& frame_infos = recent_frame_infos_.Get(frame_event.media_type);
+
+  // Event is too old, don't bother.
+  const bool map_is_full = frame_infos.size() == kMaxRecentFrameInfoMapSize;
+  if (map_is_full && frame_event.rtp_timestamp <= frame_infos.begin()->first) {
     return;
   }
 
-  auto it = frame_infos->find(frame_event.rtp_timestamp);
-  if (it == frame_infos->end()) {
+  auto it = frame_infos.find(frame_event.rtp_timestamp);
+  if (it == frame_infos.end()) {
+    if (map_is_full) {
+      frame_infos.erase(frame_infos.begin());
+    }
+
     auto emplace_result =
-        frame_infos->emplace(frame_event.rtp_timestamp, FrameInfo{});
+        frame_infos.emplace(frame_event.rtp_timestamp, FrameInfo{});
     OSP_CHECK(emplace_result.second);
     it = emplace_result.first;
-
-    if (frame_infos->size() >= kMaxRecentFrameInfoMapSize) {
-      frame_infos->erase(frame_infos->begin());
-    }
   }
 
   switch (frame_event.type) {
@@ -236,11 +226,7 @@ void StatisticsAnalyzer::RecordFrameLatencies(const FrameEvent frame_event) {
 
       // Positive delay means the frame is late.
       if (frame_event.delay_delta > Clock::duration::zero()) {
-        SessionStats* session_stats =
-            GetSessionStatsForMediaType(frame_event.media_type);
-        if (session_stats) {
-          ++(session_stats->late_frame_counter);
-        }
+        session_stats_.Get(frame_event.media_type).late_frame_counter += 1;
         AddToHistogram(HistogramType::kFrameLatenessMs, frame_event.media_type,
                        InMilliseconds(frame_event.delay_delta));
       }
@@ -251,18 +237,17 @@ void StatisticsAnalyzer::RecordFrameLatencies(const FrameEvent frame_event) {
   }
 }
 
-void StatisticsAnalyzer::RecordPacketLatencies(const PacketEvent packet_event) {
-  FrameInfoMap* frame_infos =
-      GetRecentFrameInfosForMediaType(packet_event.media_type);
+void StatisticsAnalyzer::RecordPacketLatencies(
+    const PacketEvent& packet_event) {
+  FrameInfoMap& frame_infos = recent_frame_infos_.Get(packet_event.media_type);
 
   // Queueing latency is the time from when a frame is encoded to when the
   // packet is first sent.
-  if (frame_infos &&
-      packet_event.type == StatisticsEventType::kPacketSentToNetwork) {
-    auto it = frame_infos->find(packet_event.rtp_timestamp);
+  if (packet_event.type == StatisticsEventType::kPacketSentToNetwork) {
+    const auto it = frame_infos.find(packet_event.rtp_timestamp);
 
     // We have an encode end time for a frame associated with this packet.
-    if (it != frame_infos->end()) {
+    if (it != frame_infos.end()) {
       const Clock::duration queueing_latency =
           packet_event.timestamp - it->second.encode_end_time;
       AddToLatencyAggregrate(StatisticType::kAvgQueueingLatencyMs,
@@ -274,19 +259,16 @@ void StatisticsAnalyzer::RecordPacketLatencies(const PacketEvent packet_event) {
 
   StatisticsAnalyzer::PacketKey key =
       std::make_pair(packet_event.rtp_timestamp, packet_event.packet_id);
-  PacketInfoMap* packet_infos =
-      GetRecentPacketInfosForMediaType(packet_event.media_type);
-  if (!packet_infos) {
-    return;
-  }
+  PacketInfoMap& packet_infos =
+      recent_packet_infos_.Get(packet_event.media_type);
 
-  auto it = packet_infos->find(key);
-  if (it == packet_infos->end()) {
-    packet_infos->insert(
+  const auto it = packet_infos.find(key);
+  if (it == packet_infos.end()) {
+    packet_infos.insert(
         std::make_pair(key, PacketInfo{.timestamp = packet_event.timestamp,
                                        .type = packet_event.type}));
-    if (packet_infos->size() > kMaxRecentPacketInfoMapSize) {
-      packet_infos->erase(packet_infos->begin());
+    if (packet_infos.size() > kMaxRecentPacketInfoMapSize) {
+      packet_infos.erase(packet_infos.begin());
     }
   } else {  // We know when this packet was sent, and when it arrived.
     PacketInfo value = it->second;
@@ -305,11 +287,11 @@ void StatisticsAnalyzer::RecordPacketLatencies(const PacketEvent packet_event) {
       return;
     }
 
-    packet_infos->erase(it);
+    packet_infos.erase(it);
 
     // Use the offset estimator directly since we are trying to calculate the
     // average network latency.
-    const absl::optional<Clock::duration> receiver_offset =
+    const std::optional<Clock::duration> receiver_offset =
         offset_estimator_->GetEstimatedOffset();
     if (!receiver_offset) {
       return;
@@ -320,6 +302,7 @@ void StatisticsAnalyzer::RecordPacketLatencies(const PacketEvent packet_event) {
     // is received.
     const Clock::duration network_latency =
         packet_received_time - packet_sent_time;
+    RecordEstimatedNetworkLatency(network_latency);
     AddToLatencyAggregrate(StatisticType::kAvgNetworkLatencyMs, network_latency,
                            packet_event.media_type);
     AddToHistogram(HistogramType::kNetworkLatencyMs, packet_event.media_type,
@@ -327,8 +310,8 @@ void StatisticsAnalyzer::RecordPacketLatencies(const PacketEvent packet_event) {
 
     // Packet latency is the time from when a frame is encoded until when the
     // packet is received.
-    auto frame_it = frame_infos->find(packet_event.rtp_timestamp);
-    if (frame_it != frame_infos->end()) {
+    const auto frame_it = frame_infos.find(packet_event.rtp_timestamp);
+    if (frame_it != frame_infos.end()) {
       const Clock::duration packet_latency =
           packet_received_time - frame_it->second.encode_end_time;
       AddToLatencyAggregrate(StatisticType::kAvgPacketLatencyMs, packet_latency,
@@ -339,55 +322,46 @@ void StatisticsAnalyzer::RecordPacketLatencies(const PacketEvent packet_event) {
   }
 }
 
-void StatisticsAnalyzer::RecordEventTimes(
-    const Clock::time_point timestamp,
-    const StatisticsEventMediaType media_type,
-    const bool is_receiver_event) {
-  SessionStats* session_stats = GetSessionStatsForMediaType(media_type);
-  if (!session_stats) {
-    return;
-  }
+void StatisticsAnalyzer::RecordEventTimes(const StatisticsEvent& event) {
+  SessionStats& session_stats = session_stats_.Get(event.media_type);
+
+  Clock::time_point sender_timestamp = event.timestamp;
+  if (IsReceiverEvent(event.type)) {
+    const Clock::time_point estimated_sent_time =
+        event.received_timestamp - estimated_network_latency_;
+    session_stats.last_response_received_time = std::max(
+        session_stats.last_response_received_time, estimated_sent_time);
 
-  Clock::time_point sender_timestamp = timestamp;
-  if (is_receiver_event) {
-    auto timestamp_result = ToSenderTimestamp(timestamp, media_type);
-    if (!timestamp_result) {
+    const auto result = ToSenderTimestamp(event.timestamp, event.media_type);
+    if (!result) {
       return;
     }
-    sender_timestamp = *timestamp_result;
-
-    session_stats->last_response_received_time =
-        std::max(session_stats->last_response_received_time, sender_timestamp);
+    sender_timestamp = *result;
   }
 
-  session_stats->first_event_time =
-      std::min(session_stats->first_event_time, sender_timestamp);
-  session_stats->last_event_time =
-      std::max(session_stats->last_event_time, sender_timestamp);
+  session_stats.first_event_time =
+      std::min(session_stats.first_event_time, sender_timestamp);
+  session_stats.last_event_time =
+      std::max(session_stats.last_event_time, sender_timestamp);
 }
 
-void StatisticsAnalyzer::ErasePacketInfo(const PacketEvent packet_event) {
-  StatisticsAnalyzer::PacketKey key =
+void StatisticsAnalyzer::ErasePacketInfo(const PacketEvent& packet_event) {
+  const StatisticsAnalyzer::PacketKey key =
       std::make_pair(packet_event.rtp_timestamp, packet_event.packet_id);
-  PacketInfoMap* packet_infos =
-      GetRecentPacketInfosForMediaType(packet_event.media_type);
-  if (packet_infos) {
-    packet_infos->erase(key);
-  }
+  PacketInfoMap& packet_infos =
+      recent_packet_infos_.Get(packet_event.media_type);
+  packet_infos.erase(key);
 }
 
 void StatisticsAnalyzer::AddToLatencyAggregrate(
-    const StatisticType latency_stat,
-    const Clock::duration latency_delta,
-    const StatisticsEventMediaType media_type) {
-  LatencyStatsMap* latency_stats = GetLatencyStatsMapForMediaType(media_type);
-  if (!latency_stats) {
-    return;
-  }
+    StatisticType latency_stat,
+    Clock::duration latency_delta,
+    StatisticsEventMediaType media_type) {
+  LatencyStatsMap& latency_stats = latency_stats_.Get(media_type);
 
-  auto it = latency_stats->find(latency_stat);
-  if (it == latency_stats->end()) {
-    latency_stats->insert(std::make_pair(
+  auto it = latency_stats.find(latency_stat);
+  if (it == latency_stats.end()) {
+    latency_stats.insert(std::make_pair(
         latency_stat, LatencyStatsAggregate{.data_point_counter = 1,
                                             .sum_latency = latency_delta}));
   } else {
@@ -396,125 +370,25 @@ void StatisticsAnalyzer::AddToLatencyAggregrate(
   }
 }
 
-void StatisticsAnalyzer::AddToHistogram(
-    const HistogramType histogram,
-    const StatisticsEventMediaType media_type,
-    const int64_t sample) {
-  if (media_type == StatisticsEventMediaType::kAudio) {
-    audio_histograms_[static_cast<int>(histogram)].Add(sample);
-  } else if (media_type == StatisticsEventMediaType::kVideo) {
-    video_histograms_[static_cast<int>(histogram)].Add(sample);
-  }
-}
-
-StatisticsAnalyzer::FrameStatsMap*
-StatisticsAnalyzer::GetFrameStatsMapForMediaType(
-    const StatisticsEventMediaType media_type) {
-  switch (media_type) {
-    case StatisticsEventMediaType::kAudio:
-      return &audio_frame_stats_;
-    case StatisticsEventMediaType::kVideo:
-      return &video_frame_stats_;
-    default:
-      return nullptr;
-  }
-}
-
-StatisticsAnalyzer::PacketStatsMap*
-StatisticsAnalyzer::GetPacketStatsMapForMediaType(
-    const StatisticsEventMediaType media_type) {
-  switch (media_type) {
-    case StatisticsEventMediaType::kAudio:
-      return &audio_packet_stats_;
-    case StatisticsEventMediaType::kVideo:
-      return &video_packet_stats_;
-    default:
-      return nullptr;
-  }
-}
-
-StatisticsAnalyzer::LatencyStatsMap*
-StatisticsAnalyzer::GetLatencyStatsMapForMediaType(
-    const StatisticsEventMediaType media_type) {
-  switch (media_type) {
-    case StatisticsEventMediaType::kAudio:
-      return &audio_latency_stats_;
-    case StatisticsEventMediaType::kVideo:
-      return &video_latency_stats_;
-    default:
-      return nullptr;
-  }
-}
-
-StatisticsAnalyzer::SessionStats*
-StatisticsAnalyzer::GetSessionStatsForMediaType(
-    const StatisticsEventMediaType media_type) {
-  switch (media_type) {
-    case StatisticsEventMediaType::kAudio:
-      return &audio_session_stats_;
-    case StatisticsEventMediaType::kVideo:
-      return &video_session_stats_;
-    default:
-      return nullptr;
-  }
-}
-
-StatisticsAnalyzer::FrameInfoMap*
-StatisticsAnalyzer::GetRecentFrameInfosForMediaType(
-    const StatisticsEventMediaType media_type) {
-  switch (media_type) {
-    case StatisticsEventMediaType::kAudio:
-      return &audio_recent_frame_infos_;
-    case StatisticsEventMediaType::kVideo:
-      return &video_recent_frame_infos_;
-    default:
-      return nullptr;
-  }
-}
-
-StatisticsAnalyzer::PacketInfoMap*
-StatisticsAnalyzer::GetRecentPacketInfosForMediaType(
-    const StatisticsEventMediaType media_type) {
-  switch (media_type) {
-    case StatisticsEventMediaType::kAudio:
-      return &audio_recent_packet_infos_;
-    case StatisticsEventMediaType::kVideo:
-      return &video_recent_packet_infos_;
-    default:
-      return nullptr;
-  }
-}
-
-SenderStats::HistogramsList StatisticsAnalyzer::GetAudioHistograms() {
-  SenderStats::HistogramsList histos_list;
-  for (size_t i = 0; i < audio_histograms_.size(); i++) {
-    histos_list[i] = audio_histograms_[i].Copy();
-  }
-  return histos_list;
-}
-
-SenderStats::HistogramsList StatisticsAnalyzer::GetVideoHistograms() {
-  SenderStats::HistogramsList histos_list;
-  for (size_t i = 0; i < video_histograms_.size(); i++) {
-    histos_list[i] = video_histograms_[i].Copy();
-  }
-  return histos_list;
+void StatisticsAnalyzer::AddToHistogram(HistogramType histogram,
+                                        StatisticsEventMediaType media_type,
+                                        int64_t sample) {
+  histograms_.Get(media_type)[static_cast<int>(histogram)].Add(sample);
 }
 
 SenderStats::StatisticsList StatisticsAnalyzer::ConstructStatisticsList(
-    const Clock::time_point end_time,
-    const StatisticsEventMediaType media_type) {
+    Clock::time_point end_time,
+    StatisticsEventMediaType media_type) {
   SenderStats::StatisticsList stats_list;
 
   // TODO(b/298205111): Support kNumFramesDroppedByEncoder stat.
-  stats_list = PopulateFrameCountStat(StatisticsEventType::kFrameCaptureEnd,
-                                      StatisticType::kNumFramesCaptured,
-                                      stats_list, media_type);
+  PopulateFrameCountStat(StatisticsEventType::kFrameCaptureEnd,
+                         StatisticType::kNumFramesCaptured, media_type,
+                         stats_list);
 
   // kEnqueueFps
-  stats_list = PopulateFpsStat(StatisticsEventType::kFrameEncoded,
-                               StatisticType::kEnqueueFps, stats_list,
-                               media_type, end_time);
+  PopulateFpsStat(StatisticsEventType::kFrameEncoded,
+                  StatisticType::kEnqueueFps, media_type, end_time, stats_list);
 
   constexpr StatisticType kSupportedLatencyStats[] = {
       StatisticType::kAvgEncodeTimeMs,      StatisticType::kAvgCaptureLatencyMs,
@@ -523,87 +397,74 @@ SenderStats::StatisticsList StatisticsAnalyzer::ConstructStatisticsList(
       StatisticType::kAvgEndToEndLatencyMs,
   };
   for (StatisticType type : kSupportedLatencyStats) {
-    stats_list = PopulateAvgLatencyStat(type, stats_list, media_type);
+    PopulateAvgLatencyStat(type, media_type, stats_list);
   }
 
   // kEncodeRateKbps
-  stats_list = PopulateFrameBitrateStat(StatisticsEventType::kFrameEncoded,
-                                        StatisticType::kEncodeRateKbps,
-                                        stats_list, media_type, end_time);
+  PopulateFrameBitrateStat(StatisticsEventType::kFrameEncoded,
+                           StatisticType::kEncodeRateKbps, media_type, end_time,
+                           stats_list);
 
   // kPacketTransmissionRateKbps
-  stats_list =
-      PopulatePacketBitrateStat(StatisticsEventType::kPacketSentToNetwork,
-                                StatisticType::kPacketTransmissionRateKbps,
-                                stats_list, media_type, end_time);
+  PopulatePacketBitrateStat(StatisticsEventType::kPacketSentToNetwork,
+                            StatisticType::kPacketTransmissionRateKbps,
+                            media_type, end_time, stats_list);
 
   // kNumPacketsSent
-  stats_list = PopulatePacketCountStat(
-      StatisticsEventType::kPacketSentToNetwork, StatisticType::kNumPacketsSent,
-      stats_list, media_type);
+  PopulatePacketCountStat(StatisticsEventType::kPacketSentToNetwork,
+                          StatisticType::kNumPacketsSent, media_type,
+                          stats_list);
 
   // kNumPacketsReceived
-  stats_list = PopulatePacketCountStat(StatisticsEventType::kPacketReceived,
-                                       StatisticType::kNumPacketsReceived,
-                                       stats_list, media_type);
+  PopulatePacketCountStat(StatisticsEventType::kPacketReceived,
+                          StatisticType::kNumPacketsReceived, media_type,
+                          stats_list);
 
   // kTimeSinceLastReceiverResponseMs
   // kFirstEventTimeMs
   // kLastEventTimeMs
   // kNumLateFrames
-  stats_list = PopulateSessionStats(stats_list, media_type, end_time);
+  PopulateSessionStats(media_type, end_time, stats_list);
 
   return stats_list;
 }
 
-SenderStats::StatisticsList StatisticsAnalyzer::PopulatePacketCountStat(
-    const StatisticsEventType event,
-    const StatisticType stat,
-    SenderStats::StatisticsList stats_list,
-    const StatisticsEventMediaType media_type) {
-  PacketStatsMap* stats_map = GetPacketStatsMapForMediaType(media_type);
-  if (!stats_map) {
-    return stats_list;
-  }
+void StatisticsAnalyzer::PopulatePacketCountStat(
+    StatisticsEventType event,
+    StatisticType stat,
+    StatisticsEventMediaType media_type,
+    SenderStats::StatisticsList& stats_list) {
+  PacketStatsMap& stats_map = packet_stats_.Get(media_type);
 
-  auto it = stats_map->find(event);
-  if (it != stats_map->end()) {
+  auto it = stats_map.find(event);
+  if (it != stats_map.end()) {
     stats_list[static_cast<int>(stat)] = it->second.event_counter;
   }
-
-  return stats_list;
 }
 
-SenderStats::StatisticsList StatisticsAnalyzer::PopulateFrameCountStat(
-    const StatisticsEventType event,
-    const StatisticType stat,
-    SenderStats::StatisticsList stats_list,
-    const StatisticsEventMediaType media_type) {
-  FrameStatsMap* stats_map = GetFrameStatsMapForMediaType(media_type);
-  if (!stats_map) {
-    return stats_list;
-  }
-  auto it = stats_map->find(event);
-  if (it != stats_map->end()) {
+void StatisticsAnalyzer::PopulateFrameCountStat(
+    StatisticsEventType event,
+    StatisticType stat,
+    StatisticsEventMediaType media_type,
+    SenderStats::StatisticsList& stats_list) {
+  FrameStatsMap& stats_map = frame_stats_.Get(media_type);
+
+  const auto it = stats_map.find(event);
+  if (it != stats_map.end()) {
     stats_list[static_cast<int>(stat)] = it->second.event_counter;
   }
-
-  return stats_list;
 }
 
-SenderStats::StatisticsList StatisticsAnalyzer::PopulateFpsStat(
-    const StatisticsEventType event,
-    const StatisticType stat,
-    SenderStats::StatisticsList stats_list,
-    const StatisticsEventMediaType media_type,
-    const Clock::time_point end_time) {
-  FrameStatsMap* stats_map = GetFrameStatsMapForMediaType(media_type);
-  if (!stats_map) {
-    return stats_list;
-  }
+void StatisticsAnalyzer::PopulateFpsStat(
+    StatisticsEventType event,
+    StatisticType stat,
+    StatisticsEventMediaType media_type,
+    Clock::time_point end_time,
+    SenderStats::StatisticsList& stats_list) {
+  FrameStatsMap& stats_map = frame_stats_.Get(media_type);
 
-  auto it = stats_map->find(event);
-  if (it != stats_map->end()) {
+  const auto it = stats_map.find(event);
+  if (it != stats_map.end()) {
     const Clock::duration duration = end_time - start_time_;
     if (duration != Clock::duration::zero()) {
       const int count = it->second.event_counter;
@@ -611,128 +472,110 @@ SenderStats::StatisticsList StatisticsAnalyzer::PopulateFpsStat(
       stats_list[static_cast<int>(stat)] = fps;
     }
   }
-
-  return stats_list;
 }
 
-SenderStats::StatisticsList StatisticsAnalyzer::PopulateAvgLatencyStat(
-    const StatisticType stat,
-    SenderStats::StatisticsList stats_list,
-    const StatisticsEventMediaType media_type) {
-  LatencyStatsMap* latency_map = GetLatencyStatsMapForMediaType(media_type);
-  if (!latency_map) {
-    return stats_list;
-  }
+void StatisticsAnalyzer::PopulateAvgLatencyStat(
+    StatisticType stat,
+    StatisticsEventMediaType media_type,
+    SenderStats::StatisticsList& stats_list
+
+) {
+  LatencyStatsMap& latency_map = latency_stats_.Get(media_type);
 
-  auto it = latency_map->find(stat);
-  if (it != latency_map->end() && it->second.data_point_counter > 0) {
+  const auto it = latency_map.find(stat);
+  if (it != latency_map.end() && it->second.data_point_counter > 0) {
     const double avg_latency =
         InMilliseconds(it->second.sum_latency) / it->second.data_point_counter;
     stats_list[static_cast<int>(stat)] = avg_latency;
   }
-
-  return stats_list;
 }
 
-SenderStats::StatisticsList StatisticsAnalyzer::PopulateFrameBitrateStat(
-    const StatisticsEventType event,
-    const StatisticType stat,
-    SenderStats::StatisticsList stats_list,
-    const StatisticsEventMediaType media_type,
-    const Clock::time_point end_time) {
-  FrameStatsMap* stats_map = GetFrameStatsMapForMediaType(media_type);
-  if (!stats_map) {
-    return stats_list;
-  }
+void StatisticsAnalyzer::PopulateFrameBitrateStat(
+    StatisticsEventType event,
+    StatisticType stat,
+    StatisticsEventMediaType media_type,
+    Clock::time_point end_time,
+    SenderStats::StatisticsList& stats_list) {
+  FrameStatsMap& stats_map = frame_stats_.Get(media_type);
 
-  auto it = stats_map->find(event);
-  if (it != stats_map->end()) {
+  const auto it = stats_map.find(event);
+  if (it != stats_map.end()) {
     const Clock::duration duration = end_time - start_time_;
     if (duration != Clock::duration::zero()) {
       const double kbps = it->second.sum_size / InMilliseconds(duration) * 8;
       stats_list[static_cast<int>(stat)] = kbps;
     }
   }
-
-  return stats_list;
 }
 
-SenderStats::StatisticsList StatisticsAnalyzer::PopulatePacketBitrateStat(
-    const StatisticsEventType event,
-    const StatisticType stat,
-    SenderStats::StatisticsList stats_list,
-    const StatisticsEventMediaType media_type,
-    const Clock::time_point end_time) {
-  PacketStatsMap* stats_map = GetPacketStatsMapForMediaType(media_type);
-  if (!stats_map) {
-    return stats_list;
-  }
+void StatisticsAnalyzer::PopulatePacketBitrateStat(
+    StatisticsEventType event,
+    StatisticType stat,
+    StatisticsEventMediaType media_type,
+    Clock::time_point end_time,
+    SenderStats::StatisticsList& stats_list) {
+  PacketStatsMap& stats_map = packet_stats_.Get(media_type);
 
-  auto it = stats_map->find(event);
-  if (it != stats_map->end()) {
+  auto it = stats_map.find(event);
+  if (it != stats_map.end()) {
     const Clock::duration duration = end_time - start_time_;
     if (duration != Clock::duration::zero()) {
       const double kbps = it->second.sum_size / InMilliseconds(duration) * 8;
       stats_list[static_cast<int>(stat)] = kbps;
     }
   }
-
-  return stats_list;
 }
 
-SenderStats::StatisticsList StatisticsAnalyzer::PopulateSessionStats(
-    SenderStats::StatisticsList stats_list,
-    const StatisticsEventMediaType media_type,
-    const Clock::time_point end_time) {
-  SessionStats* session_stats = GetSessionStatsForMediaType(media_type);
-  if (!session_stats) {
-    return stats_list;
-  }
+void StatisticsAnalyzer::PopulateSessionStats(
+    StatisticsEventMediaType media_type,
+    Clock::time_point end_time,
+    SenderStats::StatisticsList& stats_list) {
+  SessionStats& session_stats = session_stats_.Get(media_type);
 
-  if (session_stats->first_event_time != Clock::time_point::min()) {
+  if (session_stats.first_event_time != Clock::time_point::min()) {
     stats_list[static_cast<int>(StatisticType::kFirstEventTimeMs)] =
-        InMilliseconds(session_stats->first_event_time.time_since_epoch());
+        InMilliseconds(session_stats.first_event_time.time_since_epoch());
   }
 
-  if (session_stats->last_event_time != Clock::time_point::min()) {
+  if (session_stats.last_event_time != Clock::time_point::min()) {
     stats_list[static_cast<int>(StatisticType::kLastEventTimeMs)] =
-        InMilliseconds(session_stats->last_event_time.time_since_epoch());
+        InMilliseconds(session_stats.last_event_time.time_since_epoch());
   }
 
-  if (session_stats->last_response_received_time != Clock::time_point::min()) {
+  if (session_stats.last_response_received_time != Clock::time_point::min()) {
     stats_list[static_cast<int>(
         StatisticType::kTimeSinceLastReceiverResponseMs)] =
-        InMilliseconds(end_time - session_stats->last_response_received_time);
+        InMilliseconds(end_time - session_stats.last_response_received_time);
   }
 
   stats_list[static_cast<int>(StatisticType::kNumLateFrames)] =
-      session_stats->late_frame_counter;
-
-  return stats_list;
+      session_stats.late_frame_counter;
 }
 
-absl::optional<Clock::time_point> StatisticsAnalyzer::ToSenderTimestamp(
+std::optional<Clock::time_point> StatisticsAnalyzer::ToSenderTimestamp(
     Clock::time_point receiver_timestamp,
-    StatisticsEventMediaType media_type) {
-  const absl::optional<Clock::duration> receiver_offset =
+    StatisticsEventMediaType media_type) const {
+  const std::optional<Clock::duration> receiver_offset =
       offset_estimator_->GetEstimatedOffset();
   if (!receiver_offset) {
     return {};
   }
-  receiver_timestamp -= *receiver_offset;
-
-  // Offset by the avg network latency, if available.
-  LatencyStatsMap* latency_map = GetLatencyStatsMapForMediaType(media_type);
-  if (latency_map) {
-    auto it = latency_map->find(StatisticType::kAvgNetworkLatencyMs);
-    if (it != latency_map->end() && it->second.data_point_counter > 0) {
-      const Clock::duration avg_network_latency =
-          it->second.sum_latency / it->second.data_point_counter;
-      receiver_timestamp += avg_network_latency;
-    }
+  return receiver_timestamp + estimated_network_latency_ - *receiver_offset;
+}
+
+void StatisticsAnalyzer::RecordEstimatedNetworkLatency(
+    Clock::duration latency) {
+  if (estimated_network_latency_ == Clock::duration{}) {
+    estimated_network_latency_ = latency;
+    return;
   }
 
-  return receiver_timestamp;
+  // We use an exponential moving average for recording the network latency.
+  // NOTE: value chosen experimentally to perform some smoothing and represent
+  // the past few seconds of data.
+  constexpr double kWeight = 2.0 / 301.0;
+  estimated_network_latency_ = to_microseconds(
+      latency * kWeight + estimated_network_latency_ * (1.0 - kWeight));
 }
-}  // namespace cast
-}  // namespace openscreen
+
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/statistics_analyzer.h b/chromium/third_party/openscreen/src/cast/streaming/statistics_analyzer.h
index 0e7a680e5cb..236bf0f198e 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/statistics_analyzer.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/statistics_analyzer.h
@@ -7,6 +7,7 @@
 
 #include <map>
 #include <memory>
+#include <optional>
 #include <utility>
 #include <vector>
 
@@ -16,8 +17,7 @@
 #include "platform/api/time.h"
 #include "util/alarm.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class StatisticsAnalyzer {
  public:
@@ -69,6 +69,24 @@ class StatisticsAnalyzer {
     int late_frame_counter = 0;
   };
 
+  // Named std::pair equivalent for audio + video classes.
+  template <typename T>
+  struct AVPair {
+    T audio;
+    T video;
+
+    const T& Get(StatisticsEventMediaType media_type) const {
+      if (media_type == StatisticsEventMediaType::kAudio) {
+        return audio;
+      }
+      OSP_CHECK(media_type == StatisticsEventMediaType::kVideo);
+      return video;
+    }
+    T& Get(StatisticsEventMediaType media_type) {
+      return const_cast<T&>(const_cast<const AVPair*>(this)->Get(media_type));
+    }
+  };
+
   using FrameStatsMap = std::map<StatisticsEventType, FrameStatsAggregate>;
   using PacketStatsMap = std::map<StatisticsEventType, PacketStatsAggregate>;
   using LatencyStatsMap = std::map<StatisticType, LatencyStatsAggregate>;
@@ -90,87 +108,70 @@ class StatisticsAnalyzer {
 
   // Handles incoming stat events, and adds their infos to all of the proper
   // stats maps / aggregates.
-  void ProcessFrameEvents(const std::vector<FrameEvent> frame_events);
-  void ProcessPacketEvents(const std::vector<PacketEvent> packet_events);
-  void RecordFrameLatencies(const FrameEvent frame_event);
-  void RecordPacketLatencies(const PacketEvent packet_event);
-  void RecordEventTimes(const Clock::time_point timestamp,
-                        const StatisticsEventMediaType media_type,
-                        const bool is_receiver_event);
-  void ErasePacketInfo(const PacketEvent packet_event);
-  void AddToLatencyAggregrate(const StatisticType latency_stat,
-                              const Clock::duration latency_delta,
-                              const StatisticsEventMediaType media_type);
-  void AddToHistogram(const HistogramType histogram,
-                      const StatisticsEventMediaType media_type,
-                      const int64_t sample);
-
-  // Gets a reference to the appropriate object based on `media_type`.
-  FrameStatsMap* GetFrameStatsMapForMediaType(
-      const StatisticsEventMediaType media_type);
-  PacketStatsMap* GetPacketStatsMapForMediaType(
-      const StatisticsEventMediaType media_type);
-  LatencyStatsMap* GetLatencyStatsMapForMediaType(
-      const StatisticsEventMediaType media_type);
-  SessionStats* GetSessionStatsForMediaType(
-      const StatisticsEventMediaType media_type);
-  FrameInfoMap* GetRecentFrameInfosForMediaType(
-      const StatisticsEventMediaType media_type);
-  PacketInfoMap* GetRecentPacketInfosForMediaType(
-      const StatisticsEventMediaType media_type);
-
-  // Create copies of the stat histograms in their current stats, and return
-  // them as a list.
-  SenderStats::HistogramsList GetAudioHistograms();
-  SenderStats::HistogramsList GetVideoHistograms();
+  void ProcessFrameEvents(const std::vector<FrameEvent>& frame_events);
+  void ProcessPacketEvents(const std::vector<PacketEvent>& packet_events);
+  void RecordFrameLatencies(const FrameEvent& frame_event);
+  void RecordPacketLatencies(const PacketEvent& packet_event);
+  void RecordEventTimes(const StatisticsEvent& event);
+  void ErasePacketInfo(const PacketEvent& packet_event);
+  void AddToLatencyAggregrate(StatisticType latency_stat,
+                              Clock::duration latency_delta,
+                              StatisticsEventMediaType media_type);
+  void AddToHistogram(HistogramType histogram,
+                      StatisticsEventMediaType media_type,
+                      int64_t sample);
 
   // Creates a stats list, and populates the entries based on stored stats info
   // / aggregates for each stat field.
   SenderStats::StatisticsList ConstructStatisticsList(
-      const Clock::time_point end_time,
-      const StatisticsEventMediaType media_type);
-  SenderStats::StatisticsList PopulatePacketCountStat(
-      const StatisticsEventType event,
-      const StatisticType stat,
-      SenderStats::StatisticsList stats_list,
-      const StatisticsEventMediaType media_type);
-  SenderStats::StatisticsList PopulateFrameCountStat(
-      const StatisticsEventType event,
-      const StatisticType stat,
-      SenderStats::StatisticsList stats_list,
-      const StatisticsEventMediaType media_type);
-  SenderStats::StatisticsList PopulateFpsStat(
-      const StatisticsEventType event,
-      const StatisticType stat,
-      SenderStats::StatisticsList stats_list,
-      StatisticsEventMediaType media_type,
-      const Clock::time_point end_time);
-  SenderStats::StatisticsList PopulateAvgLatencyStat(
-      const StatisticType stat,
-      SenderStats::StatisticsList stats_list,
-      const StatisticsEventMediaType media_type);
-  SenderStats::StatisticsList PopulateFrameBitrateStat(
-      const StatisticsEventType event,
-      const StatisticType stat,
-      SenderStats::StatisticsList stats_list,
-      const StatisticsEventMediaType media_type,
-      const Clock::time_point end_time);
-  SenderStats::StatisticsList PopulatePacketBitrateStat(
-      const StatisticsEventType event,
-      const StatisticType stat,
-      const SenderStats::StatisticsList stats_list,
-      StatisticsEventMediaType media_type,
-      const Clock::time_point end_time);
-  SenderStats::StatisticsList PopulateSessionStats(
-      SenderStats::StatisticsList stats_list,
-      const StatisticsEventMediaType media_type,
-      const Clock::time_point end_time);
+      Clock::time_point end_time,
+      StatisticsEventMediaType media_type);
+
+  void PopulatePacketCountStat(StatisticsEventType event,
+                               StatisticType stat,
+                               StatisticsEventMediaType media_type,
+                               SenderStats::StatisticsList& stats_list);
+
+  void PopulateFrameCountStat(StatisticsEventType event,
+                              StatisticType stat,
+                              StatisticsEventMediaType media_type,
+                              SenderStats::StatisticsList& stats_list);
+
+  void PopulateFpsStat(StatisticsEventType event,
+                       StatisticType stat,
+                       StatisticsEventMediaType media_type,
+                       Clock::time_point end_time,
+                       SenderStats::StatisticsList& stats_list);
+
+  void PopulateAvgLatencyStat(StatisticType stat,
+                              StatisticsEventMediaType media_type,
+                              SenderStats::StatisticsList& stats_list);
+
+  void PopulateFrameBitrateStat(StatisticsEventType event,
+                                StatisticType stat,
+                                StatisticsEventMediaType media_type,
+                                Clock::time_point end_time,
+                                SenderStats::StatisticsList& stats_list);
+
+  void PopulatePacketBitrateStat(StatisticsEventType event,
+                                 StatisticType stat,
+                                 StatisticsEventMediaType media_type,
+                                 Clock::time_point end_time,
+                                 SenderStats::StatisticsList& stats_list);
+
+  void PopulateSessionStats(StatisticsEventMediaType media_type,
+                            Clock::time_point end_time,
+                            SenderStats::StatisticsList& stats_list);
 
   // Calculates the offset between the sender and receiver clocks and returns
   // the sender-side version of this receiver timestamp, if possible.
-  absl::optional<Clock::time_point> ToSenderTimestamp(
+  std::optional<Clock::time_point> ToSenderTimestamp(
       Clock::time_point receiver_timestamp,
-      StatisticsEventMediaType media_type);
+      StatisticsEventMediaType media_type) const;
+
+  // Records the network latency estimate, which is then weighted and used as
+  // part of the moving network latency estimate.
+  void RecordEstimatedNetworkLatency(Clock::duration latency);
 
   // The statistics client to which we report analyzed statistics.
   SenderStatsClient* const stats_client_;
@@ -186,35 +187,31 @@ class StatisticsAnalyzer {
   Alarm alarm_;
   Clock::time_point start_time_;
 
+  // Keep track of the currently estimated network latency.
+  //
+  // NOTE: though we currently record the average network latency separately for
+  // audio and video, they use the same network so the value should be the same.
+  Clock::duration estimated_network_latency_{};
+
   // Maps of frame / packet infos used for stats that rely on seeing multiple
   // events. For example, network latency is the calculated time difference
   // between went a packet is sent, and when it is received.
-  FrameInfoMap audio_recent_frame_infos_;
-  FrameInfoMap video_recent_frame_infos_;
-  PacketInfoMap audio_recent_packet_infos_;
-  PacketInfoMap video_recent_packet_infos_;
-
-  // Aggregate stats for particular event types.
-  FrameStatsMap audio_frame_stats_;
-  FrameStatsMap video_frame_stats_;
-  PacketStatsMap audio_packet_stats_;
-  PacketStatsMap video_packet_stats_;
+  AVPair<FrameInfoMap> recent_frame_infos_;
+  AVPair<PacketInfoMap> recent_packet_infos_;
 
-  // Aggregates related to latency-type stats.
-  LatencyStatsMap audio_latency_stats_;
-  LatencyStatsMap video_latency_stats_;
+  // Aggregate statistics.
+  AVPair<FrameStatsMap> frame_stats_;
+  AVPair<PacketStatsMap> packet_stats_;
+  AVPair<LatencyStatsMap> latency_stats_;
 
   // Stats that relate to the entirety of the session. For example, total late
   // frames, or time of last event.
-  SessionStats audio_session_stats_;
-  SessionStats video_session_stats_;
+  AVPair<SessionStats> session_stats_;
 
-  // Histograms
-  SenderStats::HistogramsList audio_histograms_;
-  SenderStats::HistogramsList video_histograms_;
+  // Histograms.
+  AVPair<SenderStats::HistogramsList> histograms_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_STATISTICS_ANALYZER_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/statistics_analyzer_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/statistics_analyzer_unittest.cc
index ca23ad2fb14..be89474c395 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/statistics_analyzer_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/statistics_analyzer_unittest.cc
@@ -24,8 +24,7 @@ using testing::Return;
 using testing::Sequence;
 using testing::StrictMock;
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 namespace {
 
@@ -34,28 +33,29 @@ constexpr int kDefaultNumEvents = 20;
 constexpr int kDefaultSizeBytes = 10;
 constexpr int kDefaultStatIntervalMs = 5;
 
-const FrameEvent kDefaultFrameEvent =
-    FrameEvent(FrameId::first(),
-               StatisticsEventType::kFrameEncoded,
-               StatisticsEventMediaType::kVideo,
-               RtpTimeTicks(),
-               640,
-               480,
-               kDefaultSizeBytes,
-               Clock::time_point::min(),
-               std::chrono::milliseconds(20),
-               false,
-               0);
-
-const PacketEvent kDefaultPacketEvent =
-    PacketEvent(0u,
-                100u,
-                RtpTimeTicks(),
-                FrameId::first(),
-                kDefaultSizeBytes,
-                Clock::time_point::min(),
-                StatisticsEventType::kPacketSentToNetwork,
-                StatisticsEventMediaType::kVideo);
+constexpr FrameEvent kDefaultFrameEvent(FrameId::first(),
+                                        StatisticsEventType::kFrameEncoded,
+                                        StatisticsEventMediaType::kVideo,
+                                        RtpTimeTicks(),
+                                        kDefaultSizeBytes,
+                                        Clock::time_point::min(),
+                                        Clock::time_point::min(),
+                                        640,
+                                        480,
+                                        milliseconds(20),
+                                        false,
+                                        0);
+
+constexpr PacketEvent kDefaultPacketEvent(
+    FrameId::first(),
+    StatisticsEventType::kPacketSentToNetwork,
+    StatisticsEventMediaType::kVideo,
+    RtpTimeTicks(),
+    kDefaultSizeBytes,
+    Clock::time_point::min(),
+    Clock::time_point::min(),
+    0u,
+    100u);
 
 void ExpectStatEq(SenderStats::StatisticsList stats_list,
                   StatisticType stat,
@@ -95,7 +95,7 @@ class FakeClockOffsetEstimator : public ClockOffsetEstimator {
  public:
   MOCK_METHOD(void, OnFrameEvent, (const FrameEvent&), (override));
   MOCK_METHOD(void, OnPacketEvent, (const PacketEvent&), (override));
-  MOCK_METHOD(absl::optional<Clock::duration>,
+  MOCK_METHOD(std::optional<Clock::duration>,
               GetEstimatedOffset,
               (),
               (const, override));
@@ -146,7 +146,7 @@ TEST_F(StatisticsAnalyzerTest, FrameEncoded) {
 
     collector_->CollectFrameEvent(event);
     last_event_time = fake_clock_.now();
-    fake_clock_.Advance(std::chrono::milliseconds(kDefaultStatIntervalMs));
+    fake_clock_.Advance(milliseconds(kDefaultStatIntervalMs));
     rtp_timestamp += RtpTimeDelta::FromTicks(90);
   }
 
@@ -174,14 +174,14 @@ TEST_F(StatisticsAnalyzerTest, FrameEncoded) {
       }));
 
   fake_clock_.Advance(
-      std::chrono::milliseconds(kDefaultStatsAnalysisIntervalMs -
-                                (kDefaultStatIntervalMs * kDefaultNumEvents)));
+      milliseconds(kDefaultStatsAnalysisIntervalMs -
+                   (kDefaultStatIntervalMs * kDefaultNumEvents)));
 }
 
 TEST_F(StatisticsAnalyzerTest, FrameEncodedAndAckSent) {
   analyzer_->ScheduleAnalysis();
 
-  Clock::duration total_frame_latency = std::chrono::milliseconds(0);
+  Clock::duration total_frame_latency = milliseconds(0);
   RtpTimeTicks rtp_timestamp;
 
   for (int i = 0; i < kDefaultNumEvents; i++) {
@@ -191,8 +191,7 @@ TEST_F(StatisticsAnalyzerTest, FrameEncodedAndAckSent) {
     event1.timestamp = fake_clock_.now();
 
     // Let random frame delay be anywhere from 20 - 39 ms
-    Clock::duration random_latency =
-        std::chrono::milliseconds(20 + (rand() % 20));
+    Clock::duration random_latency = milliseconds(20 + (rand() % 20));
     total_frame_latency += random_latency;
 
     FrameEvent event2(kDefaultFrameEvent);
@@ -200,10 +199,11 @@ TEST_F(StatisticsAnalyzerTest, FrameEncodedAndAckSent) {
     event2.type = StatisticsEventType::kFrameAckSent;
     event2.rtp_timestamp = rtp_timestamp;
     event2.timestamp = fake_clock_.now() + random_latency;
+    event2.received_timestamp = fake_clock_.now() + random_latency * 2;
 
     collector_->CollectFrameEvent(event1);
     collector_->CollectFrameEvent(event2);
-    fake_clock_.Advance(std::chrono::milliseconds(kDefaultStatIntervalMs));
+    fake_clock_.Advance(milliseconds(kDefaultStatIntervalMs));
     rtp_timestamp += RtpTimeDelta::FromTicks(90);
   }
 
@@ -217,8 +217,8 @@ TEST_F(StatisticsAnalyzerTest, FrameEncodedAndAckSent) {
       }));
 
   fake_clock_.Advance(
-      std::chrono::milliseconds(kDefaultStatsAnalysisIntervalMs -
-                                (kDefaultStatIntervalMs * kDefaultNumEvents)));
+      milliseconds(kDefaultStatsAnalysisIntervalMs -
+                   (kDefaultStatIntervalMs * kDefaultNumEvents)));
 }
 
 TEST_F(StatisticsAnalyzerTest, FramePlayedOut) {
@@ -234,26 +234,26 @@ TEST_F(StatisticsAnalyzerTest, FramePlayedOut) {
     event1.timestamp = fake_clock_.now();
 
     // Let random frame delay be anywhere from 20 - 39 ms.
-    Clock::duration random_latency =
-        std::chrono::milliseconds(20 + (rand() % 20));
+    Clock::duration random_latency = milliseconds(20 + (rand() % 20));
 
     // Frames will have delay_deltas of -20, 0, 20, 40, or 60 ms.
-    auto delay_delta = std::chrono::milliseconds(60 - (20 * (i % 5)));
+    auto delay_delta = milliseconds(60 - (20 * (i % 5)));
 
     FrameEvent event2(kDefaultFrameEvent);
     event2.frame_id = FrameId(i);
     event2.type = StatisticsEventType::kFramePlayedOut;
     event2.rtp_timestamp = rtp_timestamp;
     event2.timestamp = fake_clock_.now() + random_latency;
+    event2.received_timestamp = fake_clock_.now() + random_latency * 2;
     event2.delay_delta = delay_delta;
 
-    if (delay_delta > std::chrono::milliseconds(0)) {
+    if (delay_delta > milliseconds(0)) {
       total_late_frames++;
     }
 
     collector_->CollectFrameEvent(event1);
     collector_->CollectFrameEvent(event2);
-    fake_clock_.Advance(std::chrono::milliseconds(kDefaultStatIntervalMs));
+    fake_clock_.Advance(milliseconds(kDefaultStatIntervalMs));
     rtp_timestamp += RtpTimeDelta::FromTicks(90);
   }
 
@@ -273,8 +273,8 @@ TEST_F(StatisticsAnalyzerTest, FramePlayedOut) {
       }));
 
   fake_clock_.Advance(
-      std::chrono::milliseconds(kDefaultStatsAnalysisIntervalMs -
-                                (kDefaultStatIntervalMs * kDefaultNumEvents)));
+      milliseconds(kDefaultStatsAnalysisIntervalMs -
+                   (kDefaultStatIntervalMs * kDefaultNumEvents)));
 }
 
 TEST_F(StatisticsAnalyzerTest, AllFrameEvents) {
@@ -312,8 +312,8 @@ TEST_F(StatisticsAnalyzerTest, AllFrameEvents) {
 
       current_event++;
     }
-    fake_clock_.Advance(std::chrono::milliseconds(kDefaultStatIntervalMs *
-                                                  kEventsToReport.size()));
+    fake_clock_.Advance(
+        milliseconds(kDefaultStatIntervalMs * kEventsToReport.size()));
     rtp_timestamp += RtpTimeDelta::FromTicks(90);
   }
 
@@ -349,14 +349,14 @@ TEST_F(StatisticsAnalyzerTest, AllFrameEvents) {
         }
       }));
 
-  fake_clock_.Advance(std::chrono::milliseconds(
-      kDefaultStatsAnalysisIntervalMs - (kDefaultStatIntervalMs * kNumEvents)));
+  fake_clock_.Advance(milliseconds(kDefaultStatsAnalysisIntervalMs -
+                                   (kDefaultStatIntervalMs * kNumEvents)));
 }
 
 TEST_F(StatisticsAnalyzerTest, FrameEncodedAndPacketSent) {
   analyzer_->ScheduleAnalysis();
 
-  Clock::duration total_queueing_latency = std::chrono::milliseconds(0);
+  Clock::duration total_queueing_latency = milliseconds(0);
   RtpTimeTicks rtp_timestamp;
 
   for (int i = 0; i < kDefaultNumEvents; i++) {
@@ -366,8 +366,7 @@ TEST_F(StatisticsAnalyzerTest, FrameEncodedAndPacketSent) {
     event1.timestamp = fake_clock_.now();
 
     // Let queueing latency be either 0, 20, 40, 60, or 80 ms.
-    const Clock::duration queueing_latency =
-        std::chrono::milliseconds(80 - (20 * (i % 5)));
+    const Clock::duration queueing_latency = milliseconds(80 - (20 * (i % 5)));
     total_queueing_latency += queueing_latency;
 
     PacketEvent event2(kDefaultPacketEvent);
@@ -378,7 +377,7 @@ TEST_F(StatisticsAnalyzerTest, FrameEncodedAndPacketSent) {
 
     collector_->CollectFrameEvent(event1);
     collector_->CollectPacketEvent(event2);
-    fake_clock_.Advance(std::chrono::milliseconds(kDefaultStatIntervalMs));
+    fake_clock_.Advance(milliseconds(kDefaultStatIntervalMs));
     rtp_timestamp += RtpTimeDelta::FromTicks(90);
   }
 
@@ -410,14 +409,14 @@ TEST_F(StatisticsAnalyzerTest, FrameEncodedAndPacketSent) {
       }));
 
   fake_clock_.Advance(
-      std::chrono::milliseconds(kDefaultStatsAnalysisIntervalMs -
-                                (kDefaultStatIntervalMs * kDefaultNumEvents)));
+      milliseconds(kDefaultStatsAnalysisIntervalMs -
+                   (kDefaultStatIntervalMs * kDefaultNumEvents)));
 }
 
 TEST_F(StatisticsAnalyzerTest, PacketSentAndReceived) {
   analyzer_->ScheduleAnalysis();
 
-  Clock::duration total_network_latency = std::chrono::milliseconds(0);
+  Clock::duration total_network_latency = milliseconds(0);
   RtpTimeTicks rtp_timestamp;
 
   for (int i = 0; i < kDefaultNumEvents; i++) {
@@ -428,8 +427,7 @@ TEST_F(StatisticsAnalyzerTest, PacketSentAndReceived) {
     event1.timestamp = fake_clock_.now();
 
     // Let network latency be either 0, 20, 40, 60, or 80 ms.
-    Clock::duration network_latency =
-        std::chrono::milliseconds(80 - (20 * (i % 5)));
+    Clock::duration network_latency = milliseconds(80 - (20 * (i % 5)));
     total_network_latency += network_latency;
 
     PacketEvent event2(kDefaultPacketEvent);
@@ -437,11 +435,12 @@ TEST_F(StatisticsAnalyzerTest, PacketSentAndReceived) {
     event2.rtp_timestamp = rtp_timestamp;
     event2.frame_id = FrameId(i);
     event2.timestamp = fake_clock_.now() + network_latency;
+    event2.received_timestamp = fake_clock_.now() + network_latency * 2;
     event2.type = StatisticsEventType::kPacketReceived;
 
     collector_->CollectPacketEvent(event1);
     collector_->CollectPacketEvent(event2);
-    fake_clock_.Advance(std::chrono::milliseconds(kDefaultStatIntervalMs));
+    fake_clock_.Advance(milliseconds(kDefaultStatIntervalMs));
     rtp_timestamp += RtpTimeDelta::FromTicks(90);
   }
 
@@ -467,14 +466,14 @@ TEST_F(StatisticsAnalyzerTest, PacketSentAndReceived) {
       }));
 
   fake_clock_.Advance(
-      std::chrono::milliseconds(kDefaultStatsAnalysisIntervalMs -
-                                (kDefaultStatIntervalMs * kDefaultNumEvents)));
+      milliseconds(kDefaultStatsAnalysisIntervalMs -
+                   (kDefaultStatIntervalMs * kDefaultNumEvents)));
 }
 
 TEST_F(StatisticsAnalyzerTest, FrameEncodedPacketSentAndReceived) {
   analyzer_->ScheduleAnalysis();
 
-  Clock::duration total_packet_latency = std::chrono::milliseconds(0);
+  Clock::duration total_packet_latency = milliseconds(0);
   RtpTimeTicks rtp_timestamp;
   Clock::time_point last_event_time;
 
@@ -491,8 +490,7 @@ TEST_F(StatisticsAnalyzerTest, FrameEncodedPacketSentAndReceived) {
     event2.timestamp = fake_clock_.now();
 
     // Let packet latency be either 20, 40, 60, 80, or 100 ms.
-    Clock::duration packet_latency =
-        std::chrono::milliseconds(100 - (20 * (i % 5)));
+    Clock::duration packet_latency = milliseconds(100 - (20 * (i % 5)));
     total_packet_latency += packet_latency;
     if (fake_clock_.now() + packet_latency > last_event_time) {
       last_event_time = fake_clock_.now() + packet_latency;
@@ -503,12 +501,13 @@ TEST_F(StatisticsAnalyzerTest, FrameEncodedPacketSentAndReceived) {
     event3.rtp_timestamp = rtp_timestamp;
     event3.frame_id = FrameId(i);
     event3.timestamp = fake_clock_.now() + packet_latency;
+    event3.received_timestamp = fake_clock_.now() + packet_latency * 2;
     event3.type = StatisticsEventType::kPacketReceived;
 
     collector_->CollectFrameEvent(event1);
     collector_->CollectPacketEvent(event2);
     collector_->CollectPacketEvent(event3);
-    fake_clock_.Advance(std::chrono::milliseconds(kDefaultStatIntervalMs));
+    fake_clock_.Advance(milliseconds(kDefaultStatIntervalMs));
     rtp_timestamp += RtpTimeDelta::FromTicks(90);
   }
 
@@ -519,13 +518,11 @@ TEST_F(StatisticsAnalyzerTest, FrameEncodedPacketSentAndReceived) {
         ExpectStatEq(stats.video_statistics, StatisticType::kNumPacketsReceived,
                      kDefaultNumEvents);
 
-        const double avg_network_delay =
-            stats.video_statistics[static_cast<int>(
-                StatisticType::kAvgNetworkLatencyMs)];
         const double expected_time_since_last_receiver_response =
             static_cast<double>(
-                to_milliseconds(fake_clock_.now() - last_event_time).count()) -
-            avg_network_delay;
+                (to_milliseconds(fake_clock_.now() - last_event_time) -
+                 milliseconds(25))
+                    .count());
         ExpectStatEq(stats.video_statistics,
                      StatisticType::kTimeSinceLastReceiverResponseMs,
                      expected_time_since_last_receiver_response);
@@ -549,8 +546,8 @@ TEST_F(StatisticsAnalyzerTest, FrameEncodedPacketSentAndReceived) {
       }));
 
   fake_clock_.Advance(
-      std::chrono::milliseconds(kDefaultStatsAnalysisIntervalMs -
-                                (kDefaultStatIntervalMs * kDefaultNumEvents)));
+      milliseconds(kDefaultStatsAnalysisIntervalMs -
+                   (kDefaultStatIntervalMs * kDefaultNumEvents)));
 }
 
 TEST_F(StatisticsAnalyzerTest, AudioAndVideoFrameEncodedPacketSentAndReceived) {
@@ -560,8 +557,8 @@ TEST_F(StatisticsAnalyzerTest, AudioAndVideoFrameEncodedPacketSentAndReceived) {
   const int frame_interval_ms = 2;
 
   RtpTimeTicks rtp_timestamp;
-  Clock::duration total_audio_packet_latency = std::chrono::milliseconds(0);
-  Clock::duration total_video_packet_latency = std::chrono::milliseconds(0);
+  Clock::duration total_audio_packet_latency = milliseconds(0);
+  Clock::duration total_video_packet_latency = milliseconds(0);
   int total_audio_events = 0;
   int total_video_events = 0;
 
@@ -581,12 +578,11 @@ TEST_F(StatisticsAnalyzerTest, AudioAndVideoFrameEncodedPacketSentAndReceived) {
     event2.packet_id = static_cast<uint16_t>(i);
     event2.rtp_timestamp = rtp_timestamp;
     event2.frame_id = FrameId(i);
-    event2.timestamp = fake_clock_.now() + std::chrono::milliseconds(5);
+    event2.timestamp = fake_clock_.now() + milliseconds(5);
     event2.media_type = media_type;
 
     // Let packet latency be either 20, 40, 60, 80, or 100 ms.
-    Clock::duration packet_latency =
-        std::chrono::milliseconds(100 - (20 * (i % 5)));
+    Clock::duration packet_latency = milliseconds(100 - (20 * (i % 5)));
     if (media_type == StatisticsEventMediaType::kAudio) {
       total_audio_events++;
       total_audio_packet_latency += packet_latency;
@@ -606,7 +602,7 @@ TEST_F(StatisticsAnalyzerTest, AudioAndVideoFrameEncodedPacketSentAndReceived) {
     collector_->CollectFrameEvent(event1);
     collector_->CollectPacketEvent(event2);
     collector_->CollectPacketEvent(event3);
-    fake_clock_.Advance(std::chrono::milliseconds(frame_interval_ms));
+    fake_clock_.Advance(milliseconds(frame_interval_ms));
     rtp_timestamp += RtpTimeDelta::FromTicks(90);
   }
 
@@ -635,9 +631,94 @@ TEST_F(StatisticsAnalyzerTest, AudioAndVideoFrameEncodedPacketSentAndReceived) {
                      expected_video_avg_packet_latency);
       }));
 
-  fake_clock_.Advance(std::chrono::milliseconds(
-      kDefaultStatsAnalysisIntervalMs - (frame_interval_ms * num_events)));
+  fake_clock_.Advance(milliseconds(kDefaultStatsAnalysisIntervalMs -
+                                   (frame_interval_ms * num_events)));
 }
 
-}  // namespace cast
-}  // namespace openscreen
+TEST_F(StatisticsAnalyzerTest, LotsOfEventsStillWorksProperly) {
+  constexpr std::array<StatisticsEventType, 5> kEventsToReport{
+      StatisticsEventType::kFrameCaptureBegin,
+      StatisticsEventType::kFrameCaptureEnd, StatisticsEventType::kFrameEncoded,
+      StatisticsEventType::kFrameAckSent, StatisticsEventType::kFramePlayedOut};
+  constexpr int kNumFrames = 1000;
+  constexpr int kNumEvents = kNumFrames * kEventsToReport.size();
+
+  constexpr std::array<int, 5> kFramePlayoutDelayDeltasMs{10, 14, 3, 40, 1};
+  constexpr std::array<int, 25> kTimestampOffsetsMs{
+      // clang-format off
+      0, 13, 39, 278, 552,   // Frame One.
+      0, 14, 34, 239, 373,   // Frame Two.
+      0, 19, 29, 245, 389,   // Frame Three.
+      0, 17, 37, 261, 390,   // Frame Four.
+      0, 14, 44, 290, 440,   // Frame Five.
+      // clang-format on
+  };
+
+  constexpr std::array<std::pair<StatisticType, double>, 7> kExpectedStats{{
+      {StatisticType::kNumLateFrames, 1000},
+      {StatisticType::kNumFramesCaptured, 1000},
+      {StatisticType::kAvgEndToEndLatencyMs, 428.8},
+      {StatisticType::kAvgCaptureLatencyMs, 15.4},
+      {StatisticType::kAvgFrameLatencyMs, 226},
+      {StatisticType::kAvgEncodeTimeMs, 21.2},
+      {StatisticType::kEnqueueFps, 40},
+  }};
+
+  constexpr std::array<std::pair<HistogramType, std::array<int, 30>>, 4>
+      kExpectedHistograms{
+          {{HistogramType::kCaptureLatencyMs, {0, 1000}},
+           {HistogramType::kEncodeTimeMs, {0, 200, 800}},
+           {HistogramType::kEndToEndLatencyMs,
+            {0, 0, 0, 0, 0,   0,   0, 0, 0,   0, 0, 0, 0, 0,  0,
+             0, 0, 0, 0, 200, 400, 0, 0, 200, 0, 0, 0, 0, 200
+
+            }},
+           {HistogramType::kFrameLatenessMs, {0, 800, 0, 200}}}};
+
+  // We don't check stats the first 49 times, only the last.
+  {
+    testing::InSequence s;
+    EXPECT_CALL(stats_client_, OnStatisticsUpdated(_)).Times(49);
+    EXPECT_CALL(stats_client_, OnStatisticsUpdated(_))
+        .WillOnce(Invoke([&](const SenderStats& stats) {
+          for (const auto& stat_pair : kExpectedStats) {
+            ExpectStatEq(stats.video_statistics, stat_pair.first,
+                         stat_pair.second);
+          }
+          for (const auto& histogram_pair : kExpectedHistograms) {
+            ExpectHistoBuckets(stats.video_histograms, histogram_pair.first,
+                               histogram_pair.second);
+          }
+        }));
+  }
+
+  analyzer_->ScheduleAnalysis();
+  RtpTimeTicks rtp_timestamp;
+  int current_event = 0;
+  for (int frame_id = 0; frame_id < kNumFrames; frame_id++) {
+    for (StatisticsEventType event_type : kEventsToReport) {
+      FrameEvent event(kDefaultFrameEvent);
+      event.type = event_type;
+      event.frame_id = FrameId(frame_id);
+      event.rtp_timestamp = rtp_timestamp;
+      event.timestamp =
+          fake_clock_.now() +
+          milliseconds(
+              kTimestampOffsetsMs[current_event % kTimestampOffsetsMs.size()]);
+      event.delay_delta = milliseconds(
+          kFramePlayoutDelayDeltasMs[frame_id %
+                                     kFramePlayoutDelayDeltasMs.size()]);
+      collector_->CollectFrameEvent(std::move(event));
+
+      current_event++;
+    }
+    fake_clock_.Advance(
+        milliseconds(kDefaultStatIntervalMs * kEventsToReport.size()));
+    rtp_timestamp += RtpTimeDelta::FromTicks(90);
+  }
+
+  fake_clock_.Advance(milliseconds(kDefaultStatsAnalysisIntervalMs -
+                                   (kDefaultStatIntervalMs * kNumEvents)));
+}
+
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/statistics_collector.cc b/chromium/third_party/openscreen/src/cast/streaming/statistics_collector.cc
index 11a9caf6d6d..c3023dffd43 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/statistics_collector.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/statistics_collector.cc
@@ -12,8 +12,7 @@
 #include "cast/streaming/environment.h"
 #include "util/big_endian.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 StatisticsCollector::StatisticsCollector(ClockNowFunctionPtr now) : now_(now) {}
 StatisticsCollector::~StatisticsCollector() = default;
@@ -72,5 +71,4 @@ std::vector<FrameEvent> StatisticsCollector::TakeRecentFrameEvents() {
   return out;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/statistics_collector.h b/chromium/third_party/openscreen/src/cast/streaming/statistics_collector.h
index e266df2386d..43bcc8495f4 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/statistics_collector.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/statistics_collector.h
@@ -11,8 +11,7 @@
 #include "platform/api/time.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 // This POD struct contains helpful information about a given packet that is
 // not stored directly on the packet itself.
@@ -60,7 +59,6 @@ class StatisticsCollector {
   std::vector<FrameEvent> recent_frame_events_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_STATISTICS_COLLECTOR_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/statistics_collector_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/statistics_collector_unittest.cc
index 4a588b5c0c1..4ffb9e66937 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/statistics_collector_unittest.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/statistics_collector_unittest.cc
@@ -12,9 +12,9 @@
 #include "platform/base/span.h"
 #include "platform/test/fake_clock.h"
 #include "platform/test/fake_task_runner.h"
+#include "util/chrono_helpers.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class StatisticsCollectorTest : public ::testing::Test {
  public:
@@ -32,23 +32,29 @@ TEST_F(StatisticsCollectorTest, ReturnsEmptyIfNoEvents) {
 }
 
 TEST_F(StatisticsCollectorTest, CanCollectPacketEvents) {
-  const PacketEvent kEventOne{123u,
-                              456u,
-                              RtpTimeTicks(47474838),
-                              FrameId(5000),
-                              1234,
-                              Clock::now(),
-                              StatisticsEventType::kPacketSentToNetwork,
-                              StatisticsEventMediaType::kAudio};
-
-  const PacketEvent kEventTwo{124u,
-                              456u,
-                              RtpTimeTicks(4747900),
-                              FrameId(20000),
-                              553,
-                              Clock::now(),
-                              StatisticsEventType::kPacketSentToNetwork,
-                              StatisticsEventMediaType::kVideo};
+  // clang-format off
+  constexpr PacketEvent kEventOne(
+      FrameId(5000),
+      StatisticsEventType::kPacketSentToNetwork,
+      StatisticsEventMediaType::kAudio,
+      RtpTimeTicks(47474838),
+      1234u,
+      Clock::time_point(milliseconds(12455680)),
+      Clock::time_point(milliseconds(12455685)),
+      123u,
+      456u);
+
+  constexpr PacketEvent kEventTwo(
+      FrameId(20000),
+      StatisticsEventType::kPacketSentToNetwork,
+      StatisticsEventMediaType::kVideo,
+      RtpTimeTicks(4747900),
+      553u,
+      Clock::time_point(milliseconds(12455880)),
+      Clock::time_point(milliseconds(12455889)),
+      124u,
+      456u);
+  // clang-format on
 
   collector_.CollectPacketEvent(kEventOne);
   collector_.CollectPacketEvent(kEventTwo);
@@ -95,29 +101,35 @@ TEST_F(StatisticsCollectorTest, CanCollectPacketSentEvents) {
 }
 
 TEST_F(StatisticsCollectorTest, CanCollectFrameEvents) {
-  const FrameEvent kEventOne{FrameId(1),
-                             StatisticsEventType::kFrameAckReceived,
-                             StatisticsEventMediaType::kVideo,
-                             RtpTimeTicks(1233),
-                             /* width= */ 640,
-                             /* height= */ 480,
-                             /* size= */ 0,
-                             Clock::now(),
-                             /* delay_delta= */ std::chrono::milliseconds(20),
-                             /* key_frame=*/false,
-                             0};
-
-  const FrameEvent kEventTwo{FrameId(2),
-                             StatisticsEventType::kFramePlayedOut,
-                             StatisticsEventMediaType::kAudio,
-                             RtpTimeTicks(1733),
-                             /* width= */ 0,
-                             /* height= */ 0,
-                             /* size= */ 6000,
-                             Clock::now(),
-                             /* delay_delta= */ std::chrono::milliseconds(10),
-                             /* key_frame= */ false,
-                             /* target_bitrate = */ 5000};
+  // clang-format off
+  constexpr FrameEvent kEventOne(
+      FrameId(1),
+      StatisticsEventType::kFrameAckReceived,
+      StatisticsEventMediaType::kVideo,
+      RtpTimeTicks(1233),
+      /* size= */ 0,
+      Clock::time_point(milliseconds(12345678)),
+      Clock::time_point(milliseconds(12345699)),
+      /* width= */ 640,
+      /* height= */ 480,
+      /* delay_delta= */ std::chrono::milliseconds(20),
+      /* key_frame= */ false,
+      /* target_bitrate= */ 0);
+
+  constexpr FrameEvent kEventTwo(
+      FrameId(2),
+      StatisticsEventType::kFramePlayedOut,
+      StatisticsEventMediaType::kAudio,
+      RtpTimeTicks(1733),
+      /* size= */ 6000,
+      Clock::time_point(milliseconds(12455680)),
+      Clock::time_point(milliseconds(12455685)),
+      /* width= */ 0,
+      /* height= */ 0,
+      /* delay_delta= */ std::chrono::milliseconds(10),
+      /* key_frame= */ false,
+      /* target_bitrate = */ 5000);
+  // clang-format on
 
   collector_.CollectFrameEvent(kEventOne);
   collector_.CollectFrameEvent(kEventTwo);
@@ -128,5 +140,4 @@ TEST_F(StatisticsCollectorTest, CanCollectFrameEvents) {
   EXPECT_EQ(kEventTwo, events[1]);
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/statistics_defines.cc b/chromium/third_party/openscreen/src/cast/streaming/statistics_defines.cc
index 51764951656..ec34a2c0654 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/statistics_defines.cc
+++ b/chromium/third_party/openscreen/src/cast/streaming/statistics_defines.cc
@@ -4,8 +4,7 @@
 
 #include "cast/streaming/statistics_defines.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 const EnumNameTable<StatisticsEventType,
                     static_cast<size_t>(StatisticsEventType::kNumOfEvents)>
@@ -36,35 +35,39 @@ StatisticsEventMediaType ToMediaType(StreamType type) {
   OSP_NOTREACHED();
 }
 
-FrameEvent::FrameEvent() = default;
+StatisticsEvent::StatisticsEvent(const StatisticsEvent& other) = default;
+StatisticsEvent::StatisticsEvent(StatisticsEvent&& other) noexcept = default;
+StatisticsEvent& StatisticsEvent::operator=(const StatisticsEvent& other) =
+    default;
+StatisticsEvent& StatisticsEvent::operator=(StatisticsEvent&& other) = default;
+
+bool StatisticsEvent::operator==(const StatisticsEvent& other) const {
+  return frame_id == other.frame_id && type == other.type &&
+         media_type == other.media_type &&
+         rtp_timestamp == other.rtp_timestamp && size == other.size &&
+         timestamp == other.timestamp &&
+         received_timestamp == other.received_timestamp;
+}
+
 FrameEvent::FrameEvent(const FrameEvent& other) = default;
 FrameEvent::FrameEvent(FrameEvent&& other) noexcept = default;
 FrameEvent& FrameEvent::operator=(const FrameEvent& other) = default;
 FrameEvent& FrameEvent::operator=(FrameEvent&& other) = default;
-FrameEvent::~FrameEvent() = default;
 
 bool FrameEvent::operator==(const FrameEvent& other) const {
-  return frame_id == other.frame_id && type == other.type &&
-         media_type == other.media_type &&
-         rtp_timestamp == other.rtp_timestamp && width == other.width &&
-         height == other.height && size == other.size &&
-         timestamp == other.timestamp && delay_delta == other.delay_delta &&
+  return StatisticsEvent::operator==(other) && width == other.width &&
+         height == other.height && delay_delta == other.delay_delta &&
          key_frame == other.key_frame && target_bitrate == other.target_bitrate;
 }
 
-PacketEvent::PacketEvent() = default;
 PacketEvent::PacketEvent(const PacketEvent& other) = default;
 PacketEvent::PacketEvent(PacketEvent&& other) noexcept = default;
 PacketEvent& PacketEvent::operator=(const PacketEvent& other) = default;
 PacketEvent& PacketEvent::operator=(PacketEvent&& other) = default;
-PacketEvent::~PacketEvent() = default;
 
 bool PacketEvent::operator==(const PacketEvent& other) const {
-  return packet_id == other.packet_id && max_packet_id == other.max_packet_id &&
-         rtp_timestamp == other.rtp_timestamp && frame_id == other.frame_id &&
-         size == other.size && timestamp == other.timestamp &&
-         type == other.type && media_type == other.media_type;
+  return StatisticsEvent::operator==(other) && packet_id == other.packet_id &&
+         max_packet_id == other.max_packet_id;
 }
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/statistics_defines.h b/chromium/third_party/openscreen/src/cast/streaming/statistics_defines.h
index 837c7f61e73..f6c2f1abf6b 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/statistics_defines.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/statistics_defines.h
@@ -14,8 +14,7 @@
 #include "platform/api/time.h"
 #include "util/enum_name_table.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 enum class StatisticsEventType : int {
   kUnknown = 0,
@@ -55,38 +54,30 @@ extern const EnumNameTable<StatisticsEventType,
                                StatisticsEventType::kNumOfEvents)>
     kStatisticEventTypeNames;
 
-struct FrameEvent {
-  constexpr FrameEvent(FrameId frame_id,
-                       StatisticsEventType type,
-                       StatisticsEventMediaType media_type,
-                       RtpTimeTicks rtp_timestamp,
-                       int width,
-                       int height,
-                       uint32_t size,
-                       Clock::time_point timestamp,
-                       Clock::duration delay_delta,
-                       bool key_frame,
-                       int target_bitrate)
+struct StatisticsEvent {
+  constexpr StatisticsEvent(FrameId frame_id,
+                            StatisticsEventType type,
+                            StatisticsEventMediaType media_type,
+                            RtpTimeTicks rtp_timestamp,
+                            uint32_t size,
+                            Clock::time_point timestamp,
+                            Clock::time_point received_timestamp)
       : frame_id(frame_id),
         type(type),
         media_type(media_type),
         rtp_timestamp(rtp_timestamp),
-        width(width),
-        height(height),
         size(size),
         timestamp(timestamp),
-        delay_delta(delay_delta),
-        key_frame(key_frame),
-        target_bitrate(target_bitrate) {}
+        received_timestamp(received_timestamp) {}
 
-  FrameEvent();
-  FrameEvent(const FrameEvent& other);
-  FrameEvent(FrameEvent&& other) noexcept;
-  FrameEvent& operator=(const FrameEvent& other);
-  FrameEvent& operator=(FrameEvent&& other);
-  ~FrameEvent();
+  constexpr StatisticsEvent() = default;
+  StatisticsEvent(const StatisticsEvent& other);
+  StatisticsEvent(StatisticsEvent&& other) noexcept;
+  StatisticsEvent& operator=(const StatisticsEvent& other);
+  StatisticsEvent& operator=(StatisticsEvent&& other);
+  ~StatisticsEvent() = default;
 
-  bool operator==(const FrameEvent& other) const;
+  bool operator==(const StatisticsEvent& other) const;
 
   // The frame this event is associated with.
   FrameId frame_id;
@@ -100,11 +91,7 @@ struct FrameEvent {
   // The RTP timestamp of the frame this event is associated with.
   RtpTimeTicks rtp_timestamp;
 
-  // Resolution of the frame. Only set for video FRAME_CAPTURE_END events.
-  int width = 0;
-  int height = 0;
-
-  // Size of encoded frame in bytes. Only set for FRAME_ENCODED event.
+  // Size of this packet, or the frame it is associated with.
   // Note: we use uint32_t instead of size_t for byte count because this struct
   // is sent over IPC which could span 32 & 64 bit processes.
   uint32_t size = 0;
@@ -112,11 +99,55 @@ struct FrameEvent {
   // Time of event logged.
   Clock::time_point timestamp;
 
+  // Time that the event was received by the sender. Only set for receiver-side
+  // events.
+  Clock::time_point received_timestamp;
+};
+
+struct FrameEvent : public StatisticsEvent {
+  constexpr FrameEvent(FrameId frame_id_in,
+                       StatisticsEventType type_in,
+                       StatisticsEventMediaType media_type_in,
+                       RtpTimeTicks rtp_timestamp_in,
+                       uint32_t size_in,
+                       Clock::time_point timestamp_in,
+                       Clock::time_point received_timestamp_in,
+                       int width,
+                       int height,
+                       Clock::duration delay_delta,
+                       bool key_frame,
+                       int target_bitrate)
+      : StatisticsEvent(frame_id_in,
+                        type_in,
+                        media_type_in,
+                        rtp_timestamp_in,
+                        size_in,
+                        timestamp_in,
+                        received_timestamp_in),
+        width(width),
+        height(height),
+        delay_delta(delay_delta),
+        key_frame(key_frame),
+        target_bitrate(target_bitrate) {}
+
+  constexpr FrameEvent() = default;
+  FrameEvent(const FrameEvent& other);
+  FrameEvent(FrameEvent&& other) noexcept;
+  FrameEvent& operator=(const FrameEvent& other);
+  FrameEvent& operator=(FrameEvent&& other);
+  ~FrameEvent() = default;
+
+  bool operator==(const FrameEvent& other) const;
+
+  // Resolution of the frame. Only set for video FRAME_CAPTURE_END events.
+  int width = 0;
+  int height = 0;
+
   // Only set for FRAME_PLAYOUT events.
   // If this value is zero the frame is rendered on time.
   // If this value is positive it means the frame is rendered late.
   // If this value is negative it means the frame is rendered early.
-  Clock::duration delay_delta;
+  Clock::duration delay_delta{};
 
   // Whether the frame is a key frame. Only set for video FRAME_ENCODED event.
   bool key_frame = false;
@@ -126,30 +157,32 @@ struct FrameEvent {
   int target_bitrate = 0;
 };
 
-struct PacketEvent {
-  constexpr PacketEvent(uint16_t packet_id,
-                        uint16_t max_packet_id,
-                        RtpTimeTicks rtp_timestamp,
-                        FrameId frame_id,
-                        uint32_t size,
-                        Clock::time_point timestamp,
-                        StatisticsEventType type,
-                        StatisticsEventMediaType media_type)
-      : packet_id(packet_id),
-        max_packet_id(max_packet_id),
-        rtp_timestamp(rtp_timestamp),
-        frame_id(frame_id),
-        size(size),
-        timestamp(timestamp),
-        type(type),
-        media_type(media_type) {}
-
-  PacketEvent();
+struct PacketEvent : public StatisticsEvent {
+  constexpr PacketEvent(FrameId frame_id_in,
+                        StatisticsEventType type_in,
+                        StatisticsEventMediaType media_type_in,
+                        RtpTimeTicks rtp_timestamp_in,
+                        uint32_t size_in,
+                        Clock::time_point timestamp_in,
+                        Clock::time_point received_timestamp_in,
+                        uint16_t packet_id,
+                        uint16_t max_packet_id)
+      : StatisticsEvent(frame_id_in,
+                        type_in,
+                        media_type_in,
+                        rtp_timestamp_in,
+                        size_in,
+                        timestamp_in,
+                        received_timestamp_in),
+        packet_id(packet_id),
+        max_packet_id(max_packet_id) {}
+
+  constexpr PacketEvent() = default;
   PacketEvent(const PacketEvent& other);
   PacketEvent(PacketEvent&& other) noexcept;
   PacketEvent& operator=(const PacketEvent& other);
   PacketEvent& operator=(PacketEvent&& other);
-  ~PacketEvent();
+  ~PacketEvent() = default;
 
   bool operator==(const PacketEvent& other) const;
 
@@ -158,27 +191,8 @@ struct PacketEvent {
 
   // The highest packet ID seen so far at time of event.
   uint16_t max_packet_id = 0;
-
-  // The RTP timestamp of the frame this event is associated with.
-  RtpTimeTicks rtp_timestamp;
-
-  // The frame this event is associated with.
-  FrameId frame_id;
-
-  // The size of this packet.
-  uint32_t size = 0;
-
-  // Time of event logged.
-  Clock::time_point timestamp;
-
-  // The type of this packet event.
-  StatisticsEventType type = StatisticsEventType::kUnknown;
-
-  // Whether this was audio or video (or unknown).
-  StatisticsEventMediaType media_type = StatisticsEventMediaType::kUnknown;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_STATISTICS_DEFINES_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/statistics_unittest.cc b/chromium/third_party/openscreen/src/cast/streaming/statistics_unittest.cc
new file mode 100644
index 00000000000..f6bcbf5a09d
--- /dev/null
+++ b/chromium/third_party/openscreen/src/cast/streaming/statistics_unittest.cc
@@ -0,0 +1,58 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "cast/streaming/statistics.h"
+
+#include "gtest/gtest.h"
+#include "util/std_util.h"
+
+namespace openscreen::cast {
+
+class StatisticsTest : public testing::Test {
+ public:
+  StatisticsTest() : test_histogram_(-80, 100, 20) {
+    constexpr std::array<int64_t, 12> kDefaultSamples{
+        {-200, -144, -80, -61, -60, 59, 0, 79, 80, 81, 99, 100}};
+    for (int64_t sample : kDefaultSamples) {
+      test_histogram_.Add(sample);
+    }
+  }
+
+  const SimpleHistogram& test_histogram() { return test_histogram_; }
+
+ protected:
+  SimpleHistogram test_histogram_;
+};
+
+TEST_F(StatisticsTest, SimpleHistogramSamples) {
+  EXPECT_EQ(-80, test_histogram().min);
+  EXPECT_EQ(100, test_histogram().max);
+  EXPECT_EQ(20, test_histogram().width);
+  EXPECT_EQ(11u, test_histogram().buckets.size());
+
+  constexpr std::array<std::pair<size_t, int64_t>, 7> kExpectedBuckets{
+      {{0u, 2}, {1u, 2}, {2u, 1}, {7u, 1}, {8u, 1}, {9u, 3}, {10u, 1}}};
+  for (const std::pair<size_t, int64_t>& bucket : kExpectedBuckets) {
+    EXPECT_EQ(bucket.second, test_histogram().buckets[bucket.first]);
+  }
+}
+
+TEST_F(StatisticsTest, SimpleHistogramCopy) {
+  SimpleHistogram copy = test_histogram();
+  EXPECT_EQ(test_histogram(), copy);
+}
+
+TEST_F(StatisticsTest, SimpleHistogramSerialization) {
+  EXPECT_EQ("[]", SimpleHistogram().ToString());
+
+  constexpr const char* kExpected =
+      "[{\"<-80\":2},{\"-80--61\":2},{\"-60--41\":1},{\"0-19\":1},"
+      "{\"40-59\":1},{\"60-79\":1},{\"80-99\":3},{\">=100\":1}]";
+
+  std::string serialized = test_histogram().ToString();
+  RemoveWhitespace(serialized);
+  EXPECT_EQ(kExpected, serialized);
+}
+
+}  // namespace openscreen::cast
diff --git a/chromium/third_party/openscreen/src/cast/streaming/testing/message_pipe.h b/chromium/third_party/openscreen/src/cast/streaming/testing/message_pipe.h
index 328c962006d..2f2f47e40b1 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/testing/message_pipe.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/testing/message_pipe.h
@@ -17,8 +17,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class MessagePipeEnd : public MessagePort {
  public:
@@ -89,7 +88,6 @@ class MessagePipe {
   MessagePipeEnd right_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_TESTING_MESSAGE_PIPE_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/testing/simple_message_port.h b/chromium/third_party/openscreen/src/cast/streaming/testing/simple_message_port.h
index eea8dd664ac..6a1dfe50cc2 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/testing/simple_message_port.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/testing/simple_message_port.h
@@ -14,8 +14,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class SimpleMessagePort : public MessagePort {
  public:
@@ -64,7 +63,6 @@ class SimpleMessagePort : public MessagePort {
   std::vector<std::string> posted_messages_;
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_TESTING_SIMPLE_MESSAGE_PORT_H_
diff --git a/chromium/third_party/openscreen/src/cast/streaming/testing/simple_socket_subscriber.h b/chromium/third_party/openscreen/src/cast/streaming/testing/simple_socket_subscriber.h
index 21e90dfe9d4..fb318bb46e1 100644
--- a/chromium/third_party/openscreen/src/cast/streaming/testing/simple_socket_subscriber.h
+++ b/chromium/third_party/openscreen/src/cast/streaming/testing/simple_socket_subscriber.h
@@ -8,15 +8,13 @@
 #include "cast/streaming/environment.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace cast {
+namespace openscreen::cast {
 
 class SimpleSubscriber : public Environment::SocketSubscriber {
   void OnSocketReady() {}
   void OnSocketInvalid(Error error) { ASSERT_TRUE(error.ok()) << error; }
 };
 
-}  // namespace cast
-}  // namespace openscreen
+}  // namespace openscreen::cast
 
 #endif  // CAST_STREAMING_TESTING_SIMPLE_SOCKET_SUBSCRIBER_H_
diff --git a/chromium/third_party/openscreen/src/discovery/common/config.h b/chromium/third_party/openscreen/src/discovery/common/config.h
index 0338f42e85e..d5e3000cdf7 100644
--- a/chromium/third_party/openscreen/src/discovery/common/config.h
+++ b/chromium/third_party/openscreen/src/discovery/common/config.h
@@ -9,8 +9,7 @@
 
 #include "platform/base/interface_info.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 // This struct provides parameters needed to initialize the discovery pipeline.
 struct Config {
@@ -83,7 +82,6 @@ struct Config {
   bool ignore_nsec_responses = false;
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_COMMON_CONFIG_H_
diff --git a/chromium/third_party/openscreen/src/discovery/common/reporting_client.h b/chromium/third_party/openscreen/src/discovery/common/reporting_client.h
index 358c9df6f18..5261a0a0ad8 100644
--- a/chromium/third_party/openscreen/src/discovery/common/reporting_client.h
+++ b/chromium/third_party/openscreen/src/discovery/common/reporting_client.h
@@ -7,8 +7,7 @@
 
 #include "platform/base/error.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 // This class is implemented by the embedder who wishes to use discovery. The
 // discovery implementation will use this API to report back errors and metrics.
@@ -32,7 +31,6 @@ class ReportingClient {
   virtual void OnRecoverableError(Error error) = 0;
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_COMMON_REPORTING_CLIENT_H_
diff --git a/chromium/third_party/openscreen/src/discovery/common/testing/mock_reporting_client.h b/chromium/third_party/openscreen/src/discovery/common/testing/mock_reporting_client.h
index 15949a93bf4..8d5133e9c49 100644
--- a/chromium/third_party/openscreen/src/discovery/common/testing/mock_reporting_client.h
+++ b/chromium/third_party/openscreen/src/discovery/common/testing/mock_reporting_client.h
@@ -8,8 +8,7 @@
 #include "discovery/common/reporting_client.h"
 #include "gmock/gmock.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class MockReportingClient : public ReportingClient {
  public:
@@ -17,7 +16,6 @@ class MockReportingClient : public ReportingClient {
   MOCK_METHOD1(OnRecoverableError, void(Error error));
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_COMMON_TESTING_MOCK_REPORTING_CLIENT_H_
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/constants.h b/chromium/third_party/openscreen/src/discovery/dnssd/impl/constants.h
index 38e849466f0..d118e3e1e86 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/constants.h
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/constants.h
@@ -11,8 +11,7 @@
 #include "discovery/mdns/public/mdns_constants.h"
 #include "discovery/mdns/public/mdns_records.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 // This is the DNS Information required to start a new query.
 struct DnsQueryInfo {
@@ -21,7 +20,6 @@ struct DnsQueryInfo {
   DnsClass dns_class;
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_DNSSD_IMPL_CONSTANTS_H_
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/conversion_layer.cc b/chromium/third_party/openscreen/src/discovery/dnssd/impl/conversion_layer.cc
index 80e73589cb7..97d743f2863 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/conversion_layer.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/conversion_layer.cc
@@ -8,7 +8,6 @@
 
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
-#include "absl/types/optional.h"
 #include "discovery/dnssd/impl/constants.h"
 #include "discovery/dnssd/impl/instance_key.h"
 #include "discovery/dnssd/impl/service_key.h"
@@ -17,8 +16,7 @@
 #include "discovery/mdns/public/mdns_records.h"
 #include "util/span_util.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 namespace {
 
 void AddServiceInfoToLabels(const std::string& service,
@@ -194,5 +192,4 @@ std::vector<MdnsRecord> GetDnsRecords(const DnsSdInstanceEndpoint& endpoint) {
   return records;
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/conversion_layer.h b/chromium/third_party/openscreen/src/discovery/dnssd/impl/conversion_layer.h
index d9ae74ace5f..3a9f280cc92 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/conversion_layer.h
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/conversion_layer.h
@@ -8,15 +8,13 @@
 #include <string>
 #include <vector>
 
-#include "absl/strings/string_view.h"
 #include "discovery/dnssd/impl/constants.h"
 #include "discovery/dnssd/public/dns_sd_instance_endpoint.h"
 #include "discovery/dnssd/public/dns_sd_txt_record.h"
 #include "discovery/mdns/public/mdns_records.h"
 #include "platform/base/error.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class InstanceKey;
 class ServiceKey;
@@ -56,7 +54,6 @@ DnsQueryInfo GetPtrQueryInfo(const ServiceKey& key);
 std::vector<MdnsRecord> GetDnsRecords(const DnsSdInstanceEndpoint& endpoint);
 std::vector<MdnsRecord> GetDnsRecords(const DnsSdInstance& instance);
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_DNSSD_IMPL_CONVERSION_LAYER_H_
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/conversion_layer_unittest.cc b/chromium/third_party/openscreen/src/discovery/dnssd/impl/conversion_layer_unittest.cc
index 79ad75c202a..3f875412321 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/conversion_layer_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/conversion_layer_unittest.cc
@@ -17,8 +17,7 @@
 #include "util/span_util.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 // TXT Conversions.
 TEST(DnsSdConversionLayerTest, TestCreateTxtEmpty) {
@@ -285,5 +284,4 @@ TEST(DnsSdConversionLayerTest, GetDnsRecordsTxt) {
       rdata.texts(), std::vector<uint8_t>{'b', 'o', 'o', 'l', 'e', 'a', 'n'}));
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/dns_data_graph.cc b/chromium/third_party/openscreen/src/discovery/dnssd/impl/dns_data_graph.cc
index d82ec970529..3eadd72608d 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/dns_data_graph.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/dns_data_graph.cc
@@ -4,20 +4,20 @@
 
 #include "discovery/dnssd/impl/dns_data_graph.h"
 
+#include <optional>
 #include <utility>
 
 #include "discovery/dnssd/impl/conversion_layer.h"
 #include "discovery/dnssd/impl/instance_key.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 namespace {
 
 ErrorOr<DnsSdInstanceEndpoint> CreateEndpoint(
     const DomainName& domain,
-    const absl::optional<ARecordRdata>& a,
-    const absl::optional<AAAARecordRdata>& aaaa,
+    const std::optional<ARecordRdata>& a,
+    const std::optional<AAAARecordRdata>& aaaa,
     const SrvRecordRdata& srv,
     const TxtRecordRdata& txt,
     NetworkInterfaceIndex network_interface) {
@@ -102,12 +102,12 @@ class DnsDataGraphImpl : public DnsDataGraph {
     Error ApplyDataRecordChange(MdnsRecord record, RecordChangedEvent event);
 
     // Returns the first rdata of a record with type matching |type| in this
-    // node's |records_|, or absl::nullopt if no such record exists.
+    // node's |records_|, or std::nullopt if no such record exists.
     template <typename T>
-    absl::optional<T> GetRdata(DnsType type) {
+    std::optional<T> GetRdata(DnsType type) {
       auto it = FindRecord(type);
       if (it == records_.end()) {
-        return absl::nullopt;
+        return std::nullopt;
       } else {
         return std::cref(absl::get<T>(it->rdata()));
       }
@@ -475,7 +475,7 @@ std::vector<ErrorOr<DnsSdInstanceEndpoint>> DnsDataGraphImpl::CreateEndpoints(
       // First, there has to be a SRV record present (to provide the port
       // number), and the target of that SRV record has to be the node where the
       // address records are sourced from.
-      const absl::optional<SrvRecordRdata> srv =
+      const std::optional<SrvRecordRdata> srv =
           srv_and_txt->GetRdata<SrvRecordRdata>(DnsType::kSRV);
       if (!srv.has_value() || srv.value().target() != address->name()) {
         continue;
@@ -483,7 +483,7 @@ std::vector<ErrorOr<DnsSdInstanceEndpoint>> DnsDataGraphImpl::CreateEndpoints(
 
       // Next, a TXT record must be present to provide additional connection
       // information about the service per RFC 6763.
-      const absl::optional<TxtRecordRdata> txt =
+      const std::optional<TxtRecordRdata> txt =
           srv_and_txt->GetRdata<TxtRecordRdata>(DnsType::kTXT);
       if (!txt.has_value()) {
         continue;
@@ -491,9 +491,9 @@ std::vector<ErrorOr<DnsSdInstanceEndpoint>> DnsDataGraphImpl::CreateEndpoints(
 
       // Last, at least one address record must be present to provide an
       // endpoint for this instance.
-      const absl::optional<ARecordRdata> a =
+      const std::optional<ARecordRdata> a =
           address->GetRdata<ARecordRdata>(DnsType::kA);
-      const absl::optional<AAAARecordRdata> aaaa =
+      const std::optional<AAAARecordRdata> aaaa =
           address->GetRdata<AAAARecordRdata>(DnsType::kAAAA);
       if (!a.has_value() && !aaaa.has_value()) {
         continue;
@@ -516,18 +516,18 @@ std::vector<ErrorOr<DnsSdInstanceEndpoint>> DnsDataGraphImpl::CreateEndpoints(
 
 // static
 bool DnsDataGraphImpl::IsValidAddressNode(Node* node) {
-  const absl::optional<ARecordRdata> a =
+  const std::optional<ARecordRdata> a =
       node->GetRdata<ARecordRdata>(DnsType::kA);
-  const absl::optional<AAAARecordRdata> aaaa =
+  const std::optional<AAAARecordRdata> aaaa =
       node->GetRdata<AAAARecordRdata>(DnsType::kAAAA);
   return a.has_value() || aaaa.has_value();
 }
 
 // static
 bool DnsDataGraphImpl::IsValidSrvAndTxtNode(Node* node) {
-  const absl::optional<SrvRecordRdata> srv =
+  const std::optional<SrvRecordRdata> srv =
       node->GetRdata<SrvRecordRdata>(DnsType::kSRV);
-  const absl::optional<TxtRecordRdata> txt =
+  const std::optional<TxtRecordRdata> txt =
       node->GetRdata<TxtRecordRdata>(DnsType::kTXT);
 
   return srv.has_value() && txt.has_value();
@@ -587,5 +587,4 @@ DnsDataGraphImpl::DomainGroup DnsDataGraph::GetDomainGroup(
   return GetDomainGroup(record.dns_type());
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/dns_data_graph.h b/chromium/third_party/openscreen/src/discovery/dnssd/impl/dns_data_graph.h
index e7625280d87..6d20b43e652 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/dns_data_graph.h
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/dns_data_graph.h
@@ -10,14 +10,12 @@
 #include <memory>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "discovery/dnssd/impl/constants.h"
 #include "discovery/dnssd/public/dns_sd_instance_endpoint.h"
 #include "discovery/mdns/public/mdns_record_changed_callback.h"
 #include "discovery/mdns/public/mdns_records.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 /*
  Per RFC 6763, the following mappings exist between the domains of the called
@@ -128,7 +126,6 @@ class DnsDataGraph {
   virtual bool IsTracked(const DomainName& name) const = 0;
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_DNSSD_IMPL_DNS_DATA_GRAPH_H_
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/dns_data_graph_unittest.cc b/chromium/third_party/openscreen/src/discovery/dnssd/impl/dns_data_graph_unittest.cc
index 37bae5d764c..465d3231135 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/dns_data_graph_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/dns_data_graph_unittest.cc
@@ -11,8 +11,7 @@
 #include "gtest/gtest.h"
 #include "platform/base/ip_address.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 namespace {
 
 IPAddress GetAddressV4(const DnsSdInstanceEndpoint endpoint) {
@@ -478,5 +477,4 @@ TEST_F(DnsDataGraphTests, FailedConversionOnlyFailsSingleEndpointCreation) {
   ExpectDomainEqual(endpoint, primary_domain_);
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/instance_key.cc b/chromium/third_party/openscreen/src/discovery/dnssd/impl/instance_key.cc
index 8d0e78c4781..bb75224077c 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/instance_key.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/instance_key.cc
@@ -14,8 +14,7 @@
 #include "discovery/mdns/public/mdns_constants.h"
 #include "discovery/mdns/public/mdns_records.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 InstanceKey::InstanceKey(const MdnsRecord& record)
     : InstanceKey(GetDomainName(record)) {}
@@ -30,9 +29,9 @@ InstanceKey::InstanceKey(const DnsSdInstance& instance)
                   instance.service_id(),
                   instance.domain_id()) {}
 
-InstanceKey::InstanceKey(absl::string_view instance,
-                         absl::string_view service,
-                         absl::string_view domain)
+InstanceKey::InstanceKey(std::string_view instance,
+                         std::string_view service,
+                         std::string_view domain)
     : ServiceKey(service, domain), instance_id_(instance) {
   OSP_DCHECK(IsInstanceValid(instance_id_))
       << "invalid instance id" << instance;
@@ -50,5 +49,4 @@ DomainName InstanceKey::GetName() const {
   return DomainName(std::move(labels));
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/instance_key.h b/chromium/third_party/openscreen/src/discovery/dnssd/impl/instance_key.h
index 539663dc07f..18e8aab40f0 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/instance_key.h
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/instance_key.h
@@ -6,13 +6,12 @@
 #define DISCOVERY_DNSSD_IMPL_INSTANCE_KEY_H_
 
 #include <string>
+#include <string_view>
 #include <utility>
 
-#include "absl/strings/string_view.h"
 #include "discovery/dnssd/impl/service_key.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class DnsSdInstance;
 class DomainName;
@@ -31,9 +30,9 @@ class InstanceKey : public ServiceKey {
 
   // NOTE: The provided parameters must be valid instance,  service and domain
   // ids.
-  InstanceKey(absl::string_view instance,
-              absl::string_view service,
-              absl::string_view domain);
+  InstanceKey(std::string_view instance,
+              std::string_view service,
+              std::string_view domain);
 
   InstanceKey(const InstanceKey& other);
   InstanceKey(InstanceKey&& other) noexcept;
@@ -94,7 +93,6 @@ inline bool operator!=(const InstanceKey& lhs, const InstanceKey& rhs) {
   return !(lhs == rhs);
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_DNSSD_IMPL_INSTANCE_KEY_H_
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/instance_key_unittest.cc b/chromium/third_party/openscreen/src/discovery/dnssd/impl/instance_key_unittest.cc
index 2f265915426..aae667e20dd 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/instance_key_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/instance_key_unittest.cc
@@ -11,8 +11,7 @@
 #include "discovery/dnssd/testing/fake_dns_record_factory.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 TEST(DnsSdInstanceKeyTest, TestInstanceKeyEquals) {
   InstanceKey key1("instance", "_service._udp", "domain");
@@ -106,5 +105,4 @@ TEST(DnsSdInstanceKeyTest, GetNameTest) {
   EXPECT_EQ(expected, key.GetName());
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/network_interface_config.cc b/chromium/third_party/openscreen/src/discovery/dnssd/impl/network_interface_config.cc
index 87b930ecae0..d27cf5547e9 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/network_interface_config.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/network_interface_config.cc
@@ -4,8 +4,7 @@
 
 #include "discovery/dnssd/impl/network_interface_config.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 NetworkInterfaceConfig::NetworkInterfaceConfig(
     NetworkInterfaceIndex network_interface,
@@ -31,5 +30,4 @@ const IPAddress& NetworkInterfaceConfig::GetAddress() const {
   return HasAddressV4() ? address_v4_ : address_v6_;
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/network_interface_config.h b/chromium/third_party/openscreen/src/discovery/dnssd/impl/network_interface_config.h
index 9c36b896416..64100be5255 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/network_interface_config.h
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/network_interface_config.h
@@ -8,8 +8,7 @@
 #include "platform/base/interface_info.h"
 #include "platform/base/ip_address.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class NetworkInterfaceConfig {
  public:
@@ -39,7 +38,6 @@ class NetworkInterfaceConfig {
   IPAddress address_v6_;
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_DNSSD_IMPL_NETWORK_INTERFACE_CONFIG_H_
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/publisher_impl.cc b/chromium/third_party/openscreen/src/discovery/dnssd/impl/publisher_impl.cc
index 62f5690df0d..45713c17ede 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/publisher_impl.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/publisher_impl.cc
@@ -5,11 +5,11 @@
 #include "discovery/dnssd/impl/publisher_impl.h"
 
 #include <map>
+#include <optional>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "discovery/common/reporting_client.h"
 #include "discovery/dnssd/impl/conversion_layer.h"
 #include "discovery/dnssd/impl/instance_key.h"
@@ -19,8 +19,7 @@
 #include "platform/base/error.h"
 #include "util/trace_logging.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 namespace {
 
 DnsSdInstanceEndpoint CreateEndpoint(
@@ -164,7 +163,7 @@ Error PublisherImpl::UpdatePublishedRegistration(
   // instance of each DnsType, so use that here to simplify this step. First in
   // each pair is the old instances, second is the new instance.
   std::map<DnsType,
-           std::pair<absl::optional<MdnsRecord>, absl::optional<MdnsRecord>>>
+           std::pair<std::optional<MdnsRecord>, std::optional<MdnsRecord>>>
       changed_records;
   const std::vector<MdnsRecord> old_records =
       GetDnsRecords(published_instance_it->second);
@@ -174,7 +173,7 @@ Error PublisherImpl::UpdatePublishedRegistration(
   for (size_t i = 0; i < old_records.size(); i++) {
     const auto key = old_records[i].dns_type();
     OSP_DCHECK(changed_records.find(key) == changed_records.end());
-    auto value = std::make_pair(std::move(old_records[i]), absl::nullopt);
+    auto value = std::make_pair(std::move(old_records[i]), std::nullopt);
     changed_records.emplace(key, std::move(value));
   }
 
@@ -183,8 +182,8 @@ Error PublisherImpl::UpdatePublishedRegistration(
     const auto key = new_records[i].dns_type();
     auto find_it = changed_records.find(key);
     if (find_it == changed_records.end()) {
-      std::pair<absl::optional<MdnsRecord>, absl::optional<MdnsRecord>> value(
-          absl::nullopt, std::move(new_records[i]));
+      std::pair<std::optional<MdnsRecord>, std::optional<MdnsRecord>> value(
+          std::nullopt, std::move(new_records[i]));
       changed_records.emplace(key, std::move(value));
     } else {
       find_it->second.second = std::move(new_records[i]);
@@ -194,16 +193,16 @@ Error PublisherImpl::UpdatePublishedRegistration(
   // Apply changes called out in |changed_records|.
   Error total_result = Error::None();
   for (const auto& pair : changed_records) {
-    OSP_DCHECK(pair.second.first != absl::nullopt ||
-               pair.second.second != absl::nullopt);
-    if (pair.second.first == absl::nullopt) {
+    OSP_DCHECK(pair.second.first != std::nullopt ||
+               pair.second.second != std::nullopt);
+    if (pair.second.first == std::nullopt) {
       TRACE_SCOPED(TraceCategory::kDiscovery, "mdns.RegisterRecord");
       auto error = mdns_publisher_->RegisterRecord(pair.second.second.value());
       TRACE_SET_RESULT(error);
       if (!error.ok()) {
         total_result = error;
       }
-    } else if (pair.second.second == absl::nullopt) {
+    } else if (pair.second.second == std::nullopt) {
       TRACE_SCOPED(TraceCategory::kDiscovery, "mdns.UnregisterRecord");
       auto error = mdns_publisher_->UnregisterRecord(pair.second.first.value());
       TRACE_SET_RESULT(error);
@@ -306,5 +305,4 @@ void PublisherImpl::OnDomainFound(const DomainName& requested_name,
   client->OnEndpointClaimed(pair.first->first, pair.first->second);
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/publisher_impl.h b/chromium/third_party/openscreen/src/discovery/dnssd/impl/publisher_impl.h
index 5f5aab058ac..6443fd64aff 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/publisher_impl.h
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/publisher_impl.h
@@ -8,15 +8,13 @@
 #include <map>
 #include <string>
 
-#include "absl/strings/string_view.h"
 #include "discovery/dnssd/impl/conversion_layer.h"
 #include "discovery/dnssd/public/dns_sd_instance.h"
 #include "discovery/dnssd/public/dns_sd_publisher.h"
 #include "discovery/mdns/public/mdns_domain_confirmed_provider.h"
 #include "discovery/mdns/public/mdns_service.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class NetworkInterfaceConfig;
 class ReportingClient;
@@ -59,7 +57,6 @@ class PublisherImpl : public DnsSdPublisher,
   friend class PublisherTesting;
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_DNSSD_IMPL_PUBLISHER_IMPL_H_
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/publisher_impl_unittest.cc b/chromium/third_party/openscreen/src/discovery/dnssd/impl/publisher_impl_unittest.cc
index 25a12438963..7b93c7ea999 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/publisher_impl_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/publisher_impl_unittest.cc
@@ -14,8 +14,7 @@
 #include "platform/test/fake_clock.h"
 #include "platform/test/fake_task_runner.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 namespace {
 
 using testing::_;
@@ -221,5 +220,4 @@ TEST_F(PublisherImplTest, TestUpdate) {
 }
 
 }  // namespace
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/querier_impl.cc b/chromium/third_party/openscreen/src/discovery/dnssd/impl/querier_impl.cc
index da9146e6b25..43e25281e5c 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/querier_impl.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/querier_impl.cc
@@ -5,6 +5,7 @@
 #include "discovery/dnssd/impl/querier_impl.h"
 
 #include <algorithm>
+#include <optional>
 #include <string>
 #include <utility>
 #include <vector>
@@ -15,8 +16,7 @@
 #include "platform/api/task_runner.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 namespace {
 
 static constexpr char kLocalDomain[] = "local";
@@ -89,8 +89,8 @@ std::vector<DnsSdInstanceEndpoint> GetValues(
   return results;
 }
 
-bool IsEqualOrUpdate(const absl::optional<DnsSdInstanceEndpoint>& first,
-                     const absl::optional<DnsSdInstanceEndpoint>& second) {
+bool IsEqualOrUpdate(const std::optional<DnsSdInstanceEndpoint>& first,
+                     const std::optional<DnsSdInstanceEndpoint>& second) {
   if (!first.has_value() || !second.has_value()) {
     return !first.has_value() && !second.has_value();
   }
@@ -108,8 +108,8 @@ bool IsEqualOrUpdate(const absl::optional<DnsSdInstanceEndpoint>& first,
          a.service_id() == b.service_id() && a.domain_id() == b.domain_id();
 }
 
-bool IsNotEqualOrUpdate(const absl::optional<DnsSdInstanceEndpoint>& first,
-                        const absl::optional<DnsSdInstanceEndpoint>& second) {
+bool IsNotEqualOrUpdate(const std::optional<DnsSdInstanceEndpoint>& first,
+                        const std::optional<DnsSdInstanceEndpoint>& second) {
   return !IsEqualOrUpdate(first, second);
 }
 
@@ -133,13 +133,13 @@ void CalculateChangeSets(std::vector<DnsSdInstanceEndpoint> old_endpoints,
   // Use set difference with default operators to find the elements present in
   // one list but not the others.
   //
-  // NOTE: Because absl::optional<...> types are used here and below, calls to
+  // NOTE: Because std::optional<...> types are used here and below, calls to
   // the ctor and dtor for empty elements are no-ops.
   const int total_count = old_endpoints.size() + new_endpoints.size();
 
   // This is the set of elements that aren't in the old endpoints, meaning the
   // old endpoint either didn't exist or had different TXT / Address / etc..
-  std::vector<absl::optional<DnsSdInstanceEndpoint>> created_or_updated(
+  std::vector<std::optional<DnsSdInstanceEndpoint>> created_or_updated(
       total_count);
   auto new_end = std::set_difference(new_endpoints.begin(), new_endpoints.end(),
                                      old_endpoints.begin(), old_endpoints.end(),
@@ -148,7 +148,7 @@ void CalculateChangeSets(std::vector<DnsSdInstanceEndpoint> old_endpoints,
 
   // This is the set of elements that are only in the old endpoints, similar to
   // the above.
-  std::vector<absl::optional<DnsSdInstanceEndpoint>> deleted_or_updated(
+  std::vector<std::optional<DnsSdInstanceEndpoint>> deleted_or_updated(
       total_count);
   new_end = std::set_difference(old_endpoints.begin(), old_endpoints.end(),
                                 new_endpoints.begin(), new_endpoints.end(),
@@ -158,7 +158,7 @@ void CalculateChangeSets(std::vector<DnsSdInstanceEndpoint> old_endpoints,
   // Next, find the elements which were updated.
   const size_t max_count =
       std::max(created_or_updated.size(), deleted_or_updated.size());
-  std::vector<absl::optional<DnsSdInstanceEndpoint>> updated(max_count);
+  std::vector<std::optional<DnsSdInstanceEndpoint>> updated(max_count);
   new_end = std::set_intersection(
       created_or_updated.begin(), created_or_updated.end(),
       deleted_or_updated.begin(), deleted_or_updated.end(), updated.begin(),
@@ -166,14 +166,14 @@ void CalculateChangeSets(std::vector<DnsSdInstanceEndpoint> old_endpoints,
   updated.erase(new_end, updated.end());
 
   // Use the updated elements to find all created and deleted elements.
-  std::vector<absl::optional<DnsSdInstanceEndpoint>> created(
+  std::vector<std::optional<DnsSdInstanceEndpoint>> created(
       created_or_updated.size());
   new_end = std::set_difference(
       created_or_updated.begin(), created_or_updated.end(), updated.begin(),
       updated.end(), created.begin(), IsNotEqualOrUpdate);
   created.erase(new_end, created.end());
 
-  std::vector<absl::optional<DnsSdInstanceEndpoint>> deleted(
+  std::vector<std::optional<DnsSdInstanceEndpoint>> deleted(
       deleted_or_updated.size());
   new_end = std::set_difference(
       deleted_or_updated.begin(), deleted_or_updated.end(), updated.begin(),
@@ -182,19 +182,19 @@ void CalculateChangeSets(std::vector<DnsSdInstanceEndpoint> old_endpoints,
 
   // Return the calculated elements back to the caller in the output variables.
   created_out->reserve(created.size());
-  for (absl::optional<DnsSdInstanceEndpoint>& endpoint : created) {
+  for (std::optional<DnsSdInstanceEndpoint>& endpoint : created) {
     OSP_DCHECK(endpoint.has_value());
     created_out->push_back(std::move(endpoint.value()));
   }
 
   updated_out->reserve(updated.size());
-  for (absl::optional<DnsSdInstanceEndpoint>& endpoint : updated) {
+  for (std::optional<DnsSdInstanceEndpoint>& endpoint : updated) {
     OSP_DCHECK(endpoint.has_value());
     updated_out->push_back(std::move(endpoint.value()));
   }
 
   deleted_out->reserve(deleted.size());
-  for (absl::optional<DnsSdInstanceEndpoint>& endpoint : deleted) {
+  for (std::optional<DnsSdInstanceEndpoint>& endpoint : deleted) {
     OSP_DCHECK(endpoint.has_value());
     deleted_out->push_back(std::move(endpoint.value()));
   }
@@ -468,5 +468,4 @@ ErrorOr<std::vector<PendingQueryChange>> QuerierImpl::ApplyRecordChanges(
   return pending_changes;
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/querier_impl.h b/chromium/third_party/openscreen/src/discovery/dnssd/impl/querier_impl.h
index 17ecf8cba1d..615a309a0c5 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/querier_impl.h
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/querier_impl.h
@@ -12,7 +12,6 @@
 #include <vector>
 
 #include "absl/hash/hash.h"
-#include "absl/strings/string_view.h"
 #include "discovery/dnssd/impl/constants.h"
 #include "discovery/dnssd/impl/conversion_layer.h"
 #include "discovery/dnssd/impl/dns_data_graph.h"
@@ -24,8 +23,7 @@
 #include "discovery/mdns/public/mdns_records.h"
 #include "discovery/mdns/public/mdns_service.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class NetworkInterfaceConfig;
 class ReportingClient;
@@ -78,7 +76,6 @@ class QuerierImpl : public DnsSdQuerier, public MdnsRecordChangedCallback {
   ReportingClient* reporting_client_;
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_DNSSD_IMPL_QUERIER_IMPL_H_
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/querier_impl_unittest.cc b/chromium/third_party/openscreen/src/discovery/dnssd/impl/querier_impl_unittest.cc
index 28369a57ae9..02a34c348c7 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/querier_impl_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/querier_impl_unittest.cc
@@ -10,7 +10,6 @@
 
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
-#include "absl/types/optional.h"
 #include "discovery/common/testing/mock_reporting_client.h"
 #include "discovery/dnssd/impl/conversion_layer.h"
 #include "discovery/dnssd/testing/fake_network_interface_config.h"
@@ -23,8 +22,7 @@
 #include "util/osp_logging.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 namespace {
 
 NetworkInterfaceIndex kNetworkInterface = 0;
@@ -653,5 +651,4 @@ TEST_F(DnsSdQuerierImplTest, MixOfErrorsAndSuccessesHandledCorrectly) {
                             RecordChangedEvent::kCreated);
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_dispatcher.cc b/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_dispatcher.cc
index dc249f22ff7..394702c009c 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_dispatcher.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_dispatcher.cc
@@ -14,8 +14,7 @@
 #include "platform/api/task_runner.h"
 #include "util/trace_logging.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 namespace {
 
 void ForAllQueriers(
@@ -149,5 +148,4 @@ ErrorOr<int> ServiceDispatcher::DeregisterAll(const std::string& service) {
   }
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_instance.cc b/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_instance.cc
index 549f53e103b..73d034daec1 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_instance.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_instance.cc
@@ -10,8 +10,7 @@
 #include "discovery/mdns/public/mdns_service.h"
 #include "platform/api/task_runner.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 ServiceInstance::ServiceInstance(TaskRunner& task_runner,
                                  ReportingClient* reporting_client,
@@ -39,5 +38,4 @@ ServiceInstance::~ServiceInstance() {
   OSP_DCHECK(task_runner_.IsRunningOnTaskRunner());
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_key.cc b/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_key.cc
index 45ea7b4014f..0e2c366317a 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_key.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_key.cc
@@ -10,8 +10,7 @@
 #include "discovery/mdns/public/mdns_constants.h"
 #include "discovery/mdns/public/mdns_records.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 // The InstanceKey ctor used below cares about the Instance ID of the
 // MdnsRecord, while this class doesn't, so it's possible that the InstanceKey
@@ -28,7 +27,7 @@ ServiceKey::ServiceKey(const DomainName& domain) {
   *this = std::move(key.value());
 }
 
-ServiceKey::ServiceKey(absl::string_view service, absl::string_view domain)
+ServiceKey::ServiceKey(std::string_view service, std::string_view domain)
     : service_id_(service.data(), service.size()),
       domain_id_(domain.data(), domain.size()) {
   OSP_DCHECK(IsServiceValid(service_id_)) << "invalid service id: " << service;
@@ -78,5 +77,4 @@ ErrorOr<ServiceKey> ServiceKey::TryCreate(const DomainName& names) {
   return ServiceKey(service_id, domain_id);
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_key.h b/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_key.h
index 47db53a30c9..cc206509a36 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_key.h
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_key.h
@@ -6,13 +6,12 @@
 #define DISCOVERY_DNSSD_IMPL_SERVICE_KEY_H_
 
 #include <string>
+#include <string_view>
 #include <utility>
 
-#include "absl/strings/string_view.h"
 #include "platform/base/error.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class DomainName;
 class MdnsRecord;
@@ -27,7 +26,7 @@ class ServiceKey {
   virtual ~ServiceKey() = default;
 
   // NOTE: The provided service and domain labels must be valid.
-  ServiceKey(absl::string_view service, absl::string_view domain);
+  ServiceKey(std::string_view service, std::string_view domain);
   ServiceKey(const ServiceKey& other);
   ServiceKey(ServiceKey&& other) noexcept;
 
@@ -93,7 +92,6 @@ inline bool operator!=(const ServiceKey& lhs, const ServiceKey& rhs) {
   return !(lhs == rhs);
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_DNSSD_IMPL_SERVICE_KEY_H_
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_key_unittest.cc b/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_key_unittest.cc
index 26a61efea6e..71dbac11f69 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_key_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/impl/service_key_unittest.cc
@@ -10,8 +10,7 @@
 #include "discovery/dnssd/testing/fake_dns_record_factory.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 TEST(DnsSdServiceKeyTest, TestServiceKeyEquals) {
   ServiceKey key1("_service._udp", "domain");
@@ -61,5 +60,4 @@ TEST(DnsSdServiceKeyTest, CreateFromRecordTest) {
   EXPECT_EQ(key.domain_id(), FakeDnsRecordFactory::kDomainName);
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance.cc b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance.cc
index 75e5e0a0031..2d5eeff3942 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance.cc
@@ -11,8 +11,7 @@
 
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 namespace {
 
 // Maximum number of octets allowed in a single domain name label.
@@ -218,5 +217,4 @@ bool operator<(const DnsSdInstance& lhs, const DnsSdInstance& rhs) {
   return lhs.txt_ < rhs.txt_;
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance.h b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance.h
index df2b9dcc751..767c9c8459a 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance.h
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance.h
@@ -13,8 +13,7 @@
 #include "platform/base/ip_address.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 bool IsInstanceValid(const std::string& instance);
 bool IsServiceValid(const std::string& service);
@@ -117,7 +116,6 @@ inline bool operator!=(const DnsSdInstance& lhs, const DnsSdInstance& rhs) {
   return !(lhs == rhs);
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_DNSSD_PUBLIC_DNS_SD_INSTANCE_H_
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance_endpoint.cc b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance_endpoint.cc
index ff7d75dc396..7bfe65b5a23 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance_endpoint.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance_endpoint.cc
@@ -11,8 +11,7 @@
 
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 DnsSdInstanceEndpoint::DnsSdInstanceEndpoint(
     std::string instance_id,
@@ -101,5 +100,4 @@ bool operator<(const DnsSdInstanceEndpoint& lhs,
          static_cast<const DnsSdInstance&>(rhs);
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance_endpoint.h b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance_endpoint.h
index 69aad27562b..907f908bd1a 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance_endpoint.h
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance_endpoint.h
@@ -14,8 +14,7 @@
 #include "platform/base/interface_info.h"
 #include "platform/base/ip_address.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 // Represents the data stored in DNS records of types SRV, TXT, A, and AAAA
 class DnsSdInstanceEndpoint : public DnsSdInstance {
@@ -177,7 +176,6 @@ inline bool operator!=(const DnsSdInstanceEndpoint& lhs,
   return !(lhs == rhs);
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_DNSSD_PUBLIC_DNS_SD_INSTANCE_ENDPOINT_H_
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance_endpoint_unittest.cc b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance_endpoint_unittest.cc
index 28c36b51588..8bb5b58e3cf 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance_endpoint_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance_endpoint_unittest.cc
@@ -8,8 +8,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 TEST(DnsSdInstanceEndpointTests, ComparisonTests) {
   constexpr NetworkInterfaceIndex kIndex0 = 0;
@@ -73,5 +72,4 @@ TEST(DnsSdInstanceEndpointTests, Constructors) {
   EXPECT_EQ(ep1, ep4);
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance_unittest.cc b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance_unittest.cc
index a8e72023e09..cd744084ea4 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance_unittest.cc
@@ -9,8 +9,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 TEST(DnsSdInstanceTests, InstanceLength) {
   EXPECT_TRUE(IsInstanceValid("instance"));
@@ -251,5 +250,4 @@ TEST(DnsSdInstanceTests, ComparisonTests) {
   EXPECT_LT(kIn9, kIn10);
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_publisher.h b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_publisher.h
index e961a6b9e0e..e87f4fd040f 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_publisher.h
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_publisher.h
@@ -10,8 +10,7 @@
 #include "discovery/dnssd/public/dns_sd_instance.h"
 #include "platform/base/error.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class DnsSdInstanceEndpoint;
 
@@ -58,7 +57,6 @@ class DnsSdPublisher {
   virtual ErrorOr<int> DeregisterAll(const std::string& service) = 0;
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_DNSSD_PUBLIC_DNS_SD_PUBLISHER_H_
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_querier.h b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_querier.h
index a3502c53cd5..70cc9292208 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_querier.h
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_querier.h
@@ -9,8 +9,7 @@
 
 #include "discovery/dnssd/public/dns_sd_instance_endpoint.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class DnsSdQuerier {
  public:
@@ -61,7 +60,6 @@ class DnsSdQuerier {
   virtual void ReinitializeQueries(const std::string& service) = 0;
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_DNSSD_PUBLIC_DNS_SD_QUERIER_H_
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_service.h b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_service.h
index d8da4d9ce56..0482ee6c051 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_service.h
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_service.h
@@ -12,8 +12,7 @@
 #include "platform/base/interface_info.h"
 #include "platform/base/ip_address.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class DnsSdPublisher;
 class DnsSdQuerier;
@@ -33,7 +32,6 @@ class DnsSdService {
   virtual DnsSdPublisher* GetPublisher() = 0;
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_DNSSD_PUBLIC_DNS_SD_SERVICE_H_
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.cc b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.cc
index 599320d626a..684fd1acfe6 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.cc
@@ -9,8 +9,7 @@
 
 #include "util/span_util.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 // static
 bool DnsSdTxtRecord::IsValidTxtValue(const std::string& key, ByteView value) {
@@ -169,5 +168,4 @@ bool DnsSdTxtRecord::CaseInsensitiveComparison::operator()(
   return false;
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h
index 1d08a272383..8760262a7bd 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h
@@ -16,8 +16,7 @@
 #include "platform/base/error.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class DnsSdTxtRecord {
  public:
@@ -116,7 +115,6 @@ inline bool operator!=(const DnsSdTxtRecord& lhs, const DnsSdTxtRecord& rhs) {
   return !(lhs == rhs);
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_DNSSD_PUBLIC_DNS_SD_TXT_RECORD_H_
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record_unittest.cc b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record_unittest.cc
index 0b5cacff601..2b4aeccf81a 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record_unittest.cc
@@ -7,8 +7,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 namespace dnssd {
 
 TEST(TxtRecordTest, TestCaseInsensitivity) {
@@ -147,5 +146,4 @@ TEST(TxtRecordTest, TestGetDataWorks) {
 }
 
 }  // namespace dnssd
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/testing/fake_dns_record_factory.cc b/chromium/third_party/openscreen/src/discovery/dnssd/testing/fake_dns_record_factory.cc
index a878bf4d338..78765c21610 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/testing/fake_dns_record_factory.cc
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/testing/fake_dns_record_factory.cc
@@ -6,8 +6,7 @@
 
 #include <utility>
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 // static
 MdnsRecord FakeDnsRecordFactory::CreateFullyPopulatedSrvRecord(uint16_t port) {
@@ -45,5 +44,4 @@ const char FakeDnsRecordFactory::kServiceNameServicePart[] = "_srv-name";
 // static
 const char FakeDnsRecordFactory::kDomainName[] = "local";
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/testing/fake_dns_record_factory.h b/chromium/third_party/openscreen/src/discovery/dnssd/testing/fake_dns_record_factory.h
index cb9ca2a218a..23ed6c4a22e 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/testing/fake_dns_record_factory.h
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/testing/fake_dns_record_factory.h
@@ -14,8 +14,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class FakeDnsRecordFactory {
  public:
@@ -31,7 +30,6 @@ class FakeDnsRecordFactory {
   static MdnsRecord CreateFullyPopulatedSrvRecord(uint16_t port = kPortNum);
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_DNSSD_TESTING_FAKE_DNS_RECORD_FACTORY_H_
diff --git a/chromium/third_party/openscreen/src/discovery/dnssd/testing/fake_network_interface_config.h b/chromium/third_party/openscreen/src/discovery/dnssd/testing/fake_network_interface_config.h
index 45010fc9893..3746b853ec2 100644
--- a/chromium/third_party/openscreen/src/discovery/dnssd/testing/fake_network_interface_config.h
+++ b/chromium/third_party/openscreen/src/discovery/dnssd/testing/fake_network_interface_config.h
@@ -10,8 +10,7 @@
 #include "discovery/dnssd/impl/network_interface_config.h"
 #include "gmock/gmock.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class FakeNetworkInterfaceConfig : public NetworkInterfaceConfig {
  public:
@@ -26,7 +25,6 @@ class FakeNetworkInterfaceConfig : public NetworkInterfaceConfig {
   void set_address_v6(IPAddress address) { address_v6_ = std::move(address); }
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_DNSSD_TESTING_FAKE_NETWORK_INTERFACE_CONFIG_H_
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_probe.cc b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_probe.cc
index fbf83f70779..d2141d376cb 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_probe.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_probe.cc
@@ -12,8 +12,7 @@
 #include "platform/api/task_runner.h"
 #include "platform/api/time.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 MdnsProbe::MdnsProbe(DomainName target_name, IPAddress address)
     : target_name_(std::move(target_name)),
@@ -107,5 +106,4 @@ void MdnsProbeImpl::OnMessageReceived(const MdnsMessage& message) {
   }
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_probe_manager.cc b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_probe_manager.cc
index 931ff69e5ad..c6df7a2a4fb 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_probe_manager.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_probe_manager.cc
@@ -11,8 +11,7 @@
 #include "discovery/mdns/impl/mdns_sender.h"
 #include "platform/api/task_runner.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 namespace {
 
 // The timespan by which to delay subsequent mDNS Probe queries for the same
@@ -249,5 +248,4 @@ MdnsProbeManagerImpl::OngoingProbe::OngoingProbe(
       requested_name(std::move(name)),
       callback(callback) {}
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_probe_manager_unittest.cc b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_probe_manager_unittest.cc
index f9b6e94bf87..cf9d790ec9f 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_probe_manager_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_probe_manager_unittest.cc
@@ -23,8 +23,7 @@ using testing::Invoke;
 using testing::Return;
 using testing::StrictMock;
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class MockDomainConfirmedProvider : public MdnsDomainConfirmedProvider {
  public:
@@ -349,5 +348,4 @@ TEST_F(MdnsProbeManagerTests, ProbeFailureCreatesNewProbeIfNameUnclaimed) {
   ExpectProbeStopped(name_);
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_probe_unittest.cc b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_probe_unittest.cc
index 8872df757f2..632eb75aca6 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_probe_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_probe_unittest.cc
@@ -23,8 +23,7 @@ using testing::Invoke;
 using testing::Return;
 using testing::StrictMock;
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class MockMdnsSender : public MdnsSender {
  public:
@@ -128,5 +127,4 @@ TEST_F(MdnsProbeTests, DISABLED_TestNoCancelationOnUnrelatedMessages) {
   testing::Mock::VerifyAndClearExpectations(&sender_);
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_publisher.cc b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_publisher.cc
index 993889632c4..73c7cfa9200 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_publisher.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_publisher.cc
@@ -14,8 +14,7 @@
 #include "platform/api/task_runner.h"
 #include "platform/base/trivial_clock_traits.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 namespace {
 
 // Minimum delay between announcements of a given record in seconds.
@@ -360,7 +359,7 @@ void MdnsPublisher::ProcessRecordQueue() {
     sender_->SendMulticast(message);
   }
 
-  batch_records_alarm_ = absl::nullopt;
+  batch_records_alarm_ = std::nullopt;
   records_to_send_.clear();
 }
 
@@ -369,5 +368,4 @@ Clock::duration MdnsPublisher::RecordAnnouncer::GetNextAnnounceDelay() {
                             pow(kIntervalIncreaseFactor, attempts_));
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_publisher.h b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_publisher.h
index a25588b5622..f3ee4ac05e4 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_publisher.h
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_publisher.h
@@ -7,10 +7,10 @@
 
 #include <map>
 #include <memory>
+#include <optional>
 #include <utility>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "discovery/mdns/impl/mdns_responder.h"
 #include "discovery/mdns/public/mdns_records.h"
 #include "util/alarm.h"
@@ -184,7 +184,7 @@ class MdnsPublisher : public MdnsResponder::RecordHandler {
 
   // Alarm to cancel batching of records when this class is destroyed, and
   // instead send them immediately. Variable is only set when it is in use.
-  absl::optional<Alarm> batch_records_alarm_;
+  std::optional<Alarm> batch_records_alarm_;
 
   // Number of times to announce a newly published record.
   const int max_announcement_attempts_;
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_publisher_unittest.cc b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_publisher_unittest.cc
index fc0891fd60e..08538a39899 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_publisher_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_publisher_unittest.cc
@@ -20,8 +20,7 @@ using testing::Invoke;
 using testing::Return;
 using testing::StrictMock;
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 namespace {
 
 constexpr Clock::duration kAnnounceGoodbyeDelay = std::chrono::milliseconds(25);
@@ -455,5 +454,4 @@ TEST_F(MdnsPublisherTest, RegistrationAnnouncesEightTimes) {
   clock_.Advance(kAnnounceGoodbyeDelay);
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_querier.cc b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_querier.cc
index c926efce07a..66a10c5e9d5 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_querier.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_querier.cc
@@ -20,8 +20,7 @@
 #include "discovery/mdns/public/mdns_constants.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 namespace {
 
 constexpr std::array<DnsType, 5> kTranslatedNsecAnyQueryTypes = {
@@ -868,5 +867,4 @@ void MdnsQuerier::ApplyPendingChanges(
   }
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_querier.h b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_querier.h
index 232c89d403c..2e0779d6f10 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_querier.h
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_querier.h
@@ -17,8 +17,7 @@
 #include "discovery/mdns/public/mdns_records.h"
 #include "platform/api/task_runner.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class MdnsRandom;
 class MdnsSender;
@@ -234,7 +233,6 @@ class MdnsQuerier : public MdnsReceiver::ResponseClient {
   std::multimap<DomainName, CallbackInfo> callbacks_;
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_MDNS_IMPL_MDNS_QUERIER_H_
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_querier_unittest.cc b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_querier_unittest.cc
index 29a832bd4f2..b80861dc925 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_querier_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_querier_unittest.cc
@@ -23,8 +23,7 @@
 #include "platform/test/mock_udp_socket.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 using testing::_;
 using testing::Args;
@@ -898,5 +897,4 @@ TEST_F(MdnsQuerierTest, TestMaxRecordsRespected) {
   EXPECT_TRUE(ContainsRecord(querier.get(), record1_created_, DnsType::kA));
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_random.h b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_random.h
index 7838b8a2875..ad628ccc42c 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_random.h
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_random.h
@@ -9,8 +9,7 @@
 
 #include "platform/api/time.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class MdnsRandom {
  public:
@@ -73,7 +72,6 @@ class MdnsRandom {
       kMinimumProbeInitializationDelayMs, kMaximumProbeInitializationDelayMs};
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_MDNS_IMPL_MDNS_RANDOM_H_
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_random_unittest.cc b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_random_unittest.cc
index 43e77405ab4..6b79182bccf 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_random_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_random_unittest.cc
@@ -7,8 +7,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 namespace {
 constexpr int kIterationCount = 100;
@@ -58,5 +57,4 @@ TEST(MdnsRandomTest, TruncatedQueryResponseDelay) {
   }
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_receiver.cc b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_receiver.cc
index 8936df92e69..7f2e57be08a 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_receiver.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_receiver.cc
@@ -10,8 +10,7 @@
 #include "util/std_util.h"
 #include "util/trace_logging.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 MdnsReceiver::ResponseClient::~ResponseClient() = default;
 
@@ -92,5 +91,4 @@ void MdnsReceiver::OnRead(UdpSocket* socket,
   }
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_receiver.h b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_receiver.h
index e12e8c2f21f..0f968f5069e 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_receiver.h
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_receiver.h
@@ -13,8 +13,7 @@
 #include "platform/base/error.h"
 #include "platform/base/udp_packet.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class MdnsMessage;
 
@@ -66,7 +65,6 @@ class MdnsReceiver {
   Config config_;
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_MDNS_IMPL_MDNS_RECEIVER_H_
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_receiver_unittest.cc b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_receiver_unittest.cc
index a33d2d040d6..7a24ec81c8e 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_receiver_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_receiver_unittest.cc
@@ -15,8 +15,7 @@
 #include "platform/api/time.h"
 #include "platform/test/fake_udp_socket.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 using testing::_;
 using testing::Return;
@@ -129,5 +128,4 @@ TEST(MdnsReceiverTest, ReceiveResponse) {
   receiver.RemoveResponseCallback(&delegate);
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_responder.cc b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_responder.cc
index 280e8be10c2..1c49b5cde53 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_responder.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_responder.cc
@@ -17,8 +17,7 @@
 #include "discovery/mdns/impl/mdns_sender.h"
 #include "platform/api/task_runner.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 namespace {
 
 constexpr std::array<const char*, 3> kServiceEnumerationDomainLabels{
@@ -618,5 +617,4 @@ void MdnsResponder::SendResponse(
   }
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_responder_unittest.cc b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_responder_unittest.cc
index 2255ce798cb..b6e03e8cf46 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_responder_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_responder_unittest.cc
@@ -17,8 +17,7 @@
 #include "platform/test/fake_udp_socket.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 namespace {
 
 constexpr Clock::duration kMaximumSharedRecordResponseDelayMs(120 * 1000);
@@ -840,5 +839,4 @@ TEST_F(MdnsResponderTest, EnumerateAllQueryNoResults) {
   clock_.Advance(Clock::duration(kMaximumSharedRecordResponseDelayMs));
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_sender.cc b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_sender.cc
index 4c8cb3a0350..c4ea6addab2 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_sender.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_sender.cc
@@ -11,8 +11,7 @@
 #include "discovery/mdns/public/mdns_writer.h"
 #include "platform/api/udp_socket.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 MdnsSender::MdnsSender(UdpSocket* socket) : socket_(socket) {
   OSP_DCHECK(socket_ != nullptr);
@@ -46,5 +45,4 @@ void MdnsSender::OnSendError(UdpSocket* socket, Error error) {
   OSP_LOG_ERROR << "Error sending packet " << error;
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_sender.h b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_sender.h
index 340f6f02072..9f93aeae361 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_sender.h
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_sender.h
@@ -9,8 +9,7 @@
 #include "platform/base/error.h"
 #include "platform/base/ip_address.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class MdnsMessage;
 
@@ -36,7 +35,6 @@ class MdnsSender {
   UdpSocket* const socket_;
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_MDNS_IMPL_MDNS_SENDER_H_
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_sender_unittest.cc b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_sender_unittest.cc
index 5f96d160492..24951bc7dcc 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_sender_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_sender_unittest.cc
@@ -13,8 +13,7 @@
 #include "platform/test/fake_udp_socket.h"
 #include "platform/test/mock_udp_socket.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 using testing::_;
 using testing::Args;
@@ -163,5 +162,4 @@ TEST_F(MdnsSenderTest, ReturnsErrorOnSocketFailure) {
   EXPECT_EQ(socket.send_queue_size(), size_t{0});
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_service_impl.cc b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_service_impl.cc
index 20d4761dbca..62d1daec410 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_service_impl.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_service_impl.cc
@@ -12,8 +12,7 @@
 #include "discovery/mdns/public/mdns_constants.h"
 #include "discovery/mdns/public/mdns_records.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 // static
 std::unique_ptr<MdnsService> MdnsService::Create(
@@ -169,5 +168,4 @@ void MdnsServiceImpl::OnBound(UdpSocket* socket) {
   }
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_trackers.cc b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_trackers.cc
index e9d293e3346..fd60ad425e4 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_trackers.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_trackers.cc
@@ -14,8 +14,7 @@
 #include "discovery/mdns/public/mdns_record_changed_callback.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 namespace {
 
@@ -423,5 +422,4 @@ void MdnsQuestionTracker::ScheduleFollowUpQuery() {
   }
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_trackers.h b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_trackers.h
index 690b839505d..fb2e7aac9b2 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_trackers.h
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_trackers.h
@@ -16,8 +16,7 @@
 #include "platform/base/trivial_clock_traits.h"
 #include "util/alarm.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 struct Config;
 class MdnsRandom;
@@ -254,7 +253,6 @@ class MdnsQuestionTracker : public MdnsTracker {
   int announcements_so_far_ = 0;
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_MDNS_IMPL_MDNS_TRACKERS_H_
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_trackers_unittest.cc b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_trackers_unittest.cc
index 329613d7fa5..49c453c35d8 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_trackers_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/impl/mdns_trackers_unittest.cc
@@ -17,8 +17,7 @@
 #include "platform/test/fake_task_runner.h"
 #include "platform/test/fake_udp_socket.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 namespace {
 
 constexpr Clock::duration kOneSecond =
@@ -509,5 +508,4 @@ TEST_F(MdnsTrackerTest, QuestionTrackerSendsMultipleMessages) {
   clock_.Advance(std::chrono::milliseconds(120));
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_constants.h b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_constants.h
index 75ba12d10d1..55f985379ce 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_constants.h
+++ b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_constants.h
@@ -23,8 +23,7 @@
 #include "platform/base/ip_address.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 // ============================================================================
 // Networking
@@ -462,7 +461,6 @@ constexpr int kVersionShift = 16;
 constexpr uint32_t kDnssecOkBitMask = 0x00008000;
 constexpr uint8_t kVersionBadvers = 0x10;
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_MDNS_PUBLIC_MDNS_CONSTANTS_H_
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_domain_confirmed_provider.h b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_domain_confirmed_provider.h
index 8318fd5d708..719edadc7b4 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_domain_confirmed_provider.h
+++ b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_domain_confirmed_provider.h
@@ -7,8 +7,7 @@
 
 #include "discovery/mdns/public/mdns_records.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class MdnsDomainConfirmedProvider {
  public:
@@ -22,7 +21,6 @@ class MdnsDomainConfirmedProvider {
                              const DomainName& confirmed_name) = 0;
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_MDNS_PUBLIC_MDNS_DOMAIN_CONFIRMED_PROVIDER_H_
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_reader.cc b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_reader.cc
index 9738fc047d6..1a698bb3c51 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_reader.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_reader.cc
@@ -5,6 +5,7 @@
 #include "discovery/mdns/public/mdns_reader.h"
 
 #include <algorithm>
+#include <string_view>
 #include <utility>
 
 #include "discovery/common/config.h"
@@ -12,8 +13,7 @@
 #include "util/osp_logging.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 namespace {
 
 bool TryParseDnsType(uint16_t to_parse, DnsType* type) {
@@ -73,7 +73,7 @@ bool MdnsReader::Read(DomainName* out) {
   // greater than the length of the buffer.
   size_t bytes_processed = 0;
   size_t domain_name_length = 0;
-  std::vector<absl::string_view> labels;
+  std::vector<std::string_view> labels;
   // If we are pointing before the beginning or past the end of the buffer, we
   // hit a malformed pointer. If we have processed more bytes than there are in
   // the buffer, we are in a circular compression loop.
@@ -110,8 +110,8 @@ bool MdnsReader::Read(DomainName* out) {
       if (position + label_length >= end()) {
         return false;
       }
-      const absl::string_view label(reinterpret_cast<const char*>(position),
-                                    label_length);
+      const std::string_view label(reinterpret_cast<const char*>(position),
+                                   label_length);
       domain_name_length += label_length + 1;  // including the length byte
       if (!IsValidDomainLabel(label) ||
           domain_name_length > kMaxDomainNameLength) {
@@ -467,5 +467,4 @@ bool MdnsReader::Read(NsecBitMapField* out) {
   return false;
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_reader.h b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_reader.h
index 5ad5c6b4539..4d47291db17 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_reader.h
+++ b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_reader.h
@@ -12,8 +12,7 @@
 #include "platform/base/error.h"
 #include "util/big_endian.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 struct Config;
 
@@ -89,7 +88,6 @@ class MdnsReader : public BigEndianReader {
   const size_t kMaximumAllowedRdataSize;
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_MDNS_PUBLIC_MDNS_READER_H_
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_reader_fuzztest.cc b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_reader_fuzztest.cc
index e7145ae8eed..d990d21e2cb 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_reader_fuzztest.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_reader_fuzztest.cc
@@ -5,14 +5,12 @@
 #include "discovery/common/config.h"
 #include "discovery/mdns/public/mdns_reader.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 void Fuzz(const uint8_t* data, size_t size) {
   MdnsReader reader(Config{}, data, size);
   reader.Read();
 }
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   openscreen::discovery::Fuzz(data, size);
   return 0;
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_reader_unittest.cc b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_reader_unittest.cc
index 86f6b5e4925..0edf27de723 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_reader_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_reader_unittest.cc
@@ -6,14 +6,14 @@
 
 #include <memory>
 #include <sstream>
+#include <string_view>
 
 #include "discovery/common/config.h"
 #include "discovery/mdns/testing/mdns_test_util.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 namespace {
 
@@ -380,7 +380,7 @@ TEST(MdnsReaderTest, ReadTxtRecordRdata_WithNullInTheMiddle) {
   // clang-format on
   TestReadEntrySucceeds(
       kTxtRecordRdata, sizeof(kTxtRecordRdata),
-      MakeTxtRecord({absl::string_view("with\0NULL", 9), "other"}));
+      MakeTxtRecord({std::string_view("with\0NULL", 9), "other"}));
 }
 
 TEST(MdnsReaderTest, ReadTxtRecordRdata_EmptyEntries) {
@@ -733,5 +733,4 @@ TEST(MdnsReaderTest, ReadMdnsMessage_MissingAdditionalRecord) {
   TestReadEntryFails<MdnsMessage>(kInvalidMessage, sizeof(kInvalidMessage));
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_record_changed_callback.h b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_record_changed_callback.h
index d4cd723136c..9e35e2bcfd6 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_record_changed_callback.h
+++ b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_record_changed_callback.h
@@ -10,8 +10,7 @@
 #include "discovery/mdns/public/mdns_records.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 enum class RecordChangedEvent {
   kCreated,
@@ -56,7 +55,6 @@ inline std::ostream& operator<<(std::ostream& output,
   OSP_NOTREACHED();
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_MDNS_PUBLIC_MDNS_RECORD_CHANGED_CALLBACK_H_
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_records.cc b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_records.cc
index 3bd13c8509b..6868a5c040e 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_records.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_records.cc
@@ -16,8 +16,7 @@
 #include "absl/strings/str_join.h"
 #include "discovery/mdns/public/mdns_writer.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 namespace {
 
@@ -53,10 +52,10 @@ bool IsGreaterThan(const Rdata& lhs, const Rdata& rhs) {
   const size_t lhs_size = lhs_cast.MaxWireSize() + 2;
   const size_t rhs_size = rhs_cast.MaxWireSize() + 2;
 
-  uint8_t lhs_bytes[lhs_size];  // NOLINT(runtime/arrays)
-  uint8_t rhs_bytes[rhs_size];  // NOLINT(runtime/arrays)
-  MdnsWriter lhs_writer(lhs_bytes, lhs_size);
-  MdnsWriter rhs_writer(rhs_bytes, rhs_size);
+  std::vector<uint8_t> lhs_bytes(lhs_size);
+  std::vector<uint8_t> rhs_bytes(rhs_size);
+  MdnsWriter lhs_writer(lhs_bytes.data(), lhs_size);
+  MdnsWriter rhs_writer(rhs_bytes.data(), rhs_size);
 
   const bool lhs_write = lhs_writer.Write(lhs_cast);
   const bool rhs_write = rhs_writer.Write(rhs_cast);
@@ -95,7 +94,7 @@ bool IsGreaterThan(DnsType type, const Rdata& lhs, const Rdata& rhs) {
 
 }  // namespace
 
-bool IsValidDomainLabel(absl::string_view label) {
+bool IsValidDomainLabel(std::string_view label) {
   const size_t label_size = label.size();
   return label_size > 0 && label_size <= kMaxLabelLength;
 }
@@ -105,10 +104,10 @@ DomainName::DomainName() = default;
 DomainName::DomainName(std::vector<std::string> labels)
     : DomainName(labels.begin(), labels.end()) {}
 
-DomainName::DomainName(const std::vector<absl::string_view>& labels)
+DomainName::DomainName(const std::vector<std::string_view>& labels)
     : DomainName(labels.begin(), labels.end()) {}
 
-DomainName::DomainName(std::initializer_list<absl::string_view> labels)
+DomainName::DomainName(std::initializer_list<std::string_view> labels)
     : DomainName(labels.begin(), labels.end()) {}
 
 DomainName::DomainName(std::vector<std::string> labels, size_t max_wire_size)
@@ -934,5 +933,4 @@ bool CanBeProcessed(DnsType type) {
   return false;
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_records.h b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_records.h
index ebd3b4b33c1..c16b1e0da8d 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_records.h
+++ b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_records.h
@@ -11,11 +11,11 @@
 #include <initializer_list>
 #include <ostream>
 #include <string>
+#include <string_view>
 #include <utility>
 #include <vector>
 
 #include "absl/strings/ascii.h"
-#include "absl/strings/string_view.h"
 #include "absl/types/variant.h"
 #include "discovery/mdns/public/mdns_constants.h"
 #include "platform/base/error.h"
@@ -23,10 +23,9 @@
 #include "platform/base/ip_address.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
-bool IsValidDomainLabel(absl::string_view label);
+bool IsValidDomainLabel(std::string_view label);
 
 // Represents domain name as a collection of labels, ensures label length and
 // domain name length requirements are met.
@@ -61,8 +60,8 @@ class DomainName {
     *this = std::move(domain.value());
   }
   explicit DomainName(std::vector<std::string> labels);
-  explicit DomainName(const std::vector<absl::string_view>& labels);
-  explicit DomainName(std::initializer_list<absl::string_view> labels);
+  explicit DomainName(const std::vector<std::string_view>& labels);
+  explicit DomainName(std::initializer_list<std::string_view> labels);
   DomainName(const DomainName& other);
   DomainName(DomainName&& other) noexcept;
 
@@ -652,7 +651,6 @@ bool CanBeQueried(DnsType type);
 // should be processed.
 bool CanBeProcessed(DnsType type);
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_MDNS_PUBLIC_MDNS_RECORDS_H_
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_records_unittest.cc b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_records_unittest.cc
index 0f14fa53a6a..5af9ddf9d69 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_records_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_records_unittest.cc
@@ -18,8 +18,7 @@
 #include "gtest/gtest.h"
 #include "platform/api/network_interface.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 using testing::ElementsAreArray;
 
@@ -58,7 +57,7 @@ TEST(MdnsDomainNameTest, Construct) {
   name2_stream << name2;
   EXPECT_EQ(name2_stream.str(), "MyDevice._mYSERvice.local");
 
-  std::vector<absl::string_view> labels{"OtherDevice", "_MYservice", "LOcal"};
+  std::vector<std::string_view> labels{"OtherDevice", "_MYservice", "LOcal"};
   DomainName name3(labels);
   EXPECT_FALSE(name3.empty());
   EXPECT_EQ(name3.MaxWireSize(), size_t{30});
@@ -798,5 +797,4 @@ TEST(MdnsRecordOperations, CanBeProcessed) {
   EXPECT_FALSE(CanBeProcessed(static_cast<DnsType>(8973)));
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_service.cc b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_service.cc
index 12db6a1ca55..8f2d6f27c31 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_service.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_service.cc
@@ -4,12 +4,10 @@
 
 #include "discovery/mdns/public/mdns_service.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 MdnsService::MdnsService() = default;
 
 MdnsService::~MdnsService() = default;
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_writer.cc b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_writer.cc
index 3242b273cff..d42cd0f5acc 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_writer.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_writer.cc
@@ -14,8 +14,7 @@
 #include "util/hashing.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 namespace {
 
@@ -281,5 +280,4 @@ bool MdnsWriter::Write(const Header& header) {
   return false;
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_writer.h b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_writer.h
index 1ffd2842026..a4f3373a29c 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_writer.h
+++ b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_writer.h
@@ -13,8 +13,7 @@
 #include "platform/base/span.h"
 #include "util/big_endian.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 class MdnsWriter : public BigEndianWriter {
  public:
@@ -73,7 +72,6 @@ class MdnsWriter : public BigEndianWriter {
   std::unordered_map<uint64_t, uint16_t> dictionary_;
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_MDNS_PUBLIC_MDNS_WRITER_H_
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_writer_unittest.cc b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_writer_unittest.cc
index e229c80ce72..2e4300005b2 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_writer_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/public/mdns_writer_unittest.cc
@@ -11,8 +11,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 using testing::ElementsAreArray;
 
@@ -465,5 +464,4 @@ TEST(MdnsWriterTest, WriteMdnsMessage_InsufficientBuffer) {
   TestWriteEntryInsufficientBuffer(message);
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/testing/hash_test_util_abseil.h b/chromium/third_party/openscreen/src/discovery/mdns/testing/hash_test_util_abseil.h
index 11526026b3e..f426c2ed03c 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/testing/hash_test_util_abseil.h
+++ b/chromium/third_party/openscreen/src/discovery/mdns/testing/hash_test_util_abseil.h
@@ -10,8 +10,7 @@
 #include "absl/hash/hash_testing.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 template <int&..., typename T>
 testing::AssertionResult VerifyTypeImplementsAbslHashCorrectly(
@@ -19,7 +18,6 @@ testing::AssertionResult VerifyTypeImplementsAbslHashCorrectly(
   absl::VerifyTypeImplementsAbslHashCorrectly(std::move(values));
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_MDNS_TESTING_HASH_TEST_UTIL_ABSEIL_H_
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/testing/hash_test_util_nop.h b/chromium/third_party/openscreen/src/discovery/mdns/testing/hash_test_util_nop.h
index 9cd5c2eb228..0b37c6ff794 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/testing/hash_test_util_nop.h
+++ b/chromium/third_party/openscreen/src/discovery/mdns/testing/hash_test_util_nop.h
@@ -7,8 +7,7 @@
 
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 template <int&..., typename T>
 testing::AssertionResult VerifyTypeImplementsAbslHashCorrectly(
@@ -16,7 +15,6 @@ testing::AssertionResult VerifyTypeImplementsAbslHashCorrectly(
   return testing::AssertionSuccess();
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_MDNS_TESTING_HASH_TEST_UTIL_NOP_H_
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/testing/mdns_test_util.cc b/chromium/third_party/openscreen/src/discovery/mdns/testing/mdns_test_util.cc
index a050f194393..82ed20e6cd4 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/testing/mdns_test_util.cc
+++ b/chromium/third_party/openscreen/src/discovery/mdns/testing/mdns_test_util.cc
@@ -8,15 +8,14 @@
 #include <utility>
 #include <vector>
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
-TxtRecordRdata MakeTxtRecord(std::initializer_list<absl::string_view> strings) {
+TxtRecordRdata MakeTxtRecord(std::initializer_list<std::string_view> strings) {
   return TxtRecordRdata(MakeTxtEntries(strings));
 }
 
 std::vector<TxtRecordRdata::Entry> MakeTxtEntries(
-    std::initializer_list<absl::string_view> strings) {
+    std::initializer_list<std::string_view> strings) {
   std::vector<TxtRecordRdata::Entry> texts;
   for (const auto& string : strings) {
     texts.push_back(TxtRecordRdata::Entry(string.begin(), string.end()));
@@ -62,5 +61,4 @@ MdnsRecord GetFakeAAAARecord(const DomainName& name, std::chrono::seconds ttl) {
                     ttl, std::move(rdata));
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/discovery/mdns/testing/mdns_test_util.h b/chromium/third_party/openscreen/src/discovery/mdns/testing/mdns_test_util.h
index 1bb0ccf1868..3ef8c79f44e 100644
--- a/chromium/third_party/openscreen/src/discovery/mdns/testing/mdns_test_util.h
+++ b/chromium/third_party/openscreen/src/discovery/mdns/testing/mdns_test_util.h
@@ -6,21 +6,20 @@
 #define DISCOVERY_MDNS_TESTING_MDNS_TEST_UTIL_H_
 
 #include <initializer_list>
+#include <string_view>
 #include <vector>
 
-#include "absl/strings/string_view.h"
 #include "discovery/mdns/public/mdns_records.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 const IPAddress kFakeARecordAddress = IPAddress(192, 168, 0, 0);
 const IPAddress kFakeAAAARecordAddress = IPAddress(1, 2, 3, 4, 5, 6, 7, 8);
 constexpr uint16_t kFakeSrvRecordPort = 80;
 
-TxtRecordRdata MakeTxtRecord(std::initializer_list<absl::string_view> strings);
+TxtRecordRdata MakeTxtRecord(std::initializer_list<std::string_view> strings);
 std::vector<TxtRecordRdata::Entry> MakeTxtEntries(
-    std::initializer_list<absl::string_view> strings);
+    std::initializer_list<std::string_view> strings);
 
 // Methods to create fake MdnsRecord entities for use in UnitTests.
 MdnsRecord GetFakePtrRecord(const DomainName& target,
@@ -38,7 +37,6 @@ MdnsRecord GetFakeAAAARecord(
     const DomainName& name,
     std::chrono::seconds ttl = std::chrono::seconds(1));
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_MDNS_TESTING_MDNS_TEST_UTIL_H_
diff --git a/chromium/third_party/openscreen/src/discovery/public/dns_sd_service_publisher.h b/chromium/third_party/openscreen/src/discovery/public/dns_sd_service_publisher.h
index 0c421cd5f74..4b8ba812a0e 100644
--- a/chromium/third_party/openscreen/src/discovery/public/dns_sd_service_publisher.h
+++ b/chromium/third_party/openscreen/src/discovery/public/dns_sd_service_publisher.h
@@ -15,8 +15,7 @@
 #include "platform/base/error.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 // This class represents a top-level discovery API which sits on top of DNS-SD.
 // The main purpose of this class is to hide DNS-SD internals from embedders who
@@ -90,7 +89,6 @@ class DnsSdServicePublisher : public DnsSdPublisher::Client {
   DnsSdPublisher* const publisher_;
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_PUBLIC_DNS_SD_SERVICE_PUBLISHER_H_
diff --git a/chromium/third_party/openscreen/src/discovery/public/dns_sd_service_watcher.h b/chromium/third_party/openscreen/src/discovery/public/dns_sd_service_watcher.h
index f10b26f9825..e92a35aaabf 100644
--- a/chromium/third_party/openscreen/src/discovery/public/dns_sd_service_watcher.h
+++ b/chromium/third_party/openscreen/src/discovery/public/dns_sd_service_watcher.h
@@ -19,8 +19,7 @@
 #include "util/hashing.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 
 // This class represents a top-level discovery API which sits on top of DNS-SD.
 // T is the service-specific type which stores information regarding a specific
@@ -215,7 +214,6 @@ class DnsSdServiceWatcher : public DnsSdQuerier::Callback {
   DnsSdQuerier* const querier_;
 };
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
 
 #endif  // DISCOVERY_PUBLIC_DNS_SD_SERVICE_WATCHER_H_
diff --git a/chromium/third_party/openscreen/src/discovery/public/dns_sd_service_watcher_unittest.cc b/chromium/third_party/openscreen/src/discovery/public/dns_sd_service_watcher_unittest.cc
index bdf20d3143b..d618497140f 100644
--- a/chromium/third_party/openscreen/src/discovery/public/dns_sd_service_watcher_unittest.cc
+++ b/chromium/third_party/openscreen/src/discovery/public/dns_sd_service_watcher_unittest.cc
@@ -16,8 +16,7 @@ using testing::IsSubsetOf;
 using testing::IsSupersetOf;
 using testing::StrictMock;
 
-namespace openscreen {
-namespace discovery {
+namespace openscreen::discovery {
 namespace {
 
 std::vector<std::string> ConvertRefs(
@@ -332,5 +331,4 @@ TEST_F(DnsSdServiceWatcherTests, CreatingUpdatingDeletingInstancesWork) {
   EXPECT_FALSE(ContainsService(record2));
 }
 
-}  // namespace discovery
-}  // namespace openscreen
+}  // namespace openscreen::discovery
diff --git a/chromium/third_party/openscreen/src/infra/config/global/generated/commit-queue.cfg b/chromium/third_party/openscreen/src/infra/config/global/generated/commit-queue.cfg
index df3c27f3240..44b91d2a6f7 100644
--- a/chromium/third_party/openscreen/src/infra/config/global/generated/commit-queue.cfg
+++ b/chromium/third_party/openscreen/src/infra/config/global/generated/commit-queue.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see Config message:
-#   https://luci-config.appspot.com/schemas/projects:commit-queue.cfg
+#   https://config.luci.app/schemas/projects:commit-queue.cfg
 
 cq_status_host: "chromium-cq-status.appspot.com"
 config_groups {
diff --git a/chromium/third_party/openscreen/src/infra/config/global/generated/cr-buildbucket.cfg b/chromium/third_party/openscreen/src/infra/config/global/generated/cr-buildbucket.cfg
index 37f46aef5c1..d6f71b58588 100644
--- a/chromium/third_party/openscreen/src/infra/config/global/generated/cr-buildbucket.cfg
+++ b/chromium/third_party/openscreen/src/infra/config/global/generated/cr-buildbucket.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see BuildbucketCfg message:
-#   https://luci-config.appspot.com/schemas/projects:buildbucket.cfg
+#   https://config.luci.app/schemas/projects:buildbucket.cfg
 
 buckets {
   name: "ci"
@@ -54,7 +54,7 @@ buckets {
       name: "chromium_mac_debug"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-13"
       dimensions: "pool:luci.flex.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -284,7 +284,7 @@ buckets {
       name: "mac_debug"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-13"
       dimensions: "pool:luci.flex.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -369,7 +369,7 @@ buckets {
       name: "chromium_mac_debug"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-13"
       dimensions: "pool:luci.flex.try"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -592,7 +592,7 @@ buckets {
       name: "mac_debug"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac-13"
       dimensions: "pool:luci.flex.try"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
diff --git a/chromium/third_party/openscreen/src/infra/config/global/generated/luci-logdog.cfg b/chromium/third_party/openscreen/src/infra/config/global/generated/luci-logdog.cfg
index adc75bef498..01a391261d5 100644
--- a/chromium/third_party/openscreen/src/infra/config/global/generated/luci-logdog.cfg
+++ b/chromium/third_party/openscreen/src/infra/config/global/generated/luci-logdog.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see ProjectConfig message:
-#   https://luci-config.appspot.com/schemas/projects:luci-logdog.cfg
+#   https://config.luci.app/schemas/projects:luci-logdog.cfg
 
 reader_auth_groups: "all"
 writer_auth_groups: "luci-logdog-chromium-writers"
diff --git a/chromium/third_party/openscreen/src/infra/config/global/generated/luci-milo.cfg b/chromium/third_party/openscreen/src/infra/config/global/generated/luci-milo.cfg
index 0cbdc1bb90a..e1a1916ff62 100644
--- a/chromium/third_party/openscreen/src/infra/config/global/generated/luci-milo.cfg
+++ b/chromium/third_party/openscreen/src/infra/config/global/generated/luci-milo.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see Project message:
-#   https://luci-config.appspot.com/schemas/projects:luci-milo.cfg
+#   https://config.luci.app/schemas/projects:luci-milo.cfg
 
 consoles {
   id: "ci"
@@ -42,7 +42,7 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.openscreen.ci/mac_debug"
-    category: "Mac-11|x86-64"
+    category: "Mac-13|x86-64"
     short_name: "mac_debug"
   }
   builders {
@@ -52,7 +52,7 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.openscreen.ci/chromium_mac_debug"
-    category: "Mac-11|x86-64"
+    category: "Mac-13|x86-64"
     short_name: "chromium_mac_debug"
   }
 }
@@ -99,7 +99,7 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.openscreen.try/mac_debug"
-    category: "Mac-11|x86-64"
+    category: "Mac-13|x86-64"
     short_name: "mac_debug"
   }
   builders {
@@ -109,7 +109,7 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.openscreen.try/chromium_mac_debug"
-    category: "Mac-11|x86-64"
+    category: "Mac-13|x86-64"
     short_name: "chromium_mac_debug"
   }
 }
diff --git a/chromium/third_party/openscreen/src/infra/config/global/generated/luci-scheduler.cfg b/chromium/third_party/openscreen/src/infra/config/global/generated/luci-scheduler.cfg
index 938b747dab9..d74b1b98344 100644
--- a/chromium/third_party/openscreen/src/infra/config/global/generated/luci-scheduler.cfg
+++ b/chromium/third_party/openscreen/src/infra/config/global/generated/luci-scheduler.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see ProjectConfig message:
-#   https://luci-config.appspot.com/schemas/projects:luci-scheduler.cfg
+#   https://config.luci.app/schemas/projects:luci-scheduler.cfg
 
 job {
   id: "chromium_linux64_debug"
diff --git a/chromium/third_party/openscreen/src/infra/config/global/generated/project.cfg b/chromium/third_party/openscreen/src/infra/config/global/generated/project.cfg
index 4c4ad652ff0..ec5f8c45b78 100644
--- a/chromium/third_party/openscreen/src/infra/config/global/generated/project.cfg
+++ b/chromium/third_party/openscreen/src/infra/config/global/generated/project.cfg
@@ -2,12 +2,12 @@
 # Do not modify manually.
 #
 # For the schema of this file, see ProjectCfg message:
-#   https://luci-config.appspot.com/schemas/projects:project.cfg
+#   https://config.luci.app/schemas/projects:project.cfg
 
 name: "openscreen"
 access: "group:all"
 lucicfg {
-  version: "1.39.14"
+  version: "1.40.0"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/chromium/third_party/openscreen/src/infra/config/global/generated/realms.cfg b/chromium/third_party/openscreen/src/infra/config/global/generated/realms.cfg
index bb3c7871a53..03f60292d1e 100644
--- a/chromium/third_party/openscreen/src/infra/config/global/generated/realms.cfg
+++ b/chromium/third_party/openscreen/src/infra/config/global/generated/realms.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see RealmsCfg message:
-#   https://luci-config.appspot.com/schemas/projects:realms.cfg
+#   https://config.luci.app/schemas/projects:realms.cfg
 
 realms {
   name: "@root"
diff --git a/chromium/third_party/openscreen/src/infra/config/global/main.star b/chromium/third_party/openscreen/src/infra/config/global/main.star
index b8d4176cfb1..fedb995ecf2 100755
--- a/chromium/third_party/openscreen/src/infra/config/global/main.star
+++ b/chromium/third_party/openscreen/src/infra/config/global/main.star
@@ -5,7 +5,7 @@ Open Screen's LUCI configuration for post-submit and pre-submit builders.
 
 REPO_URL = "https://chromium.googlesource.com/openscreen"
 CHROMIUM_REPO_URL = "https://chromium.googlesource.com/chromium/src"
-MAC_VERSION = "Mac-11"
+MAC_VERSION = "Mac-13"
 REF = "refs/heads/main"
 
 # Use LUCI Scheduler BBv2 names and add Scheduler realms configs.
diff --git a/chromium/third_party/openscreen/src/osp/demo/osp_demo.cc b/chromium/third_party/openscreen/src/osp/demo/osp_demo.cc
index fce45b50f82..8328441aaca 100644
--- a/chromium/third_party/openscreen/src/osp/demo/osp_demo.cc
+++ b/chromium/third_party/openscreen/src/osp/demo/osp_demo.cc
@@ -11,9 +11,9 @@
 #include <iostream>
 #include <memory>
 #include <string>
+#include <string_view>
 #include <vector>
 
-#include "absl/strings/string_view.h"
 #include "osp/msgs/osp_messages.h"
 #include "osp/public/message_demuxer.h"
 #include "osp/public/network_service_manager.h"
@@ -75,8 +75,7 @@ void SignalThings() {
 
 }  // namespace
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class DemoListenerObserver final : public ServiceListener::Observer {
  public:
@@ -100,7 +99,7 @@ class DemoListenerObserver final : public ServiceListener::Observer {
   void OnMetrics(ServiceListener::Metrics) override {}
 };
 
-std::string SanitizeServiceId(absl::string_view service_id) {
+std::string SanitizeServiceId(std::string_view service_id) {
   std::string safe_service_id(service_id);
   for (auto& c : safe_service_id) {
     if (c < ' ' || c > '~') {
@@ -246,10 +245,10 @@ class DemoConnectionDelegate final : public Connection::Delegate {
     OSP_LOG_INFO << "presentation connection closed by remote";
   }
   void OnDiscarded() override {}
-  void OnError(const absl::string_view message) override {}
+  void OnError(const std::string_view message) override {}
   void OnTerminated() override { OSP_LOG_INFO << "presentation terminated"; }
 
-  void OnStringMessage(absl::string_view message) override {
+  void OnStringMessage(std::string_view message) override {
     OSP_LOG_INFO << "got message: " << message;
   }
   void OnBinaryMessage(const std::vector<uint8_t>& data) override {}
@@ -267,10 +266,10 @@ class DemoReceiverConnectionDelegate final : public Connection::Delegate {
     OSP_LOG_INFO << "presentation connection closed by remote";
   }
   void OnDiscarded() override {}
-  void OnError(const absl::string_view message) override {}
+  void OnError(const std::string_view message) override {}
   void OnTerminated() override { OSP_LOG_INFO << "presentation terminated"; }
 
-  void OnStringMessage(const absl::string_view message) override {
+  void OnStringMessage(const std::string_view message) override {
     OSP_LOG_INFO << "got message: " << message;
     connection_->SendString("--echo-- " + std::string(message));
   }
@@ -398,7 +397,7 @@ void RunControllerPollLoop(Controller* controller) {
           {std::string(command_result.command_line.argument_tail)},
           &receiver_observer);
     } else if (command_result.command_line.command == "start") {
-      const absl::string_view& argument_tail =
+      const std::string_view& argument_tail =
           command_result.command_line.argument_tail;
       size_t next_split = argument_tail.find_first_of(' ');
       const std::string& service_id = receiver_observer.GetServiceId(
@@ -466,8 +465,8 @@ void ListenerDemo() {
   NetworkServiceManager::Dispose();
 }
 
-void HandleReceiverCommand(absl::string_view command,
-                           absl::string_view argument_tail,
+void HandleReceiverCommand(std::string_view command,
+                           std::string_view argument_tail,
                            DemoReceiverDelegate& delegate,
                            NetworkServiceManager* manager) {
   if (command == "avail") {
@@ -518,7 +517,7 @@ void CleanupPublisherDemo(NetworkServiceManager* manager) {
   NetworkServiceManager::Dispose();
 }
 
-void PublisherDemo(absl::string_view friendly_name) {
+void PublisherDemo(std::string_view friendly_name) {
   SignalThings();
 
   constexpr uint16_t server_port = 6667;
@@ -574,11 +573,10 @@ void PublisherDemo(absl::string_view friendly_name) {
   CleanupPublisherDemo(network_service);
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 struct InputArgs {
-  absl::string_view friendly_server_name;
+  std::string_view friendly_server_name;
   bool is_verbose;
   bool is_help;
   bool tracing_enabled;
diff --git a/chromium/third_party/openscreen/src/osp/impl/dns_sd_publisher_client.cc b/chromium/third_party/openscreen/src/osp/impl/dns_sd_publisher_client.cc
index 6480dfa74cd..4b453ee0ec9 100644
--- a/chromium/third_party/openscreen/src/osp/impl/dns_sd_publisher_client.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/dns_sd_publisher_client.cc
@@ -14,8 +14,7 @@
 #include "platform/base/macros.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 using State = ServicePublisher::State;
 
@@ -114,5 +113,4 @@ DnsSdPublisherClient::CreateDnsSdServiceInternal(
   return CreateDnsSdService(task_runner_, publisher_, dns_sd_config);
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/dns_sd_watcher_client.cc b/chromium/third_party/openscreen/src/osp/impl/dns_sd_watcher_client.cc
index 4d96e55d072..7f8f071e8ea 100644
--- a/chromium/third_party/openscreen/src/osp/impl/dns_sd_watcher_client.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/dns_sd_watcher_client.cc
@@ -16,8 +16,7 @@
 #include "platform/base/interface_info.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 using State = ServiceListener::State;
 
@@ -153,5 +152,4 @@ void DnsSdWatcherClient::OnDnsWatcherUpdated(
   listener_->OnReceiverUpdated(discovered_services);
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/message_demuxer.cc b/chromium/third_party/openscreen/src/osp/impl/message_demuxer.cc
index 8e198432365..6d98153ef85 100644
--- a/chromium/third_party/openscreen/src/osp/impl/message_demuxer.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/message_demuxer.cc
@@ -12,8 +12,7 @@
 #include "util/big_endian.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 // static
 // Decodes a varUint, expecting it to follow the encoding format described here:
@@ -85,12 +84,10 @@ MessageDemuxer::MessageWatch::MessageWatch(MessageDemuxer* parent,
       message_type_(message_type) {}
 
 MessageDemuxer::MessageWatch::MessageWatch(
-    MessageDemuxer::MessageWatch&& other) noexcept
-    : parent_(other.parent_),
-      is_default_(other.is_default_),
-      endpoint_id_(other.endpoint_id_),
-      message_type_(other.message_type_) {
-  other.parent_ = nullptr;
+    MessageDemuxer::MessageWatch&& other) noexcept {
+  // Although all fields are POD, this does not use the default implementation.
+  // See `operator=` for details.
+  *this = std::move(other);
 }
 
 MessageDemuxer::MessageWatch::~MessageWatch() {
@@ -109,6 +106,9 @@ MessageDemuxer::MessageWatch::~MessageWatch() {
 
 MessageDemuxer::MessageWatch& MessageDemuxer::MessageWatch::operator=(
     MessageWatch&& other) noexcept {
+  // Although all fields are POD, this does not use the default `operator=`
+  // implementation because it is important that exactly one of `this` or
+  // `other` refers to `parent_`, so that the destructor behaves correctly.
   using std::swap;
   swap(parent_, other.parent_);
   swap(is_default_, other.is_default_);
@@ -286,5 +286,4 @@ void StopWatching(MessageDemuxer::MessageWatch* watch) {
   *watch = MessageDemuxer::MessageWatch();
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/network_service_manager.cc b/chromium/third_party/openscreen/src/osp/impl/network_service_manager.cc
index 2ec9f6349a8..c33e5bb91e4 100644
--- a/chromium/third_party/openscreen/src/osp/impl/network_service_manager.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/network_service_manager.cc
@@ -11,8 +11,7 @@ openscreen::osp::NetworkServiceManager* g_network_service_manager_instance =
 
 }  //  namespace
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 // static
 NetworkServiceManager* NetworkServiceManager::Create(
@@ -74,5 +73,4 @@ NetworkServiceManager::NetworkServiceManager(
 
 NetworkServiceManager::~NetworkServiceManager() = default;
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_common.cc b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_common.cc
index 4f26df4c384..4ee50a3a9ce 100644
--- a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_common.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_common.cc
@@ -8,8 +8,7 @@
 
 #include "absl/strings/ascii.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 std::unique_ptr<ProtocolConnection> GetProtocolConnection(
     uint64_t endpoint_id) {
@@ -44,5 +43,4 @@ PresentationID::PresentationID(std::string presentation_id)
   }
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_common.h b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_common.h
index 9dfb2b5b548..57990d5a0ef 100644
--- a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_common.h
+++ b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_common.h
@@ -16,8 +16,7 @@
 #include "platform/api/time.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 // This method asks the singleton NetworkServiceManager
 // to create a new protocol connection for the given endpoint.
@@ -44,7 +43,6 @@ class PresentationID {
   ErrorOr<std::string> id_;
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_IMPL_PRESENTATION_PRESENTATION_COMMON_H_
diff --git a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_connection.cc b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_connection.cc
index 3f665190617..1db8de0bba3 100644
--- a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_connection.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_connection.cc
@@ -8,7 +8,6 @@
 #include <memory>
 #include <ostream>
 
-#include "absl/strings/string_view.h"
 #include "osp/impl/presentation/presentation_common.h"
 #include "osp/msgs/osp_messages.h"
 #include "osp/public/network_service_manager.h"
@@ -20,8 +19,7 @@
 
 // TODO(crbug.com/openscreen/27): Address TODOs in this file
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 namespace {
 
@@ -101,7 +99,7 @@ void Connection::OnTerminated() {
   delegate_->OnTerminated();
 }
 
-Error Connection::SendString(absl::string_view message) {
+Error Connection::SendString(std::string_view message) {
   if (state_ != State::kConnected)
     return Error::Code::kNoActiveConnection;
 
@@ -290,5 +288,4 @@ Connection* ConnectionManager::GetConnection(uint64_t connection_id) {
   return nullptr;
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_connection_unittest.cc b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_connection_unittest.cc
index cce5641104e..f5821bee4a5 100644
--- a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_connection_unittest.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_connection_unittest.cc
@@ -6,7 +6,6 @@
 
 #include <memory>
 
-#include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "osp/impl/presentation/testing/mock_connection_delegate.h"
@@ -18,8 +17,7 @@
 #include "platform/test/fake_clock.h"
 #include "platform/test/fake_task_runner.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 using ::testing::_;
 using ::testing::Invoke;
@@ -178,9 +176,9 @@ TEST_F(ConnectionTest, ConnectAndSend) {
 
   std::string received;
   EXPECT_CALL(mock_receiver_delegate,
-              OnStringMessage(static_cast<absl::string_view>(expected_message)))
+              OnStringMessage(static_cast<std::string_view>(expected_message)))
       .WillOnce(Invoke(
-          [&received](absl::string_view s) { received = std::string(s); }));
+          [&received](std::string_view s) { received = std::string(s); }));
   quic_bridge_.RunTasksUntilIdle();
 
   std::string string_response = MakeEchoResponse(received);
@@ -188,7 +186,7 @@ TEST_F(ConnectionTest, ConnectAndSend) {
 
   EXPECT_CALL(
       mock_controller_delegate,
-      OnStringMessage(static_cast<absl::string_view>(expected_response)));
+      OnStringMessage(static_cast<std::string_view>(expected_response)));
   quic_bridge_.RunTasksUntilIdle();
 
   std::vector<uint8_t> data{0, 3, 2, 4, 4, 6, 1};
@@ -219,5 +217,4 @@ TEST_F(ConnectionTest, ConnectAndSend) {
   receiver_connection_manager_.RemoveConnection(&receiver);
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_controller.cc b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_controller.cc
index 4a3174851f6..671012afa99 100644
--- a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_controller.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_controller.cc
@@ -8,7 +8,6 @@
 #include <sstream>
 #include <type_traits>
 
-#include "absl/types/optional.h"
 #include "osp/impl/presentation/url_availability_requester.h"
 #include "osp/msgs/osp_messages.h"
 #include "osp/public/message_demuxer.h"
@@ -18,8 +17,7 @@
 #include "util/osp_logging.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 #define DECLARE_MSG_REQUEST_RESPONSE(base_name)                        \
   using RequestMsgType = msgs::Presentation##base_name##Request;       \
@@ -388,7 +386,7 @@ Controller::ConnectRequest::ConnectRequest() = default;
 Controller::ConnectRequest::ConnectRequest(Controller* controller,
                                            const std::string& service_id,
                                            bool is_reconnect,
-                                           absl::optional<uint64_t> request_id)
+                                           std::optional<uint64_t> request_id)
     : service_id_(service_id),
       is_reconnect_(is_reconnect),
       request_id_(request_id),
@@ -783,5 +781,4 @@ void Controller::OnAllReceiversRemoved() {
   availability_requester_->RemoveAllReceivers();
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_controller_unittest.cc b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_controller_unittest.cc
index 12fd9e0cc94..d9bd9d45cc2 100644
--- a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_controller_unittest.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_controller_unittest.cc
@@ -18,8 +18,7 @@
 #include "platform/test/fake_clock.h"
 #include "platform/test/fake_task_runner.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 using ::testing::_;
 using ::testing::Invoke;
@@ -532,5 +531,4 @@ TEST_F(ControllerTest, Reconnect) {
   EXPECT_EQ(connection->state(), Connection::State::kConnected);
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_receiver.cc b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_receiver.cc
index 1c884cb4e65..66955920787 100644
--- a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_receiver.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_receiver.cc
@@ -16,8 +16,7 @@
 #include "util/osp_logging.h"
 #include "util/trace_logging.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 namespace {
 
 msgs::PresentationConnectionCloseEvent_reason GetEventCloseReason(
@@ -555,5 +554,4 @@ uint64_t Receiver::GetNextConnectionId() {
   return request_id++;
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_receiver_unittest.cc b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_receiver_unittest.cc
index f466fa66c45..69d63d2908e 100644
--- a/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_receiver_unittest.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/presentation/presentation_receiver_unittest.cc
@@ -19,8 +19,7 @@
 #include "platform/test/fake_clock.h"
 #include "platform/test/fake_task_runner.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 namespace {
 
@@ -198,5 +197,4 @@ TEST_F(PresentationReceiverTest, StartPresentation) {
 // TODO(btolsch): Connect and reconnect.
 // TODO(btolsch): Terminate request and event.
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/presentation/testing/mock_connection_delegate.h b/chromium/third_party/openscreen/src/osp/impl/presentation/testing/mock_connection_delegate.h
index 2c03b8ef76f..f9cb90a2a32 100644
--- a/chromium/third_party/openscreen/src/osp/impl/presentation/testing/mock_connection_delegate.h
+++ b/chromium/third_party/openscreen/src/osp/impl/presentation/testing/mock_connection_delegate.h
@@ -5,13 +5,13 @@
 #ifndef OSP_IMPL_PRESENTATION_TESTING_MOCK_CONNECTION_DELEGATE_H_
 #define OSP_IMPL_PRESENTATION_TESTING_MOCK_CONNECTION_DELEGATE_H_
 
+#include <string_view>
 #include <vector>
 
 #include "gmock/gmock.h"
 #include "osp/public/presentation/presentation_connection.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class MockConnectionDelegate : public Connection::Delegate {
  public:
@@ -20,13 +20,12 @@ class MockConnectionDelegate : public Connection::Delegate {
   MOCK_METHOD0(OnConnected, void());
   MOCK_METHOD0(OnClosedByRemote, void());
   MOCK_METHOD0(OnDiscarded, void());
-  MOCK_METHOD1(OnError, void(const absl::string_view message));
+  MOCK_METHOD1(OnError, void(const std::string_view message));
   MOCK_METHOD0(OnTerminated, void());
-  MOCK_METHOD1(OnStringMessage, void(const absl::string_view message));
+  MOCK_METHOD1(OnStringMessage, void(const std::string_view message));
   MOCK_METHOD1(OnBinaryMessage, void(const std::vector<uint8_t>& data));
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_IMPL_PRESENTATION_TESTING_MOCK_CONNECTION_DELEGATE_H_
diff --git a/chromium/third_party/openscreen/src/osp/impl/presentation/url_availability_requester.cc b/chromium/third_party/openscreen/src/osp/impl/presentation/url_availability_requester.cc
index aad3d42d661..d8793c7669f 100644
--- a/chromium/third_party/openscreen/src/osp/impl/presentation/url_availability_requester.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/presentation/url_availability_requester.cc
@@ -17,8 +17,7 @@
 
 using std::chrono::seconds;
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 namespace {
 
 static constexpr Clock::duration kWatchDuration = seconds(20);
@@ -490,5 +489,4 @@ ErrorOr<size_t> UrlAvailabilityRequester::ReceiverRequester::OnStreamMessage(
   return Error::Code::kCborParsing;
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/presentation/url_availability_requester.h b/chromium/third_party/openscreen/src/osp/impl/presentation/url_availability_requester.h
index 96e90a4cc5e..98606973b39 100644
--- a/chromium/third_party/openscreen/src/osp/impl/presentation/url_availability_requester.h
+++ b/chromium/third_party/openscreen/src/osp/impl/presentation/url_availability_requester.h
@@ -19,8 +19,7 @@
 #include "platform/api/time.h"
 #include "platform/base/error.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 // Handles Presentation API URL availability requests and persistent watches.
 // It keeps track of the set of currently known receivers as well as all
@@ -147,7 +146,6 @@ class UrlAvailabilityRequester {
       receiver_by_service_id_;
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_IMPL_PRESENTATION_URL_AVAILABILITY_REQUESTER_H_
diff --git a/chromium/third_party/openscreen/src/osp/impl/presentation/url_availability_requester_unittest.cc b/chromium/third_party/openscreen/src/osp/impl/presentation/url_availability_requester_unittest.cc
index f1ce66c404d..cf063b62f46 100644
--- a/chromium/third_party/openscreen/src/osp/impl/presentation/url_availability_requester_unittest.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/presentation/url_availability_requester_unittest.cc
@@ -20,8 +20,7 @@
 #include "platform/test/fake_task_runner.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 using ::testing::_;
 using ::testing::Invoke;
@@ -672,5 +671,4 @@ TEST_F(UrlAvailabilityRequesterTest, RemoveObserverInSteps) {
   quic_bridge_.RunTasksUntilIdle();
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/protocol_connection_client_factory.cc b/chromium/third_party/openscreen/src/osp/impl/protocol_connection_client_factory.cc
index 731daeaeacf..e61ec7b54f0 100644
--- a/chromium/third_party/openscreen/src/osp/impl/protocol_connection_client_factory.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/protocol_connection_client_factory.cc
@@ -12,8 +12,7 @@
 #include "platform/api/task_runner.h"
 #include "platform/api/time.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 // static
 std::unique_ptr<ProtocolConnectionClient>
@@ -26,5 +25,4 @@ ProtocolConnectionClientFactory::Create(
       observer, &Clock::now, task_runner);
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/protocol_connection_server_factory.cc b/chromium/third_party/openscreen/src/osp/impl/protocol_connection_server_factory.cc
index 120348b430f..55d010f0982 100644
--- a/chromium/third_party/openscreen/src/osp/impl/protocol_connection_server_factory.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/protocol_connection_server_factory.cc
@@ -12,8 +12,7 @@
 #include "platform/api/task_runner.h"
 #include "platform/api/time.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 // static
 std::unique_ptr<ProtocolConnectionServer>
@@ -27,5 +26,4 @@ ProtocolConnectionServerFactory::Create(
       observer, &Clock::now, task_runner);
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/quic_client.cc b/chromium/third_party/openscreen/src/osp/impl/quic/quic_client.cc
index 58be3ef85a9..6d5eb66a1a5 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/quic_client.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/quic_client.cc
@@ -12,8 +12,7 @@
 #include "platform/api/time.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 QuicClient::QuicClient(
     MessageDemuxer* demuxer,
@@ -249,5 +248,4 @@ void QuicClient::CancelConnectRequest(uint64_t request_id) {
   request_map_.erase(request_entry);
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/quic_client.h b/chromium/third_party/openscreen/src/osp/impl/quic/quic_client.h
index d532078f06b..394802ed215 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/quic_client.h
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/quic_client.h
@@ -19,8 +19,7 @@
 #include "platform/base/ip_address.h"
 #include "util/alarm.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 // This class is the default implementation of ProtocolConnectionClient for the
 // library.  It manages connections to other endpoints as well as the lifetime
@@ -134,7 +133,6 @@ class QuicClient final : public ProtocolConnectionClient,
   Alarm cleanup_alarm_;
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_IMPL_QUIC_QUIC_CLIENT_H_
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/quic_client_unittest.cc b/chromium/third_party/openscreen/src/osp/impl/quic/quic_client_unittest.cc
index 68531305d2b..7bd3c1881b0 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/quic_client_unittest.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/quic_client_unittest.cc
@@ -21,8 +21,7 @@
 #include "platform/test/fake_task_runner.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 namespace {
 
 using ::testing::_;
@@ -266,5 +265,4 @@ TEST_F(QuicClientTest, RequestIds) {
   EXPECT_EQ(0u, client_->endpoint_request_ids()->GetNextRequestId(endpoint_id));
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection.h b/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection.h
index 0d4016f144e..b8fb39fa006 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection.h
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection.h
@@ -10,8 +10,7 @@
 
 #include "platform/api/udp_socket.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class QuicStream {
  public:
@@ -80,7 +79,6 @@ class QuicConnection : public UdpSocket::Client {
   Delegate* const delegate_;
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_IMPL_QUIC_QUIC_CONNECTION_H_
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_factory.h b/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_factory.h
index ce3e8dbf963..5b55c7ef85d 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_factory.h
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_factory.h
@@ -8,13 +8,11 @@
 #include <memory>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "osp/impl/quic/quic_connection.h"
 #include "platform/api/time.h"
 #include "platform/base/ip_address.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 // This interface provides a way to make new QUIC connections to endpoints.  It
 // also provides a way to receive incoming QUIC connections (as a server).
@@ -42,7 +40,6 @@ class QuicConnectionFactory : public UdpSocket::Client {
       QuicConnection::Delegate* connection_delegate) = 0;
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_IMPL_QUIC_QUIC_CONNECTION_FACTORY_H_
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_factory_impl.cc b/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_factory_impl.cc
index bf17dc37260..4b7dc9b1fea 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_factory_impl.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_factory_impl.cc
@@ -21,8 +21,7 @@
 #include "util/std_util.h"
 #include "util/trace_logging.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class QuicTaskRunner final : public ::base::TaskRunner {
  public:
@@ -217,5 +216,4 @@ void QuicConnectionFactoryImpl::OnSendError(UdpSocket* socket, Error error) {
   OSP_UNIMPLEMENTED();
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_factory_impl.h b/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_factory_impl.h
index a9967a42235..b26a4216885 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_factory_impl.h
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_factory_impl.h
@@ -16,8 +16,7 @@
 #include "third_party/chromium_quic/src/net/quic/quic_chromium_alarm_factory.h"
 #include "third_party/chromium_quic/src/net/third_party/quic/quartc/quartc_factory.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class QuicTaskRunner;
 
@@ -62,7 +61,6 @@ class QuicConnectionFactoryImpl final : public QuicConnectionFactory {
   TaskRunner& task_runner_;
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_IMPL_QUIC_QUIC_CONNECTION_FACTORY_IMPL_H_
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_impl.cc b/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_impl.cc
index 4ddb2a6a3a3..670a941fe80 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_impl.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_impl.cc
@@ -9,15 +9,13 @@
 #include <utility>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "osp/impl/quic/quic_connection_factory_impl.h"
 #include "platform/base/error.h"
 #include "third_party/chromium_quic/src/net/third_party/quic/platform/impl/quic_chromium_clock.h"
 #include "util/osp_logging.h"
 #include "util/trace_logging.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 UdpTransport::UdpTransport(UdpSocket* socket, const IPEndpoint& destination)
     : socket_(socket), destination_(destination) {
@@ -153,5 +151,4 @@ void QuicConnectionImpl::OnConnectionClosed(
   delegate_->OnConnectionClosed(session_->connection_id());
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_impl.h b/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_impl.h
index 80197f25506..8b0ddeaaed8 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_impl.h
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/quic_connection_impl.h
@@ -20,8 +20,7 @@
 #include "third_party/chromium_quic/src/net/third_party/quic/quartc/quartc_session.h"
 #include "third_party/chromium_quic/src/net/third_party/quic/quartc/quartc_stream.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class QuicConnectionFactoryImpl;
 
@@ -100,7 +99,6 @@ class QuicConnectionImpl final : public QuicConnection,
   std::vector<QuicStream*> streams_;
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_IMPL_QUIC_QUIC_CONNECTION_IMPL_H_
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/quic_server.cc b/chromium/third_party/openscreen/src/osp/impl/quic/quic_server.cc
index 385932fbc70..5e628966504 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/quic_server.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/quic_server.cc
@@ -11,8 +11,7 @@
 #include "platform/api/time.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 QuicServer::QuicServer(
     const ServerConfig& config,
@@ -188,5 +187,4 @@ void QuicServer::OnIncomingConnection(
                                       std::move(pending_connection_delegate_)));
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/quic_server.h b/chromium/third_party/openscreen/src/osp/impl/quic/quic_server.h
index 34e1e6d2353..bf1b43b6b98 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/quic_server.h
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/quic_server.h
@@ -19,8 +19,7 @@
 #include "platform/base/ip_address.h"
 #include "util/alarm.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 // This class is the default implementation of ProtocolConnectionServer for the
 // library.  It manages connections to other endpoints as well as the lifetime
@@ -107,7 +106,6 @@ class QuicServer final : public ProtocolConnectionServer,
   Alarm cleanup_alarm_;
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_IMPL_QUIC_QUIC_SERVER_H_
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/quic_server_unittest.cc b/chromium/third_party/openscreen/src/osp/impl/quic/quic_server_unittest.cc
index 0d633987723..4f9882c76f7 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/quic_server_unittest.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/quic_server_unittest.cc
@@ -19,8 +19,7 @@
 #include "platform/test/fake_clock.h"
 #include "platform/test/fake_task_runner.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 namespace {
 
 using ::testing::_;
@@ -205,5 +204,4 @@ TEST_F(QuicServerTest, RequestIds) {
   EXPECT_EQ(1u, server_->endpoint_request_ids()->GetNextRequestId(endpoint_id));
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/quic_service_common.cc b/chromium/third_party/openscreen/src/osp/impl/quic/quic_service_common.cc
index 20df7300170..836049c5572 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/quic_service_common.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/quic_service_common.cc
@@ -9,8 +9,7 @@
 
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 // static
 std::unique_ptr<QuicProtocolConnection> QuicProtocolConnection::FromExisting(
@@ -166,5 +165,4 @@ ServiceConnectionData::~ServiceConnectionData() = default;
 ServiceConnectionData& ServiceConnectionData::operator=(
     ServiceConnectionData&&) noexcept = default;
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/quic_service_common.h b/chromium/third_party/openscreen/src/osp/impl/quic/quic_service_common.h
index 223eddcea7a..49fc4a77387 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/quic_service_common.h
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/quic_service_common.h
@@ -13,8 +13,7 @@
 #include "osp/impl/quic/quic_connection.h"
 #include "osp/public/protocol_connection.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class ServiceConnectionDelegate;
 
@@ -136,7 +135,6 @@ struct ServiceConnectionData {
   std::unique_ptr<ServiceConnectionDelegate> delegate;
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_IMPL_QUIC_QUIC_SERVICE_COMMON_H_
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection.cc b/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection.cc
index 35f545da980..f4e180b7c9f 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection.cc
@@ -10,8 +10,7 @@
 #include "osp/impl/quic/testing/fake_quic_connection_factory.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 FakeQuicStream::FakeQuicStream(Delegate* delegate, uint64_t id)
     : QuicStream(delegate, id) {}
@@ -90,5 +89,4 @@ void FakeQuicConnection::Close() {
   }
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection.h b/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection.h
index 8a884690b5b..28396ee9159 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection.h
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection.h
@@ -11,8 +11,7 @@
 
 #include "osp/impl/quic/quic_connection.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class FakeQuicConnectionFactoryBridge;
 
@@ -75,7 +74,6 @@ class FakeQuicConnection final : public QuicConnection {
   std::map<uint64_t, FakeQuicStream*> streams_;
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_IMPL_QUIC_TESTING_FAKE_QUIC_CONNECTION_H_
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection_factory.cc b/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection_factory.cc
index 8943f207680..df41c103785 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection_factory.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection_factory.cc
@@ -10,8 +10,7 @@
 
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 FakeQuicConnectionFactoryBridge::FakeQuicConnectionFactoryBridge(
     const IPEndpoint& controller_endpoint)
@@ -221,5 +220,4 @@ void FakeServerQuicConnectionFactory::OnRead(UdpSocket* socket,
   idle_ = bridge_->server_idle();
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection_factory.h b/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection_factory.h
index 6d2afc7376d..7eaa995498f 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection_factory.h
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/testing/fake_quic_connection_factory.h
@@ -13,8 +13,7 @@
 #include "osp/impl/quic/testing/fake_quic_connection.h"
 #include "osp/public/message_demuxer.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class FakeQuicConnectionFactoryBridge {
  public:
@@ -102,7 +101,6 @@ class FakeServerQuicConnectionFactory final : public QuicConnectionFactory {
   bool idle_ = true;
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_IMPL_QUIC_TESTING_FAKE_QUIC_CONNECTION_FACTORY_H_
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/testing/quic_test_support.cc b/chromium/third_party/openscreen/src/osp/impl/quic/testing/quic_test_support.cc
index 8e33fb3b2cc..89661aa4e40 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/testing/quic_test_support.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/testing/quic_test_support.cc
@@ -12,8 +12,7 @@
 #include "osp/public/network_service_manager.h"
 #include "platform/test/fake_task_runner.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 FakeQuicBridge::FakeQuicBridge(FakeTaskRunner& task_runner,
                                ClockNowFunctionPtr now_function)
@@ -76,5 +75,4 @@ void FakeQuicBridge::RunTasksUntilIdle() {
   task_runner_.RunTasksUntilIdle();
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/quic/testing/quic_test_support.h b/chromium/third_party/openscreen/src/osp/impl/quic/testing/quic_test_support.h
index 944d66f0714..dc65a0022ec 100644
--- a/chromium/third_party/openscreen/src/osp/impl/quic/testing/quic_test_support.h
+++ b/chromium/third_party/openscreen/src/osp/impl/quic/testing/quic_test_support.h
@@ -22,8 +22,7 @@
 #include "platform/test/fake_task_runner.h"
 #include "platform/test/fake_udp_socket.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class MockServiceObserver : public ProtocolConnectionServiceObserver {
  public:
@@ -84,7 +83,6 @@ class FakeQuicBridge {
   std::unique_ptr<FakeUdpSocket> server_socket_;
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_IMPL_QUIC_TESTING_QUIC_TEST_SUPPORT_H_
diff --git a/chromium/third_party/openscreen/src/osp/impl/receiver_list.cc b/chromium/third_party/openscreen/src/osp/impl/receiver_list.cc
index 1aba0faca27..186e1676173 100644
--- a/chromium/third_party/openscreen/src/osp/impl/receiver_list.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/receiver_list.cc
@@ -6,8 +6,7 @@
 
 #include <algorithm>
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 ReceiverList::ReceiverList() = default;
 ReceiverList::~ReceiverList() = default;
@@ -46,5 +45,4 @@ Error ReceiverList::OnAllReceiversRemoved() {
   return empty ? Error::Code::kItemNotFound : Error::None();
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/receiver_list.h b/chromium/third_party/openscreen/src/osp/impl/receiver_list.h
index 344ad486eee..4400cfd10c5 100644
--- a/chromium/third_party/openscreen/src/osp/impl/receiver_list.h
+++ b/chromium/third_party/openscreen/src/osp/impl/receiver_list.h
@@ -10,8 +10,7 @@
 #include "osp/public/service_info.h"
 #include "platform/base/error.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class ReceiverList {
  public:
@@ -35,7 +34,6 @@ class ReceiverList {
   std::vector<ServiceInfo> receivers_;
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_IMPL_RECEIVER_LIST_H_
diff --git a/chromium/third_party/openscreen/src/osp/impl/receiver_list_unittest.cc b/chromium/third_party/openscreen/src/osp/impl/receiver_list_unittest.cc
index 8443dae9f4e..acab0b966e7 100644
--- a/chromium/third_party/openscreen/src/osp/impl/receiver_list_unittest.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/receiver_list_unittest.cc
@@ -7,8 +7,7 @@
 #include "gtest/gtest.h"
 #include "platform/base/error.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 TEST(ReceiverListTest, AddReceivers) {
   ReceiverList list;
@@ -92,5 +91,4 @@ TEST(ReceiverListTest, RemoveAllReceivers) {
   ASSERT_TRUE(list.receivers().empty());
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/service_listener_impl.cc b/chromium/third_party/openscreen/src/osp/impl/service_listener_impl.cc
index ffc26e3edcb..b8575794d64 100644
--- a/chromium/third_party/openscreen/src/osp/impl/service_listener_impl.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/service_listener_impl.cc
@@ -11,8 +11,7 @@
 #include "util/osp_logging.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 namespace {
 
 bool IsTransitionValid(ServiceListener::State from, ServiceListener::State to) {
@@ -251,5 +250,4 @@ void ServiceListenerImpl::MaybeNotifyObservers() {
   }
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/service_listener_impl.h b/chromium/third_party/openscreen/src/osp/impl/service_listener_impl.h
index e0d4ce2fc41..4e3f4c145e4 100644
--- a/chromium/third_party/openscreen/src/osp/impl/service_listener_impl.h
+++ b/chromium/third_party/openscreen/src/osp/impl/service_listener_impl.h
@@ -15,8 +15,7 @@
 #include "osp/public/service_listener.h"
 #include "platform/base/macros.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class ServiceListenerImpl final : public ServiceListener,
                                   public openscreen::discovery::ReportingClient,
@@ -92,7 +91,6 @@ class ServiceListenerImpl final : public ServiceListener,
   OSP_DISALLOW_COPY_AND_ASSIGN(ServiceListenerImpl);
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_IMPL_SERVICE_LISTENER_IMPL_H_
diff --git a/chromium/third_party/openscreen/src/osp/impl/service_listener_impl_unittest.cc b/chromium/third_party/openscreen/src/osp/impl/service_listener_impl_unittest.cc
index 11fc3583e94..bdb285ae549 100644
--- a/chromium/third_party/openscreen/src/osp/impl/service_listener_impl_unittest.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/service_listener_impl_unittest.cc
@@ -10,8 +10,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 namespace {
 
 using ::testing::_;
@@ -412,5 +411,4 @@ TEST_F(ServiceListenerImplTest, MultipleObservers) {
   mock_delegate_->SetState(State::kRunning);
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/service_publisher_impl.cc b/chromium/third_party/openscreen/src/osp/impl/service_publisher_impl.cc
index 80bb6198868..979d110ea99 100644
--- a/chromium/third_party/openscreen/src/osp/impl/service_publisher_impl.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/service_publisher_impl.cc
@@ -8,8 +8,7 @@
 
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 namespace {
 
 bool IsTransitionValid(ServicePublisher::State from,
@@ -124,5 +123,4 @@ void ServicePublisherImpl::MaybeNotifyObserver() {
   }
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/service_publisher_impl.h b/chromium/third_party/openscreen/src/osp/impl/service_publisher_impl.h
index 816c1b28729..7765f93e4ca 100644
--- a/chromium/third_party/openscreen/src/osp/impl/service_publisher_impl.h
+++ b/chromium/third_party/openscreen/src/osp/impl/service_publisher_impl.h
@@ -12,8 +12,7 @@
 #include "osp/public/service_publisher.h"
 #include "platform/base/macros.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class ServicePublisherImpl final
     : public ServicePublisher,
@@ -71,7 +70,6 @@ class ServicePublisherImpl final
   OSP_DISALLOW_COPY_AND_ASSIGN(ServicePublisherImpl);
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_IMPL_SERVICE_PUBLISHER_IMPL_H_
diff --git a/chromium/third_party/openscreen/src/osp/impl/service_publisher_impl_unittest.cc b/chromium/third_party/openscreen/src/osp/impl/service_publisher_impl_unittest.cc
index 66d6d0eb8b8..6626e8e2944 100644
--- a/chromium/third_party/openscreen/src/osp/impl/service_publisher_impl_unittest.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/service_publisher_impl_unittest.cc
@@ -10,8 +10,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 namespace {
 
 using ::testing::_;
@@ -164,5 +163,4 @@ TEST_F(ServicePublisherImplTest, ObserverTransitions) {
   mock_delegate_ptr->SetState(State::kStopped);
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/with_destruction_callback.cc b/chromium/third_party/openscreen/src/osp/impl/with_destruction_callback.cc
index 4bf32e7a56c..d5fa2f5ef21 100644
--- a/chromium/third_party/openscreen/src/osp/impl/with_destruction_callback.cc
+++ b/chromium/third_party/openscreen/src/osp/impl/with_destruction_callback.cc
@@ -6,8 +6,7 @@
 
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 WithDestructionCallback::WithDestructionCallback() = default;
 
@@ -25,5 +24,4 @@ void WithDestructionCallback::SetDestructionCallback(
   destruction_callback_state_ = state;
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/impl/with_destruction_callback.h b/chromium/third_party/openscreen/src/osp/impl/with_destruction_callback.h
index b5e8fa39256..d29f15dfd52 100644
--- a/chromium/third_party/openscreen/src/osp/impl/with_destruction_callback.h
+++ b/chromium/third_party/openscreen/src/osp/impl/with_destruction_callback.h
@@ -7,8 +7,7 @@
 
 #include "platform/base/macros.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 // A decoration for classes which allows a callback to be run just after
 // destruction. Setting the callback is optional.
@@ -30,7 +29,6 @@ class WithDestructionCallback {
   OSP_DISALLOW_COPY_AND_ASSIGN(WithDestructionCallback);
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_IMPL_WITH_DESTRUCTION_CALLBACK_H_
diff --git a/chromium/third_party/openscreen/src/osp/msgs/messages_unittest.cc b/chromium/third_party/openscreen/src/osp/msgs/messages_unittest.cc
index 1448ea1c8b3..c2a440fb9de 100644
--- a/chromium/third_party/openscreen/src/osp/msgs/messages_unittest.cc
+++ b/chromium/third_party/openscreen/src/osp/msgs/messages_unittest.cc
@@ -11,8 +11,7 @@ using openscreen::msgs::PresentationConnectionMessage;
 using openscreen::msgs::PresentationStartRequest;
 using openscreen::msgs::PresentationUrlAvailabilityRequest;
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 // TODO(btolsch): This is in the current (draft) spec, but should we actually
 // allow this?
@@ -227,5 +226,4 @@ TEST(PresentationMessagesTest, CborEncodeBufferTooLarge) {
   ASSERT_FALSE(EncodePresentationUrlAvailabilityRequest(request, &buffer));
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/public/client_config.cc b/chromium/third_party/openscreen/src/osp/public/client_config.cc
index 5240bb6a125..d8ba3bb58e9 100644
--- a/chromium/third_party/openscreen/src/osp/public/client_config.cc
+++ b/chromium/third_party/openscreen/src/osp/public/client_config.cc
@@ -4,12 +4,10 @@
 
 #include "osp/public/client_config.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 ClientConfig::ClientConfig() = default;
 
 ClientConfig::~ClientConfig() = default;
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/public/client_config.h b/chromium/third_party/openscreen/src/osp/public/client_config.h
index fefc85579af..115f46a7c6b 100644
--- a/chromium/third_party/openscreen/src/osp/public/client_config.h
+++ b/chromium/third_party/openscreen/src/osp/public/client_config.h
@@ -10,8 +10,7 @@
 
 #include "platform/api/network_interface.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 struct ClientConfig {
   ClientConfig();
@@ -23,7 +22,6 @@ struct ClientConfig {
   std::vector<NetworkInterfaceIndex> interface_indexes;
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_PUBLIC_CLIENT_CONFIG_H_
diff --git a/chromium/third_party/openscreen/src/osp/public/endpoint_request_ids.cc b/chromium/third_party/openscreen/src/osp/public/endpoint_request_ids.cc
index b620f2e4383..abb556594d2 100644
--- a/chromium/third_party/openscreen/src/osp/public/endpoint_request_ids.cc
+++ b/chromium/third_party/openscreen/src/osp/public/endpoint_request_ids.cc
@@ -4,8 +4,7 @@
 
 #include "osp/public/endpoint_request_ids.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 EndpointRequestIds::EndpointRequestIds(Role role) : role_(role) {}
 EndpointRequestIds::~EndpointRequestIds() = default;
@@ -27,5 +26,4 @@ void EndpointRequestIds::Reset() {
   request_ids_by_endpoint_id_.clear();
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/public/endpoint_request_ids.h b/chromium/third_party/openscreen/src/osp/public/endpoint_request_ids.h
index 7f3f27bdeb6..73bff58cdb7 100644
--- a/chromium/third_party/openscreen/src/osp/public/endpoint_request_ids.h
+++ b/chromium/third_party/openscreen/src/osp/public/endpoint_request_ids.h
@@ -10,8 +10,7 @@
 
 #include "platform/base/macros.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 // Tracks the next available message request ID per endpoint by its endpoint ID.
 // These can only be incremented while an endpoint is connected but can be reset
@@ -39,7 +38,6 @@ class EndpointRequestIds {
   OSP_DISALLOW_COPY_AND_ASSIGN(EndpointRequestIds);
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_PUBLIC_ENDPOINT_REQUEST_IDS_H_
diff --git a/chromium/third_party/openscreen/src/osp/public/endpoint_request_ids_unittest.cc b/chromium/third_party/openscreen/src/osp/public/endpoint_request_ids_unittest.cc
index 5be374a59ef..5a0e92e69e0 100644
--- a/chromium/third_party/openscreen/src/osp/public/endpoint_request_ids_unittest.cc
+++ b/chromium/third_party/openscreen/src/osp/public/endpoint_request_ids_unittest.cc
@@ -6,8 +6,7 @@
 
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 // These tests validate RequestId generation for two endpoints with IDs 3 and 7.
 
@@ -84,5 +83,4 @@ TEST(EndpointRequestIdsTest, ResetAll) {
   EXPECT_EQ(1u, request_ids_server.GetNextRequestId(3));
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/public/message_demuxer.h b/chromium/third_party/openscreen/src/osp/public/message_demuxer.h
index d7addbfabe3..bbd547aad79 100644
--- a/chromium/third_party/openscreen/src/osp/public/message_demuxer.h
+++ b/chromium/third_party/openscreen/src/osp/public/message_demuxer.h
@@ -13,8 +13,7 @@
 #include "platform/api/time.h"
 #include "platform/base/error.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class QuicStream;
 
@@ -56,9 +55,9 @@ class MessageDemuxer {
 
    private:
     MessageDemuxer* parent_ = nullptr;
-    bool is_default_;
-    uint64_t endpoint_id_;
-    msgs::Type message_type_;
+    bool is_default_ = false;
+    uint64_t endpoint_id_ = 0;
+    msgs::Type message_type_ = msgs::Type::kUnknown;
   };
 
   static constexpr size_t kDefaultBufferLimit = 1 << 16;
@@ -131,7 +130,6 @@ class MessageTypeDecoder {
                                          size_t* num_bytes_decoded);
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_PUBLIC_MESSAGE_DEMUXER_H_
diff --git a/chromium/third_party/openscreen/src/osp/public/message_demuxer_unittest.cc b/chromium/third_party/openscreen/src/osp/public/message_demuxer_unittest.cc
index 637900eba1e..b67a4c1a6a4 100644
--- a/chromium/third_party/openscreen/src/osp/public/message_demuxer_unittest.cc
+++ b/chromium/third_party/openscreen/src/osp/public/message_demuxer_unittest.cc
@@ -11,8 +11,7 @@
 #include "platform/test/fake_clock.h"
 #include "third_party/tinycbor/src/src/cbor.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 namespace {
 
 using ::testing::_;
@@ -362,5 +361,4 @@ TEST_F(MessageDemuxerTest, DeserializeMessages) {
   EXPECT_TRUE(kUnknownInfo.is_error());
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/public/network_metrics.h b/chromium/third_party/openscreen/src/osp/public/network_metrics.h
index c7a5463d910..6359f4745d4 100644
--- a/chromium/third_party/openscreen/src/osp/public/network_metrics.h
+++ b/chromium/third_party/openscreen/src/osp/public/network_metrics.h
@@ -9,8 +9,7 @@
 
 #include "osp/public/timestamp.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 // Holds a set of metrics, captured over a specific range of time, about the
 // behavior of a network service running in the library.
@@ -39,7 +38,6 @@ struct NetworkMetrics {
   size_t max_ipv6_connections = 0;
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_PUBLIC_NETWORK_METRICS_H_
diff --git a/chromium/third_party/openscreen/src/osp/public/network_service_manager.h b/chromium/third_party/openscreen/src/osp/public/network_service_manager.h
index c039d7883f1..eaa1eaa101c 100644
--- a/chromium/third_party/openscreen/src/osp/public/network_service_manager.h
+++ b/chromium/third_party/openscreen/src/osp/public/network_service_manager.h
@@ -12,8 +12,7 @@
 #include "osp/public/service_listener.h"
 #include "osp/public/service_publisher.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 // Manages services run as part of the Open Screen Protocol Library.  Library
 // embedders should pass instances of required services to Create(), which will
@@ -72,7 +71,6 @@ class NetworkServiceManager final {
   std::unique_ptr<ProtocolConnectionServer> connection_server_;
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_PUBLIC_NETWORK_SERVICE_MANAGER_H_
diff --git a/chromium/third_party/openscreen/src/osp/public/presentation/presentation_connection.h b/chromium/third_party/openscreen/src/osp/public/presentation/presentation_connection.h
index ca762e520f9..29dfe8bf4d4 100644
--- a/chromium/third_party/openscreen/src/osp/public/presentation/presentation_connection.h
+++ b/chromium/third_party/openscreen/src/osp/public/presentation/presentation_connection.h
@@ -8,11 +8,11 @@
 #include <cstdint>
 #include <map>
 #include <memory>
+#include <optional>
 #include <string>
+#include <string_view>
 #include <vector>
 
-#include "absl/strings/string_view.h"
-#include "absl/types/optional.h"
 #include "osp/public/message_demuxer.h"
 #include "platform/api/time.h"
 #include "platform/base/error.h"
@@ -20,8 +20,7 @@
 #include "platform/base/macros.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class ProtocolConnection;
 
@@ -73,13 +72,13 @@ class Connection {
     virtual void OnDiscarded() = 0;
 
     // Closed because of an error.
-    virtual void OnError(const absl::string_view message) = 0;
+    virtual void OnError(const std::string_view message) = 0;
 
     // Terminated through a different connection.
     virtual void OnTerminated() = 0;
 
     // A UTF-8 string message was received.
-    virtual void OnStringMessage(const absl::string_view message) = 0;
+    virtual void OnStringMessage(const std::string_view message) = 0;
 
     // A binary message was received.
     virtual void OnBinaryMessage(const std::vector<uint8_t>& data) = 0;
@@ -141,7 +140,7 @@ class Connection {
   }
 
   // Sends a UTF-8 string message.
-  Error SendString(absl::string_view message);
+  Error SendString(std::string_view message);
 
   // Sends a binary message.
   Error SendBinary(std::vector<uint8_t>&& data);
@@ -178,8 +177,8 @@ class Connection {
   State state_ = State::kConnecting;
   Delegate* delegate_;
   ParentDelegate* parent_delegate_;
-  absl::optional<uint64_t> connection_id_;
-  absl::optional<uint64_t> endpoint_id_;
+  std::optional<uint64_t> connection_id_;
+  std::optional<uint64_t> endpoint_id_;
   std::unique_ptr<ProtocolConnection> protocol_connection_;
 
   OSP_DISALLOW_COPY_AND_ASSIGN(Connection);
@@ -215,7 +214,6 @@ class ConnectionManager final : public MessageDemuxer::MessageCallback {
   OSP_DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_PUBLIC_PRESENTATION_PRESENTATION_CONNECTION_H_
diff --git a/chromium/third_party/openscreen/src/osp/public/presentation/presentation_controller.h b/chromium/third_party/openscreen/src/osp/public/presentation/presentation_controller.h
index e8a286cef74..85acd36dad7 100644
--- a/chromium/third_party/openscreen/src/osp/public/presentation/presentation_controller.h
+++ b/chromium/third_party/openscreen/src/osp/public/presentation/presentation_controller.h
@@ -7,20 +7,18 @@
 
 #include <map>
 #include <memory>
+#include <optional>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "absl/strings/string_view.h"
-#include "absl/types/optional.h"
 #include "osp/public/presentation/presentation_connection.h"
 #include "osp/public/protocol_connection.h"
 #include "osp/public/service_listener.h"
 #include "platform/api/time.h"
 #include "platform/base/error.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class UrlAvailabilityRequester;
 
@@ -81,7 +79,7 @@ class Controller final : public ServiceListener::Observer,
     ConnectRequest(Controller* controller,
                    const std::string& service_id,
                    bool is_reconnect,
-                   absl::optional<uint64_t> request_id);
+                   std::optional<uint64_t> request_id);
     ConnectRequest(ConnectRequest&&) noexcept;
     ~ConnectRequest();
 
@@ -94,7 +92,7 @@ class Controller final : public ServiceListener::Observer,
    private:
     std::string service_id_;
     bool is_reconnect_;
-    absl::optional<uint64_t> request_id_;
+    std::optional<uint64_t> request_id_;
     Controller* controller_;
   };
 
@@ -219,7 +217,6 @@ class Controller final : public ServiceListener::Observer,
       termination_listener_by_id_;
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_PUBLIC_PRESENTATION_PRESENTATION_CONTROLLER_H_
diff --git a/chromium/third_party/openscreen/src/osp/public/presentation/presentation_receiver.h b/chromium/third_party/openscreen/src/osp/public/presentation/presentation_receiver.h
index 853c6af6364..a6871a9b3cc 100644
--- a/chromium/third_party/openscreen/src/osp/public/presentation/presentation_receiver.h
+++ b/chromium/third_party/openscreen/src/osp/public/presentation/presentation_receiver.h
@@ -14,8 +14,7 @@
 #include "osp/public/message_demuxer.h"
 #include "osp/public/presentation/presentation_connection.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 enum class ResponseResult {
   kSuccess = 0,
@@ -144,7 +143,6 @@ class Receiver final : public MessageDemuxer::MessageCallback,
   uint64_t GetNextConnectionId();
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_PUBLIC_PRESENTATION_PRESENTATION_RECEIVER_H_
diff --git a/chromium/third_party/openscreen/src/osp/public/protocol_connection.cc b/chromium/third_party/openscreen/src/osp/public/protocol_connection.cc
index 32c9fb8b97e..f8f639191d0 100644
--- a/chromium/third_party/openscreen/src/osp/public/protocol_connection.cc
+++ b/chromium/third_party/openscreen/src/osp/public/protocol_connection.cc
@@ -4,8 +4,7 @@
 
 #include "osp/public/protocol_connection.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 ProtocolConnection::ProtocolConnection(uint64_t endpoint_id, uint64_t id)
     : endpoint_id_(endpoint_id), id_(id) {}
@@ -15,5 +14,4 @@ void ProtocolConnection::SetObserver(Observer* observer) {
   observer_ = observer;
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/public/protocol_connection_client.cc b/chromium/third_party/openscreen/src/osp/public/protocol_connection_client.cc
index 9e5d2911af1..22f6c3d2e51 100644
--- a/chromium/third_party/openscreen/src/osp/public/protocol_connection_client.cc
+++ b/chromium/third_party/openscreen/src/osp/public/protocol_connection_client.cc
@@ -6,8 +6,7 @@
 
 #include <utility>
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 ProtocolConnectionClient::ConnectRequest::ConnectRequest() = default;
 
@@ -61,5 +60,4 @@ std::ostream& operator<<(std::ostream& os,
   }
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/public/protocol_connection_client.h b/chromium/third_party/openscreen/src/osp/public/protocol_connection_client.h
index 543d453e7b5..ab32258a61c 100644
--- a/chromium/third_party/openscreen/src/osp/public/protocol_connection_client.h
+++ b/chromium/third_party/openscreen/src/osp/public/protocol_connection_client.h
@@ -16,8 +16,7 @@
 #include "platform/base/ip_address.h"
 #include "platform/base/macros.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 // Embedder's view of the network service that initiates OSP connections to OSP
 // receivers.
@@ -118,7 +117,6 @@ class ProtocolConnectionClient {
 std::ostream& operator<<(std::ostream& os,
                          ProtocolConnectionClient::State state);
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_PUBLIC_PROTOCOL_CONNECTION_CLIENT_H_
diff --git a/chromium/third_party/openscreen/src/osp/public/protocol_connection_server.cc b/chromium/third_party/openscreen/src/osp/public/protocol_connection_server.cc
index 49361e4c722..d3ed07c77a8 100644
--- a/chromium/third_party/openscreen/src/osp/public/protocol_connection_server.cc
+++ b/chromium/third_party/openscreen/src/osp/public/protocol_connection_server.cc
@@ -4,8 +4,7 @@
 
 #include "osp/public/protocol_connection_server.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 ProtocolConnectionServer::ProtocolConnectionServer(MessageDemuxer* demuxer,
                                                    Observer* observer)
@@ -33,5 +32,4 @@ std::ostream& operator<<(std::ostream& os,
   }
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/public/protocol_connection_server.h b/chromium/third_party/openscreen/src/osp/public/protocol_connection_server.h
index 831d62dbc20..024319e406f 100644
--- a/chromium/third_party/openscreen/src/osp/public/protocol_connection_server.h
+++ b/chromium/third_party/openscreen/src/osp/public/protocol_connection_server.h
@@ -18,8 +18,7 @@
 #include "platform/base/ip_address.h"
 #include "platform/base/macros.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class ProtocolConnectionServer {
  public:
@@ -98,7 +97,6 @@ class ProtocolConnectionServer {
 std::ostream& operator<<(std::ostream& os,
                          ProtocolConnectionServer::State state);
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_PUBLIC_PROTOCOL_CONNECTION_SERVER_H_
diff --git a/chromium/third_party/openscreen/src/osp/public/request_response_handler.h b/chromium/third_party/openscreen/src/osp/public/request_response_handler.h
index d864cf01aa6..5824323aa81 100644
--- a/chromium/third_party/openscreen/src/osp/public/request_response_handler.h
+++ b/chromium/third_party/openscreen/src/osp/public/request_response_handler.h
@@ -7,11 +7,11 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <optional>
 #include <type_traits>
 #include <utility>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "osp/public/message_demuxer.h"
 #include "osp/public/network_service_manager.h"
 #include "osp/public/protocol_connection.h"
@@ -19,8 +19,7 @@
 #include "platform/base/macros.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 template <typename T>
 using MessageDecodingFunction = ssize_t (*)(const uint8_t*, size_t, T*);
@@ -94,7 +93,7 @@ class RequestResponseHandler : public MessageDemuxer::MessageCallback {
           std::is_same<typename std::decay<RequestTRval>::type,
                        RequestT>::value,
       Error>::type
-  WriteMessage(absl::optional<uint64_t> id, RequestTRval&& message) {
+  WriteMessage(std::optional<uint64_t> id, RequestTRval&& message) {
     auto* request_msg = RequestCoderTraits::serial_request(message);
     if (connection_) {
       request_msg->request_id = GetNextRequestId(connection_->endpoint_id());
@@ -118,7 +117,7 @@ class RequestResponseHandler : public MessageDemuxer::MessageCallback {
                        RequestT>::value,
       Error>::type
   WriteMessage(RequestTRval&& message) {
-    return WriteMessage(absl::nullopt, std::move(message));
+    return WriteMessage(std::nullopt, std::move(message));
   }
 
   // Remove the message that was originally written with |id| from the send and
@@ -195,7 +194,7 @@ class RequestResponseHandler : public MessageDemuxer::MessageCallback {
 
  private:
   struct RequestWithId {
-    absl::optional<uint64_t> id;
+    std::optional<uint64_t> id;
     RequestT request;
   };
 
@@ -225,7 +224,6 @@ class RequestResponseHandler : public MessageDemuxer::MessageCallback {
   OSP_DISALLOW_COPY_AND_ASSIGN(RequestResponseHandler);
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_PUBLIC_REQUEST_RESPONSE_HANDLER_H_
diff --git a/chromium/third_party/openscreen/src/osp/public/server_config.cc b/chromium/third_party/openscreen/src/osp/public/server_config.cc
index 08c1c28474b..f177dc89a90 100644
--- a/chromium/third_party/openscreen/src/osp/public/server_config.cc
+++ b/chromium/third_party/openscreen/src/osp/public/server_config.cc
@@ -4,12 +4,10 @@
 
 #include "osp/public/server_config.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 ServerConfig::ServerConfig() = default;
 
 ServerConfig::~ServerConfig() = default;
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/public/server_config.h b/chromium/third_party/openscreen/src/osp/public/server_config.h
index de71b15e1f0..1b099efe79e 100644
--- a/chromium/third_party/openscreen/src/osp/public/server_config.h
+++ b/chromium/third_party/openscreen/src/osp/public/server_config.h
@@ -11,8 +11,7 @@
 #include "platform/api/network_interface.h"
 #include "platform/base/ip_address.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 struct ServerConfig {
   ServerConfig();
@@ -29,7 +28,6 @@ struct ServerConfig {
   std::vector<IPEndpoint> connection_endpoints;
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_PUBLIC_SERVER_CONFIG_H_
diff --git a/chromium/third_party/openscreen/src/osp/public/service_info.cc b/chromium/third_party/openscreen/src/osp/public/service_info.cc
index 15c266564d3..ff45727f352 100644
--- a/chromium/third_party/openscreen/src/osp/public/service_info.cc
+++ b/chromium/third_party/openscreen/src/osp/public/service_info.cc
@@ -9,8 +9,7 @@
 
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 bool ServiceInfo::operator==(const ServiceInfo& other) const {
   return (service_id == other.service_id &&
@@ -53,5 +52,4 @@ std::string ServiceInfo::ToString() const {
   return ss.str();
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/public/service_info.h b/chromium/third_party/openscreen/src/osp/public/service_info.h
index 5bfdb56786b..2a15f6ee5f7 100644
--- a/chromium/third_party/openscreen/src/osp/public/service_info.h
+++ b/chromium/third_party/openscreen/src/osp/public/service_info.h
@@ -11,8 +11,7 @@
 #include "platform/api/network_interface.h"
 #include "platform/base/ip_address.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 constexpr char kOpenScreenServiceName[] = "_openscreen._udp";
 
@@ -44,7 +43,6 @@ struct ServiceInfo {
   IPEndpoint v6_endpoint;
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_PUBLIC_SERVICE_INFO_H_
diff --git a/chromium/third_party/openscreen/src/osp/public/service_info_unittest.cc b/chromium/third_party/openscreen/src/osp/public/service_info_unittest.cc
index 61f9938000a..a9ac09b69bd 100644
--- a/chromium/third_party/openscreen/src/osp/public/service_info_unittest.cc
+++ b/chromium/third_party/openscreen/src/osp/public/service_info_unittest.cc
@@ -9,8 +9,7 @@
 #include "gtest/gtest.h"
 #include "platform/base/error.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 TEST(ServiceInfoTest, Compare) {
   const ServiceInfo receiver1{
@@ -52,5 +51,4 @@ TEST(ServiceInfoTest, Update) {
   original.Update("buzz", 1, {{193, 169, 2, 11}, 1234}, {});
   EXPECT_EQ(original, updated);
 }
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/public/service_listener.cc b/chromium/third_party/openscreen/src/osp/public/service_listener.cc
index ebced7944c8..7d90287a04d 100644
--- a/chromium/third_party/openscreen/src/osp/public/service_listener.cc
+++ b/chromium/third_party/openscreen/src/osp/public/service_listener.cc
@@ -4,8 +4,7 @@
 
 #include "osp/public/service_listener.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 ServiceListener::Metrics::Metrics() = default;
 ServiceListener::Metrics::~Metrics() = default;
@@ -24,5 +23,4 @@ void ServiceListener::SetConfig(const Config& config) {
   config_ = config;
 }
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/public/service_listener.h b/chromium/third_party/openscreen/src/osp/public/service_listener.h
index fd876955f69..c3d3208788d 100644
--- a/chromium/third_party/openscreen/src/osp/public/service_listener.h
+++ b/chromium/third_party/openscreen/src/osp/public/service_listener.h
@@ -15,8 +15,7 @@
 #include "platform/base/interface_info.h"
 #include "platform/base/macros.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class ServiceListener {
  public:
@@ -155,7 +154,6 @@ class ServiceListener {
   OSP_DISALLOW_COPY_AND_ASSIGN(ServiceListener);
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_PUBLIC_SERVICE_LISTENER_H_
diff --git a/chromium/third_party/openscreen/src/osp/public/service_publisher.cc b/chromium/third_party/openscreen/src/osp/public/service_publisher.cc
index e691606d5c6..c32b1ebd5ae 100644
--- a/chromium/third_party/openscreen/src/osp/public/service_publisher.cc
+++ b/chromium/third_party/openscreen/src/osp/public/service_publisher.cc
@@ -4,8 +4,7 @@
 
 #include "osp/public/service_publisher.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 ServicePublisher::Metrics::Metrics() = default;
 ServicePublisher::Metrics::~Metrics() = default;
@@ -27,5 +26,4 @@ void ServicePublisher::SetConfig(const Config& config) {
 ServicePublisher::ServicePublisher(Observer* observer)
     : state_(State::kStopped), observer_(observer) {}
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
diff --git a/chromium/third_party/openscreen/src/osp/public/service_publisher.h b/chromium/third_party/openscreen/src/osp/public/service_publisher.h
index 80410eb8a6b..6a08ba51e26 100644
--- a/chromium/third_party/openscreen/src/osp/public/service_publisher.h
+++ b/chromium/third_party/openscreen/src/osp/public/service_publisher.h
@@ -14,8 +14,7 @@
 #include "platform/base/interface_info.h"
 #include "platform/base/macros.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class ServicePublisher {
  public:
@@ -141,7 +140,6 @@ class ServicePublisher {
   OSP_DISALLOW_COPY_AND_ASSIGN(ServicePublisher);
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_PUBLIC_SERVICE_PUBLISHER_H_
diff --git a/chromium/third_party/openscreen/src/osp/public/testing/message_demuxer_test_support.h b/chromium/third_party/openscreen/src/osp/public/testing/message_demuxer_test_support.h
index 63637d4b9e9..a26d524067d 100644
--- a/chromium/third_party/openscreen/src/osp/public/testing/message_demuxer_test_support.h
+++ b/chromium/third_party/openscreen/src/osp/public/testing/message_demuxer_test_support.h
@@ -9,8 +9,7 @@
 #include "osp/public/message_demuxer.h"
 #include "platform/api/time.h"
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 class MockMessageCallback final : public MessageDemuxer::MessageCallback {
  public:
@@ -25,7 +24,6 @@ class MockMessageCallback final : public MessageDemuxer::MessageCallback {
                                Clock::time_point now));
 };
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_PUBLIC_TESTING_MESSAGE_DEMUXER_TEST_SUPPORT_H_
diff --git a/chromium/third_party/openscreen/src/osp/public/timestamp.h b/chromium/third_party/openscreen/src/osp/public/timestamp.h
index 24f7ae39ea2..721009b6760 100644
--- a/chromium/third_party/openscreen/src/osp/public/timestamp.h
+++ b/chromium/third_party/openscreen/src/osp/public/timestamp.h
@@ -5,13 +5,11 @@
 #ifndef OSP_PUBLIC_TIMESTAMP_H_
 #define OSP_PUBLIC_TIMESTAMP_H_
 
-namespace openscreen {
-namespace osp {
+namespace openscreen::osp {
 
 // Microseconds after the epoch.
 typedef uint64_t timestamp_t;
 
-}  // namespace osp
-}  // namespace openscreen
+}  // namespace openscreen::osp
 
 #endif  // OSP_PUBLIC_TIMESTAMP_H_
diff --git a/chromium/third_party/openscreen/src/platform/impl/logging_unittest.cc b/chromium/third_party/openscreen/src/platform/impl/logging_unittest.cc
index 5be6bbdc492..1f251bb64d9 100644
--- a/chromium/third_party/openscreen/src/platform/impl/logging_unittest.cc
+++ b/chromium/third_party/openscreen/src/platform/impl/logging_unittest.cc
@@ -5,11 +5,11 @@
 #include "platform/api/logging.h"
 
 #include <string>
+#include <string_view>
 #include <vector>
 
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
-#include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
 #include "platform/impl/logging.h"
 #include "platform/impl/logging_test.h"
@@ -34,7 +34,7 @@ class LoggingTest : public ::testing::Test {
   }
 
  protected:
-  void ExpectLog(LogLevel level, absl::string_view message) {
+  void ExpectLog(LogLevel level, std::string_view message) {
     const char* level_string = "";
     switch (level) {
       case LogLevel::kVerbose:
diff --git a/chromium/third_party/openscreen/src/platform/impl/network_interface.cc b/chromium/third_party/openscreen/src/platform/impl/network_interface.cc
index 62769c9c67c..727cc308357 100644
--- a/chromium/third_party/openscreen/src/platform/impl/network_interface.cc
+++ b/chromium/third_party/openscreen/src/platform/impl/network_interface.cc
@@ -10,7 +10,7 @@
 namespace openscreen {
 
 // Returns an InterfaceInfo associated with the system's loopback interface.
-absl::optional<InterfaceInfo> GetLoopbackInterfaceForTesting() {
+std::optional<InterfaceInfo> GetLoopbackInterfaceForTesting() {
   const std::vector<InterfaceInfo> interfaces = GetNetworkInterfaces();
   auto it = std::find_if(
       interfaces.begin(), interfaces.end(), [](const InterfaceInfo& info) {
@@ -22,7 +22,7 @@ absl::optional<InterfaceInfo> GetLoopbackInterfaceForTesting() {
       });
 
   if (it == interfaces.end()) {
-    return absl::nullopt;
+    return std::nullopt;
   } else {
     return *it;
   }
diff --git a/chromium/third_party/openscreen/src/platform/impl/network_interface.h b/chromium/third_party/openscreen/src/platform/impl/network_interface.h
index 6828c5b02e1..d7ae1c6c734 100644
--- a/chromium/third_party/openscreen/src/platform/impl/network_interface.h
+++ b/chromium/third_party/openscreen/src/platform/impl/network_interface.h
@@ -5,9 +5,9 @@
 #ifndef PLATFORM_IMPL_NETWORK_INTERFACE_H_
 #define PLATFORM_IMPL_NETWORK_INTERFACE_H_
 
+#include <optional>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "platform/base/interface_info.h"
 
 namespace openscreen {
@@ -16,7 +16,7 @@ namespace openscreen {
 std::vector<InterfaceInfo> GetNetworkInterfaces();
 
 // Returns the system's loopback interface.  Used for unit tests.
-absl::optional<InterfaceInfo> GetLoopbackInterfaceForTesting();
+std::optional<InterfaceInfo> GetLoopbackInterfaceForTesting();
 
 }  // namespace openscreen
 
diff --git a/chromium/third_party/openscreen/src/platform/impl/network_interface_linux.cc b/chromium/third_party/openscreen/src/platform/impl/network_interface_linux.cc
index 7292f53bf5d..b7288e142f7 100644
--- a/chromium/third_party/openscreen/src/platform/impl/network_interface_linux.cc
+++ b/chromium/third_party/openscreen/src/platform/impl/network_interface_linux.cc
@@ -20,9 +20,9 @@
 
 #include <algorithm>
 #include <cstring>
+#include <optional>
+#include <string_view>
 
-#include "absl/strings/string_view.h"
-#include "absl/types/optional.h"
 #include "platform/api/network_interface.h"
 #include "platform/base/ip_address.h"
 #include "platform/impl/network_interface.h"
@@ -36,7 +36,7 @@ constexpr int kNetlinkRecvmsgBufSize = 8192;
 
 // Safely reads the system name for the interface from the (probably)
 // null-terminated string |kernel_name| and returns a std::string.
-std::string GetInterfaceName(absl::string_view kernel_name) {
+std::string GetInterfaceName(std::string_view kernel_name) {
   OSP_CHECK_LT(kernel_name.length(), IFNAMSIZ);
   return std::string(kernel_name);
 }
@@ -113,10 +113,10 @@ void GetInterfaceAttributes(struct rtattr* rta,
 // pointed to by |rta|. |ifname| is the name of the interface to which we
 // believe the address belongs based on interface index matching. It is only
 // used for sanity checking.
-absl::optional<IPAddress> GetIPAddressOrNull(struct rtattr* rta,
-                                             unsigned int attrlen,
-                                             IPAddress::Version version,
-                                             const std::string& ifname) {
+std::optional<IPAddress> GetIPAddressOrNull(struct rtattr* rta,
+                                            unsigned int attrlen,
+                                            IPAddress::Version version,
+                                            const std::string& ifname) {
   const size_t expected_address_size = version == IPAddress::Version::kV4
                                            ? IPAddress::kV4Size
                                            : IPAddress::kV6Size;
@@ -130,7 +130,7 @@ absl::optional<IPAddress> GetIPAddressOrNull(struct rtattr* rta,
       if (ifname != label) {
         OSP_LOG_ERROR << "Interface label mismatch! Expected: " << ifname
                       << ", Have: " << label;
-        return absl::nullopt;
+        return std::nullopt;
       }
     } else if (rta->rta_type == IFA_ADDRESS) {
       OSP_DCHECK_EQ(expected_address_size, RTA_PAYLOAD(rta));
diff --git a/chromium/third_party/openscreen/src/platform/impl/platform_client_posix.h b/chromium/third_party/openscreen/src/platform/impl/platform_client_posix.h
index 9d6ab4bcd8c..805fcccf354 100644
--- a/chromium/third_party/openscreen/src/platform/impl/platform_client_posix.h
+++ b/chromium/third_party/openscreen/src/platform/impl/platform_client_posix.h
@@ -8,10 +8,10 @@
 #include <atomic>
 #include <memory>
 #include <mutex>
+#include <optional>
 #include <thread>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "platform/api/time.h"
 #include "platform/base/macros.h"
 #include "platform/impl/socket_handle_waiter_posix.h"
@@ -116,7 +116,7 @@ class PlatformClientPosix {
   // Threads for running TaskRunner and OperationLoop instances.
   // NOTE: These must be declared last to avoid nondterministic failures.
   std::thread networking_loop_thread_;
-  absl::optional<std::thread> task_runner_thread_;
+  std::optional<std::thread> task_runner_thread_;
 
   static PlatformClientPosix* instance_;
 
diff --git a/chromium/third_party/openscreen/src/platform/impl/stream_socket.h b/chromium/third_party/openscreen/src/platform/impl/stream_socket.h
index 3998ae4631b..c096cb791d5 100644
--- a/chromium/third_party/openscreen/src/platform/impl/stream_socket.h
+++ b/chromium/third_party/openscreen/src/platform/impl/stream_socket.h
@@ -7,6 +7,7 @@
 
 #include <cstdint>
 #include <memory>
+#include <optional>
 #include <string>
 
 #include "platform/api/network_interface.h"
@@ -55,10 +56,10 @@ class StreamSocket {
   virtual const SocketHandle& socket_handle() const = 0;
 
   // Returns the connected remote address, if socket is connected.
-  virtual absl::optional<IPEndpoint> remote_address() const = 0;
+  virtual std::optional<IPEndpoint> remote_address() const = 0;
 
   // Returns the local address, if one is assigned.
-  virtual absl::optional<IPEndpoint> local_address() const = 0;
+  virtual std::optional<IPEndpoint> local_address() const = 0;
 
   // Returns the state of the socket.
   virtual TcpSocketState state() const = 0;
diff --git a/chromium/third_party/openscreen/src/platform/impl/stream_socket_posix.cc b/chromium/third_party/openscreen/src/platform/impl/stream_socket_posix.cc
index 7c5024b6dc2..421839c826c 100644
--- a/chromium/third_party/openscreen/src/platform/impl/stream_socket_posix.cc
+++ b/chromium/third_party/openscreen/src/platform/impl/stream_socket_posix.cc
@@ -189,16 +189,16 @@ Error StreamSocketPosix::Listen(int max_backlog_size) {
   return Error::None();
 }
 
-absl::optional<IPEndpoint> StreamSocketPosix::remote_address() const {
+std::optional<IPEndpoint> StreamSocketPosix::remote_address() const {
   if ((state_ != TcpSocketState::kConnected) || !remote_address_) {
-    return absl::nullopt;
+    return std::nullopt;
   }
   return remote_address_.value();
 }
 
-absl::optional<IPEndpoint> StreamSocketPosix::local_address() const {
+std::optional<IPEndpoint> StreamSocketPosix::local_address() const {
   if (!local_address_.has_value()) {
-    return absl::nullopt;
+    return std::nullopt;
   }
   return local_address_.value().endpoint();
 }
diff --git a/chromium/third_party/openscreen/src/platform/impl/stream_socket_posix.h b/chromium/third_party/openscreen/src/platform/impl/stream_socket_posix.h
index 7ff9d437189..c2b48d6d266 100644
--- a/chromium/third_party/openscreen/src/platform/impl/stream_socket_posix.h
+++ b/chromium/third_party/openscreen/src/platform/impl/stream_socket_posix.h
@@ -7,9 +7,9 @@
 
 #include <atomic>
 #include <memory>
+#include <optional>
 #include <string>
 
-#include "absl/types/optional.h"
 #include "platform/base/error.h"
 #include "platform/base/ip_address.h"
 #include "platform/impl/socket_address_posix.h"
@@ -47,8 +47,8 @@ class StreamSocketPosix : public StreamSocket {
 
   // StreamSocket getter overrides.
   const SocketHandle& socket_handle() const override { return handle_; }
-  absl::optional<IPEndpoint> remote_address() const override;
-  absl::optional<IPEndpoint> local_address() const override;
+  std::optional<IPEndpoint> remote_address() const override;
+  std::optional<IPEndpoint> local_address() const override;
   TcpSocketState state() const override;
   IPAddress::Version version() const override;
 
@@ -72,8 +72,8 @@ class StreamSocketPosix : public StreamSocket {
   // atomic's (trivially) copyable and moveable requirements.
   Error::Code last_error_code_ = Error::Code::kNone;
   IPAddress::Version version_;
-  absl::optional<SocketAddressPosix> local_address_;
-  absl::optional<IPEndpoint> remote_address_;
+  std::optional<SocketAddressPosix> local_address_;
+  std::optional<IPEndpoint> remote_address_;
 
   bool is_bound_ = false;
   TcpSocketState state_ = TcpSocketState::kNotConnected;
diff --git a/chromium/third_party/openscreen/src/platform/impl/task_runner.h b/chromium/third_party/openscreen/src/platform/impl/task_runner.h
index ecfd7d8e758..f2ce660472b 100644
--- a/chromium/third_party/openscreen/src/platform/impl/task_runner.h
+++ b/chromium/third_party/openscreen/src/platform/impl/task_runner.h
@@ -14,7 +14,6 @@
 #include <vector>
 
 #include "absl/base/thread_annotations.h"
-#include "absl/types/optional.h"
 #include "platform/api/task_runner.h"
 #include "platform/api/time.h"
 #include "platform/base/error.h"
diff --git a/chromium/third_party/openscreen/src/platform/impl/task_runner_unittest.cc b/chromium/third_party/openscreen/src/platform/impl/task_runner_unittest.cc
index 0f7251d3b34..6e66bc9c9c5 100644
--- a/chromium/third_party/openscreen/src/platform/impl/task_runner_unittest.cc
+++ b/chromium/third_party/openscreen/src/platform/impl/task_runner_unittest.cc
@@ -8,6 +8,7 @@
 
 #include <atomic>
 #include <chrono>
+#include <optional>
 #include <string>
 #include <thread>
 
@@ -273,9 +274,9 @@ TEST(TaskRunnerImplTest, WakesEventWaiterOnPostTask) {
 
 class RepeatedClass {
  public:
-  MOCK_METHOD0(Repeat, absl::optional<Clock::duration>());
+  MOCK_METHOD0(Repeat, std::optional<Clock::duration>());
 
-  absl::optional<Clock::duration> DoCall() {
+  std::optional<Clock::duration> DoCall() {
     auto result = Repeat();
     execution_count++;
     return result;
diff --git a/chromium/third_party/openscreen/src/platform/impl/tls_connection_posix.cc b/chromium/third_party/openscreen/src/platform/impl/tls_connection_posix.cc
index c646fc12160..3da6418d751 100644
--- a/chromium/third_party/openscreen/src/platform/impl/tls_connection_posix.cc
+++ b/chromium/third_party/openscreen/src/platform/impl/tls_connection_posix.cc
@@ -16,10 +16,10 @@
 
 #include <cstring>
 #include <memory>
+#include <optional>
 #include <utility>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "platform/api/task_runner.h"
 #include "platform/base/error.h"
 #include "platform/base/span.h"
@@ -99,7 +99,7 @@ bool TlsConnectionPosix::Send(const void* data, size_t len) {
 IPEndpoint TlsConnectionPosix::GetRemoteEndpoint() const {
   OSP_DCHECK(task_runner_.IsRunningOnTaskRunner());
 
-  absl::optional<IPEndpoint> endpoint = socket_->remote_address();
+  std::optional<IPEndpoint> endpoint = socket_->remote_address();
   OSP_DCHECK(endpoint.has_value());
   return endpoint.value();
 }
diff --git a/chromium/third_party/openscreen/src/platform/impl/udp_socket_posix.cc b/chromium/third_party/openscreen/src/platform/impl/udp_socket_posix.cc
index 3600d70a69e..fc5004c0266 100644
--- a/chromium/third_party/openscreen/src/platform/impl/udp_socket_posix.cc
+++ b/chromium/third_party/openscreen/src/platform/impl/udp_socket_posix.cc
@@ -21,7 +21,6 @@
 #include <type_traits>
 #include <utility>
 
-#include "absl/types/optional.h"
 #include "platform/api/task_runner.h"
 #include "platform/base/error.h"
 #include "platform/impl/udp_socket_reader_posix.h"
diff --git a/chromium/third_party/openscreen/src/platform/impl/udp_socket_posix.h b/chromium/third_party/openscreen/src/platform/impl/udp_socket_posix.h
index 5ada98ffc8a..980f5823d9c 100644
--- a/chromium/third_party/openscreen/src/platform/impl/udp_socket_posix.h
+++ b/chromium/third_party/openscreen/src/platform/impl/udp_socket_posix.h
@@ -5,7 +5,6 @@
 #ifndef PLATFORM_IMPL_UDP_SOCKET_POSIX_H_
 #define PLATFORM_IMPL_UDP_SOCKET_POSIX_H_
 
-#include "absl/types/optional.h"
 #include "platform/api/udp_socket.h"
 #include "platform/base/macros.h"
 #include "platform/impl/platform_client_posix.h"
diff --git a/chromium/third_party/openscreen/src/testing/util/read_file.cc b/chromium/third_party/openscreen/src/testing/util/read_file.cc
index a7a0671b8d5..3ad4850d3b1 100644
--- a/chromium/third_party/openscreen/src/testing/util/read_file.cc
+++ b/chromium/third_party/openscreen/src/testing/util/read_file.cc
@@ -8,7 +8,7 @@
 
 namespace openscreen {
 
-std::string ReadEntireFileToString(absl::string_view filename) {
+std::string ReadEntireFileToString(std::string_view filename) {
   FILE* file = fopen(filename.data(), "r");
   if (file == nullptr) {
     return {};
diff --git a/chromium/third_party/openscreen/src/testing/util/read_file.h b/chromium/third_party/openscreen/src/testing/util/read_file.h
index 1214dd5d6b7..790dc6c1983 100644
--- a/chromium/third_party/openscreen/src/testing/util/read_file.h
+++ b/chromium/third_party/openscreen/src/testing/util/read_file.h
@@ -6,12 +6,11 @@
 #define TESTING_UTIL_READ_FILE_H_
 
 #include <string>
-
-#include "absl/strings/string_view.h"
+#include <string_view>
 
 namespace openscreen {
 
-std::string ReadEntireFileToString(absl::string_view filename);
+std::string ReadEntireFileToString(std::string_view filename);
 
 }  // namespace openscreen
 
diff --git a/chromium/third_party/openscreen/src/third_party/abseil/BUILD.gn b/chromium/third_party/openscreen/src/third_party/abseil/BUILD.gn
index b80a0bd58d3..78bac4bf95d 100644
--- a/chromium/third_party/openscreen/src/third_party/abseil/BUILD.gn
+++ b/chromium/third_party/openscreen/src/third_party/abseil/BUILD.gn
@@ -101,19 +101,210 @@ if (build_with_chromium) {
       "src/absl/strings/str_replace.h",
       "src/absl/strings/str_split.cc",
       "src/absl/strings/str_split.h",
-      "src/absl/strings/string_view.cc",
-      "src/absl/strings/string_view.h",
       "src/absl/strings/substitute.cc",
       "src/absl/strings/substitute.h",
       "src/absl/types/bad_optional_access.cc",
       "src/absl/types/bad_optional_access.h",
       "src/absl/types/bad_variant_access.cc",
       "src/absl/types/bad_variant_access.h",
-      "src/absl/types/optional.h",
       "src/absl/types/variant.h",
     ]
 
     configs += [ ":private_abseil_config" ]
     public_configs = [ ":abseil_config" ]
   }
+
+  config("private_abseil_quiche_config") {
+    cflags = [
+      "-Wno-implicit-int-float-conversion",
+      "-Wno-unreachable-code-break",
+    ]
+
+    cflags_cc = [ "-Wno-exit-time-destructors" ]
+  }
+
+  source_set("abseil_quiche") {
+    visibility = [ "//third_party/quiche" ]
+
+    sources = [
+      "src/absl/base/internal/cycleclock.cc",
+      "src/absl/base/internal/cycleclock.h",
+      "src/absl/base/internal/low_level_alloc.cc",
+      "src/absl/base/internal/low_level_alloc.h",
+      "src/absl/base/internal/spinlock.cc",
+      "src/absl/base/internal/spinlock.h",
+      "src/absl/base/internal/spinlock_wait.cc",
+      "src/absl/base/internal/spinlock_wait.h",
+      "src/absl/base/internal/strerror.cc",
+      "src/absl/base/internal/strerror.h",
+      "src/absl/base/internal/sysinfo.cc",
+      "src/absl/base/internal/sysinfo.h",
+      "src/absl/base/internal/thread_identity.cc",
+      "src/absl/base/internal/thread_identity.h",
+      "src/absl/base/internal/unscaledcycleclock.cc",
+      "src/absl/base/internal/unscaledcycleclock.h",
+      "src/absl/container/internal/raw_hash_set.cc",
+      "src/absl/container/internal/raw_hash_set.h",
+      "src/absl/crc/crc32c.cc",
+      "src/absl/crc/crc32c.h",
+      "src/absl/crc/internal/crc.cc",
+      "src/absl/crc/internal/crc.h",
+      "src/absl/crc/internal/crc_cord_state.cc",
+      "src/absl/crc/internal/crc_cord_state.h",
+      "src/absl/crc/internal/crc_internal.h",
+      "src/absl/crc/internal/crc_memcpy.h",
+      "src/absl/crc/internal/crc_memcpy_fallback.cc",
+      "src/absl/crc/internal/crc_memcpy_x86_64.cc",
+      "src/absl/crc/internal/crc_x86_arm_combined.cc",
+      "src/absl/debugging/internal/address_is_readable.cc",
+      "src/absl/debugging/internal/address_is_readable.h",
+      "src/absl/debugging/internal/demangle.cc",
+      "src/absl/debugging/internal/demangle.h",
+      "src/absl/debugging/internal/elf_mem_image.cc",
+      "src/absl/debugging/internal/elf_mem_image.h",
+      "src/absl/debugging/internal/examine_stack.cc",
+      "src/absl/debugging/internal/examine_stack.h",
+      "src/absl/debugging/internal/vdso_support.cc",
+      "src/absl/debugging/internal/vdso_support.h",
+      "src/absl/debugging/stacktrace.cc",
+      "src/absl/debugging/stacktrace.h",
+      "src/absl/debugging/symbolize.cc",
+      "src/absl/debugging/symbolize.h",
+      "src/absl/flags/commandlineflag.cc",
+      "src/absl/flags/commandlineflag.h",
+      "src/absl/flags/internal/commandlineflag.cc",
+      "src/absl/flags/internal/commandlineflag.h",
+      "src/absl/flags/internal/flag.cc",
+      "src/absl/flags/internal/flag.h",
+      "src/absl/flags/internal/private_handle_accessor.cc",
+      "src/absl/flags/internal/private_handle_accessor.h",
+      "src/absl/flags/internal/program_name.cc",
+      "src/absl/flags/internal/program_name.h",
+      "src/absl/flags/internal/registry.h",
+      "src/absl/flags/internal/usage.cc",
+      "src/absl/flags/internal/usage.h",
+      "src/absl/flags/marshalling.cc",
+      "src/absl/flags/marshalling.h",
+      "src/absl/flags/parse.cc",
+      "src/absl/flags/parse.h",
+      "src/absl/flags/reflection.cc",
+      "src/absl/flags/reflection.h",
+      "src/absl/flags/usage.cc",
+      "src/absl/flags/usage.h",
+      "src/absl/flags/usage_config.cc",
+      "src/absl/flags/usage_config.h",
+      "src/absl/log/absl_log.h",
+      "src/absl/log/globals.cc",
+      "src/absl/log/globals.h",
+      "src/absl/log/initialize.cc",
+      "src/absl/log/initialize.h",
+      "src/absl/log/internal/check_op.cc",
+      "src/absl/log/internal/check_op.h",
+      "src/absl/log/internal/conditions.cc",
+      "src/absl/log/internal/conditions.h",
+      "src/absl/log/internal/globals.cc",
+      "src/absl/log/internal/globals.h",
+      "src/absl/log/internal/log_format.cc",
+      "src/absl/log/internal/log_format.h",
+      "src/absl/log/internal/log_impl.h",
+      "src/absl/log/internal/log_message.cc",
+      "src/absl/log/internal/log_message.h",
+      "src/absl/log/internal/log_sink_set.cc",
+      "src/absl/log/internal/log_sink_set.h",
+      "src/absl/log/internal/nullguard.cc",
+      "src/absl/log/internal/nullguard.h",
+      "src/absl/log/internal/proto.cc",
+      "src/absl/log/internal/proto.h",
+      "src/absl/log/log_sink.cc",
+      "src/absl/log/log_sink.h",
+      "src/absl/profiling/internal/exponential_biased.cc",
+      "src/absl/profiling/internal/exponential_biased.h",
+      "src/absl/status/status.cc",
+      "src/absl/status/status.h",
+      "src/absl/status/status_payload_printer.cc",
+      "src/absl/status/status_payload_printer.h",
+      "src/absl/status/statusor.cc",
+      "src/absl/status/statusor.h",
+      "src/absl/strings/cord.cc",
+      "src/absl/strings/cord.h",
+      "src/absl/strings/internal/cord_internal.cc",
+      "src/absl/strings/internal/cord_internal.h",
+      "src/absl/strings/internal/cord_rep_btree.cc",
+      "src/absl/strings/internal/cord_rep_btree.h",
+      "src/absl/strings/internal/cord_rep_btree_navigator.cc",
+      "src/absl/strings/internal/cord_rep_btree_navigator.h",
+      "src/absl/strings/internal/cord_rep_btree_reader.cc",
+      "src/absl/strings/internal/cord_rep_btree_reader.h",
+      "src/absl/strings/internal/cord_rep_consume.cc",
+      "src/absl/strings/internal/cord_rep_consume.h",
+      "src/absl/strings/internal/cord_rep_crc.cc",
+      "src/absl/strings/internal/cord_rep_crc.h",
+      "src/absl/strings/internal/cord_rep_ring.cc",
+      "src/absl/strings/internal/cord_rep_ring.h",
+      "src/absl/strings/internal/cordz_functions.cc",
+      "src/absl/strings/internal/cordz_functions.h",
+      "src/absl/strings/internal/cordz_handle.cc",
+      "src/absl/strings/internal/cordz_handle.h",
+      "src/absl/strings/internal/cordz_info.cc",
+      "src/absl/strings/internal/cordz_info.h",
+      "src/absl/strings/internal/damerau_levenshtein_distance.cc",
+      "src/absl/strings/internal/damerau_levenshtein_distance.h",
+      "src/absl/strings/internal/str_format/arg.cc",
+      "src/absl/strings/internal/str_format/arg.h",
+      "src/absl/strings/internal/str_format/bind.cc",
+      "src/absl/strings/internal/str_format/bind.h",
+      "src/absl/strings/internal/str_format/extension.cc",
+      "src/absl/strings/internal/str_format/extension.h",
+      "src/absl/strings/internal/str_format/float_conversion.cc",
+      "src/absl/strings/internal/str_format/float_conversion.h",
+      "src/absl/strings/internal/str_format/output.cc",
+      "src/absl/strings/internal/str_format/output.h",
+      "src/absl/strings/internal/str_format/parser.cc",
+      "src/absl/strings/internal/str_format/parser.h",
+      "src/absl/strings/string_view.cc",
+      "src/absl/strings/string_view.h",
+      "src/absl/synchronization/internal/create_thread_identity.cc",
+      "src/absl/synchronization/internal/create_thread_identity.h",
+      "src/absl/synchronization/internal/graphcycles.cc",
+      "src/absl/synchronization/internal/graphcycles.h",
+      "src/absl/synchronization/internal/per_thread_sem.cc",
+      "src/absl/synchronization/internal/per_thread_sem.h",
+      "src/absl/synchronization/internal/waiter.cc",
+      "src/absl/synchronization/internal/waiter.h",
+      "src/absl/synchronization/mutex.cc",
+      "src/absl/synchronization/mutex.h",
+      "src/absl/time/clock.cc",
+      "src/absl/time/clock.h",
+      "src/absl/time/duration.cc",
+      "src/absl/time/internal/cctz/include/cctz/civil_time.h",
+      "src/absl/time/internal/cctz/include/cctz/civil_time_detail.h",
+      "src/absl/time/internal/cctz/include/cctz/time_zone.h",
+      "src/absl/time/internal/cctz/include/cctz/zone_info_source.h",
+      "src/absl/time/internal/cctz/src/time_zone_fixed.cc",
+      "src/absl/time/internal/cctz/src/time_zone_fixed.h",
+      "src/absl/time/internal/cctz/src/time_zone_format.cc",
+      "src/absl/time/internal/cctz/src/time_zone_if.cc",
+      "src/absl/time/internal/cctz/src/time_zone_if.h",
+      "src/absl/time/internal/cctz/src/time_zone_impl.cc",
+      "src/absl/time/internal/cctz/src/time_zone_impl.h",
+      "src/absl/time/internal/cctz/src/time_zone_info.cc",
+      "src/absl/time/internal/cctz/src/time_zone_info.h",
+      "src/absl/time/internal/cctz/src/time_zone_libc.cc",
+      "src/absl/time/internal/cctz/src/time_zone_libc.h",
+      "src/absl/time/internal/cctz/src/time_zone_lookup.cc",
+      "src/absl/time/internal/cctz/src/time_zone_posix.cc",
+      "src/absl/time/internal/cctz/src/time_zone_posix.h",
+      "src/absl/time/internal/cctz/src/zone_info_source.cc",
+      "src/absl/time/time.cc",
+      "src/absl/time/time.h",
+      "src/absl/types/optional.h",
+    ]
+
+    if (is_mac) {
+      frameworks = [ "CoreFoundation.framework" ]
+    }
+
+    deps = [ ":abseil" ]
+    configs += [ ":private_abseil_quiche_config" ]
+  }
 }
diff --git a/chromium/third_party/openscreen/src/third_party/googleurl/BUILD.gn b/chromium/third_party/openscreen/src/third_party/googleurl/BUILD.gn
index 1acd4ac1fcd..3a18f340226 100644
--- a/chromium/third_party/openscreen/src/third_party/googleurl/BUILD.gn
+++ b/chromium/third_party/openscreen/src/third_party/googleurl/BUILD.gn
@@ -67,7 +67,7 @@ if (build_with_chromium) {
       "src/base/strings/utf_string_conversions.cc",
       "src/base/strings/utf_string_conversions.h",
       "src/base/template_util.h",
-      "src/base/third_party/icu_utf.h",
+      "src/base/third_party/icu/icu_utf.h",
       "src/base/types/always_false.h",
       "src/build/build.config.h",
       "src/build/buildflag.h",
@@ -112,14 +112,14 @@ if (build_with_chromium) {
       "src/url/url_canon_relative.cc",
       "src/url/url_canon_stdstring.cc",
       "src/url/url_canon_stdstring.h",
-      "src/url/url_canon_stdurl.h",
+      "src/url/url_canon_stdurl.cc",
       "src/url/url_constants.cc",
       "src/url/url_constants.h",
       "src/url/url_features.cc",
       "src/url/url_features.h",
       "src/url/url_file.h",
       "src/url/url_idna_ascii_only.cc",
-      "src/url/url_parse_file.h",
+      "src/url/url_parse_file.cc",
       "src/url/url_parse_internal.h",
       "src/url/url_util.cc",
       "src/url/url_util.h",
diff --git a/chromium/third_party/openscreen/src/third_party/mozilla/BUILD.gn b/chromium/third_party/openscreen/src/third_party/mozilla/BUILD.gn
deleted file mode 100644
index 9f30ad2d446..00000000000
--- a/chromium/third_party/openscreen/src/third_party/mozilla/BUILD.gn
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-source_set("mozilla") {
-  sources = [
-    "url_parse.cc",
-    "url_parse.h",
-    "url_parse_internal.cc",
-    "url_parse_internal.h",
-  ]
-
-  public_configs = [ "../../build:openscreen_include_dirs" ]
-}
diff --git a/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt b/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt
deleted file mode 100644
index ac40837824a..00000000000
--- a/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-Copyright 2007, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--------------------------------------------------------------------------------
-
-The file url_parse.cc is based on nsURLParsers.cc from Mozilla. This file is
-licensed separately as follows:
-
-The contents of this file are subject to the Mozilla Public License Version
-1.1 (the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-http://www.mozilla.org/MPL/
-
-Software distributed under the License is distributed on an "AS IS" basis,
-WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-for the specific language governing rights and limitations under the
-License.
-
-The Original Code is mozilla.org code.
-
-The Initial Developer of the Original Code is
-Netscape Communications Corporation.
-Portions created by the Initial Developer are Copyright (C) 1998
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Darin Fisher (original author)
-
-Alternatively, the contents of this file may be used under the terms of
-either the GNU General Public License Version 2 or later (the "GPL"), or
-the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-in which case the provisions of the GPL or the LGPL are applicable instead
-of those above. If you wish to allow use of your version of this file only
-under the terms of either the GPL or the LGPL, and not to allow others to
-use your version of this file under the terms of the MPL, indicate your
-decision by deleting the provisions above and replace them with the notice
-and other provisions required by the GPL or the LGPL. If you do not delete
-the provisions above, a recipient may use your version of this file under
-the terms of any one of the MPL, the GPL or the LGPL.
diff --git a/chromium/third_party/openscreen/src/third_party/mozilla/README.chromium b/chromium/third_party/openscreen/src/third_party/mozilla/README.chromium
deleted file mode 100644
index 7d2195c18ce..00000000000
--- a/chromium/third_party/openscreen/src/third_party/mozilla/README.chromium
+++ /dev/null
@@ -1,8 +0,0 @@
-Name: url_parse
-URL: http://mxr.mozilla.org/comm-central/source/mozilla/netwerk/base/src/nsURLParsers.cpp
-Security Critical: yes
-Shipped: yes
-License: BSD and MPL 1.1/GPL 2.0/LGPL 2.1
-License File: LICENSE.txt
-Description:
-The file url_parse.cc is based on nsURLParsers.cc from Mozilla.
diff --git a/chromium/third_party/openscreen/src/third_party/mozilla/README.md b/chromium/third_party/openscreen/src/third_party/mozilla/README.md
deleted file mode 100644
index ed4c24d8c06..00000000000
--- a/chromium/third_party/openscreen/src/third_party/mozilla/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# url_parse
-
-`url_parse.{h,cc}` are based on the same files in Chromium under
-`//url/third_party/mozilla` but have been slightly modified for our use case.
-`url_parse_internal.{h,cc}` contains additional functions needed by the former
-files but aren't provided directly.  These are also ported from Chromium's
-version.
diff --git a/chromium/third_party/openscreen/src/third_party/mozilla/url_parse.cc b/chromium/third_party/openscreen/src/third_party/mozilla/url_parse.cc
deleted file mode 100644
index e6efd9e7a34..00000000000
--- a/chromium/third_party/openscreen/src/third_party/mozilla/url_parse.cc
+++ /dev/null
@@ -1,858 +0,0 @@
-/* Based on nsURLParsers.cc from Mozilla
- * -------------------------------------
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Darin Fisher (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "third_party/mozilla/url_parse.h"
-
-#include <assert.h>
-#include <ctype.h>
-#include <stdlib.h>
-
-#include "third_party/mozilla/url_parse_internal.h"
-
-namespace openscreen {
-namespace {
-
-// Returns true if the given character is a valid digit to use in a port.
-bool IsPortDigit(char ch) {
-  return ch >= '0' && ch <= '9';
-}
-
-// Returns the offset of the next authority terminator in the input starting
-// from start_offset. If no terminator is found, the return value will be equal
-// to spec_len.
-int FindNextAuthorityTerminator(const char* spec,
-                                int start_offset,
-                                int spec_len) {
-  for (int i = start_offset; i < spec_len; i++) {
-    if (IsAuthorityTerminator(spec[i]))
-      return i;
-  }
-  return spec_len;  // Not found.
-}
-
-void ParseUserInfo(const char* spec,
-                   const Component& user,
-                   Component* username,
-                   Component* password) {
-  // Find the first colon in the user section, which separates the username and
-  // password.
-  int colon_offset = 0;
-  while (colon_offset < user.len && spec[user.begin + colon_offset] != ':')
-    colon_offset++;
-
-  if (colon_offset < user.len) {
-    // Found separator: <username>:<password>
-    *username = Component(user.begin, colon_offset);
-    *password = MakeRange(user.begin + colon_offset + 1, user.begin + user.len);
-  } else {
-    // No separator, treat everything as the username
-    *username = user;
-    *password = Component();
-  }
-}
-
-void ParseServerInfo(const char* spec,
-                     const Component& serverinfo,
-                     Component* hostname,
-                     Component* port_num) {
-  if (serverinfo.len == 0) {
-    // No server info, host name is empty.
-    hostname->reset();
-    port_num->reset();
-    return;
-  }
-
-  // If the host starts with a left-bracket, assume the entire host is an
-  // IPv6 literal.  Otherwise, assume none of the host is an IPv6 literal.
-  // This assumption will be overridden if we find a right-bracket.
-  //
-  // Our IPv6 address canonicalization code requires both brackets to exist,
-  // but the ability to locate an incomplete address can still be useful.
-  int ipv6_terminator = spec[serverinfo.begin] == '[' ? serverinfo.end() : -1;
-  int colon = -1;
-
-  // Find the last right-bracket, and the last colon.
-  for (int i = serverinfo.begin; i < serverinfo.end(); i++) {
-    switch (spec[i]) {
-      case ']':
-        ipv6_terminator = i;
-        break;
-      case ':':
-        colon = i;
-        break;
-    }
-  }
-
-  if (colon > ipv6_terminator) {
-    // Found a port number: <hostname>:<port>
-    *hostname = MakeRange(serverinfo.begin, colon);
-    if (hostname->len == 0)
-      hostname->reset();
-    *port_num = MakeRange(colon + 1, serverinfo.end());
-  } else {
-    // No port: <hostname>
-    *hostname = serverinfo;
-    port_num->reset();
-  }
-}
-
-// Given an already-identified auth section, breaks it into its consituent
-// parts. The port number will be parsed and the resulting integer will be
-// filled into the given *port variable, or -1 if there is no port number or it
-// is invalid.
-void DoParseAuthority(const char* spec,
-                      const Component& auth,
-                      Component* username,
-                      Component* password,
-                      Component* hostname,
-                      Component* port_num) {
-  assert(auth.is_valid());
-  if (auth.len == 0) {
-    username->reset();
-    password->reset();
-    hostname->reset();
-    port_num->reset();
-    return;
-  }
-
-  // Search backwards for @, which is the separator between the user info and
-  // the server info.
-  int i = auth.begin + auth.len - 1;
-  while (i > auth.begin && spec[i] != '@')
-    i--;
-
-  if (spec[i] == '@') {
-    // Found user info: <user-info>@<server-info>
-    ParseUserInfo(spec, Component(auth.begin, i - auth.begin), username,
-                  password);
-    ParseServerInfo(spec, MakeRange(i + 1, auth.begin + auth.len), hostname,
-                    port_num);
-  } else {
-    // No user info, everything is server info.
-    username->reset();
-    password->reset();
-    ParseServerInfo(spec, auth, hostname, port_num);
-  }
-}
-
-inline void FindQueryAndRefParts(const char* spec,
-                                 const Component& path,
-                                 int* query_separator,
-                                 int* ref_separator) {
-  int path_end = path.begin + path.len;
-  for (int i = path.begin; i < path_end; i++) {
-    switch (spec[i]) {
-      case '?':
-        // Only match the query string if it precedes the reference fragment
-        // and when we haven't found one already.
-        if (*query_separator < 0)
-          *query_separator = i;
-        break;
-      case '#':
-        // Record the first # sign only.
-        if (*ref_separator < 0) {
-          *ref_separator = i;
-          return;
-        }
-        break;
-    }
-  }
-}
-
-void ParsePath(const char* spec,
-               const Component& path,
-               Component* filepath,
-               Component* query,
-               Component* ref) {
-  // path = [/]<segment1>/<segment2>/<...>/<segmentN>;<param>?<query>#<ref>
-
-  // Special case when there is no path.
-  if (path.len == -1) {
-    filepath->reset();
-    query->reset();
-    ref->reset();
-    return;
-  }
-  assert(path.len > 0);
-
-  // Search for first occurrence of either ? or #.
-  int query_separator = -1;  // Index of the '?'
-  int ref_separator = -1;    // Index of the '#'
-  FindQueryAndRefParts(spec, path, &query_separator, &ref_separator);
-
-  // Markers pointing to the character after each of these corresponding
-  // components. The code below words from the end back to the beginning,
-  // and will update these indices as it finds components that exist.
-  int file_end, query_end;
-
-  // Ref fragment: from the # to the end of the path.
-  int path_end = path.begin + path.len;
-  if (ref_separator >= 0) {
-    file_end = query_end = ref_separator;
-    *ref = MakeRange(ref_separator + 1, path_end);
-  } else {
-    file_end = query_end = path_end;
-    ref->reset();
-  }
-
-  // Query fragment: everything from the ? to the next boundary (either the end
-  // of the path or the ref fragment).
-  if (query_separator >= 0) {
-    file_end = query_separator;
-    *query = MakeRange(query_separator + 1, query_end);
-  } else {
-    query->reset();
-  }
-
-  // File path: treat an empty file path as no file path.
-  if (file_end != path.begin)
-    *filepath = MakeRange(path.begin, file_end);
-  else
-    filepath->reset();
-}
-
-bool DoExtractScheme(const char* url, int url_len, Component* scheme) {
-  // Skip leading whitespace and control characters.
-  int begin = 0;
-  while (begin < url_len && ShouldTrimFromURL(url[begin]))
-    begin++;
-  if (begin == url_len)
-    return false;  // Input is empty or all whitespace.
-
-  // Find the first colon character.
-  for (int i = begin; i < url_len; i++) {
-    if (url[i] == ':') {
-      *scheme = MakeRange(begin, i);
-      return true;
-    }
-  }
-  return false;  // No colon found: no scheme
-}
-
-// Fills in all members of the Parsed structure except for the scheme.
-//
-// |spec| is the full spec being parsed, of length |spec_len|.
-// |after_scheme| is the character immediately following the scheme (after the
-//   colon) where we'll begin parsing.
-//
-// Compatability data points. I list "host", "path" extracted:
-// Input                IE6             Firefox                Us
-// -----                --------------  --------------         --------------
-// http://foo.com/      "foo.com", "/"  "foo.com", "/"         "foo.com", "/"
-// http:foo.com/        "foo.com", "/"  "foo.com", "/"         "foo.com", "/"
-// http:/foo.com/       fail(*)         "foo.com", "/"         "foo.com", "/"
-// http:\foo.com/       fail(*)         "\foo.com", "/"(fail)  "foo.com", "/"
-// http:////foo.com/    "foo.com", "/"  "foo.com", "/"         "foo.com", "/"
-//
-// (*) Interestingly, although IE fails to load these URLs, its history
-// canonicalizer handles them, meaning if you've been to the corresponding
-// "http://foo.com/" link, it will be colored.
-void DoParseAfterScheme(const char* spec,
-                        int spec_len,
-                        int after_scheme,
-                        Parsed* parsed) {
-  int num_slashes = CountConsecutiveSlashes(spec, after_scheme, spec_len);
-  int after_slashes = after_scheme + num_slashes;
-
-  // First split into two main parts, the authority (username, password, host,
-  // and port) and the full path (path, query, and reference).
-  Component authority;
-  Component full_path;
-
-  // Found "//<some data>", looks like an authority section. Treat everything
-  // from there to the next slash (or end of spec) to be the authority. Note
-  // that we ignore the number of slashes and treat it as the authority.
-  int end_auth = FindNextAuthorityTerminator(spec, after_slashes, spec_len);
-  authority = Component(after_slashes, end_auth - after_slashes);
-
-  if (end_auth == spec_len)  // No beginning of path found.
-    full_path = Component();
-  else  // Everything starting from the slash to the end is the path.
-    full_path = Component(end_auth, spec_len - end_auth);
-
-  // Now parse those two sub-parts.
-  DoParseAuthority(spec, authority, &parsed->username, &parsed->password,
-                   &parsed->host, &parsed->port);
-  ParsePath(spec, full_path, &parsed->path, &parsed->query, &parsed->ref);
-}
-
-// The main parsing function for standard URLs. Standard URLs have a scheme,
-// host, path, etc.
-void DoParseStandardURL(const char* spec, int spec_len, Parsed* parsed) {
-  assert(spec_len >= 0);
-
-  // Strip leading & trailing spaces and control characters.
-  int begin = 0;
-  TrimURL(spec, &begin, &spec_len);
-
-  int after_scheme;
-  if (DoExtractScheme(spec, spec_len, &parsed->scheme)) {
-    after_scheme = parsed->scheme.end() + 1;  // Skip past the colon.
-  } else {
-    // Say there's no scheme when there is no colon. We could also say that
-    // everything is the scheme. Both would produce an invalid URL, but this way
-    // seems less wrong in more cases.
-    parsed->scheme.reset();
-    after_scheme = begin;
-  }
-  DoParseAfterScheme(spec, spec_len, after_scheme, parsed);
-}
-
-void DoParseFileSystemURL(const char* spec, int spec_len, Parsed* parsed) {
-  assert(spec_len >= 0);
-
-  // Get the unused parts of the URL out of the way.
-  parsed->username.reset();
-  parsed->password.reset();
-  parsed->host.reset();
-  parsed->port.reset();
-  parsed->path.reset();          // May use this; reset for convenience.
-  parsed->ref.reset();           // May use this; reset for convenience.
-  parsed->query.reset();         // May use this; reset for convenience.
-  parsed->clear_inner_parsed();  // May use this; reset for convenience.
-
-  // Strip leading & trailing spaces and control characters.
-  int begin = 0;
-  TrimURL(spec, &begin, &spec_len);
-
-  // Handle empty specs or ones that contain only whitespace or control chars.
-  if (begin == spec_len) {
-    parsed->scheme.reset();
-    return;
-  }
-
-  int inner_start = -1;
-
-  // Extract the scheme.  We also handle the case where there is no scheme.
-  if (DoExtractScheme(&spec[begin], spec_len - begin, &parsed->scheme)) {
-    // Offset the results since we gave ExtractScheme a substring.
-    parsed->scheme.begin += begin;
-
-    if (parsed->scheme.end() == spec_len - 1)
-      return;
-
-    inner_start = parsed->scheme.end() + 1;
-  } else {
-    // No scheme found; that's not valid for filesystem URLs.
-    parsed->scheme.reset();
-    return;
-  }
-
-  Component inner_scheme;
-  const char* inner_spec = &spec[inner_start];
-  int inner_spec_len = spec_len - inner_start;
-
-  if (DoExtractScheme(inner_spec, inner_spec_len, &inner_scheme)) {
-    // Offset the results since we gave ExtractScheme a substring.
-    inner_scheme.begin += inner_start;
-
-    if (inner_scheme.end() == spec_len - 1)
-      return;
-  } else {
-    // No scheme found; that's not valid for filesystem URLs.
-    // The best we can do is return "filesystem://".
-    return;
-  }
-
-  Parsed inner_parsed;
-
-  if (CompareSchemeComponent(spec, inner_scheme, kFileScheme)) {
-    // File URLs are special.
-    ParseFileURL(inner_spec, inner_spec_len, &inner_parsed);
-  } else if (CompareSchemeComponent(spec, inner_scheme, kFileSystemScheme)) {
-    // Filesystem URLs don't nest.
-    return;
-  } else if (IsStandard(spec, inner_scheme)) {
-    // All "normal" URLs.
-    DoParseStandardURL(inner_spec, inner_spec_len, &inner_parsed);
-  } else {
-    return;
-  }
-
-  // All members of inner_parsed need to be offset by inner_start.
-  // If we had any scheme that supported nesting more than one level deep,
-  // we'd have to recurse into the inner_parsed's inner_parsed when
-  // adjusting by inner_start.
-  inner_parsed.scheme.begin += inner_start;
-  inner_parsed.username.begin += inner_start;
-  inner_parsed.password.begin += inner_start;
-  inner_parsed.host.begin += inner_start;
-  inner_parsed.port.begin += inner_start;
-  inner_parsed.query.begin += inner_start;
-  inner_parsed.ref.begin += inner_start;
-  inner_parsed.path.begin += inner_start;
-
-  // Query and ref move from inner_parsed to parsed.
-  parsed->query = inner_parsed.query;
-  inner_parsed.query.reset();
-  parsed->ref = inner_parsed.ref;
-  inner_parsed.ref.reset();
-
-  parsed->set_inner_parsed(inner_parsed);
-  if (!inner_parsed.scheme.is_valid() || !inner_parsed.path.is_valid() ||
-      inner_parsed.inner_parsed()) {
-    return;
-  }
-
-  // The path in inner_parsed should start with a slash, then have a filesystem
-  // type followed by a slash.  From the first slash up to but excluding the
-  // second should be what it keeps; the rest goes to parsed.  If the path ends
-  // before the second slash, it's still pretty clear what the user meant, so
-  // we'll let that through.
-  if (!IsURLSlash(spec[inner_parsed.path.begin])) {
-    return;
-  }
-  int inner_path_end = inner_parsed.path.begin + 1;  // skip the leading slash
-  while (inner_path_end < spec_len && !IsURLSlash(spec[inner_path_end]))
-    ++inner_path_end;
-  parsed->path.begin = inner_path_end;
-  int new_inner_path_length = inner_path_end - inner_parsed.path.begin;
-  parsed->path.len = inner_parsed.path.len - new_inner_path_length;
-  parsed->inner_parsed()->path.len = new_inner_path_length;
-}
-
-// Initializes a path URL which is merely a scheme followed by a path. Examples
-// include "about:foo" and "javascript:alert('bar');"
-void DoParsePathURL(const char* spec,
-                    int spec_len,
-                    bool trim_path_end,
-                    Parsed* parsed) {
-  // Get the non-path and non-scheme parts of the URL out of the way, we never
-  // use them.
-  parsed->username.reset();
-  parsed->password.reset();
-  parsed->host.reset();
-  parsed->port.reset();
-  parsed->path.reset();
-  parsed->query.reset();
-  parsed->ref.reset();
-
-  // Strip leading & trailing spaces and control characters.
-  int scheme_begin = 0;
-  TrimURL(spec, &scheme_begin, &spec_len, trim_path_end);
-
-  // Handle empty specs or ones that contain only whitespace or control chars.
-  if (scheme_begin == spec_len) {
-    parsed->scheme.reset();
-    parsed->path.reset();
-    return;
-  }
-
-  int path_begin;
-  // Extract the scheme, with the path being everything following. We also
-  // handle the case where there is no scheme.
-  if (ExtractScheme(&spec[scheme_begin], spec_len - scheme_begin,
-                    &parsed->scheme)) {
-    // Offset the results since we gave ExtractScheme a substring.
-    parsed->scheme.begin += scheme_begin;
-    path_begin = parsed->scheme.end() + 1;
-  } else {
-    // No scheme case.
-    parsed->scheme.reset();
-    path_begin = scheme_begin;
-  }
-
-  if (path_begin == spec_len)
-    return;
-  assert(path_begin < spec_len);
-
-  ParsePath(spec, MakeRange(path_begin, spec_len), &parsed->path,
-            &parsed->query, &parsed->ref);
-}
-
-void DoParseMailtoURL(const char* spec, int spec_len, Parsed* parsed) {
-  assert(spec_len >= 0);
-
-  // Get the non-path and non-scheme parts of the URL out of the way, we never
-  // use them.
-  parsed->username.reset();
-  parsed->password.reset();
-  parsed->host.reset();
-  parsed->port.reset();
-  parsed->ref.reset();
-  parsed->query.reset();  // May use this; reset for convenience.
-
-  // Strip leading & trailing spaces and control characters.
-  int begin = 0;
-  TrimURL(spec, &begin, &spec_len);
-
-  // Handle empty specs or ones that contain only whitespace or control chars.
-  if (begin == spec_len) {
-    parsed->scheme.reset();
-    parsed->path.reset();
-    return;
-  }
-
-  int path_begin = -1;
-  int path_end = -1;
-
-  // Extract the scheme, with the path being everything following. We also
-  // handle the case where there is no scheme.
-  if (ExtractScheme(&spec[begin], spec_len - begin, &parsed->scheme)) {
-    // Offset the results since we gave ExtractScheme a substring.
-    parsed->scheme.begin += begin;
-
-    if (parsed->scheme.end() != spec_len - 1) {
-      path_begin = parsed->scheme.end() + 1;
-      path_end = spec_len;
-    }
-  } else {
-    // No scheme found, just path.
-    parsed->scheme.reset();
-    path_begin = begin;
-    path_end = spec_len;
-  }
-
-  // Split [path_begin, path_end) into a path + query.
-  for (int i = path_begin; i < path_end; ++i) {
-    if (spec[i] == '?') {
-      parsed->query = MakeRange(i + 1, path_end);
-      path_end = i;
-      break;
-    }
-  }
-
-  // For compatability with the standard URL parser, treat no path as
-  // -1, rather than having a length of 0
-  if (path_begin == path_end) {
-    parsed->path.reset();
-  } else {
-    parsed->path = MakeRange(path_begin, path_end);
-  }
-}
-
-// Converts a port number in a string to an integer. We'd like to just call
-// sscanf but our input is not NULL-terminated, which sscanf requires. Instead,
-// we copy the digits to a small stack buffer (since we know the maximum number
-// of digits in a valid port number) that we can NULL terminate.
-int DoParsePort(const char* spec, const Component& component) {
-  // Easy success case when there is no port.
-  const int kMaxDigits = 5;
-  if (!component.is_nonempty())
-    return PORT_UNSPECIFIED;
-
-  // Skip over any leading 0s.
-  Component digits_comp(component.end(), 0);
-  for (int i = 0; i < component.len; i++) {
-    if (spec[component.begin + i] != '0') {
-      digits_comp = MakeRange(component.begin + i, component.end());
-      break;
-    }
-  }
-  if (digits_comp.len == 0)
-    return 0;  // All digits were 0.
-
-  // Verify we don't have too many digits (we'll be copying to our buffer so
-  // we need to double-check).
-  if (digits_comp.len > kMaxDigits)
-    return PORT_INVALID;
-
-  // Copy valid digits to the buffer.
-  char digits[kMaxDigits + 1];  // +1 for null terminator
-  for (int i = 0; i < digits_comp.len; i++) {
-    char ch = spec[digits_comp.begin + i];
-    if (!IsPortDigit(ch)) {
-      // Invalid port digit, fail.
-      return PORT_INVALID;
-    }
-    digits[i] = static_cast<char>(ch);
-  }
-
-  // Null-terminate the string and convert to integer. Since we guarantee
-  // only digits, atoi's lack of error handling is OK.
-  digits[digits_comp.len] = 0;
-  int port = atoi(digits);
-  if (port > 65535)
-    return PORT_INVALID;  // Out of range.
-  return port;
-}
-
-void DoExtractFileName(const char* spec,
-                       const Component& path,
-                       Component* file_name) {
-  // Handle empty paths: they have no file names.
-  if (!path.is_nonempty()) {
-    file_name->reset();
-    return;
-  }
-
-  // Extract the filename range from the path which is between
-  // the last slash and the following semicolon.
-  int file_end = path.end();
-  for (int i = path.end() - 1; i >= path.begin; i--) {
-    if (spec[i] == ';') {
-      file_end = i;
-    } else if (IsURLSlash(spec[i])) {
-      // File name is everything following this character to the end
-      *file_name = MakeRange(i + 1, file_end);
-      return;
-    }
-  }
-
-  // No slash found, this means the input was degenerate (generally paths
-  // will start with a slash). Let's call everything the file name.
-  *file_name = MakeRange(path.begin, file_end);
-  return;
-}
-
-bool DoExtractQueryKeyValue(const char* spec,
-                            Component* query,
-                            Component* key,
-                            Component* value) {
-  if (!query->is_nonempty())
-    return false;
-
-  int start = query->begin;
-  int cur = start;
-  int end = query->end();
-
-  // We assume the beginning of the input is the beginning of the "key" and we
-  // skip to the end of it.
-  key->begin = cur;
-  while (cur < end && spec[cur] != '&' && spec[cur] != '=')
-    cur++;
-  key->len = cur - key->begin;
-
-  // Skip the separator after the key (if any).
-  if (cur < end && spec[cur] == '=')
-    cur++;
-
-  // Find the value part.
-  value->begin = cur;
-  while (cur < end && spec[cur] != '&')
-    cur++;
-  value->len = cur - value->begin;
-
-  // Finally skip the next separator if any
-  if (cur < end && spec[cur] == '&')
-    cur++;
-
-  // Save the new query
-  *query = MakeRange(cur, end);
-  return true;
-}
-
-}  // namespace
-
-Parsed::Parsed() : potentially_dangling_markup(false), inner_parsed_(NULL) {}
-
-Parsed::Parsed(const Parsed& other)
-    : scheme(other.scheme),
-      username(other.username),
-      password(other.password),
-      host(other.host),
-      port(other.port),
-      path(other.path),
-      query(other.query),
-      ref(other.ref),
-      potentially_dangling_markup(other.potentially_dangling_markup),
-      inner_parsed_(NULL) {
-  if (other.inner_parsed_)
-    set_inner_parsed(*other.inner_parsed_);
-}
-
-Parsed& Parsed::operator=(const Parsed& other) {
-  if (this != &other) {
-    scheme = other.scheme;
-    username = other.username;
-    password = other.password;
-    host = other.host;
-    port = other.port;
-    path = other.path;
-    query = other.query;
-    ref = other.ref;
-    potentially_dangling_markup = other.potentially_dangling_markup;
-    if (other.inner_parsed_)
-      set_inner_parsed(*other.inner_parsed_);
-    else
-      clear_inner_parsed();
-  }
-  return *this;
-}
-
-Parsed::~Parsed() {
-  delete inner_parsed_;
-}
-
-int Parsed::Length() const {
-  if (ref.is_valid())
-    return ref.end();
-  return CountCharactersBefore(REF, false);
-}
-
-int Parsed::CountCharactersBefore(ComponentType type,
-                                  bool include_delimiter) const {
-  if (type == SCHEME)
-    return scheme.begin;
-
-  // There will be some characters after the scheme like "://" and we don't
-  // know how many. Search forwards for the next thing until we find one.
-  int cur = 0;
-  if (scheme.is_valid())
-    cur = scheme.end() + 1;  // Advance over the ':' at the end of the scheme.
-
-  if (username.is_valid()) {
-    if (type <= USERNAME)
-      return username.begin;
-    cur = username.end() + 1;  // Advance over the '@' or ':' at the end.
-  }
-
-  if (password.is_valid()) {
-    if (type <= PASSWORD)
-      return password.begin;
-    cur = password.end() + 1;  // Advance over the '@' at the end.
-  }
-
-  if (host.is_valid()) {
-    if (type <= HOST)
-      return host.begin;
-    cur = host.end();
-  }
-
-  if (port.is_valid()) {
-    if (type < PORT || (type == PORT && include_delimiter))
-      return port.begin - 1;  // Back over delimiter.
-    if (type == PORT)
-      return port.begin;  // Don't want delimiter counted.
-    cur = port.end();
-  }
-
-  if (path.is_valid()) {
-    if (type <= PATH)
-      return path.begin;
-    cur = path.end();
-  }
-
-  if (query.is_valid()) {
-    if (type < QUERY || (type == QUERY && include_delimiter))
-      return query.begin - 1;  // Back over delimiter.
-    if (type == QUERY)
-      return query.begin;  // Don't want delimiter counted.
-    cur = query.end();
-  }
-
-  if (ref.is_valid()) {
-    if (type == REF && !include_delimiter)
-      return ref.begin;  // Back over delimiter.
-
-    // When there is a ref and we get here, the component we wanted was before
-    // this and not found, so we always know the beginning of the ref is right.
-    return ref.begin - 1;  // Don't want delimiter counted.
-  }
-
-  return cur;
-}
-
-Component Parsed::GetContent() const {
-  const int begin = CountCharactersBefore(USERNAME, false);
-  const int len = Length() - begin;
-  // For compatability with the standard URL parser, we treat no content as
-  // -1, rather than having a length of 0 (we normally wouldn't care so
-  // much for these non-standard URLs).
-  return len ? Component(begin, len) : Component();
-}
-
-bool ExtractScheme(const char* url, int url_len, Component* scheme) {
-  return DoExtractScheme(url, url_len, scheme);
-}
-
-// This handles everything that may be an authority terminator, including
-// backslash. For special backslash handling see DoParseAfterScheme.
-bool IsAuthorityTerminator(char ch) {
-  return IsURLSlash(ch) || ch == '?' || ch == '#';
-}
-
-void ExtractFileName(const char* url,
-                     const Component& path,
-                     Component* file_name) {
-  DoExtractFileName(url, path, file_name);
-}
-
-bool ExtractQueryKeyValue(const char* url,
-                          Component* query,
-                          Component* key,
-                          Component* value) {
-  return DoExtractQueryKeyValue(url, query, key, value);
-}
-
-void ParseAuthority(const char* spec,
-                    const Component& auth,
-                    Component* username,
-                    Component* password,
-                    Component* hostname,
-                    Component* port_num) {
-  DoParseAuthority(spec, auth, username, password, hostname, port_num);
-}
-
-int ParsePort(const char* url, const Component& port) {
-  return DoParsePort(url, port);
-}
-
-void ParseStandardURL(const char* url, int url_len, Parsed* parsed) {
-  DoParseStandardURL(url, url_len, parsed);
-}
-
-void ParsePathURL(const char* url,
-                  int url_len,
-                  bool trim_path_end,
-                  Parsed* parsed) {
-  DoParsePathURL(url, url_len, trim_path_end, parsed);
-}
-
-void ParseFileSystemURL(const char* url, int url_len, Parsed* parsed) {
-  DoParseFileSystemURL(url, url_len, parsed);
-}
-
-void ParseMailtoURL(const char* url, int url_len, Parsed* parsed) {
-  DoParseMailtoURL(url, url_len, parsed);
-}
-
-void ParsePathInternal(const char* spec,
-                       const Component& path,
-                       Component* filepath,
-                       Component* query,
-                       Component* ref) {
-  ParsePath(spec, path, filepath, query, ref);
-}
-
-void ParseAfterScheme(const char* spec,
-                      int spec_len,
-                      int after_scheme,
-                      Parsed* parsed) {
-  DoParseAfterScheme(spec, spec_len, after_scheme, parsed);
-}
-
-}  // namespace openscreen
diff --git a/chromium/third_party/openscreen/src/third_party/mozilla/url_parse.h b/chromium/third_party/openscreen/src/third_party/mozilla/url_parse.h
deleted file mode 100644
index f00b4838328..00000000000
--- a/chromium/third_party/openscreen/src/third_party/mozilla/url_parse.h
+++ /dev/null
@@ -1,322 +0,0 @@
-// Copyright 2013 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef THIRD_PARTY_MOZILLA_URL_PARSE_H_
-#define THIRD_PARTY_MOZILLA_URL_PARSE_H_
-
-namespace openscreen {
-
-// Component ------------------------------------------------------------------
-
-// Represents a substring for URL parsing.
-struct Component {
-  Component() : begin(0), len(-1) {}
-
-  // Normal constructor: takes an offset and a length.
-  Component(int b, int l) : begin(b), len(l) {}
-
-  int end() const { return begin + len; }
-
-  // Returns true if this component is valid, meaning the length is given. Even
-  // valid components may be empty to record the fact that they exist.
-  bool is_valid() const { return (len != -1); }
-
-  // Returns true if the given component is specified on false, the component
-  // is either empty or invalid.
-  bool is_nonempty() const { return (len > 0); }
-
-  void reset() {
-    begin = 0;
-    len = -1;
-  }
-
-  bool operator==(const Component& other) const {
-    return begin == other.begin && len == other.len;
-  }
-
-  int begin;  // Byte offset in the string of this component.
-  int len;    // Will be -1 if the component is unspecified.
-};
-
-// Helper that returns a component created with the given begin and ending
-// points. The ending point is non-inclusive.
-inline Component MakeRange(int begin, int end) {
-  return Component(begin, end - begin);
-}
-
-// Parsed ---------------------------------------------------------------------
-
-// A structure that holds the identified parts of an input URL. This structure
-// does NOT store the URL itself. The caller will have to store the URL text
-// and its corresponding Parsed structure separately.
-//
-// Typical usage would be:
-//
-//    Parsed parsed;
-//    Component scheme;
-//    if (!ExtractScheme(url, url_len, &scheme))
-//      return I_CAN_NOT_FIND_THE_SCHEME_DUDE;
-//
-//    if (IsStandardScheme(url, scheme))  // Not provided by this component
-//      ParseStandardURL(url, url_len, &parsed);
-//    else if (IsFileURL(url, scheme))    // Not provided by this component
-//      ParseFileURL(url, url_len, &parsed);
-//    else
-//      ParsePathURL(url, url_len, &parsed);
-//
-struct Parsed {
-  // Identifies different components.
-  enum ComponentType {
-    SCHEME,
-    USERNAME,
-    PASSWORD,
-    HOST,
-    PORT,
-    PATH,
-    QUERY,
-    REF,
-  };
-
-  // The default constructor is sufficient for the components, but inner_parsed_
-  // requires special handling.
-  Parsed();
-  Parsed(const Parsed&);
-  Parsed& operator=(const Parsed&);
-  ~Parsed();
-
-  // Returns the length of the URL (the end of the last component).
-  //
-  // Note that for some invalid, non-canonical URLs, this may not be the length
-  // of the string. For example "http://": the parsed structure will only
-  // contain an entry for the four-character scheme, and it doesn't know about
-  // the "://". For all other last-components, it will return the real length.
-  int Length() const;
-
-  // Returns the number of characters before the given component if it exists,
-  // or where the component would be if it did exist. This will return the
-  // string length if the component would be appended to the end.
-  //
-  // Note that this can get a little funny for the port, query, and ref
-  // components which have a delimiter that is not counted as part of the
-  // component. The |include_delimiter| flag controls if you want this counted
-  // as part of the component or not when the component exists.
-  //
-  // This example shows the difference between the two flags for two of these
-  // delimited components that is present (the port and query) and one that
-  // isn't (the reference). The components that this flag affects are marked
-  // with a *.
-  //                 0         1         2
-  //                 012345678901234567890
-  // Example input:  http://foo:80/?query
-  //              include_delim=true,  ...=false  ("<-" indicates different)
-  //      SCHEME: 0                    0
-  //    USERNAME: 5                    5
-  //    PASSWORD: 5                    5
-  //        HOST: 7                    7
-  //       *PORT: 10                   11 <-
-  //        PATH: 13                   13
-  //      *QUERY: 14                   15 <-
-  //        *REF: 20                   20
-  //
-  int CountCharactersBefore(ComponentType type, bool include_delimiter) const;
-
-  // Scheme without the colon: "http://foo"/ would have a scheme of "http".
-  // The length will be -1 if no scheme is specified ("foo.com"), or 0 if there
-  // is a colon but no scheme (":foo"). Note that the scheme is not guaranteed
-  // to start at the beginning of the string if there are preceeding whitespace
-  // or control characters.
-  Component scheme;
-
-  // Username. Specified in URLs with an @ sign before the host. See |password|
-  Component username;
-
-  // Password. The length will be -1 if unspecified, 0 if specified but empty.
-  // Not all URLs with a username have a password, as in "http://me@host/".
-  // The password is separated form the username with a colon, as in
-  // "http://me:secret@host/"
-  Component password;
-
-  // Host name.
-  Component host;
-
-  // Port number.
-  Component port;
-
-  // Path, this is everything following the host name, stopping at the query of
-  // ref delimiter (if any). Length will be -1 if unspecified. This includes
-  // the preceeding slash, so the path on http://www.google.com/asdf" is
-  // "/asdf". As a result, it is impossible to have a 0 length path, it will
-  // be -1 in cases like "http://host?foo".
-  // Note that we treat backslashes the same as slashes.
-  Component path;
-
-  // Stuff between the ? and the # after the path. This does not include the
-  // preceeding ? character. Length will be -1 if unspecified, 0 if there is
-  // a question mark but no query string.
-  Component query;
-
-  // Indicated by a #, this is everything following the hash sign (not
-  // including it). If there are multiple hash signs, we'll use the last one.
-  // Length will be -1 if there is no hash sign, or 0 if there is one but
-  // nothing follows it.
-  Component ref;
-
-  // The URL spec from the character after the scheme: until the end of the
-  // URL, regardless of the scheme. This is mostly useful for 'opaque' non-
-  // hierarchical schemes like data: and javascript: as a convient way to get
-  // the string with the scheme stripped off.
-  Component GetContent() const;
-
-  // True if the URL's source contained a raw `<` character, and whitespace was
-  // removed from the URL during parsing
-  //
-  // TODO(mkwst): Link this to something in a spec if
-  // https://github.com/whatwg/url/pull/284 lands.
-  bool potentially_dangling_markup;
-
-  // This is used for nested URL types, currently only filesystem.  If you
-  // parse a filesystem URL, the resulting Parsed will have a nested
-  // inner_parsed_ to hold the parsed inner URL's component information.
-  // For all other url types [including the inner URL], it will be NULL.
-  Parsed* inner_parsed() const { return inner_parsed_; }
-
-  void set_inner_parsed(const Parsed& inner_parsed) {
-    if (!inner_parsed_)
-      inner_parsed_ = new Parsed(inner_parsed);
-    else
-      *inner_parsed_ = inner_parsed;
-  }
-
-  void clear_inner_parsed() {
-    if (inner_parsed_) {
-      delete inner_parsed_;
-      inner_parsed_ = nullptr;
-    }
-  }
-
- private:
-  Parsed* inner_parsed_;  // This object is owned and managed by this struct.
-};
-
-// Initialization functions ---------------------------------------------------
-//
-// These functions parse the given URL, filling in all of the structure's
-// components. These functions can not fail, they will always do their best
-// at interpreting the input given.
-//
-// The string length of the URL MUST be specified, we do not check for NULLs
-// at any point in the process, and will actually handle embedded NULLs.
-//
-// IMPORTANT: These functions do NOT hang on to the given pointer or copy it
-// in any way. See the comment above the struct.
-//
-// The 8-bit versions require UTF-8 encoding.
-
-// StandardURL is for when the scheme is known to be one that has an
-// authority (host) like "http". This function will not handle weird ones
-// like "about:" and "javascript:", or do the right thing for "file:" URLs.
-void ParseStandardURL(const char* url, int url_len, Parsed* parsed);
-
-// PathURL is for when the scheme is known not to have an authority (host)
-// section but that aren't file URLs either. The scheme is parsed, and
-// everything after the scheme is considered as the path. This is used for
-// things like "about:" and "javascript:"
-void ParsePathURL(const char* url,
-                  int url_len,
-                  bool trim_path_end,
-                  Parsed* parsed);
-
-// FileURL is for file URLs. There are some special rules for interpreting
-// these.
-void ParseFileURL(const char* url, int url_len, Parsed* parsed);
-
-// Filesystem URLs are structured differently than other URLs.
-void ParseFileSystemURL(const char* url, int url_len, Parsed* parsed);
-
-// MailtoURL is for mailto: urls. They are made up scheme,path,query
-void ParseMailtoURL(const char* url, int url_len, Parsed* parsed);
-
-// Helper functions -----------------------------------------------------------
-
-// Locates the scheme according to the URL  parser's rules. This function is
-// designed so the caller can find the scheme and call the correct Init*
-// function according to their known scheme types.
-//
-// It also does not perform any validation on the scheme.
-//
-// This function will return true if the scheme is found and will put the
-// scheme's range into *scheme. False means no scheme could be found. Note
-// that a URL beginning with a colon has a scheme, but it is empty, so this
-// function will return true but *scheme will = (0,0).
-//
-// The scheme is found by skipping spaces and control characters at the
-// beginning, and taking everything from there to the first colon to be the
-// scheme. The character at scheme.end() will be the colon (we may enhance
-// this to handle full width colons or something, so don't count on the
-// actual character value). The character at scheme.end()+1 will be the
-// beginning of the rest of the URL, be it the authority or the path (or the
-// end of the string).
-//
-// The 8-bit version requires UTF-8 encoding.
-bool ExtractScheme(const char* url, int url_len, Component* scheme);
-
-// Returns true if ch is a character that terminates the authority segment
-// of a URL.
-bool IsAuthorityTerminator(char ch);
-
-// Does a best effort parse of input |spec|, in range |auth|. If a particular
-// component is not found, it will be set to invalid.
-void ParseAuthority(const char* spec,
-                    const Component& auth,
-                    Component* username,
-                    Component* password,
-                    Component* hostname,
-                    Component* port_num);
-
-// Computes the integer port value from the given port component. The port
-// component should have been identified by one of the init functions on
-// |Parsed| for the given input url.
-//
-// The return value will be a positive integer between 0 and 64K, or one of
-// the two special values below.
-enum SpecialPort { PORT_UNSPECIFIED = -1, PORT_INVALID = -2 };
-int ParsePort(const char* url, const Component& port);
-
-// Extracts the range of the file name in the given url. The path must
-// already have been computed by the parse function, and the matching URL
-// and extracted path are provided to this function. The filename is
-// defined as being everything from the last slash/backslash of the path
-// to the end of the path.
-//
-// The file name will be empty if the path is empty or there is nothing
-// following the last slash.
-//
-// The 8-bit version requires UTF-8 encoding.
-void ExtractFileName(const char* url,
-                     const Component& path,
-                     Component* file_name);
-
-// Extract the first key/value from the range defined by |*query|. Updates
-// |*query| to start at the end of the extracted key/value pair. This is
-// designed for use in a loop: you can keep calling it with the same query
-// object and it will iterate over all items in the query.
-//
-// Some key/value pairs may have the key, the value, or both be empty (for
-// example, the query string "?&"). These will be returned. Note that an empty
-// last parameter "foo.com?" or foo.com?a&" will not be returned, this case
-// is the same as "done."
-//
-// The initial query component should not include the '?' (this is the default
-// for parsed URLs).
-//
-// If no key/value are found |*key| and |*value| will be unchanged and it will
-// return false.
-bool ExtractQueryKeyValue(const char* url,
-                          Component* query,
-                          Component* key,
-                          Component* value);
-
-}  // namespace openscreen
-
-#endif  // THIRD_PARTY_MOZILLA_URL_PARSE_H_
diff --git a/chromium/third_party/openscreen/src/third_party/mozilla/url_parse_internal.cc b/chromium/third_party/openscreen/src/third_party/mozilla/url_parse_internal.cc
deleted file mode 100644
index 5e138a75486..00000000000
--- a/chromium/third_party/openscreen/src/third_party/mozilla/url_parse_internal.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2020 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "third_party/mozilla//url_parse_internal.h"
-
-#include <ctype.h>
-
-#include "third_party/mozilla/url_parse.h"
-
-namespace openscreen {
-
-namespace {
-
-static const char* g_standard_schemes[] = {
-    kHttpsScheme, kHttpScheme, kFileScheme, kFtpScheme, kWssScheme, kWsScheme,
-};
-
-}  // namespace
-
-bool IsURLSlash(char ch) {
-  return ch == '/' || ch == '\\';
-}
-
-bool ShouldTrimFromURL(char ch) {
-  return ch <= ' ';
-}
-
-void TrimURL(const char* spec, int* begin, int* len, bool trim_path_end) {
-  // Strip leading whitespace and control characters.
-  while (*begin < *len && ShouldTrimFromURL(spec[*begin])) {
-    (*begin)++;
-  }
-
-  if (trim_path_end) {
-    // Strip trailing whitespace and control characters. We need the >i test
-    // for when the input string is all blanks; we don't want to back past the
-    // input.
-    while (*len > *begin && ShouldTrimFromURL(spec[*len - 1])) {
-      (*len)--;
-    }
-  }
-}
-
-int CountConsecutiveSlashes(const char* str, int begin_offset, int str_len) {
-  int count = 0;
-  while ((begin_offset + count) < str_len &&
-         IsURLSlash(str[begin_offset + count])) {
-    ++count;
-  }
-  return count;
-}
-
-bool CompareSchemeComponent(const char* spec,
-                            const Component& component,
-                            const char* compare_to) {
-  if (!component.is_nonempty()) {
-    return compare_to[0] == 0;  // When component is empty, match empty scheme.
-  }
-  for (int i = 0; i < component.len; ++i) {
-    if (tolower(spec[i]) != compare_to[i]) {
-      return false;
-    }
-  }
-  return true;
-}
-
-bool IsStandard(const char* spec, const Component& component) {
-  if (!component.is_nonempty()) {
-    return false;
-  }
-
-  constexpr int scheme_count =
-      sizeof(g_standard_schemes) / sizeof(g_standard_schemes[0]);
-  for (int i = 0; i < scheme_count; ++i) {
-    if (CompareSchemeComponent(spec, component, g_standard_schemes[i])) {
-      return true;
-    }
-  }
-  return false;
-}
-
-// NOTE: Not implemented because file URLs are currently unsupported.
-void ParseFileURL(const char* url, int url_len, Parsed* parsed) {}
-
-}  // namespace openscreen
diff --git a/chromium/third_party/openscreen/src/third_party/mozilla/url_parse_internal.h b/chromium/third_party/openscreen/src/third_party/mozilla/url_parse_internal.h
deleted file mode 100644
index 766a458bfee..00000000000
--- a/chromium/third_party/openscreen/src/third_party/mozilla/url_parse_internal.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2020 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef THIRD_PARTY_MOZILLA_URL_PARSE_INTERNAL_H_
-#define THIRD_PARTY_MOZILLA_URL_PARSE_INTERNAL_H_
-
-namespace openscreen {
-
-struct Component;
-
-static constexpr char kHttpsScheme[] = "https";
-static constexpr char kHttpScheme[] = "http";
-static constexpr char kFileScheme[] = "file";
-static constexpr char kFtpScheme[] = "ftp";
-static constexpr char kWssScheme[] = "wss";
-static constexpr char kWsScheme[] = "ws";
-static constexpr char kFileSystemScheme[] = "filesystem";
-static constexpr char kMailtoScheme[] = "mailto";
-
-// Returns whether the character |ch| should be treated as a slash.
-bool IsURLSlash(char ch);
-
-// Returns whether the character |ch| can be safely removed for the URL.
-bool ShouldTrimFromURL(char ch);
-
-// Given an already-initialized begin index and length, this shrinks the range
-// to eliminate "should-be-trimmed" characters. Note that the length does *not*
-// indicate the length of untrimmed data from |*begin|, but rather the position
-// in the input string (so the string starts at character |*begin| in the spec,
-// and goes until |*len|).
-void TrimURL(const char* spec, int* begin, int* len, bool trim_path_end = true);
-
-// Returns the number of consecutive slashes in |str| starting from offset
-// |begin_offset|.
-int CountConsecutiveSlashes(const char* str, int begin_offset, int str_len);
-
-// Given a string and a range inside the string, compares it to the given
-// lower-case |compare_to| buffer.
-bool CompareSchemeComponent(const char* spec,
-                            const Component& component,
-                            const char* compare_to);
-
-// Returns whether the scheme given by (spec, component) is a standard scheme
-// (i.e. https://url.spec.whatwg.org/#special-scheme).
-bool IsStandard(const char* spec, const Component& component);
-
-}  // namespace openscreen
-
-#endif  // THIRD_PARTY_MOZILLA_URL_PARSE_INTERNAL_H_
diff --git a/chromium/third_party/openscreen/src/third_party/quiche/BUILD.gn b/chromium/third_party/openscreen/src/third_party/quiche/BUILD.gn
index 2693745a7d7..3beef70f9cb 100644
--- a/chromium/third_party/openscreen/src/third_party/quiche/BUILD.gn
+++ b/chromium/third_party/openscreen/src/third_party/quiche/BUILD.gn
@@ -50,6 +50,7 @@ if (build_with_chromium) {
     public_deps = [
       ":net_quic_proto",
       "//third_party/abseil",
+      "//third_party/abseil:abseil_quiche",
       "//third_party/boringssl",
       "//third_party/googleurl",
     ]
diff --git a/chromium/third_party/openscreen/src/tools/cddl/codegen.cc b/chromium/third_party/openscreen/src/tools/cddl/codegen.cc
index d53554a118f..84699b1d97e 100644
--- a/chromium/third_party/openscreen/src/tools/cddl/codegen.cc
+++ b/chromium/third_party/openscreen/src/tools/cddl/codegen.cc
@@ -8,6 +8,7 @@
 #include <iostream>
 #include <limits>
 #include <memory>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <string>
@@ -15,7 +16,6 @@
 #include <vector>
 
 #include "absl/algorithm/container.h"
-#include "absl/types/optional.h"
 
 // Convert '-' to '_' to use a CDDL identifier as a C identifier.
 std::string ToUnderscoreId(const std::string& x) {
@@ -354,7 +354,7 @@ bool WriteTypeDefinition(int fd, const CppType& type) {
     } break;
     case CppType::Which::kStruct: {
       dprintf(fd, "\nstruct %s {\n", name.c_str());
-      if (type.type_key != absl::nullopt) {
+      if (type.type_key != std::nullopt) {
         dprintf(fd, "  // type key: %" PRIu64 "\n", type.type_key.value());
       }
       dprintf(fd, "  bool operator==(const %s& other) const;\n", name.c_str());
@@ -854,7 +854,7 @@ uint8_t GetByte(uint64_t value, size_t byte) {
 }
 
 std::string GetEncodedTypeKey(const CppType& type) {
-  if (type.type_key == absl::nullopt) {
+  if (type.type_key == std::nullopt) {
     return "";
   }
 
@@ -1518,8 +1518,7 @@ bool WriteHeaderPrologue(int fd, const std::string& header_filename) {
 
 #include "third_party/tinycbor/src/src/cbor.h"
 
-namespace openscreen {
-namespace msgs {
+namespace openscreen::msgs {
 
 enum CborErrors {
   kParserEOF = -CborErrorUnexpectedEOF,
@@ -1567,8 +1566,7 @@ class CborEncodeBuffer {
 CborError ExpectKey(CborValue* it, const uint64_t key);
 CborError ExpectKey(CborValue* it, const char* key, size_t key_length);
 
-}  // namespace msgs
-}  // namespace openscreen
+}  // namespace openscreen::msgs
 #endif  // %s)";
   std::string header_guard = ToHeaderGuard(header_filename);
   dprintf(fd, epilogue, header_guard.c_str());
@@ -1582,8 +1580,7 @@ bool WriteSourcePrologue(int fd, const std::string& header_filename) {
 #include "third_party/tinycbor/src/src/utf8_p.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace msgs {
+namespace openscreen::msgs {
 namespace {
 
 /*
@@ -1707,8 +1704,7 @@ bool IsError(ssize_t x) {
 
 bool WriteSourceEpilogue(int fd) {
   static const char epilogue[] = R"(
-}  // namespace msgs
-}  // namespace openscreen)";
+}  // namespace openscreen::msgs)";
   dprintf(fd, epilogue);
   return true;
 }
diff --git a/chromium/third_party/openscreen/src/tools/cddl/parse.cc b/chromium/third_party/openscreen/src/tools/cddl/parse.cc
index 2f0c43a77b4..135018cd477 100644
--- a/chromium/third_party/openscreen/src/tools/cddl/parse.cc
+++ b/chromium/third_party/openscreen/src/tools/cddl/parse.cc
@@ -15,10 +15,9 @@
 
 #include "absl/strings/ascii.h"
 #include "absl/strings/match.h"
-#include "absl/types/optional.h"
 #include "tools/cddl/logging.h"
 
-static_assert(sizeof(absl::string_view::size_type) == sizeof(size_t),
+static_assert(sizeof(std::string_view::size_type) == sizeof(size_t),
               "We assume string_view's size_type is the same as size_t. If "
               "not, the following file needs to be refactored");
 
@@ -33,7 +32,7 @@ struct Parser {
 
 AstNode* AddNode(Parser* p,
                  AstNode::Type type,
-                 absl::string_view text,
+                 std::string_view text,
                  AstNode* children = nullptr) {
   p->nodes.emplace_back(new AstNode);
   AstNode* node = p->nodes.back().get();
@@ -61,7 +60,7 @@ bool IsWhitespaceOrSemicolon(char c) {
   return c == ' ' || c == ';' || c == '\r' || c == '\n';
 }
 
-absl::string_view SkipNewline(absl::string_view view) {
+std::string_view SkipNewline(std::string_view view) {
   size_t index = 0;
   while (IsNewline(view[index])) {
     ++index;
@@ -71,7 +70,7 @@ absl::string_view SkipNewline(absl::string_view view) {
 }
 
 // Skips over a comment that makes up the remainder of the current line.
-absl::string_view SkipComment(absl::string_view view) {
+std::string_view SkipComment(std::string_view view) {
   size_t index = 0;
   if (view[index] == ';') {
     ++index;
@@ -94,8 +93,8 @@ void SkipWhitespace(Parser* p, bool skip_comments = true) {
     return;
   }
 
-  absl::string_view view = p->data;
-  absl::string_view new_view;
+  std::string_view view = p->data;
+  std::string_view new_view;
 
   while (true) {
     new_view = SkipComment(view);
@@ -159,7 +158,7 @@ AstNode* ParseType(Parser* p, bool skip_comments = true);
 AstNode* ParseId(Parser* p);
 
 void SkipUint(Parser* p) {
-  absl::string_view view = p->data;
+  std::string_view view = p->data;
 
   bool is_binary = false;
   size_t index = 0;
@@ -196,7 +195,7 @@ AstNode* ParseNumber(Parser* p) {
 
   AstNode* node =
       AddNode(p, AstNode::Type::kNumber,
-              absl::string_view(p->data, p_speculative.data - p->data));
+              std::string_view(p->data, p_speculative.data - p->data));
   p->data = p_speculative.data;
   std::move(p_speculative.nodes.begin(), p_speculative.nodes.end(),
             std::back_inserter(p->nodes));
@@ -249,21 +248,21 @@ AstNode* ParseOccur(Parser* p) {
 
   AstNode* node =
       AddNode(p, AstNode::Type::kOccur,
-              absl::string_view(p->data, p_speculative.data - p->data));
+              std::string_view(p->data, p_speculative.data - p->data));
   p->data = p_speculative.data;
   return node;
 }
 
-absl::optional<std::string> ParseTypeKeyFromComment(Parser* p) {
+std::optional<std::string> ParseTypeKeyFromComment(Parser* p) {
   Parser p_speculative{p->data};
   if (!TrySkipCharacter(&p_speculative, ';')) {
-    return absl::nullopt;
+    return std::nullopt;
   }
 
   SkipWhitespace(&p_speculative, false);
   const char kTypeKeyPrefix[] = "type key";
   if (!absl::StartsWith(p_speculative.data, kTypeKeyPrefix)) {
-    return absl::nullopt;
+    return std::nullopt;
   }
   p_speculative.data += strlen(kTypeKeyPrefix);
 
@@ -271,8 +270,8 @@ absl::optional<std::string> ParseTypeKeyFromComment(Parser* p) {
   Parser p_speculative2{p_speculative.data};
   for (; absl::ascii_isdigit(p_speculative2.data[0]); p_speculative2.data++) {
   }
-  auto result = absl::string_view(p_speculative.data,
-                                  p_speculative2.data - p_speculative.data);
+  auto result = std::string_view(p_speculative.data,
+                                 p_speculative2.data - p_speculative.data);
   p->data = p_speculative2.data;
   return std::string(result.data()).substr(0, result.length());
 }
@@ -316,7 +315,7 @@ AstNode* ParseMemberKey1(Parser* p) {
   }
   AstNode* node =
       AddNode(p, AstNode::Type::kMemberKey,
-              absl::string_view(p->data, p_speculative.data - p->data));
+              std::string_view(p->data, p_speculative.data - p->data));
   p->data = p_speculative.data;
   std::move(p_speculative.nodes.begin(), p_speculative.nodes.end(),
             std::back_inserter(p->nodes));
@@ -338,7 +337,7 @@ AstNode* ParseMemberKey2(Parser* p) {
 
   AstNode* node =
       AddNode(p, AstNode::Type::kMemberKey,
-              absl::string_view(p->data, p_speculative.data - p->data), id);
+              std::string_view(p->data, p_speculative.data - p->data), id);
   p->data = p_speculative.data;
   std::move(p_speculative.nodes.begin(), p_speculative.nodes.end(),
             std::back_inserter(p->nodes));
@@ -359,7 +358,7 @@ AstNode* ParseMemberKey3(Parser* p) {
   }
   AstNode* node =
       AddNode(p, AstNode::Type::kMemberKey,
-              absl::string_view(p->data, p_speculative.data - p->data), value);
+              std::string_view(p->data, p_speculative.data - p->data), value);
   p->data = p_speculative.data;
   std::move(p_speculative.nodes.begin(), p_speculative.nodes.end(),
             std::back_inserter(p->nodes));
@@ -397,7 +396,7 @@ AstNode* ParseGroupChoice(Parser* p) {
   Parser p_speculative{p->data};
   AstNode* tail = nullptr;
   AstNode* group_node =
-      AddNode(&p_speculative, AstNode::Type::kGrpchoice, absl::string_view());
+      AddNode(&p_speculative, AstNode::Type::kGrpchoice, std::string_view());
   const char* group_node_text = p_speculative.data;
   while (true) {
     const char* orig = p_speculative.data;
@@ -434,13 +433,13 @@ AstNode* ParseGroup(Parser* p) {
     return nullptr;
   }
   return AddNode(p, AstNode::Type::kGroup,
-                 absl::string_view(orig, p->data - orig), group_choice);
+                 std::string_view(orig, p->data - orig), group_choice);
 }
 
 // Parse optional range operator .. (inlcusive) or ... (exclusive)
 // ABNF rule: rangeop = "..." / ".."
 AstNode* ParseRangeop(Parser* p) {
-  absl::string_view view(p->data);
+  std::string_view view(p->data);
   if (absl::StartsWith(view, "...")) {
     // rangeop ...
     p->data += 3;
@@ -456,7 +455,7 @@ AstNode* ParseRangeop(Parser* p) {
 // Parse optional control operator .id
 // ABNF rule: ctlop = "." id
 AstNode* ParseCtlop(Parser* p) {
-  absl::string_view view(p->data);
+  std::string_view view(p->data);
   if (!absl::StartsWith(view, ".")) {
     return nullptr;
   }
@@ -472,7 +471,7 @@ AstNode* ParseCtlop(Parser* p) {
 AstNode* ParseType2(Parser* p) {
   const char* orig = p->data;
   const char* it = p->data;
-  AstNode* node = AddNode(p, AstNode::Type::kType2, absl::string_view());
+  AstNode* node = AddNode(p, AstNode::Type::kType2, std::string_view());
   if (IsValue(it[0])) {
     AstNode* value = ParseValue(p);
     if (!value) {
@@ -660,7 +659,7 @@ AstNode* ParseType1(Parser* p) {
     rangeop_or_ctlop->sibling = param;
   }
   return AddNode(p, AstNode::Type::kType1,
-                 absl::string_view(orig, p->data - orig), type2);
+                 std::string_view(orig, p->data - orig), type2);
 }
 
 // Different valid types for a call are specified as type1 / type2, so we split
@@ -692,7 +691,7 @@ AstNode* ParseType(Parser* p, bool skip_comments) {
   // Create a new AstNode with all parsed types.
   AstNode* node =
       AddNode(p, AstNode::Type::kType,
-              absl::string_view(p->data, p_speculative.data - p->data), type1);
+              std::string_view(p->data, p_speculative.data - p->data), type1);
   p->data = p_speculative.data;
   std::move(p_speculative.nodes.begin(), p_speculative.nodes.end(),
             std::back_inserter(p->nodes));
@@ -725,7 +724,7 @@ AstNode* ParseId(Parser* p) {
 
   // Create and return a new node with the parsed data.
   AstNode* node =
-      AddNode(p, AstNode::Type::kId, absl::string_view(p->data, it - p->data));
+      AddNode(p, AstNode::Type::kId, std::string_view(p->data, it - p->data));
   p->data = it;
   return node;
 }
@@ -735,7 +734,7 @@ AstNode* UpdateNodesForGroupEntry(Parser* p,
                                   AstNode* occur,
                                   AstNode* member_key,
                                   AstNode* type) {
-  AstNode* node = AddNode(p, AstNode::Type::kGrpent, absl::string_view());
+  AstNode* node = AddNode(p, AstNode::Type::kGrpent, std::string_view());
   if (occur) {
     node->children = occur;
     if (member_key) {
@@ -830,7 +829,7 @@ AstNode* ParseGroupEntryWithGroupReference(Parser* p) {
   }
 
   // Create a new node containing this sub-group reference.
-  AstNode* node = AddNode(p, AstNode::Type::kGrpent, absl::string_view());
+  AstNode* node = AddNode(p, AstNode::Type::kGrpent, std::string_view());
   if (occur) {
     occur->sibling = id;
     node->children = occur;
@@ -867,7 +866,7 @@ AstNode* ParseGroupEntryWithInlineGroupDefinition(Parser* p) {
     return nullptr;
   }
   ++p_speculative.data;
-  AstNode* node = AddNode(p, AstNode::Type::kGrpent, absl::string_view());
+  AstNode* node = AddNode(p, AstNode::Type::kGrpent, std::string_view());
   if (occur) {
     node->children = occur;
     occur->sibling = group;
@@ -911,7 +910,7 @@ AstNode* ParseRule(Parser* p) {
   const char* start = p->data;
 
   // Parse the type key, if it's present
-  absl::optional<std::string> type_key = ParseTypeKeyFromComment(p);
+  std::optional<std::string> type_key = ParseTypeKeyFromComment(p);
   SkipWhitespace(p);
 
   // Use the parser to extract the id and data.
@@ -935,13 +934,12 @@ AstNode* ParseRule(Parser* p) {
     Logger::Error("No assignment operator found! assign_type: %d", assign_type);
     return nullptr;
   }
-  AstNode* assign_node = AddNode(
-      p,
-      (assign_type == AssignType::kAssign)
-          ? AstNode::Type::kAssign
-          : (assign_type == AssignType::kAssignT) ? AstNode::Type::kAssignT
-                                                  : AstNode::Type::kAssignG,
-      absl::string_view(assign_start, p->data - assign_start));
+  AstNode* assign_node =
+      AddNode(p,
+              (assign_type == AssignType::kAssign)    ? AstNode::Type::kAssign
+              : (assign_type == AssignType::kAssignT) ? AstNode::Type::kAssignT
+                                                      : AstNode::Type::kAssignG,
+              std::string_view(assign_start, p->data - assign_start));
   id->sibling = assign_node;
 
   // Parse the object type being assigned.
@@ -961,13 +959,13 @@ AstNode* ParseRule(Parser* p) {
 
   // Return the results.
   auto rule_node = AddNode(p, AstNode::Type::kRule,
-                           absl::string_view(start, p->data - start), id);
+                           std::string_view(start, p->data - start), id);
   rule_node->type_key = type_key;
   return rule_node;
 }
 
 // Iteratively parse the CDDL spec into a tree structure.
-ParseResult ParseCddl(absl::string_view data) {
+ParseResult ParseCddl(std::string_view data) {
   if (data[0] == 0) {
     return {nullptr, {}};
   }
@@ -1082,14 +1080,14 @@ void DumpAst(AstNode* node, int indent_level) {
         node_text += "kOther";
         break;
     }
-    if (node->type_key != absl::nullopt) {
+    if (node->type_key != std::nullopt) {
       node_text += " (type key=\"" + node->type_key.value() + "\")";
     }
     node_text += ": ";
 
     // Print the contents.
     int size = static_cast<int>(node->text.size());
-    absl::string_view text = node->text.data();
+    std::string_view text = node->text.data();
     for (int i = 0; i < size; ++i) {
       if (text[i] == ' ' || text[i] == '\n') {
         node_text += " ";
diff --git a/chromium/third_party/openscreen/src/tools/cddl/parse.h b/chromium/third_party/openscreen/src/tools/cddl/parse.h
index 7215e1475a8..85ff5ce48d3 100644
--- a/chromium/third_party/openscreen/src/tools/cddl/parse.h
+++ b/chromium/third_party/openscreen/src/tools/cddl/parse.h
@@ -9,12 +9,11 @@
 
 #include <iostream>
 #include <memory>
+#include <optional>
 #include <string>
+#include <string_view>
 #include <vector>
 
-#include "absl/strings/string_view.h"
-#include "absl/types/optional.h"
-
 struct AstNode {
   // These types all correspond to types in the grammar, which can be found in
   // grammar.abnf.
@@ -62,7 +61,7 @@ struct AstNode {
   std::string integer_member_key_text;
 
   // Text parsed from the CDDL spec for the type key.
-  absl::optional<std::string> type_key;
+  std::optional<std::string> type_key;
 };
 
 // Override for << operator to simplify logging.
@@ -151,7 +150,7 @@ struct ParseResult {
   std::vector<std::unique_ptr<AstNode>> nodes;
 };
 
-ParseResult ParseCddl(absl::string_view data);
+ParseResult ParseCddl(std::string_view data);
 void DumpAst(AstNode* node, int indent_level = 0);
 
 #endif  // TOOLS_CDDL_PARSE_H_
diff --git a/chromium/third_party/openscreen/src/tools/cddl/sema.cc b/chromium/third_party/openscreen/src/tools/cddl/sema.cc
index a8e51a426b6..5004cc89cc7 100644
--- a/chromium/third_party/openscreen/src/tools/cddl/sema.cc
+++ b/chromium/third_party/openscreen/src/tools/cddl/sema.cc
@@ -13,19 +13,18 @@
 #include <map>
 #include <memory>
 #include <string>
+#include <string_view>
 #include <unordered_set>
 #include <vector>
 
 #include "absl/algorithm/container.h"
 #include "absl/strings/numbers.h"
-#include "absl/strings/string_view.h"
-#include "absl/types/optional.h"
 #include "tools/cddl/logging.h"
 
 std::vector<CppType*> CppSymbolTable::TypesWithId() {
   if (!this->TypesWithId_.size()) {
     for (const std::unique_ptr<CppType>& ptr : this->cpp_types) {
-      if (ptr->type_key == absl::nullopt) {
+      if (ptr->type_key == std::nullopt) {
         continue;
       }
       this->TypesWithId_.emplace_back(ptr.get());
@@ -127,7 +126,7 @@ void CppType::InitBytes() {
   which = Which::kBytes;
 }
 
-void InitString(std::string* s, absl::string_view value) {
+void InitString(std::string* s, std::string_view value) {
   new (s) std::string(value);
 }
 
@@ -352,14 +351,14 @@ CddlGroup* AnalyzeGroup(CddlSymbolTable* table, const AstNode& group) {
 // be parsed.
 // TODO(issuetracker.google.com/281741443): Add support for hex and binary
 // options.
-absl::optional<uint64_t> ParseOptionalUint(const std::string& text) {
+std::optional<uint64_t> ParseOptionalUint(const std::string& text) {
   if (text == "0") {
     return 0;
   }
 
   uint64_t parsed = std::strtoul(text.c_str(), nullptr, 10);
   if (!parsed) {
-    return absl::nullopt;
+    return std::nullopt;
   }
   return parsed;
 }
@@ -460,7 +459,7 @@ std::pair<bool, CddlSymbolTable> BuildSymbolTable(const AstNode& rules) {
       return result;
     }
     bool is_type = node->type == AstNode::Type::kTypename;
-    absl::string_view name = node->text;
+    std::string_view name = node->text;
 
     // Ensure that the node is assignment.
     node = node->sibling;
@@ -474,9 +473,9 @@ std::pair<bool, CddlSymbolTable> BuildSymbolTable(const AstNode& rules) {
     node = node->sibling;
     if (is_type) {
       CddlType* type = AnalyzeType(&table, *node);
-      if (rule->type_key != absl::nullopt) {
+      if (rule->type_key != std::nullopt) {
         auto parsed_type_key = ParseOptionalUint(rule->type_key.value());
-        if (parsed_type_key == absl::nullopt) {
+        if (parsed_type_key == std::nullopt) {
           return result;
         }
         type->type_key = parsed_type_key.value();
@@ -826,8 +825,8 @@ bool ValidateCppTypes(const CppSymbolTable& cpp_symbols) {
       });
 }
 
-std::string DumpTypeKey(absl::optional<uint64_t> key) {
-  if (key != absl::nullopt) {
+std::string DumpTypeKey(std::optional<uint64_t> key) {
+  if (key != std::nullopt) {
     return " (type key=\"" + std::to_string(key.value()) + "\")";
   }
   return "";
diff --git a/chromium/third_party/openscreen/src/tools/cddl/sema.h b/chromium/third_party/openscreen/src/tools/cddl/sema.h
index 10e4939ad53..c58d45d0215 100644
--- a/chromium/third_party/openscreen/src/tools/cddl/sema.h
+++ b/chromium/third_party/openscreen/src/tools/cddl/sema.h
@@ -10,12 +10,12 @@
 #include <limits>
 #include <map>
 #include <memory>
+#include <optional>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "absl/algorithm/container.h"
-#include "absl/types/optional.h"
 #include "tools/cddl/parse.h"
 
 struct CddlGroup;
@@ -85,7 +85,7 @@ struct CddlType {
 
   Op op;
   CddlType* constraint_type;
-  absl::optional<uint64_t> type_key;
+  std::optional<uint64_t> type_key;
 };
 
 // Override for << operator to simplify logging.
@@ -133,7 +133,7 @@ struct CddlGroup {
     };
     struct EntryType {
       std::string opt_key;
-      absl::optional<uint64_t> integer_key;
+      std::optional<uint64_t> integer_key;
       CddlType* value;
     };
     Entry();
@@ -253,7 +253,7 @@ struct CppType {
       // Constructs a new CppMember from the required fields. This constructor
       // is needed for vector::emplace_back(...).
       CppMember(std::string name,
-                absl::optional<uint64_t> integer_key,
+                std::optional<uint64_t> integer_key,
                 CppType* type) {
         this->name = std::move(name);
         this->integer_key = integer_key;
@@ -265,7 +265,7 @@ struct CppType {
 
       // When present, this key is used in place of the name for serialialized
       // messages. This should only be the case for integer-keyed group entries.
-      absl::optional<uint64_t> integer_key;
+      std::optional<uint64_t> integer_key;
 
       // C++ Type this member represents.
       CppType* type;
@@ -283,7 +283,7 @@ struct CppType {
   };
 
   struct Bytes {
-    absl::optional<size_t> fixed_size;
+    std::optional<size_t> fixed_size;
   };
 
   struct TaggedType {
@@ -302,7 +302,7 @@ struct CppType {
 
   Which which = Which::kUninitialized;
   std::string name;
-  absl::optional<uint64_t> type_key;
+  std::optional<uint64_t> type_key;
   union {
     Vector vector_type;
     Enum enum_type;
diff --git a/chromium/third_party/openscreen/src/util/BUILD.gn b/chromium/third_party/openscreen/src/util/BUILD.gn
index 050165ed11a..1d8cb8bf162 100644
--- a/chromium/third_party/openscreen/src/util/BUILD.gn
+++ b/chromium/third_party/openscreen/src/util/BUILD.gn
@@ -51,6 +51,7 @@ source_set("base") {
     "json/json_value.cc",
     "simple_fraction.cc",
     "span_util.cc",
+    "std_util.cc",
     "stringprintf.cc",
     "url.cc",
     "yet_another_bit_vector.cc",
@@ -64,7 +65,7 @@ source_set("base") {
   ]
 
   deps = [
-    "../third_party/mozilla",
+    "../third_party/googleurl",
 
     # We do a clone of Chrome's modp_b64 in order to share their BUILD.gn
     # and license files, so this should always be an absolute reference.
diff --git a/chromium/third_party/openscreen/src/util/DEPS b/chromium/third_party/openscreen/src/util/DEPS
index a359638ec30..c4a4cd99d8f 100644
--- a/chromium/third_party/openscreen/src/util/DEPS
+++ b/chromium/third_party/openscreen/src/util/DEPS
@@ -4,4 +4,5 @@
 
 include_rules = [
     '+platform/api',
+    '+url',
 ]
diff --git a/chromium/third_party/openscreen/src/util/base64.cc b/chromium/third_party/openscreen/src/util/base64.cc
index f48915a7800..6d3ca98ddf8 100644
--- a/chromium/third_party/openscreen/src/util/base64.cc
+++ b/chromium/third_party/openscreen/src/util/base64.cc
@@ -14,15 +14,14 @@
 #include "util/osp_logging.h"
 #include "util/std_util.h"
 
-namespace openscreen {
-namespace base64 {
+namespace openscreen::base64 {
 
 std::string Encode(ByteView input) {
-  return Encode(absl::string_view(reinterpret_cast<const char*>(input.data()),
-                                  input.size()));
+  return Encode(std::string_view(reinterpret_cast<const char*>(input.data()),
+                                 input.size()));
 }
 
-std::string Encode(absl::string_view input) {
+std::string Encode(std::string_view input) {
   std::string out;
   out.resize(modp_b64_encode_len(input.size()));
 
@@ -37,7 +36,7 @@ std::string Encode(absl::string_view input) {
   return out;
 }
 
-bool Decode(absl::string_view input, std::vector<uint8_t>* output) {
+bool Decode(std::string_view input, std::vector<uint8_t>* output) {
   std::vector<uint8_t> out(modp_b64_decode_len(input.size()));
 
   const size_t output_size = modp_b64_decode(
@@ -52,5 +51,4 @@ bool Decode(absl::string_view input, std::vector<uint8_t>* output) {
   return true;
 }
 
-}  // namespace base64
-}  // namespace openscreen
+}  // namespace openscreen::base64
diff --git a/chromium/third_party/openscreen/src/util/base64.h b/chromium/third_party/openscreen/src/util/base64.h
index fc314da8e07..868a78eb032 100644
--- a/chromium/third_party/openscreen/src/util/base64.h
+++ b/chromium/third_party/openscreen/src/util/base64.h
@@ -8,27 +8,25 @@
 #include <stdint.h>
 
 #include <string>
+#include <string_view>
 #include <vector>
 
-#include "absl/strings/string_view.h"
 #include "platform/base/error.h"
 #include "platform/base/span.h"
 
-namespace openscreen {
-namespace base64 {
+namespace openscreen::base64 {
 
 // Encodes the input binary data in base64.
 std::string Encode(ByteView input);
 
 // Encodes the input string in base64.
-std::string Encode(absl::string_view input);
+std::string Encode(std::string_view input);
 
 // Decodes the base64 input string.  Returns true if successful and false
 // otherwise. The output string is only modified if successful. The decoding can
 // be done in-place.
-bool Decode(absl::string_view input, std::vector<uint8_t>* output);
+bool Decode(std::string_view input, std::vector<uint8_t>* output);
 
-}  // namespace base64
-}  // namespace openscreen
+}  // namespace openscreen::base64
 
 #endif  // UTIL_BASE64_H_
diff --git a/chromium/third_party/openscreen/src/util/base64_unittest.cc b/chromium/third_party/openscreen/src/util/base64_unittest.cc
index b1f6d560280..47287a98d34 100644
--- a/chromium/third_party/openscreen/src/util/base64_unittest.cc
+++ b/chromium/third_party/openscreen/src/util/base64_unittest.cc
@@ -4,13 +4,13 @@
 
 #include "util/base64.h"
 
+#include <cstring>
 #include <string>
 #include <vector>
 
 #include "gtest/gtest.h"
 
-namespace openscreen {
-namespace base64 {
+namespace openscreen::base64 {
 
 namespace {
 
@@ -52,7 +52,7 @@ TEST(Base64Test, Binary) {
   // Check that encoding the same data through the StringPiece interface gives
   // the same results.
   std::string string_piece_encoded = Encode(
-      absl::string_view(reinterpret_cast<const char*>(kData), sizeof(kData)));
+      std::string_view(reinterpret_cast<const char*>(kData), sizeof(kData)));
 
   EXPECT_EQ(binary_encoded, string_piece_encoded);
 }
@@ -68,5 +68,4 @@ TEST(Base64Test, InPlace) {
   CheckEquals(kText, out);
 }
 
-}  // namespace base64
-}  // namespace openscreen
+}  // namespace openscreen::base64
diff --git a/chromium/third_party/openscreen/src/util/big_endian.h b/chromium/third_party/openscreen/src/util/big_endian.h
index b90d38c41f4..0c01786d619 100644
--- a/chromium/third_party/openscreen/src/util/big_endian.h
+++ b/chromium/third_party/openscreen/src/util/big_endian.h
@@ -195,6 +195,7 @@ class BigEndianBuffer {
   T* end_;
 };
 
+// TODO(mfoltz): Use ByteBuffer here instead of pointer-and-length.
 class BigEndianReader : public BigEndianBuffer<const uint8_t> {
  public:
   BigEndianReader(const uint8_t* buffer, size_t length);
diff --git a/chromium/third_party/openscreen/src/util/crypto/certificate_utils.cc b/chromium/third_party/openscreen/src/util/crypto/certificate_utils.cc
index 72e87f8e294..ea5bc05a820 100644
--- a/chromium/third_party/openscreen/src/util/crypto/certificate_utils.cc
+++ b/chromium/third_party/openscreen/src/util/crypto/certificate_utils.cc
@@ -33,8 +33,8 @@ enum KeyUsageBits {
 
 // Returns whether or not the certificate field successfully was added.
 bool AddCertificateField(X509_NAME* certificate_name,
-                         absl::string_view field,
-                         absl::string_view value) {
+                         std::string_view field,
+                         std::string_view value) {
   return X509_NAME_add_entry_by_txt(
              certificate_name, std::string(field).c_str(), MBSTRING_ASC,
              reinterpret_cast<const unsigned char*>(value.data()),
@@ -47,7 +47,7 @@ bssl::UniquePtr<ASN1_TIME> ToAsn1Time(std::chrono::seconds time_since_epoch) {
 }
 
 bssl::UniquePtr<X509> CreateCertificateInternal(
-    absl::string_view name,
+    std::string_view name,
     std::chrono::seconds certificate_duration,
     const EVP_PKEY& key_pair,
     std::chrono::seconds time_since_unix_epoch,
@@ -159,7 +159,7 @@ bssl::UniquePtr<EVP_PKEY> GenerateRsaKeyPair(int key_bits) {
 }
 
 ErrorOr<bssl::UniquePtr<X509>> CreateSelfSignedX509Certificate(
-    absl::string_view name,
+    std::string_view name,
     std::chrono::seconds duration,
     const EVP_PKEY& key_pair,
     std::chrono::seconds time_since_unix_epoch,
diff --git a/chromium/third_party/openscreen/src/util/crypto/certificate_utils.h b/chromium/third_party/openscreen/src/util/crypto/certificate_utils.h
index 13fcf99615f..4c083c6089f 100644
--- a/chromium/third_party/openscreen/src/util/crypto/certificate_utils.h
+++ b/chromium/third_party/openscreen/src/util/crypto/certificate_utils.h
@@ -11,9 +11,9 @@
 
 #include <chrono>
 #include <string>
+#include <string_view>
 #include <vector>
 
-#include "absl/strings/string_view.h"
 #include "platform/api/time.h"
 #include "platform/base/error.h"
 #include "util/crypto/rsa_private_key.h"
@@ -29,7 +29,7 @@ bssl::UniquePtr<EVP_PKEY> GenerateRsaKeyPair(int key_bits = 2048);
 // be self-signed.  |make_ca| determines whether additional extensions are added
 // to make it a valid certificate authority cert.
 ErrorOr<bssl::UniquePtr<X509>> CreateSelfSignedX509Certificate(
-    absl::string_view name,
+    std::string_view name,
     std::chrono::seconds duration,
     const EVP_PKEY& key_pair,
     std::chrono::seconds time_since_unix_epoch = GetWallTimeSinceUnixEpoch(),
diff --git a/chromium/third_party/openscreen/src/util/crypto/openssl_util.cc b/chromium/third_party/openscreen/src/util/crypto/openssl_util.cc
index dc2a6058373..168d187a251 100644
--- a/chromium/third_party/openscreen/src/util/crypto/openssl_util.cc
+++ b/chromium/third_party/openscreen/src/util/crypto/openssl_util.cc
@@ -12,9 +12,9 @@
 
 #include <sstream>
 #include <string>
+#include <string_view>
 #include <utility>
 
-#include "absl/strings/string_view.h"
 #include "util/osp_logging.h"
 
 namespace openscreen {
@@ -31,7 +31,7 @@ namespace {
 // error queue and return, otherwise it will continue calling this function
 // until all errors have been removed from the queue.
 int OpenSSLErrorCallback(const char* str, size_t len, void* context) {
-  OSP_DVLOG << "\t" << absl::string_view(str, len);
+  OSP_DVLOG << "\t" << std::string_view(str, len);
   return 1;
 }
 
diff --git a/chromium/third_party/openscreen/src/util/crypto/pem_helpers.cc b/chromium/third_party/openscreen/src/util/crypto/pem_helpers.cc
index ef7929bc499..cf22a8b70c1 100644
--- a/chromium/third_party/openscreen/src/util/crypto/pem_helpers.cc
+++ b/chromium/third_party/openscreen/src/util/crypto/pem_helpers.cc
@@ -16,7 +16,7 @@
 namespace openscreen {
 
 std::vector<std::string> ReadCertificatesFromPemFile(
-    absl::string_view filename) {
+    std::string_view filename) {
   FILE* fp = fopen(filename.data(), "r");
   if (!fp) {
     return {};
@@ -38,7 +38,7 @@ std::vector<std::string> ReadCertificatesFromPemFile(
   return certs;
 }
 
-bssl::UniquePtr<EVP_PKEY> ReadKeyFromPemFile(absl::string_view filename) {
+bssl::UniquePtr<EVP_PKEY> ReadKeyFromPemFile(std::string_view filename) {
   FILE* fp = fopen(filename.data(), "r");
   if (!fp) {
     return nullptr;
diff --git a/chromium/third_party/openscreen/src/util/crypto/pem_helpers.h b/chromium/third_party/openscreen/src/util/crypto/pem_helpers.h
index 8b286b65c9a..5bb42ae46f2 100644
--- a/chromium/third_party/openscreen/src/util/crypto/pem_helpers.h
+++ b/chromium/third_party/openscreen/src/util/crypto/pem_helpers.h
@@ -8,16 +8,14 @@
 #include <openssl/evp.h>
 
 #include <string>
+#include <string_view>
 #include <vector>
 
-#include "absl/strings/string_view.h"
-
 namespace openscreen {
 
-std::vector<std::string> ReadCertificatesFromPemFile(
-    absl::string_view filename);
+std::vector<std::string> ReadCertificatesFromPemFile(std::string_view filename);
 
-bssl::UniquePtr<EVP_PKEY> ReadKeyFromPemFile(absl::string_view filename);
+bssl::UniquePtr<EVP_PKEY> ReadKeyFromPemFile(std::string_view filename);
 
 }  // namespace openscreen
 
diff --git a/chromium/third_party/openscreen/src/util/crypto/sha2.cc b/chromium/third_party/openscreen/src/util/crypto/sha2.cc
index 656295548cc..141eef459ad 100644
--- a/chromium/third_party/openscreen/src/util/crypto/sha2.cc
+++ b/chromium/third_party/openscreen/src/util/crypto/sha2.cc
@@ -13,7 +13,7 @@
 
 namespace openscreen {
 
-Error SHA256HashString(absl::string_view str,
+Error SHA256HashString(std::string_view str,
                        uint8_t output[SHA256_DIGEST_LENGTH]) {
   bssl::UniquePtr<EVP_MD_CTX> context(EVP_MD_CTX_new());
   if (!EVP_Digest(str.data(), str.size(), output, nullptr, EVP_sha256(),
@@ -24,7 +24,7 @@ Error SHA256HashString(absl::string_view str,
   return Error::None();
 }
 
-ErrorOr<std::string> SHA256HashString(absl::string_view str) {
+ErrorOr<std::string> SHA256HashString(std::string_view str) {
   std::string output(SHA256_DIGEST_LENGTH, 0);
   const Error error =
       SHA256HashString(str, reinterpret_cast<uint8_t*>(data(output)));
diff --git a/chromium/third_party/openscreen/src/util/crypto/sha2.h b/chromium/third_party/openscreen/src/util/crypto/sha2.h
index 0f7972ae5fc..3bb07fb8f4d 100644
--- a/chromium/third_party/openscreen/src/util/crypto/sha2.h
+++ b/chromium/third_party/openscreen/src/util/crypto/sha2.h
@@ -9,8 +9,8 @@
 #include <stddef.h>
 
 #include <string>
+#include <string_view>
 
-#include "absl/strings/string_view.h"
 #include "platform/base/error.h"
 
 namespace openscreen {
@@ -22,12 +22,12 @@ namespace openscreen {
 // Computes the SHA-256 hash of the input string 'str' and stores the first
 // 'len' bytes of the hash in the output buffer 'output'.  If 'len' > 32,
 // only 32 bytes (the full hash) are stored in the 'output' buffer.
-Error SHA256HashString(absl::string_view str,
+Error SHA256HashString(std::string_view str,
                        uint8_t output[SHA256_DIGEST_LENGTH]);
 
 // Convenience version of the above that returns the result in a 32-byte
 // string.
-ErrorOr<std::string> SHA256HashString(absl::string_view str);
+ErrorOr<std::string> SHA256HashString(std::string_view str);
 
 }  // namespace openscreen
 
diff --git a/chromium/third_party/openscreen/src/util/enum_name_table.h b/chromium/third_party/openscreen/src/util/enum_name_table.h
index 86d48a24b44..d547c624b3f 100644
--- a/chromium/third_party/openscreen/src/util/enum_name_table.h
+++ b/chromium/third_party/openscreen/src/util/enum_name_table.h
@@ -9,10 +9,10 @@
 #define UTIL_ENUM_NAME_TABLE_H_
 
 #include <array>
+#include <string_view>
 #include <utility>
 
 #include "absl/strings/match.h"
-#include "absl/strings/string_view.h"
 #include "platform/base/error.h"
 #include "util/osp_logging.h"
 
@@ -38,7 +38,7 @@ ErrorOr<const char*> GetEnumName(const EnumNameTable<Enum, Size>& map,
 // Get the value of an enum from the enum name.
 template <typename Enum, size_t Size>
 ErrorOr<Enum> GetEnum(const EnumNameTable<Enum, Size>& map,
-                      absl::string_view name) {
+                      std::string_view name) {
   for (auto pair : map) {
     if (absl::EqualsIgnoreCase(pair.first, name)) {
       return pair.second;
diff --git a/chromium/third_party/openscreen/src/util/flat_map.h b/chromium/third_party/openscreen/src/util/flat_map.h
index 0987442fa03..fd9f5a23a5a 100644
--- a/chromium/third_party/openscreen/src/util/flat_map.h
+++ b/chromium/third_party/openscreen/src/util/flat_map.h
@@ -5,12 +5,12 @@
 #ifndef UTIL_FLAT_MAP_H_
 #define UTIL_FLAT_MAP_H_
 
+#include <algorithm>
 #include <initializer_list>
 #include <map>
 #include <utility>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "util/osp_logging.h"
 
 namespace openscreen {
@@ -21,7 +21,7 @@ namespace openscreen {
 // performance of a vector with the convenience of a map.
 //
 // NOTE: this class allows usage of const char* as Key or Value types, but
-// it is generally recommended that you use std::string, or absl::string_view
+// it is generally recommended that you use std::string, or std::string_view
 // for literals. string_view is similarly efficient to a raw char* pointer,
 // but gives sizing and equality operators, among other features.
 template <class Key, class Value>
diff --git a/chromium/third_party/openscreen/src/util/flat_map_unittest.cc b/chromium/third_party/openscreen/src/util/flat_map_unittest.cc
index 20eaffcc8d9..950378e9593 100644
--- a/chromium/third_party/openscreen/src/util/flat_map_unittest.cc
+++ b/chromium/third_party/openscreen/src/util/flat_map_unittest.cc
@@ -5,18 +5,18 @@
 #include "util/flat_map.h"
 
 #include <chrono>
+#include <string_view>
 
-#include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
 
 namespace openscreen {
 
 namespace {
 
-const FlatMap<int, absl::string_view> kSimpleFlatMap{{-1, "bar"},
-                                                     {123, "foo"},
-                                                     {10000, "baz"},
-                                                     {0, ""}};
+const FlatMap<int, std::string_view> kSimpleFlatMap{{-1, "bar"},
+                                                    {123, "foo"},
+                                                    {10000, "baz"},
+                                                    {0, ""}};
 
 }  // namespace
 
diff --git a/chromium/third_party/openscreen/src/util/json/json_helpers.h b/chromium/third_party/openscreen/src/util/json/json_helpers.h
index c6e09619e93..0d62288ffbe 100644
--- a/chromium/third_party/openscreen/src/util/json/json_helpers.h
+++ b/chromium/third_party/openscreen/src/util/json/json_helpers.h
@@ -12,7 +12,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/strings/string_view.h"
 #include "json/value.h"
 #include "platform/base/error.h"
 #include "util/chrono_helpers.h"
@@ -21,8 +20,7 @@
 
 // This file contains helper methods for parsing JSON, in an attempt to
 // reduce boilerplate code when working with JsonCpp.
-namespace openscreen {
-namespace json {
+namespace openscreen::json {
 
 inline bool TryParseBool(const Json::Value& value, bool* out) {
   if (!value.isBool()) {
@@ -172,7 +170,6 @@ Json::Value PrimitiveVectorToJson(const std::vector<T>& vec) {
   return array;
 }
 
-}  // namespace json
-}  // namespace openscreen
+}  // namespace openscreen::json
 
 #endif  // UTIL_JSON_JSON_HELPERS_H_
diff --git a/chromium/third_party/openscreen/src/util/json/json_helpers_unittest.cc b/chromium/third_party/openscreen/src/util/json/json_helpers_unittest.cc
index d22f02d3bb8..9e1011a6138 100644
--- a/chromium/third_party/openscreen/src/util/json/json_helpers_unittest.cc
+++ b/chromium/third_party/openscreen/src/util/json/json_helpers_unittest.cc
@@ -8,8 +8,7 @@
 #include "gtest/gtest.h"
 #include "util/chrono_helpers.h"
 
-namespace openscreen {
-namespace json {
+namespace openscreen::json {
 namespace {
 
 using ::testing::ElementsAre;
@@ -209,5 +208,4 @@ TEST(ParsingHelpersTest, TryParseStringArray) {
   EXPECT_FALSE(TryParseStringArray(kEmptyArray, &out));
 }
 
-}  // namespace json
-}  // namespace openscreen
+}  // namespace openscreen::json
diff --git a/chromium/third_party/openscreen/src/util/json/json_serialization.cc b/chromium/third_party/openscreen/src/util/json/json_serialization.cc
index 3f3e6d3ca04..5036ce9f1c5 100644
--- a/chromium/third_party/openscreen/src/util/json/json_serialization.cc
+++ b/chromium/third_party/openscreen/src/util/json/json_serialization.cc
@@ -14,10 +14,9 @@
 #include "platform/base/error.h"
 #include "util/osp_logging.h"
 
-namespace openscreen {
-namespace json {
+namespace openscreen::json {
 
-ErrorOr<Json::Value> Parse(absl::string_view document) {
+ErrorOr<Json::Value> Parse(std::string_view document) {
   Json::CharReaderBuilder builder;
   Json::CharReaderBuilder::strictMode(&builder.settings_);
   if (document.empty()) {
@@ -37,10 +36,6 @@ ErrorOr<Json::Value> Parse(absl::string_view document) {
 }
 
 ErrorOr<std::string> Stringify(const Json::Value& value) {
-  if (value.empty()) {
-    return ErrorOr<std::string>(Error::Code::kJsonWriteError, "Empty value");
-  }
-
   Json::StreamWriterBuilder factory;
 #ifndef _DEBUG
   // Default is to "pretty print" the output JSON in a human readable
@@ -64,5 +59,4 @@ ErrorOr<std::string> Stringify(const Json::Value& value) {
   return stream.str();
 }
 
-}  // namespace json
-}  // namespace openscreen
+}  // namespace openscreen::json
diff --git a/chromium/third_party/openscreen/src/util/json/json_serialization.h b/chromium/third_party/openscreen/src/util/json/json_serialization.h
index 53bff0323d3..0d9373d80d2 100644
--- a/chromium/third_party/openscreen/src/util/json/json_serialization.h
+++ b/chromium/third_party/openscreen/src/util/json/json_serialization.h
@@ -6,8 +6,8 @@
 #define UTIL_JSON_JSON_SERIALIZATION_H_
 
 #include <string>
+#include <string_view>
 
-#include "absl/strings/string_view.h"
 #include "json/value.h"
 #include "platform/base/error.h"
 
@@ -15,7 +15,7 @@ namespace openscreen {
 
 namespace json {
 
-ErrorOr<Json::Value> Parse(absl::string_view value);
+ErrorOr<Json::Value> Parse(std::string_view value);
 ErrorOr<std::string> Stringify(const Json::Value& value);
 
 }  // namespace json
diff --git a/chromium/third_party/openscreen/src/util/json/json_serialization_unittest.cc b/chromium/third_party/openscreen/src/util/json/json_serialization_unittest.cc
index 16ec2bb9281..86f7c0eb730 100644
--- a/chromium/third_party/openscreen/src/util/json/json_serialization_unittest.cc
+++ b/chromium/third_party/openscreen/src/util/json/json_serialization_unittest.cc
@@ -44,12 +44,20 @@ TEST(JsonSerializationTest, ValidDocumentParsedCorrectly) {
   EXPECT_EQ(actual.value().getMemberNames().size(), 2u);
 }
 
-TEST(JsonSerializationTest, NullValueReturnsError) {
+TEST(JsonSerializationTest, EmptyArrayReturnsBrackets) {
+  const auto empty_array = Json::Value(Json::ValueType::arrayValue);
+  const auto actual = json::Stringify(empty_array);
+
+  EXPECT_TRUE(actual.is_value());
+  EXPECT_EQ(actual.value(), "[]");
+}
+
+TEST(JsonSerializationTest, NullValueReturnsNull) {
   const auto null_value = Json::Value();
   const auto actual = json::Stringify(null_value);
 
-  EXPECT_TRUE(actual.is_error());
-  EXPECT_EQ(actual.error().code(), Error::Code::kJsonWriteError);
+  EXPECT_TRUE(actual.is_value());
+  EXPECT_EQ(actual.value(), "null");
 }
 
 TEST(JsonSerializationTest, ValidValueReturnsString) {
diff --git a/chromium/third_party/openscreen/src/util/json/json_value.cc b/chromium/third_party/openscreen/src/util/json/json_value.cc
index b3d7d3410c1..f8af14b3e8f 100644
--- a/chromium/third_party/openscreen/src/util/json/json_value.cc
+++ b/chromium/third_party/openscreen/src/util/json/json_value.cc
@@ -6,34 +6,34 @@
 
 namespace openscreen {
 
-absl::optional<int> MaybeGetInt(const Json::Value& message,
-                                const char* first,
-                                const char* last) {
+std::optional<int> MaybeGetInt(const Json::Value& message,
+                               const char* first,
+                               const char* last) {
   const Json::Value* value = message.find(first, last);
-  absl::optional<int> result;
+  std::optional<int> result;
   if (value && value->isInt()) {
     result = value->asInt();
   }
   return result;
 }
 
-absl::optional<absl::string_view> MaybeGetString(const Json::Value& message) {
+std::optional<std::string_view> MaybeGetString(const Json::Value& message) {
   if (message.isString()) {
     const char* begin = nullptr;
     const char* end = nullptr;
     message.getString(&begin, &end);
     if (begin && end >= begin) {
-      return absl::string_view(begin, end - begin);
+      return std::string_view(begin, end - begin);
     }
   }
-  return absl::nullopt;
+  return std::nullopt;
 }
 
-absl::optional<absl::string_view> MaybeGetString(const Json::Value& message,
-                                                 const char* first,
-                                                 const char* last) {
+std::optional<std::string_view> MaybeGetString(const Json::Value& message,
+                                               const char* first,
+                                               const char* last) {
   const Json::Value* value = message.find(first, last);
-  absl::optional<absl::string_view> result;
+  std::optional<std::string_view> result;
   if (value && value->isString()) {
     return MaybeGetString(*value);
   }
diff --git a/chromium/third_party/openscreen/src/util/json/json_value.h b/chromium/third_party/openscreen/src/util/json/json_value.h
index afd062df3ab..93e27707b02 100644
--- a/chromium/third_party/openscreen/src/util/json/json_value.h
+++ b/chromium/third_party/openscreen/src/util/json/json_value.h
@@ -5,23 +5,24 @@
 #ifndef UTIL_JSON_JSON_VALUE_H_
 #define UTIL_JSON_JSON_VALUE_H_
 
-#include "absl/strings/string_view.h"
-#include "absl/types/optional.h"
+#include <optional>
+#include <string_view>
+
 #include "json/value.h"
 
 #define JSON_EXPAND_FIND_CONSTANT_ARGS(s) (s), ((s) + sizeof(s) - 1)
 
 namespace openscreen {
 
-absl::optional<int> MaybeGetInt(const Json::Value& message,
-                                const char* first,
-                                const char* last);
+std::optional<int> MaybeGetInt(const Json::Value& message,
+                               const char* first,
+                               const char* last);
 
-absl::optional<absl::string_view> MaybeGetString(const Json::Value& message);
+std::optional<std::string_view> MaybeGetString(const Json::Value& message);
 
-absl::optional<absl::string_view> MaybeGetString(const Json::Value& message,
-                                                 const char* first,
-                                                 const char* last);
+std::optional<std::string_view> MaybeGetString(const Json::Value& message,
+                                               const char* first,
+                                               const char* last);
 
 }  // namespace openscreen
 
diff --git a/chromium/third_party/openscreen/src/util/json/json_value_unittest.cc b/chromium/third_party/openscreen/src/util/json/json_value_unittest.cc
index 1fbca6259f2..0eac362a567 100644
--- a/chromium/third_party/openscreen/src/util/json/json_value_unittest.cc
+++ b/chromium/third_party/openscreen/src/util/json/json_value_unittest.cc
@@ -11,15 +11,15 @@
 namespace openscreen {
 
 TEST(JsonValueTest, GetInt) {
-  absl::string_view obj(R"!({"key1": 17, "key2": 32.3, "key3": "asdf"})!");
+  std::string_view obj(R"!({"key1": 17, "key2": 32.3, "key3": "asdf"})!");
   ErrorOr<Json::Value> value_or_error = json::Parse(obj);
   ASSERT_TRUE(value_or_error);
   Json::Value& value = value_or_error.value();
-  absl::optional<int> result1 =
+  std::optional<int> result1 =
       MaybeGetInt(value, JSON_EXPAND_FIND_CONSTANT_ARGS("key1"));
-  absl::optional<int> result2 =
+  std::optional<int> result2 =
       MaybeGetInt(value, JSON_EXPAND_FIND_CONSTANT_ARGS("key2"));
-  absl::optional<int> result3 =
+  std::optional<int> result3 =
       MaybeGetInt(value, JSON_EXPAND_FIND_CONSTANT_ARGS("key42"));
   EXPECT_FALSE(result2);
   EXPECT_FALSE(result3);
@@ -29,18 +29,18 @@ TEST(JsonValueTest, GetInt) {
 }
 
 TEST(JsonValueTest, GetString) {
-  absl::string_view obj(
+  std::string_view obj(
       R"!({"key1": 17, "key2": 32.3, "key3": "asdf", "key4": ""})!");
   ErrorOr<Json::Value> value_or_error = json::Parse(obj);
   ASSERT_TRUE(value_or_error);
   Json::Value& value = value_or_error.value();
-  absl::optional<absl::string_view> result1 =
+  std::optional<std::string_view> result1 =
       MaybeGetString(value, JSON_EXPAND_FIND_CONSTANT_ARGS("key3"));
-  absl::optional<absl::string_view> result2 =
+  std::optional<std::string_view> result2 =
       MaybeGetString(value, JSON_EXPAND_FIND_CONSTANT_ARGS("key2"));
-  absl::optional<absl::string_view> result3 =
+  std::optional<std::string_view> result3 =
       MaybeGetString(value, JSON_EXPAND_FIND_CONSTANT_ARGS("key42"));
-  absl::optional<absl::string_view> result4 =
+  std::optional<std::string_view> result4 =
       MaybeGetString(value, JSON_EXPAND_FIND_CONSTANT_ARGS("key4"));
 
   EXPECT_FALSE(result2);
diff --git a/chromium/third_party/openscreen/src/util/osp_logging.h b/chromium/third_party/openscreen/src/util/osp_logging.h
index 03cdaecf94f..72360830a77 100644
--- a/chromium/third_party/openscreen/src/util/osp_logging.h
+++ b/chromium/third_party/openscreen/src/util/osp_logging.h
@@ -10,8 +10,7 @@
 
 #include "platform/api/logging.h"
 
-namespace openscreen {
-namespace internal {
+namespace openscreen::internal {
 
 // The stream-based logging macros below are adapted from Chromium's
 // base/logging.h.
@@ -47,8 +46,7 @@ class Voidify {
   void operator&(std::ostream&) {}
 };
 
-}  // namespace internal
-}  // namespace openscreen
+}  // namespace openscreen::internal
 
 #define OSP_LAZY_STREAM(condition, stream) \
   !(condition) ? (void)0 : openscreen::internal::Voidify() & (stream)
diff --git a/chromium/third_party/openscreen/src/util/simple_fraction.cc b/chromium/third_party/openscreen/src/util/simple_fraction.cc
index 915c7474a80..e3bad7f7a78 100644
--- a/chromium/third_party/openscreen/src/util/simple_fraction.cc
+++ b/chromium/third_party/openscreen/src/util/simple_fraction.cc
@@ -15,8 +15,8 @@
 namespace openscreen {
 
 // static
-ErrorOr<SimpleFraction> SimpleFraction::FromString(absl::string_view value) {
-  std::vector<absl::string_view> fields = absl::StrSplit(value, '/');
+ErrorOr<SimpleFraction> SimpleFraction::FromString(std::string_view value) {
+  std::vector<std::string_view> fields = absl::StrSplit(value, '/');
   if (fields.size() != 1 && fields.size() != 2) {
     return Error::Code::kParameterInvalid;
   }
diff --git a/chromium/third_party/openscreen/src/util/simple_fraction.h b/chromium/third_party/openscreen/src/util/simple_fraction.h
index 5adfc739e5b..909362a5bbc 100644
--- a/chromium/third_party/openscreen/src/util/simple_fraction.h
+++ b/chromium/third_party/openscreen/src/util/simple_fraction.h
@@ -8,8 +8,8 @@
 #include <cmath>
 #include <limits>
 #include <string>
+#include <string_view>
 
-#include "absl/strings/string_view.h"
 #include "platform/base/error.h"
 
 namespace openscreen {
@@ -24,7 +24,7 @@ namespace openscreen {
 //    equal to zero. Since reductions are not performed, -1/-1 is negative.
 class SimpleFraction {
  public:
-  static ErrorOr<SimpleFraction> FromString(absl::string_view value);
+  static ErrorOr<SimpleFraction> FromString(std::string_view value);
   std::string ToString() const;
 
   constexpr SimpleFraction() = default;
diff --git a/chromium/third_party/openscreen/src/util/std_util.cc b/chromium/third_party/openscreen/src/util/std_util.cc
new file mode 100644
index 00000000000..7f6b9c610d2
--- /dev/null
+++ b/chromium/third_party/openscreen/src/util/std_util.cc
@@ -0,0 +1,20 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "util/std_util.h"
+
+#include <algorithm>
+#include <cctype>
+#include <string>
+
+#include "util/osp_logging.h"
+
+namespace openscreen {
+
+std::string& RemoveWhitespace(std::string& s) {
+  s.erase(std::remove_if(s.begin(), s.end(), ::isspace), s.end());
+  return s;
+}
+
+}  // namespace openscreen
diff --git a/chromium/third_party/openscreen/src/util/std_util.h b/chromium/third_party/openscreen/src/util/std_util.h
index 267f078253e..ea8af313f2f 100644
--- a/chromium/third_party/openscreen/src/util/std_util.h
+++ b/chromium/third_party/openscreen/src/util/std_util.h
@@ -50,6 +50,12 @@ std::string Join(const std::vector<T>& vec, const char* delimiter = ", ") {
   return ss.str();
 }
 
+// Removes ALL whitespace in place from the string, based on the present C
+// locale. This includes spaces, tabs, and returns. This is useful for string
+// comparisons where whitespace doesn't matter, or, in the case of JSON
+// serialization, is dependent on build configuration and other settings.
+std::string& RemoveWhitespace(std::string& s);
+
 template <typename Key, typename Value>
 void RemoveValueFromMap(std::map<Key, Value*>* map, Value* value) {
   for (auto it = map->begin(); it != map->end();) {
diff --git a/chromium/third_party/openscreen/src/util/std_util_unittest.cc b/chromium/third_party/openscreen/src/util/std_util_unittest.cc
index dd3cab36d70..43810c7c52a 100644
--- a/chromium/third_party/openscreen/src/util/std_util_unittest.cc
+++ b/chromium/third_party/openscreen/src/util/std_util_unittest.cc
@@ -31,6 +31,15 @@ TEST(StdUtilTest, Join) {
   EXPECT_EQ("", Join(std::vector<std::string>({""}), ","));
 }
 
+TEST(StdUtilTest, RemoveWhitespace) {
+  std::string portland = "Portland";
+  EXPECT_EQ("Portland", RemoveWhitespace(portland));
+
+  std::string fancy_portland = "  Po\f\v\tr\t\ntla  n\r\nd\t\t  ";
+  RemoveWhitespace(fancy_portland);
+  EXPECT_EQ("Portland", fancy_portland);
+}
+
 TEST(StdUtilTest, RemoveValueFromMap) {
   std::string capitol1("Olympia");
   std::string capitol2("Eugene");
diff --git a/chromium/third_party/openscreen/src/util/trace_logging.h b/chromium/third_party/openscreen/src/util/trace_logging.h
index f58227e430d..834d392bf0b 100644
--- a/chromium/third_party/openscreen/src/util/trace_logging.h
+++ b/chromium/third_party/openscreen/src/util/trace_logging.h
@@ -119,14 +119,12 @@ inline std::vector<openscreen::TraceEvent::Argument> ToArgumentArray(
 
 #else  // ENABLE_TRACE_LOGGING not defined
 
-namespace openscreen {
-namespace internal {
+namespace openscreen::internal {
 // Consumes |args| (to avoid "warn unused variable" errors at compile time), and
 // provides a "void" result type in the macros below.
 template <typename... Args>
 inline void DoNothingForTracing(Args... args) {}
-}  // namespace internal
-}  // namespace openscreen
+}  // namespace openscreen::internal
 
 #define TRACE_SET_RESULT(result) \
   openscreen::internal::DoNothingForTracing(result)
diff --git a/chromium/third_party/openscreen/src/util/trace_logging/macro_support.h b/chromium/third_party/openscreen/src/util/trace_logging/macro_support.h
index 20e73a525a5..faf72267486 100644
--- a/chromium/third_party/openscreen/src/util/trace_logging/macro_support.h
+++ b/chromium/third_party/openscreen/src/util/trace_logging/macro_support.h
@@ -38,16 +38,14 @@
 #define TRACE_INTERNAL_IGNORE_UNUSED_VAR [[maybe_unused]]
 #endif  // defined(__clang__)
 
-namespace openscreen {
-namespace internal {
+namespace openscreen::internal {
 
 inline bool IsTraceLoggingEnabled(TraceCategory category) {
   const CurrentTracingDestination destination;
   return destination && destination->IsTraceLoggingEnabled(category);
 }
 
-}  // namespace internal
-}  // namespace openscreen
+}  // namespace openscreen::internal
 
 #define TRACE_IS_ENABLED(category) \
   openscreen::internal::IsTraceLoggingEnabled(category)
diff --git a/chromium/third_party/openscreen/src/util/trace_logging/scoped_trace_operations.cc b/chromium/third_party/openscreen/src/util/trace_logging/scoped_trace_operations.cc
index 0b92f0ad976..b0fa855f91b 100644
--- a/chromium/third_party/openscreen/src/util/trace_logging/scoped_trace_operations.cc
+++ b/chromium/third_party/openscreen/src/util/trace_logging/scoped_trace_operations.cc
@@ -4,15 +4,13 @@
 
 #include "util/trace_logging/scoped_trace_operations.h"
 
-#include "absl/types/optional.h"
 #include "platform/api/trace_logging_platform.h"
 #include "platform/base/trace_logging_activation.h"
 #include "util/osp_logging.h"
 
 #if defined(ENABLE_TRACE_LOGGING)
 
-namespace openscreen {
-namespace internal {
+namespace openscreen::internal {
 
 // static
 bool ScopedTraceOperation::TraceAsyncEnd(const uint32_t line,
@@ -134,7 +132,6 @@ AsynchronousTraceLogger::~AsynchronousTraceLogger() {
 
 TraceIdSetter::~TraceIdSetter() = default;
 
-}  // namespace internal
-}  // namespace openscreen
+}  // namespace openscreen::internal
 
 #endif  // defined(ENABLE_TRACE_LOGGING)
diff --git a/chromium/third_party/openscreen/src/util/trace_logging/scoped_trace_operations.h b/chromium/third_party/openscreen/src/util/trace_logging/scoped_trace_operations.h
index 75b4930aecc..22badf3326f 100644
--- a/chromium/third_party/openscreen/src/util/trace_logging/scoped_trace_operations.h
+++ b/chromium/third_party/openscreen/src/util/trace_logging/scoped_trace_operations.h
@@ -20,8 +20,7 @@
 
 #if defined(ENABLE_TRACE_LOGGING)
 
-namespace openscreen {
-namespace internal {
+namespace openscreen::internal {
 
 // A base class for all trace logging objects which will create new entries in
 // the Trace Hierarchy.
@@ -197,8 +196,7 @@ class TraceInstanceHelper {
   static TraceInstanceWrapper Empty() { return TraceInstanceWrapper(); }
 };
 
-}  // namespace internal
-}  // namespace openscreen
+}  // namespace openscreen::internal
 
 #endif  // defined(ENABLE_TRACE_LOGGING)
 
diff --git a/chromium/third_party/openscreen/src/util/trace_logging/scoped_trace_operations_unittest.cc b/chromium/third_party/openscreen/src/util/trace_logging/scoped_trace_operations_unittest.cc
index be20ce78654..9b20817f83b 100644
--- a/chromium/third_party/openscreen/src/util/trace_logging/scoped_trace_operations_unittest.cc
+++ b/chromium/third_party/openscreen/src/util/trace_logging/scoped_trace_operations_unittest.cc
@@ -12,8 +12,7 @@
 
 #if defined(ENABLE_TRACE_LOGGING)
 
-namespace openscreen {
-namespace internal {
+namespace openscreen::internal {
 namespace {
 
 MATCHER_P(HasSameNameAndLocation, expected, "") {
@@ -118,7 +117,6 @@ TEST(TraceLoggingInternalTest, ValidateSetResultDoesNotSegfaultOnEmptyStack) {
   ScopedTraceOperation::set_result(Error::Code::kNone);
 }
 
-}  // namespace internal
-}  // namespace openscreen
+}  // namespace openscreen::internal
 
 #endif  // defined(ENABLE_TRACE_LOGGING)
diff --git a/chromium/third_party/openscreen/src/util/trace_logging_unittest.cc b/chromium/third_party/openscreen/src/util/trace_logging_unittest.cc
index 1dc9ed735c2..5ee842bda68 100644
--- a/chromium/third_party/openscreen/src/util/trace_logging_unittest.cc
+++ b/chromium/third_party/openscreen/src/util/trace_logging_unittest.cc
@@ -7,7 +7,6 @@
 #include <chrono>
 #include <thread>
 
-#include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "platform/test/trace_logging_helpers.h"
diff --git a/chromium/third_party/openscreen/src/util/url.cc b/chromium/third_party/openscreen/src/util/url.cc
index 7b30911a8e2..3f3637f8d41 100644
--- a/chromium/third_party/openscreen/src/util/url.cc
+++ b/chromium/third_party/openscreen/src/util/url.cc
@@ -6,16 +6,38 @@
 
 #include <limits.h>
 
+#include <string_view>
 #include <utility>
 
-#include "third_party/mozilla/url_parse.h"
-#include "third_party/mozilla/url_parse_internal.h"
+#include "url/third_party/mozilla/url_parse.h"
+#include "url/url_constants.h"
+#include "url/url_util.h"
 
 namespace openscreen {
 
+namespace {
+
+// Given a string and a range inside the string, compares it to the given
+// lower-case |compare_to| buffer.
+bool CompareSchemeComponent(std::string_view spec,
+                            const url::Component& component,
+                            std::string_view compare_to) {
+  if (component.is_empty()) {
+    return compare_to.empty();  // When component is empty, match empty scheme.
+  }
+  for (int i = 0; i < component.len; ++i) {
+    if (tolower(spec[i]) != compare_to[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+
+}  // namespace
+
 Url::Url(const std::string& source) {
-  Parsed parsed;
-  Component scheme;
+  url::Parsed parsed;
+  url::Component scheme;
   const char* url = source.c_str();
   size_t length = source.size();
   if (length > INT_MAX) {
@@ -23,22 +45,22 @@ Url::Url(const std::string& source) {
   }
   int url_length = static_cast<int>(length);
 
-  if (!ExtractScheme(url, url_length, &scheme)) {
+  if (!url::ExtractScheme(url, url_length, &scheme)) {
     return;
   }
 
-  if (CompareSchemeComponent(url, scheme, kFileScheme) ||
-      CompareSchemeComponent(url, scheme, kFileSystemScheme) ||
-      CompareSchemeComponent(url, scheme, kMailtoScheme)) {
+  if (CompareSchemeComponent(url, scheme, url::kFileScheme) ||
+      CompareSchemeComponent(url, scheme, url::kFileSystemScheme) ||
+      CompareSchemeComponent(url, scheme, url::kMailToScheme)) {
     // NOTE: Special schemes that are unsupported.
     return;
-  } else if (IsStandard(url, scheme)) {
-    ParseStandardURL(url, url_length, &parsed);
+  } else if (url::IsStandard(url, scheme)) {
+    url::ParseStandardURL(url, url_length, &parsed);
     if (!parsed.host.is_valid()) {
       return;
     }
   } else {
-    ParsePathURL(url, url_length, true, &parsed);
+    url::ParsePathURL(url, url_length, true, &parsed);
   }
 
   if (!parsed.scheme.is_nonempty()) {
@@ -52,8 +74,8 @@ Url::Url(const std::string& source) {
   }
 
   if (parsed.port.is_nonempty()) {
-    int parse_result = ParsePort(url, parsed.port);
-    if (parse_result == PORT_INVALID) {
+    int parse_result = url::ParsePort(url, parsed.port);
+    if (parse_result == url::PORT_INVALID) {
       return;
     } else if (parse_result >= 0) {
       has_port_ = true;
diff --git a/chromium/third_party/openscreen/src/util/url.h b/chromium/third_party/openscreen/src/util/url.h
index 33a2b815721..969966581bb 100644
--- a/chromium/third_party/openscreen/src/util/url.h
+++ b/chromium/third_party/openscreen/src/util/url.h
@@ -14,7 +14,8 @@ namespace openscreen {
 
 // Parses a URL and stores its components separately.  If parsing is successful,
 // is_valid() will return true, otherwise no other members should be accessed.
-// This is a thin wrapper around //third_party/mozilla.  It does not handle
+// This is a thin wrapper around
+// //third_party/googleurl/src/url/third_party/mozilla.  It does not handle
 // file: or mailto: URLs.
 class Url {
  public:
diff --git a/chromium/third_party/openscreen/src/util/yet_another_bit_vector.cc b/chromium/third_party/openscreen/src/util/yet_another_bit_vector.cc
index 1886f8133cb..7c382186aee 100644
--- a/chromium/third_party/openscreen/src/util/yet_another_bit_vector.cc
+++ b/chromium/third_party/openscreen/src/util/yet_another_bit_vector.cc
@@ -16,6 +16,10 @@ namespace {
 // Returns a bitmask where all the bits whose positions are in the range
 // [begin,begin+count) are set, and all other bits are cleared.
 constexpr uint64_t MakeBitmask(int begin, int count) {
+  if (begin >= std::numeric_limits<uint64_t>::digits) {
+    return 0;
+  }
+
   // Form a contiguous sequence of bits by subtracting one from the appropriate
   // power of 2. Set all the bits if count >= 64.
   const uint64_t bits_in_wrong_position =
@@ -136,13 +140,15 @@ void YetAnotherBitVector::ShiftRight(int steps) {
     // With |steps| now less than 64, shift the bits right within each array
     // element. Start from the back of the array, working towards the front, and
     // propagating any bits that are moving across array elements.
-    uint64_t incoming_carry_bits = 0;
-    const uint64_t outgoing_mask = MakeBitmask(0, steps);
-    for (int i = num_integers; i-- > 0;) {
-      const uint64_t outgoing_carry_bits = bits_.as_array[i] & outgoing_mask;
-      bits_.as_array[i] >>= steps;
-      bits_.as_array[i] |= (incoming_carry_bits << (kBitsPerInteger - steps));
-      incoming_carry_bits = outgoing_carry_bits;
+    if (steps > 0) {
+      uint64_t incoming_carry_bits = 0;
+      const uint64_t outgoing_mask = MakeBitmask(0, steps);
+      for (int i = num_integers; i-- > 0;) {
+        const uint64_t outgoing_carry_bits = bits_.as_array[i] & outgoing_mask;
+        bits_.as_array[i] >>= steps;
+        bits_.as_array[i] |= (incoming_carry_bits << (kBitsPerInteger - steps));
+        incoming_carry_bits = outgoing_carry_bits;
+      }
     }
   } else {
     if (steps < kBitsPerInteger) {
diff --git a/chromium/third_party/skia/src/gpu/ganesh/ops/DrawMeshOp.cpp b/chromium/third_party/skia/src/gpu/ganesh/ops/DrawMeshOp.cpp
index aa6b0f3a82d..7e875af8928 100644
--- a/chromium/third_party/skia/src/gpu/ganesh/ops/DrawMeshOp.cpp
+++ b/chromium/third_party/skia/src/gpu/ganesh/ops/DrawMeshOp.cpp
@@ -1031,10 +1031,13 @@ GrOp::CombineResult MeshOp::onCombineIfPossible(GrOp* t, SkArenaAlloc*, const Gr
         return CombineResult::kCannotCombine;
     }
 
+    if (fVertexCount > INT32_MAX - that->fVertexCount) {
+        return CombineResult::kCannotCombine;
+    }
     if (SkToBool(fIndexCount) != SkToBool(that->fIndexCount)) {
         return CombineResult::kCannotCombine;
     }
-    if (SkToBool(fIndexCount) && fVertexCount + that->fVertexCount > SkToInt(UINT16_MAX)) {
+    if (SkToBool(fIndexCount) && fVertexCount > SkToInt(UINT16_MAX) - that->fVertexCount) {
         return CombineResult::kCannotCombine;
     }
 
diff --git a/chromium/ui/android/display_android_manager.cc b/chromium/ui/android/display_android_manager.cc
index e3270af3d43..9cfa5c8d153 100644
--- a/chromium/ui/android/display_android_manager.cc
+++ b/chromium/ui/android/display_android_manager.cc
@@ -14,6 +14,7 @@
 #include "components/viz/common/features.h"
 #include "components/viz/common/viz_utils.h"
 #include "ui/android/screen_android.h"
+#include "ui/android/ui_android_features.h"
 #include "ui/android/ui_android_jni_headers/DisplayAndroidManager_jni.h"
 #include "ui/android/window_android.h"
 #include "ui/display/display.h"
@@ -22,15 +23,6 @@
 
 namespace ui {
 
-namespace {
-
-// Feature controlling whether or not HDR is enabled on Android.
-// TODO(https://crbug.com/1430768): Leave this as a kill switch until Android U
-// ships.
-BASE_FEATURE(kAndroidHDR, "AndroidHDR", base::FEATURE_ENABLED_BY_DEFAULT);
-
-}  // namespace
-
 using base::android::AttachCurrentThread;
 using display::Display;
 using display::DisplayList;
diff --git a/chromium/ui/android/ui_android_features.cc b/chromium/ui/android/ui_android_features.cc
index cbf10772699..1389ef573ab 100644
--- a/chromium/ui/android/ui_android_features.cc
+++ b/chromium/ui/android/ui_android_features.cc
@@ -6,6 +6,9 @@
 #include "base/feature_list.h"
 
 namespace ui {
+
+BASE_FEATURE(kAndroidHDR, "AndroidHDR", base::FEATURE_ENABLED_BY_DEFAULT);
+
 BASE_FEATURE(kConvertTrackpadEventsToMouse,
              "ConvertTrackpadEventsToMouse",
              base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/chromium/ui/android/ui_android_features.h b/chromium/ui/android/ui_android_features.h
index cb550284b44..acfc655f970 100644
--- a/chromium/ui/android/ui_android_features.h
+++ b/chromium/ui/android/ui_android_features.h
@@ -12,6 +12,11 @@ namespace ui {
 
 // Keep sorted!
 
+// Feature controlling whether or not HDR is enabled on Android.
+// TODO(https://crbug.com/1430768): Leave this as a kill switch until Android U
+// ships.
+UI_ANDROID_EXPORT BASE_DECLARE_FEATURE(kAndroidHDR);
+
 // Enables converting trackpad click gestures to mouse events in
 // order for them to be interpreted similar to a desktop
 // experience (i.e. double-click to select word.)
diff --git a/chromium/ui/base/l10n/time_format_unittest.cc b/chromium/ui/base/l10n/time_format_unittest.cc
index 7073f7e6263..7221437f658 100644
--- a/chromium/ui/base/l10n/time_format_unittest.cc
+++ b/chromium/ui/base/l10n/time_format_unittest.cc
@@ -492,7 +492,14 @@ TEST_F(TimeFormatTest, SimpleAndDetailedStringFallback) {
 }
 
 // crbug.com/159388: This test fails when daylight savings time ends.
-TEST_F(TimeFormatTest, RelativeDate) {
+// crbug.com/1488458#c21: Fails after the time on android emulator
+// is sync to current.
+#if BUILDFLAG(IS_ANDROID)
+#define MAYBE_RelativeDate DISABLED_RelativeDate
+#else
+#define MAYBE_RelativeDate RelativeDate
+#endif  // BUILDFLAG(IS_ANDROID)
+TEST_F(TimeFormatTest, MAYBE_RelativeDate) {
   base::Time now = base::Time::Now();
   std::u16string today_str = TimeFormat::RelativeDate(now, NULL);
   EXPECT_EQ(u"Today", today_str);
diff --git a/chromium/ui/strings/translations/ax_strings_gu.xtb b/chromium/ui/strings/translations/ax_strings_gu.xtb
index d85ea4b4815..5cda4e19a29 100644
--- a/chromium/ui/strings/translations/ax_strings_gu.xtb
+++ b/chromium/ui/strings/translations/ax_strings_gu.xtb
@@ -144,7 +144,7 @@
 <translation id="8861621546968757188">સંવાદ પૉપ-અપ કરવાનું બટન</translation>
 <translation id="9002566407876343676">ખોલો</translation>
 <translation id="901834265349196618">ઇમેઇલ</translation>
-<translation id="9048119486235211610">નેવિગેશન</translation>
+<translation id="9048119486235211610">નૅવિગેશન</translation>
 <translation id="9062295712474918030">દસ્તાવેજ</translation>
 <translation id="9108370397979208512">ગણિત</translation>
 <translation id="9138385573473225930">ચેતવણી</translation>
diff --git a/chromium/ui/strings/translations/ax_strings_kn.xtb b/chromium/ui/strings/translations/ax_strings_kn.xtb
index 1fbaafd0374..7e615c537d6 100644
--- a/chromium/ui/strings/translations/ax_strings_kn.xtb
+++ b/chromium/ui/strings/translations/ax_strings_kn.xtb
@@ -118,7 +118,7 @@
 <translation id="7647456547678091388">ಸಲಹೆ</translation>
 <translation id="7661956066982048809">ಗ್ರಾಫಿಕ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್</translation>
 <translation id="7681220483256441252">ಸೂಚಿಕೆ</translation>
-<translation id="7740050170769002709">HTML ವಿಷಯ</translation>
+<translation id="7740050170769002709">HTML ಕಂಟೆಂಟ್‍</translation>
 <translation id="7802800022689234070">ತ್ರಿಕೋನ ಪ್ರಕಟಣೆ</translation>
 <translation id="7891486169920085145">ಛೇದಕ</translation>
 <translation id="8034303206267677282">ಪ್ರಬಲ</translation>
diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
index 074d0e9ce39..4ac08d791ee 100644
--- a/chromium/v8/include/v8-version.h
+++ b/chromium/v8/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 11
 #define V8_MINOR_VERSION 8
 #define V8_BUILD_NUMBER 172
-#define V8_PATCH_LEVEL 17
+#define V8_PATCH_LEVEL 18
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
diff --git a/chromium/v8/src/maglev/maglev-graph-builder.cc b/chromium/v8/src/maglev/maglev-graph-builder.cc
index 6a0e3718536..1c9f8141e8b 100644
--- a/chromium/v8/src/maglev/maglev-graph-builder.cc
+++ b/chromium/v8/src/maglev/maglev-graph-builder.cc
@@ -1252,7 +1252,7 @@ ValueNode* MaglevGraphBuilder::GetTruncatedInt32ForToNumber(ValueNode* value,
       if (NodeTypeIsSmi(old_type)) {
         // Smi untagging can be cached as an int32 alternative, not just a
         // truncated alternative.
-        return alternative.set_int32(AddNewNode<UnsafeSmiUntag>({value}));
+        return alternative.set_int32(BuildSmiUntag(value));
       }
       if (desired_type == NodeType::kSmi) {
         return alternative.set_int32(AddNewNode<CheckedSmiUntag>({value}));
@@ -2970,6 +2970,11 @@ bool MaglevGraphBuilder::CheckType(ValueNode* node, NodeType type,
 
 ValueNode* MaglevGraphBuilder::BuildSmiUntag(ValueNode* node) {
   if (EnsureType(node, NodeType::kSmi)) {
+    if (SmiValuesAre31Bits()) {
+      if (auto phi = node->TryCast<Phi>()) {
+        phi->SetUseRequires31BitValue();
+      }
+    }
     return AddNewNode<UnsafeSmiUntag>({node});
   } else {
     return AddNewNode<CheckedSmiUntag>({node});
@@ -2994,7 +2999,7 @@ ValueNode* MaglevGraphBuilder::BuildNumberOrOddballToFloat64(
   if (EnsureType(node, TaggedToFloat64ConversionTypeToNodeType(conversion_type),
                  &old_type)) {
     if (old_type == NodeType::kSmi) {
-      ValueNode* untagged_smi = AddNewNode<UnsafeSmiUntag>({node});
+      ValueNode* untagged_smi = BuildSmiUntag(node);
       return AddNewNode<ChangeInt32ToFloat64>({untagged_smi});
     }
     return AddNewNode<UncheckedNumberOrOddballToFloat64>({node},
diff --git a/chromium/v8/src/maglev/maglev-interpreter-frame-state.h b/chromium/v8/src/maglev/maglev-interpreter-frame-state.h
index ceb2ba62d3d..3ac4b9a0e97 100644
--- a/chromium/v8/src/maglev/maglev-interpreter-frame-state.h
+++ b/chromium/v8/src/maglev/maglev-interpreter-frame-state.h
@@ -707,6 +707,8 @@ class MergePointInterpreterFrameState {
 
   int predecessor_count() const { return predecessor_count_; }
 
+  int predecessors_so_far() const { return predecessors_so_far_; }
+
   BasicBlock* predecessor_at(int i) const {
     // DCHECK_EQ(predecessors_so_far_, predecessor_count_);
     DCHECK_LT(i, predecessor_count_);
diff --git a/chromium/v8/src/maglev/maglev-ir.cc b/chromium/v8/src/maglev/maglev-ir.cc
index e2fa798a208..095e4a4777d 100644
--- a/chromium/v8/src/maglev/maglev-ir.cc
+++ b/chromium/v8/src/maglev/maglev-ir.cc
@@ -981,8 +981,23 @@ void Phi::SetValueLocationConstraints() {
 
   result().SetUnallocated(kIgnoredPolicy, kNoVreg);
 }
+
 void Phi::GenerateCode(MaglevAssembler* masm, const ProcessingState& state) {}
 
+void Phi::SetUseRequires31BitValue() {
+  if (uses_require_31_bit_value_) return;
+  uses_require_31_bit_value_ = true;
+  auto inputs =
+      is_loop_phi() ? merge_state_->predecessors_so_far() : input_count();
+  for (int i = 0; i < inputs; ++i) {
+    ValueNode* input_node = input(i).node();
+    DCHECK(input_node);
+    if (auto phi = input_node->TryCast<Phi>()) {
+      phi->SetUseRequires31BitValue();
+    }
+  }
+}
+
 namespace {
 
 constexpr Builtin BuiltinFor(Operation operation) {
@@ -1218,6 +1233,20 @@ void CheckedSmiTagInt32::GenerateCode(MaglevAssembler* masm,
   __ SmiTagInt32AndJumpIfFail(reg, fail);
 }
 
+void CheckedSmiSizedInt32::SetValueLocationConstraints() {
+  UseAndClobberRegister(input());
+  DefineSameAsFirst(this);
+}
+void CheckedSmiSizedInt32::GenerateCode(MaglevAssembler* masm,
+                                        const ProcessingState& state) {
+  // We shouldn't be emitting this node for 32-bit Smis.
+  DCHECK(!SmiValuesAre32Bits());
+
+  Register reg = ToRegister(input());
+  Label* fail = __ GetDeoptLabel(this, DeoptimizeReason::kNotASmi);
+  __ CheckInt32IsSmi(reg, fail);
+}
+
 void CheckedSmiTagUint32::SetValueLocationConstraints() {
   UseRegister(input());
   DefineSameAsFirst(this);
diff --git a/chromium/v8/src/maglev/maglev-ir.h b/chromium/v8/src/maglev/maglev-ir.h
index 888944b606d..2ee875b9b1b 100644
--- a/chromium/v8/src/maglev/maglev-ir.h
+++ b/chromium/v8/src/maglev/maglev-ir.h
@@ -199,6 +199,7 @@ class MergePointInterpreterFrameState;
   V(DefineKeyedOwnGeneric)                          \
   V(Phi)                                            \
   V(RegisterInput)                                  \
+  V(CheckedSmiSizedInt32)                           \
   V(CheckedSmiTagInt32)                             \
   V(CheckedSmiTagUint32)                            \
   V(UnsafeSmiTag)                                   \
@@ -2863,6 +2864,30 @@ class CheckedSmiTagInt32 : public FixedInputValueNodeT<1, CheckedSmiTagInt32> {
   void PrintParams(std::ostream&, MaglevGraphLabeller*) const {}
 };
 
+// This is a check disguised as a conversion node so we can use it to override
+// untagging conversions.
+// TODO(olivf): Support overriding bigger with smaller instruction so we can use
+// CheckInt32IsSmi instead.
+class CheckedSmiSizedInt32
+    : public FixedInputValueNodeT<1, CheckedSmiSizedInt32> {
+  using Base = FixedInputValueNodeT<1, CheckedSmiSizedInt32>;
+
+ public:
+  explicit CheckedSmiSizedInt32(uint64_t bitfield) : Base(bitfield) {}
+
+  static constexpr OpProperties kProperties = OpProperties::EagerDeopt() |
+                                              OpProperties::Int32() |
+                                              OpProperties::ConversionNode();
+  static constexpr
+      typename Base::InputTypes kInputTypes{ValueRepresentation::kInt32};
+
+  Input& input() { return Node::input(0); }
+
+  void SetValueLocationConstraints();
+  void GenerateCode(MaglevAssembler*, const ProcessingState&);
+  void PrintParams(std::ostream&, MaglevGraphLabeller*) const {}
+};
+
 class CheckedSmiTagUint32
     : public FixedInputValueNodeT<1, CheckedSmiTagUint32> {
   using Base = FixedInputValueNodeT<1, CheckedSmiTagUint32>;
@@ -6854,11 +6879,18 @@ class Phi : public ValueNodeT<Phi> {
     key_ = key;
   }
 
+  // Remembers if a use is unsafely untagged. If that happens we must ensure to
+  // stay within the smi range, even when untagging.
+  void SetUseRequires31BitValue();
+  bool uses_require_31_bit_value() { return uses_require_31_bit_value_; }
+
  private:
   Phi** next() { return &next_; }
 
   const interpreter::Register owner_;
-  bool has_key_ = false;  // True if the {key_} field has been initialized.
+  // True if the {key_} field has been initialized.
+  bool has_key_ = false;
+  bool uses_require_31_bit_value_ = false;
   UseRepresentationSet uses_repr_hint_ = {};
   UseRepresentationSet same_loop_uses_repr_hint_ = {};
 
diff --git a/chromium/v8/src/maglev/maglev-phi-representation-selector.cc b/chromium/v8/src/maglev/maglev-phi-representation-selector.cc
index 38839dcd0ae..f2bcde26b0f 100644
--- a/chromium/v8/src/maglev/maglev-phi-representation-selector.cc
+++ b/chromium/v8/src/maglev/maglev-phi-representation-selector.cc
@@ -477,7 +477,7 @@ bool MaglevPhiRepresentationSelector::IsUntagging(Opcode op) {
 }
 
 void MaglevPhiRepresentationSelector::UpdateUntaggingOfPhi(
-    ValueNode* old_untagging) {
+    Phi* phi, ValueNode* old_untagging) {
   DCHECK_EQ(old_untagging->input_count(), 1);
   DCHECK(old_untagging->input(0).node()->Is<Phi>());
 
@@ -498,6 +498,13 @@ void MaglevPhiRepresentationSelector::UpdateUntaggingOfPhi(
   }
 
   if (from_repr == to_repr) {
+    if (from_repr == ValueRepresentation::kInt32) {
+      if (phi->uses_require_31_bit_value() &&
+          old_untagging->Is<CheckedSmiUntag>()) {
+        old_untagging->OverwriteWith<CheckedSmiSizedInt32>();
+        return;
+      }
+    }
     old_untagging->OverwriteWith<Identity>();
     return;
   }
diff --git a/chromium/v8/src/maglev/maglev-phi-representation-selector.h b/chromium/v8/src/maglev/maglev-phi-representation-selector.h
index 142310e4725..647d6b3aca7 100644
--- a/chromium/v8/src/maglev/maglev-phi-representation-selector.h
+++ b/chromium/v8/src/maglev/maglev-phi-representation-selector.h
@@ -84,7 +84,8 @@ class MaglevPhiRepresentationSelector {
         // untagged. Depending on the conversion, it might need to be replaced
         // by another untagged->untagged conversion, or it might need to be
         // removed alltogether (or rather, replaced by an identity node).
-        UpdateUntaggingOfPhi(n->template Cast<ValueNode>());
+        UpdateUntaggingOfPhi(node->input(0).node()->Cast<Phi>(),
+                             n->template Cast<ValueNode>());
       }
     } else {
       result = UpdateNonUntaggingNodeInputs(n, state);
@@ -155,7 +156,7 @@ class MaglevPhiRepresentationSelector {
 
   // Updates {old_untagging} to reflect that its Phi input has been untagged and
   // that a different conversion is now needed.
-  void UpdateUntaggingOfPhi(ValueNode* old_untagging);
+  void UpdateUntaggingOfPhi(Phi* phi, ValueNode* old_untagging);
 
   // NewNodePosition is used to represent where a new node should be inserted:
   // at the start of a block (kStart), or at the end of a block (kEnd).