DEPS

diff --git a/DEPS b/DEPS
index 00b2bbea..dc7b56a 100644
--- a/DEPS
+++ b/DEPS
@@ -304,7 +304,7 @@
   # 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': 'dfd8c8c49966af8494f1f4c8311dc68f7fedd78d',
+  'skia_revision': 'c7c9cf8860da5fb237654ea5138374d693ae57c4',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
@@ -316,11 +316,11 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.
-  'swiftshader_revision': 'e621934caf42fa5e4c830692a9b6f6445cc75c3a',
+  'swiftshader_revision': '08f12cdc2290dfe803f1b1d936c04e08d1b8bdf9',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling PDFium
   # and whatever else without interference from each other.
-  'pdfium_revision': '27f3c71fffac1ead3da18f88cfcb4c46e5dba64a',
+  'pdfium_revision': '850454b6edc7cbd5427de1c19d03e0dc9f63cb6b',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling BoringSSL
   # and whatever else without interference from each other.
@@ -331,7 +331,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Fuchsia sdk
   # and whatever else without interference from each other.
-  'fuchsia_version': 'version:12.20230407.1.1',
+  'fuchsia_version': 'version:12.20230407.2.1',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling google-toolbox-for-mac
   # and whatever else without interference from each other.
@@ -391,7 +391,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling devtools-frontend
   # and whatever else without interference from each other.
-  'devtools_frontend_revision': 'eb1787796a3b80e13c2f398d66535acba12e6526',
+  'devtools_frontend_revision': '328050c74a7cd30b7564b34be4e1517c86c76f9e',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libprotobuf-mutator
   # and whatever else without interference from each other.
@@ -431,7 +431,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
-  'dawn_revision': '6b67a90d8b72bcbe6a2ac350091c447a40f488c4',
+  'dawn_revision': '4299bd0ac9e80af6b43827d391ec63f3585ff143',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
@@ -495,7 +495,7 @@
 
   # If you change this, also update the libc++ revision in
   # //buildtools/deps_revisions.gni.
-  'libcxx_revision':       'ab37483b426c16ce33f8f0064be571513d5a8c34',
+  'libcxx_revision':       'ee488d060889fc9208b22536955a7176ae9a404d',
 
   # GN CIPD package version.
   'gn_version': 'git_revision:ffeea1b1fd070cb6a8d47154a03f8523486b50a7',
@@ -790,7 +790,7 @@
 
   'src/clank': {
     'url': Var('chrome_git') + '/clank/internal/apps.git' + '@' +
-    '38d8fc1e8db956b043fe9501192911e39e6d0c81',
+    '37cae201ad080f3a5ded5cfa13df60fd26eac781',
     'condition': 'checkout_android and checkout_src_internal',
   },
 
@@ -889,7 +889,7 @@
       'packages': [
         {
           'package': 'chromium/rts/model/linux-amd64',
-          'version': 'BtJaUd90iG6mlg8FIYFdSAWLH3qaxWaQbSQ8qz3aFaQC',
+          'version': 'Dq4sgi6c1NDpRGpKQDKHIwFRrExbsOB20Xuo5WYPO5wC',
         },
       ],
       'dep_type': 'cipd',
@@ -900,7 +900,7 @@
       'packages': [
         {
           'package': 'chromium/rts/model/mac-amd64',
-          'version': 'OKup69P7c2wMhFmaptQQnk1XknUqHu-JI1ALCTitdlAC',
+          'version': '41DOvUT0ylXCMYDiatQyaNRgaJXAiwCJ8C2RDrQl1KYC',
         },
       ],
       'dep_type': 'cipd',
@@ -911,7 +911,7 @@
       'packages': [
         {
           'package': 'chromium/rts/model/windows-amd64',
-          'version': '2ufK5_TiuU2FLaN11p4qlCQkWA-puonruji7P4EqX2EC',
+          'version': 'NnW1xyVzr0rXhMKRj97Y86OqYB3sZ3FXaWclN10LafEC',
         },
       ],
       'dep_type': 'cipd',
@@ -979,7 +979,7 @@
     'packages': [
       {
           'package': 'chromium/third_party/androidx',
-          'version': '-pK90qshV0juLhQarmodo4DWoqVsaQNPvOR8Mer92qgC',
+          'version': '3B8F5G_FvmGQNHfDjnaEsK4d1ZIuuNlAGjw4zubOCuMC',
       },
     ],
     'condition': 'checkout_android',
@@ -1187,7 +1187,7 @@
   # Tools used when building Chrome for Chrome OS. This affects both the Simple
   # Chrome workflow, as well as the chromeos-chrome ebuild.
   'src/third_party/chromite': {
-      'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '4bd8727c8956f8f2002ac5bfddbbf5aea827829b',
+      'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + 'f2b209128b13c03b87dc057f6654afbc8deaa079',
       'condition': 'checkout_chromeos',
   },
 
@@ -1219,13 +1219,13 @@
   },
 
   'src/third_party/depot_tools':
-    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '801a975021e9eff1d6c53cb460ff055e92ab8def',
+    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '0a590f3e185c9541feeb75c5fd3b1bb68ffc0362',
 
   'src/third_party/devtools-frontend/src':
     Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'),
 
   'src/third_party/devtools-frontend-internal': {
-      'url': Var('chrome_git') + '/devtools/devtools-internal.git' + '@' + 'cdbb4ef000817ee0d8be333f6789372fd447e5c0',
+      'url': Var('chrome_git') + '/devtools/devtools-internal.git' + '@' + '9ef228175c955cd16437c138258b76091187abd5',
     'condition': 'checkout_src_internal',
   },
 
@@ -1966,7 +1966,7 @@
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': Var('chrome_git') + '/chrome/src-internal.git@bdaae43aaf5ba0d66a93967ae63e38aad6f32bb4',
+    'url': Var('chrome_git') + '/chrome/src-internal.git@91755631c876c6b2e9aa3306dbf456782991769d',
     'condition': 'checkout_src_internal',
   },
 
@@ -1996,7 +1996,7 @@
     'packages': [
       {
         'package': 'chromeos_internal/apps/help_app/app',
-        'version': '4md2g-5NTz-aF613lY9RPIupAG6Q5Y83uMQ1USb7gngC',
+        'version': '3llhXGkw2SgS9Yo1JzVoh5EP4oboHSMkMBIaHLqciOgC',
       },
     ],
     'condition': 'checkout_chromeos and checkout_src_internal',
@@ -2029,7 +2029,7 @@
     'packages': [
       {
         'package': 'chromeos_internal/apps/projector_app/app',
-        'version': '_fStqwcg7NH9AJ7XJCvwHOW8tvTjYc5n2X8bjVl9BIMC',
+        'version': '4qSLA3O3xAmd16NqyHxFm5d1A7yR8P7iShVovZxQjgwC',
       },
     ],
     'condition': 'checkout_chromeos and checkout_src_internal',

PRESUBMIT.py

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index f02c814a..04943f1 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -458,7 +458,7 @@
       ),
       True,
       excluded_paths=(
-        'ios/chrome/browser/ui/icons/symbol_helpers.mm',
+        'ios/chrome/browser/shared/ui/symbols/symbol_helpers.mm',
         'ios/chrome/search_widget_extension/',
       ),
     ),

WATCHLISTS

diff --git a/WATCHLISTS b/WATCHLISTS
index d7de978..645aad7 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -2708,8 +2708,7 @@
     'extension': ['chromium-apps-reviews@chromium.org',
                   'extensions-reviews@chromium.org'],
     'face_ml': ['eora-dc-eng+crrev-watch@google.com'],
-    'feed': ['carlosk+watch@chromium.org',
-             'dewittj+watch@chromium.org',
+    'feed': ['dewittj+watch@chromium.org',
              'dimich+watch@chromium.org',
              'harringtond+watch@chromium.org',
              'petewil+watch@chromium.org',
@@ -2878,7 +2877,6 @@
     'ntp_snippets': ['ntp-dev+reviews@chromium.org'],
     'ntp_tiles': ['ntp-dev+reviews@chromium.org'],
     'offline_pages': ['chili+watch@chromium.org',
-                      'carlosk+watch@chromium.org',
                       'dewittj+watch@chromium.org',
                       'dimich+watch@chromium.org',
                       'fgorski+watch@chromium.org',

ash/BUILD.gn

diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index fa7afb2..ebec2fb 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -1261,6 +1261,8 @@
     "system/bluetooth/bluetooth_feature_pod_controller.h",
     "system/bluetooth/bluetooth_notification_controller.cc",
     "system/bluetooth/bluetooth_notification_controller.h",
+    "system/bluetooth/bluetooth_state_cache.cc",
+    "system/bluetooth/bluetooth_state_cache.h",
     "system/brightness/brightness_controller_chromeos.cc",
     "system/brightness/brightness_controller_chromeos.h",
     "system/brightness/display_detailed_view.cc",
@@ -2390,8 +2392,10 @@
     "wm/snap_group/snap_group_constants.h",
     "wm/snap_group/snap_group_controller.cc",
     "wm/snap_group/snap_group_controller.h",
-    "wm/snap_group/snap_group_lock_button.cc",
-    "wm/snap_group/snap_group_lock_button.h",
+    "wm/snap_group/snap_group_expanded_menu_view.cc",
+    "wm/snap_group/snap_group_expanded_menu_view.h",
+    "wm/snap_group/snap_group_lock_or_unlock_button.cc",
+    "wm/snap_group/snap_group_lock_or_unlock_button.h",
     "wm/splitview/split_view_constants.h",
     "wm/splitview/split_view_controller.cc",
     "wm/splitview/split_view_controller.h",
@@ -3151,6 +3155,7 @@
     "system/bluetooth/bluetooth_disabled_detailed_view_unittest.cc",
     "system/bluetooth/bluetooth_feature_pod_controller_unittest.cc",
     "system/bluetooth/bluetooth_notification_controller_unittest.cc",
+    "system/bluetooth/bluetooth_state_cache_unittest.cc",
     "system/bluetooth/fake_bluetooth_detailed_view.cc",
     "system/bluetooth/fake_bluetooth_detailed_view.h",
     "system/bluetooth/fake_bluetooth_device_list_controller.cc",

ash/accelerators/accelerator_alias_converter_unittest.cc

diff --git a/ash/accelerators/accelerator_alias_converter_unittest.cc b/ash/accelerators/accelerator_alias_converter_unittest.cc
index 6ce6d9f..de015cd5 100644
--- a/ash/accelerators/accelerator_alias_converter_unittest.cc
+++ b/ash/accelerators/accelerator_alias_converter_unittest.cc
@@ -185,6 +185,24 @@
          ui::Accelerator{ui::VKEY_BROWSER_FORWARD, ui::EF_ALT_DOWN},
          {}},
 
+        // Layout2 doesn't have VKEY_ALL_APPLICATIONS key.
+        {{INTERNAL},
+         {kKbdTopRowLayout2Tag},
+         ui::Accelerator{ui::VKEY_ALL_APPLICATIONS, ui::EF_ALT_DOWN},
+         {}},
+
+        // Layout1 doesn't have VKEY_SNAPSHOT key.
+        {{EXTERNAL_BLUETOOTH},
+         {kKbdTopRowLayout1Tag},
+         ui::Accelerator{ui::VKEY_SNAPSHOT, ui::EF_ALT_DOWN},
+         {}},
+
+        // LayoutWilco doesn't have VKEY_MICROPHONE_MUTE_TOGGLE key.
+        {{EXTERNAL_USB},
+         {kKbdTopRowLayoutWilcoTag},
+         ui::Accelerator{ui::VKEY_MICROPHONE_MUTE_TOGGLE, ui::EF_ALT_DOWN},
+         {}},
+
         // For TopRowLayout1: [Alt] + [Forward] -> [Alt] + [Search] + [F2].
         {{EXTERNAL_BLUETOOTH},
          {kKbdTopRowLayout1Tag},

ash/app_list/app_list_controller_impl.cc

diff --git a/ash/app_list/app_list_controller_impl.cc b/ash/app_list/app_list_controller_impl.cc
index 8ff99b1..441635e 100644
--- a/ash/app_list/app_list_controller_impl.cc
+++ b/ash/app_list/app_list_controller_impl.cc
@@ -1477,6 +1477,10 @@
   // In the Kiosk session we should never show the app list.
   CHECK(!visible || !IsKioskSession());
 
+  if (client_) {
+    client_->RecalculateWouldTriggerLauncherSearchIph();
+  }
+
   DVLOG(1) << __PRETTY_FUNCTION__ << " visible " << visible << " display_id "
            << display_id;
   // Focus and app visibility changes while finishing home launcher state
@@ -1637,7 +1641,7 @@
     return;
   }
 
-  client_->QueryWouldTriggerLauncherSearchIph();
+  client_->RecalculateWouldTriggerLauncherSearchIph();
 }
 
 int64_t AppListControllerImpl::GetDisplayIdToShowAppListOn() {

ash/app_list/test_app_list_client.cc

diff --git a/ash/app_list/test_app_list_client.cc b/ash/app_list/test_app_list_client.cc
index 518e373..eb00dc8c 100644
--- a/ash/app_list/test_app_list_client.cc
+++ b/ash/app_list/test_app_list_client.cc
@@ -17,6 +17,14 @@
 
 namespace ash {
 
+namespace {
+class FakeScopedIphSession : public ScopedIphSession {
+ public:
+  ~FakeScopedIphSession() override = default;
+  void NotifyEvent(const std::string& event) override {}
+};
+}  // namespace
+
 TestAppListClient::TestAppListClient() = default;
 
 TestAppListClient::~TestAppListClient() = default;
@@ -84,11 +92,11 @@
   return nullptr;
 }
 
-void TestAppListClient::QueryWouldTriggerLauncherSearchIph() {}
+void TestAppListClient::RecalculateWouldTriggerLauncherSearchIph() {}
 
 std::unique_ptr<ScopedIphSession>
 TestAppListClient::CreateLauncherSearchIphSession() {
-  return std::make_unique<ScopedIphSession>();
+  return std::make_unique<FakeScopedIphSession>();
 }
 
 void TestAppListClient::OpenSearchBoxIphUrl() {}

ash/app_list/test_app_list_client.h

diff --git a/ash/app_list/test_app_list_client.h b/ash/app_list/test_app_list_client.h
index 985e5fca..7a2df45 100644
--- a/ash/app_list/test_app_list_client.h
+++ b/ash/app_list/test_app_list_client.h
@@ -59,7 +59,7 @@
       const std::string& setting_name,
       const std::map<std::string, int>& values) override {}
   AppListNotifier* GetNotifier() override;
-  void QueryWouldTriggerLauncherSearchIph() override;
+  void RecalculateWouldTriggerLauncherSearchIph() override;
   std::unique_ptr<ScopedIphSession> CreateLauncherSearchIphSession() override;
   void OpenSearchBoxIphUrl() override;
   void LoadIcon(int profile_id, const std::string& app_id) override {}

ash/app_list/views/continue_section_view.cc

diff --git a/ash/app_list/views/continue_section_view.cc b/ash/app_list/views/continue_section_view.cc
index 46c57c62..d937270 100644
--- a/ash/app_list/views/continue_section_view.cc
+++ b/ash/app_list/views/continue_section_view.cc
@@ -23,6 +23,7 @@
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
+#include "ash/wm/desks/templates/saved_desk_controller.h"
 #include "base/check.h"
 #include "base/strings/string_util.h"
 #include "extensions/common/constants.h"
@@ -153,6 +154,10 @@
                        : kMinFilesForContinueSectionClamshellMode);
 }
 
+bool ContinueSectionView::HasDesksAdminTemplates() const {
+  return suggestions_container_->num_desks_admin_template_results() > 0;
+}
+
 bool ContinueSectionView::ShouldShowPrivacyNotice() const {
   if (!nudge_controller_)
     return false;
@@ -169,7 +174,16 @@
 }
 
 bool ContinueSectionView::ShouldShowFilesSection() const {
-  return HasMinimumFilesToShow() &&
+  // TODO(hongyulong): each admin template or each file is a continue task view
+  // in the continue task container view. If we set this container visible, the
+  // admin template and the file will show up at the same time. I think we may
+  // need to separate the visibility for admin template and file in the
+  // container view. Otherwise, when we have a admin template, and if
+  // `IsPrivacyNoticeAccepted` and `WasPrivacyNoticeShown` all return false,
+  // the file, privacy toast, admin template will co-exist unexpectedly.
+  // Thus, we need to make some changes for the condition in another CL after
+  // fully consideration.
+  return (HasDesksAdminTemplates() || HasMinimumFilesToShow()) &&
          (nudge_controller_->IsPrivacyNoticeAccepted() ||
           nudge_controller_->WasPrivacyNoticeShown()) &&
          !privacy_toast_;

ash/app_list/views/continue_section_view.h

diff --git a/ash/app_list/views/continue_section_view.h b/ash/app_list/views/continue_section_view.h
index 3056e8c6..61318ab 100644
--- a/ash/app_list/views/continue_section_view.h
+++ b/ash/app_list/views/continue_section_view.h
@@ -106,6 +106,9 @@
   // section.
   bool HasMinimumFilesToShow() const;
 
+  // Whether there is at least 1 admin template.
+  bool HasDesksAdminTemplates() const;
+
   // Displays a toast with a privacy notice for the user in place of the
   // continue section. The user can accept the notice to display the continue
   // section in the launcher.

ash/app_list/views/continue_task_container_view.cc

diff --git a/ash/app_list/views/continue_task_container_view.cc b/ash/app_list/views/continue_task_container_view.cc
index 644a91be..d8288e6 100644
--- a/ash/app_list/views/continue_task_container_view.cc
+++ b/ash/app_list/views/continue_task_container_view.cc
@@ -267,11 +267,17 @@
   num_results_ = std::min(kMaxFilesForContinueSection, tasks.size());
 
   num_file_results_ = 0;
+  num_desks_admin_template_results_ = 0;
   for (size_t i = 0; i < num_results_; ++i) {
     if (tasks[i]->result_type() == AppListSearchResultType::kZeroStateFile ||
         tasks[i]->result_type() == AppListSearchResultType::kZeroStateDrive) {
       ++num_file_results_;
     }
+
+    if (tasks[i]->result_type() ==
+        AppListSearchResultType::kZeroStateDesksAdminTemplate) {
+      ++num_desks_admin_template_results_;
+    }
   }
 
   // Create new result views.

ash/app_list/views/continue_task_container_view.h

diff --git a/ash/app_list/views/continue_task_container_view.h b/ash/app_list/views/continue_task_container_view.h
index b4451f8..a31abfc 100644
--- a/ash/app_list/views/continue_task_container_view.h
+++ b/ash/app_list/views/continue_task_container_view.h
@@ -66,6 +66,9 @@
 
   size_t num_results() const { return num_results_; }
   size_t num_file_results() const { return num_file_results_; }
+  size_t num_desks_admin_template_results() const {
+    return num_desks_admin_template_results_;
+  }
 
   void SetResults(SearchModel::SearchResults* results);
 
@@ -188,6 +191,9 @@
   // whether continue section can be shown.
   size_t num_file_results_ = 0;
 
+  // The number of admin templates will be shown in the continue section.
+  size_t num_desks_admin_template_results_ = 0;
+
   // The number of columns available for the view. This is ignored in tablet
   // mode.
   int columns_ = 0;

ash/app_list/views/launcher_search_iph_view.cc

diff --git a/ash/app_list/views/launcher_search_iph_view.cc b/ash/app_list/views/launcher_search_iph_view.cc
index e02b4c37f..e393f455 100644
--- a/ash/app_list/views/launcher_search_iph_view.cc
+++ b/ash/app_list/views/launcher_search_iph_view.cc
@@ -233,6 +233,7 @@
 
 void LauncherSearchIphView::RunLauncherSearchQuery(
     const std::u16string& query) {
+  scoped_iph_session_->NotifyEvent(kIphEventNameChipClick);
   delegate_->RunLauncherSearchQuery(query);
 }
 
@@ -241,6 +242,7 @@
 }
 
 void LauncherSearchIphView::OpenAssistantPage() {
+  scoped_iph_session_->NotifyEvent(kIphEventNameAssistantClick);
   delegate_->OpenAssistantPage();
 }
 

ash/app_list/views/launcher_search_iph_view.h

diff --git a/ash/app_list/views/launcher_search_iph_view.h b/ash/app_list/views/launcher_search_iph_view.h
index 3de5b4e..ab7c466 100644
--- a/ash/app_list/views/launcher_search_iph_view.h
+++ b/ash/app_list/views/launcher_search_iph_view.h
@@ -29,6 +29,13 @@
     virtual void OpenSearchBoxIphUrl() = 0;
   };
 
+  // Event names live in a global namespace. Prefix with the feature name to
+  // prevent unintentional name collisions.
+  static constexpr char kIphEventNameChipClick[] =
+      "IPH_LauncherSearchHelpUi_chip_click";
+  static constexpr char kIphEventNameAssistantClick[] =
+      "IPH_LauncherSearchHelpUi_assistant_click";
+
   enum ViewId {
     kSelf = 1,
     kDescriptionLabel,

ash/app_list/views/paged_apps_grid_view.cc

diff --git a/ash/app_list/views/paged_apps_grid_view.cc b/ash/app_list/views/paged_apps_grid_view.cc
index 6a46b4d6..793ba180 100644
--- a/ash/app_list/views/paged_apps_grid_view.cc
+++ b/ash/app_list/views/paged_apps_grid_view.cc
@@ -122,13 +122,14 @@
 
 }  // namespace
 
-class PagedAppsGridView::BackgroundCardLayer : public ui::Layer,
+class PagedAppsGridView::BackgroundCardLayer : public ui::LayerOwner,
                                                public ui::LayerDelegate {
  public:
   explicit BackgroundCardLayer(PagedAppsGridView* paged_apps_grid_view)
-      : Layer(ui::LAYER_TEXTURED), paged_apps_grid_view_(paged_apps_grid_view) {
-    SetFillsBoundsOpaquely(false);
-    set_delegate(this);
+      : LayerOwner(std::make_unique<ui::Layer>(ui::LAYER_TEXTURED)),
+        paged_apps_grid_view_(paged_apps_grid_view) {
+    layer()->SetFillsBoundsOpaquely(false);
+    layer()->set_delegate(this);
   }
 
   BackgroundCardLayer(const BackgroundCardLayer&) = delete;
@@ -137,15 +138,16 @@
 
   void SetIsActivePage(bool is_active_page) {
     is_active_page_ = is_active_page;
-    SchedulePaint(parent()->bounds());
+    layer()->SchedulePaint(gfx::Rect(layer()->size()));
   }
 
  private:
   // ui::LayerDelegate:
   void OnPaintLayer(const ui::PaintContext& context) override {
-    ui::PaintRecorder recorder(context, size());
+    const gfx::Size size = layer()->size();
+    ui::PaintRecorder recorder(context, size);
     gfx::Canvas* canvas = recorder.canvas();
-    gfx::RectF card_size((gfx::SizeF(size())));
+    gfx::RectF card_size((gfx::SizeF(size)));
 
     // Draw a solid rounded rect as the background.
     cc::PaintFlags flags;
@@ -292,7 +294,7 @@
     // Make sure that the background cards render behind everything
     // else in the items container.
     for (size_t i = 0; i < background_cards_.size(); ++i) {
-      ui::Layer* const background_card = background_cards_[i].get();
+      ui::Layer* const background_card = background_cards_[i]->layer();
       background_card->SetBounds(BackgroundCardBounds(i));
       items_container()->layer()->StackAtBottom(background_card);
     }
@@ -310,7 +312,7 @@
   AppsGridView::OnThemeChanged();
 
   for (auto& card : background_cards_)
-    card.get()->SchedulePaint(card->parent()->bounds());
+    card->layer()->SchedulePaint(gfx::Rect(card->layer()->size()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -644,7 +646,7 @@
     size_t card_index) {
   DCHECK_LT(card_index, background_cards_.size());
   gfx::Rect bounds_in_items_container = items_container()->GetMirroredRect(
-      background_cards_[card_index]->bounds());
+      background_cards_[card_index]->layer()->bounds());
   gfx::Point origin_in_apps_grid = bounds_in_items_container.origin();
   views::View::ConvertPointToTarget(items_container(), this,
                                     &origin_in_apps_grid);
@@ -654,7 +656,7 @@
 ui::Layer* PagedAppsGridView::GetBackgroundCardLayerForTesting(
     size_t card_index) const {
   DCHECK_LT(card_index, background_cards_.size());
-  return background_cards_[card_index].get();
+  return background_cards_[card_index]->layer();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -692,7 +694,7 @@
   }
 
   gfx::RectF background_card_rect_in_grid(
-      background_cards_[GetSelectedPage()]->bounds());
+      background_cards_[GetSelectedPage()]->layer()->bounds());
   View::ConvertRectToTarget(items_container(), this,
                             &background_card_rect_in_grid);
 
@@ -813,7 +815,7 @@
   std::vector<std::unique_ptr<ui::AnimationThroughputReporter>> reporters;
   for (auto& background_card : background_cards_) {
     reporters.push_back(std::make_unique<ui::AnimationThroughputReporter>(
-        background_card->GetAnimator(),
+        background_card->layer()->GetAnimator(),
         metrics_util::ForSmoothness(base::BindRepeating(
             &ReportCardifiedSmoothness, cardified_state_))));
   }
@@ -853,23 +855,21 @@
   }
 
   for (size_t i = 0; i < background_cards_.size(); i++) {
-    auto& background_card = background_cards_[i];
+    ui::Layer* const background_card = background_cards_[i]->layer();
     // Reposition card bounds to compensate for the translation offset.
     gfx::Rect background_bounds = background_card->bounds();
     background_bounds.Offset(translate_offset);
     background_card->SetBounds(background_bounds);
     if (cardified_state_) {
       const bool is_active_page =
-          background_cards_[pagination_model_.selected_page()] ==
-          background_card;
-      background_card->SetIsActivePage(is_active_page);
+          static_cast<int>(i) == pagination_model_.selected_page();
+      background_cards_[i]->SetIsActivePage(is_active_page);
     } else {
-      animations.GetCurrentSequence().SetOpacity(background_card.get(),
+      animations.GetCurrentSequence().SetOpacity(background_card,
                                                  kBackgroundCardOpacityHide);
     }
-    animations.GetCurrentSequence().SetBounds(background_card.get(),
-                                              BackgroundCardBounds(i),
-                                              kCardifiedStateTweenType);
+    animations.GetCurrentSequence().SetBounds(
+        background_card, BackgroundCardBounds(i), kCardifiedStateTweenType);
   }
   highlighted_page_ = pagination_model_.selected_page();
 }
@@ -1014,30 +1014,32 @@
 
 void PagedAppsGridView::AppendBackgroundCard() {
   background_cards_.push_back(std::make_unique<BackgroundCardLayer>(this));
-  ui::Layer* current_layer = background_cards_.back().get();
+  ui::Layer* current_layer = background_cards_.back()->layer();
   current_layer->SetBounds(BackgroundCardBounds(background_cards_.size() - 1));
   current_layer->SetVisible(true);
   items_container()->layer()->Add(current_layer);
 }
 
 void PagedAppsGridView::RemoveBackgroundCard() {
-  items_container()->layer()->Remove(background_cards_.back().get());
+  items_container()->layer()->Remove(background_cards_.back()->layer());
   background_cards_.pop_back();
 }
 
 void PagedAppsGridView::MaskContainerToBackgroundBounds() {
   DCHECK(!background_cards_.empty());
+  const gfx::Rect background_card_bounds =
+      background_cards_[0]->layer()->bounds();
   // Mask apps grid container layer to the background card width. Optionally
   // also include extra height to ensure the top gradient mask is shown as well.
   layer()->SetClipRect(
-      gfx::Rect(background_cards_[0]->bounds().x(), -margin_for_gradient_mask_,
-                background_cards_[0]->bounds().width(),
+      gfx::Rect(background_card_bounds.x(), -margin_for_gradient_mask_,
+                background_card_bounds.width(),
                 layer()->bounds().height() + margin_for_gradient_mask_));
 }
 
 void PagedAppsGridView::RemoveAllBackgroundCards() {
   for (auto& card : background_cards_)
-    items_container()->layer()->Remove(card.get());
+    items_container()->layer()->Remove(card->layer());
   background_cards_.clear();
 }
 
@@ -1212,7 +1214,7 @@
 
 void PagedAppsGridView::StackCardsAtBottom() {
   for (size_t i = 0; i < background_cards_.size(); ++i) {
-    items_container()->layer()->StackAtBottom(background_cards_[i].get());
+    items_container()->layer()->StackAtBottom(background_cards_[i]->layer());
   }
 }
 

ash/app_list/views/search_box_view.cc

diff --git a/ash/app_list/views/search_box_view.cc b/ash/app_list/views/search_box_view.cc
index 7dcfe42..c622c47f 100644
--- a/ash/app_list/views/search_box_view.cc
+++ b/ash/app_list/views/search_box_view.cc
@@ -1265,6 +1265,13 @@
     DeleteIphView();
     assistant_button()->SetBackground(nullptr);
   }
+
+  // Adding or removing IPH view can change `SearchBoxView` bounds largely.
+  // Re-layout can be necessary on parent views as well. Explicitly call
+  // `InvalidateLayout` to trigger re-layouts on all parent views. Without this,
+  // we can have unnecessary spaces in `SearchBoxView` for an IPH dismiss under
+  // some conditions.
+  InvalidateLayout();
 }
 
 void SearchBoxView::OnWouldTriggerIphChanged() {

ash/ash_strings.grd

diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
index ecc22a8..54baaee 100644
--- a/ash/ash_strings.grd
+++ b/ash/ash_strings.grd
@@ -5628,6 +5628,18 @@
       <message name="IDS_ASH_SNAP_GROUP_CLICK_TO_UNLOCK_WINDOWS" desc="Click to unlock the locked windows.">
         Unlock the windows
       </message>
+      <message name="IDS_ASH_SNAP_GROUP_MORE_OPTIONS" desc="Click to see more options.">
+        More options
+      </message>
+      <message name="IDS_ASH_SNAP_GROUP_SWAP_WINDOWS" desc="Swap the windows in the snap group.">
+        Swap the windows
+      </message>
+      <message name="IDS_ASH_SNAP_GROUP_UPDATE_LEFT_WINDOW" desc="Update the left window in the snap group in horizontal screen orientation.">
+        Update the left window
+      </message>
+      <message name="IDS_ASH_SNAP_GROUP_UPDATE_RIGHT_WINDOW" desc="Update the right window in the snap group in horizontal screen orientation.">
+        Update the right window
+      </message>
 
       <!-- Switch Between TABLET/LAPTOP MODE-->
       <message name="IDS_ASH_SWITCH_TO_TABLET_MODE" desc="Alert of switching to tablet mode.">

ash/ash_strings_grd/IDS_ASH_SNAP_GROUP_MORE_OPTIONS.png.sha1

diff --git a/ash/ash_strings_grd/IDS_ASH_SNAP_GROUP_MORE_OPTIONS.png.sha1 b/ash/ash_strings_grd/IDS_ASH_SNAP_GROUP_MORE_OPTIONS.png.sha1
new file mode 100644
index 0000000..ef8d922
--- /dev/null
+++ b/ash/ash_strings_grd/IDS_ASH_SNAP_GROUP_MORE_OPTIONS.png.sha1
@@ -0,0 +1 @@
+e0e57ae4a2f7c4bbf8b9f8c22325f18a997813e1
\ No newline at end of file

ash/ash_strings_grd/IDS_ASH_SNAP_GROUP_SWAP_WINDOWS.png.sha1

diff --git a/ash/ash_strings_grd/IDS_ASH_SNAP_GROUP_SWAP_WINDOWS.png.sha1 b/ash/ash_strings_grd/IDS_ASH_SNAP_GROUP_SWAP_WINDOWS.png.sha1
new file mode 100644
index 0000000..2632e0f
--- /dev/null
+++ b/ash/ash_strings_grd/IDS_ASH_SNAP_GROUP_SWAP_WINDOWS.png.sha1
@@ -0,0 +1 @@
+4425d424e46891a4f62e028eb53d825cddfff7d5
\ No newline at end of file

ash/ash_strings_grd/IDS_ASH_SNAP_GROUP_UPDATE_LEFT_WINDOW.png.sha1

diff --git a/ash/ash_strings_grd/IDS_ASH_SNAP_GROUP_UPDATE_LEFT_WINDOW.png.sha1 b/ash/ash_strings_grd/IDS_ASH_SNAP_GROUP_UPDATE_LEFT_WINDOW.png.sha1
new file mode 100644
index 0000000..8e5f34a1
--- /dev/null
+++ b/ash/ash_strings_grd/IDS_ASH_SNAP_GROUP_UPDATE_LEFT_WINDOW.png.sha1
@@ -0,0 +1 @@
+6d05aea173742d52e32ff0c4b2d522db040d02e8
\ No newline at end of file

ash/ash_strings_grd/IDS_ASH_SNAP_GROUP_UPDATE_RIGHT_WINDOW.png.sha1

diff --git a/ash/ash_strings_grd/IDS_ASH_SNAP_GROUP_UPDATE_RIGHT_WINDOW.png.sha1 b/ash/ash_strings_grd/IDS_ASH_SNAP_GROUP_UPDATE_RIGHT_WINDOW.png.sha1
new file mode 100644
index 0000000..90a6b184
--- /dev/null
+++ b/ash/ash_strings_grd/IDS_ASH_SNAP_GROUP_UPDATE_RIGHT_WINDOW.png.sha1
@@ -0,0 +1 @@
+726098f05fe7334e8f4382f7509239cec3d1dbf3
\ No newline at end of file

ash/capture_mode/capture_mode_controller.cc

diff --git a/ash/capture_mode/capture_mode_controller.cc b/ash/capture_mode/capture_mode_controller.cc
index fb65872..18956bf5 100644
--- a/ash/capture_mode/capture_mode_controller.cc
+++ b/ash/capture_mode/capture_mode_controller.cc
@@ -1352,8 +1352,7 @@
     RecordSaveToLocation(GetSaveToOption(file_saved_path));
   // NOTE: Holding space `client` may be `nullptr` in tests.
   if (auto* client = HoldingSpaceController::Get()->client()) {
-    client->AddScreenCapture(HoldingSpaceItem::Type::kScreenshot,
-                             file_saved_path);
+    client->AddItemOfType(HoldingSpaceItem::Type::kScreenshot, file_saved_path);
   }
 }
 
@@ -1374,10 +1373,10 @@
                               CaptureModeType::kVideo);
       // NOTE: Holding space `client` may be `nullptr` in tests.
       if (auto* client = HoldingSpaceController::Get()->client()) {
-        client->AddScreenCapture(
-            is_gif ? HoldingSpaceItem::Type::kScreenRecordingGif
-                   : HoldingSpaceItem::Type::kScreenRecording,
-            saved_video_file_path);
+        client->AddItemOfType(is_gif
+                                  ? HoldingSpaceItem::Type::kScreenRecordingGif
+                                  : HoldingSpaceItem::Type::kScreenRecording,
+                              saved_video_file_path);
       }
 
       // We only record the file size histogram if it's not a projector-

ash/public/cpp/app_list/app_list_client.h

diff --git a/ash/public/cpp/app_list/app_list_client.h b/ash/public/cpp/app_list/app_list_client.h
index 82dc104..1d3bae4 100644
--- a/ash/public/cpp/app_list/app_list_client.h
+++ b/ash/public/cpp/app_list/app_list_client.h
@@ -118,9 +118,9 @@
   // implementation, this can return nullptr.
   virtual AppListNotifier* GetNotifier() = 0;
 
-  // Queries whether launcher search IPH should be shown and update
+  // Recalculate whether launcher search IPH should be shown and update
   // SearchBoxModel.
-  virtual void QueryWouldTriggerLauncherSearchIph() = 0;
+  virtual void RecalculateWouldTriggerLauncherSearchIph() = 0;
 
   // `feature_engagement::Tracker` needs to be initialized before this method
   // gets called. Call `WouldTriggerLauncherSearchIph` to initialize it. This

ash/public/cpp/app_list/app_list_metrics.h

diff --git a/ash/public/cpp/app_list/app_list_metrics.h b/ash/public/cpp/app_list/app_list_metrics.h
index 0a63160..97ba81b 100644
--- a/ash/public/cpp/app_list/app_list_metrics.h
+++ b/ash/public/cpp/app_list/app_list_metrics.h
@@ -182,6 +182,8 @@
   SYSTEM_INFO,
   // A local image search result.
   IMAGE_SEARCH,
+  // A zero-state result representing a admin template.
+  ZERO_STATE_DESKS_ADMIN_TEMPLATE,
   // Boundary is always last.
   SEARCH_RESULT_TYPE_BOUNDARY
 };

ash/public/cpp/app_list/app_list_types.cc

diff --git a/ash/public/cpp/app_list/app_list_types.cc b/ash/public/cpp/app_list/app_list_types.cc
index 39e1a117..443d532 100644
--- a/ash/public/cpp/app_list/app_list_types.cc
+++ b/ash/public/cpp/app_list/app_list_types.cc
@@ -44,6 +44,7 @@
     case AppListSearchResultType::kPersonalization:
     case AppListSearchResultType::kImageSearch:
     case AppListSearchResultType::kSystemInfo:
+    case AppListSearchResultType::kZeroStateDesksAdminTemplate:
       return false;
   }
 }
@@ -54,6 +55,7 @@
     case AppListSearchResultType::kZeroStateDrive:
     case AppListSearchResultType::kZeroStateHelpApp:
     case AppListSearchResultType::kZeroStateApp:
+    case AppListSearchResultType::kZeroStateDesksAdminTemplate:
       return true;
     case AppListSearchResultType::kUnknown:
     case AppListSearchResultType::kInstalledApp:

ash/public/cpp/app_list/app_list_types.h

diff --git a/ash/public/cpp/app_list/app_list_types.h b/ash/public/cpp/app_list/app_list_types.h
index fafc991b..9f362de 100644
--- a/ash/public/cpp/app_list/app_list_types.h
+++ b/ash/public/cpp/app_list/app_list_types.h
@@ -372,8 +372,9 @@
   kZeroStateApp,           // App recommendations for zero-state / recent apps.
   kImageSearch,            // Local image search result.
   kSystemInfo,             // System Info search result.
+  kZeroStateDesksAdminTemplate,  // Admin templates search results.
   // Add new values here.
-  kMaxValue = kSystemInfo,
+  kMaxValue = kZeroStateDesksAdminTemplate,
 };
 
 ASH_PUBLIC_EXPORT bool IsAppListSearchResultAnApp(
@@ -759,6 +760,9 @@
 
   ScopedIphSession(const ScopedIphSession&) = delete;
   ScopedIphSession& operator=(const ScopedIphSession&) = delete;
+
+  // Notify an IPH event with name of `event`.
+  virtual void NotifyEvent(const std::string& event) = 0;
 };
 
 using SearchResultIdWithPositionIndices =

ash/public/cpp/holding_space/holding_space_client.h

diff --git a/ash/public/cpp/holding_space/holding_space_client.h b/ash/public/cpp/holding_space/holding_space_client.h
index 25928ed..10acd92 100644
--- a/ash/public/cpp/holding_space/holding_space_client.h
+++ b/ash/public/cpp/holding_space/holding_space_client.h
@@ -34,12 +34,6 @@
   virtual const std::string& AddItemOfType(HoldingSpaceItem::Type type,
                                            const base::FilePath& file_path) = 0;
 
-  // TODO(http://b/274477308): Remove one-off API.
-  // Adds a screen capture item backed by the provided `file_path`.
-  // NOTE: `type` must refer to a screen capture type.
-  virtual void AddScreenCapture(HoldingSpaceItem::Type type,
-                                const base::FilePath& file_path) = 0;
-
   // Attempts to copy the contents of the image file backing the specified
   // holding space `item` to the clipboard. If the backing file is not suspected
   // to contain image data, this method will abort early. Success is returned

ash/public/cpp/holding_space/mock_holding_space_client.h

diff --git a/ash/public/cpp/holding_space/mock_holding_space_client.h b/ash/public/cpp/holding_space/mock_holding_space_client.h
index 09f1deb..3586191 100644
--- a/ash/public/cpp/holding_space/mock_holding_space_client.h
+++ b/ash/public/cpp/holding_space/mock_holding_space_client.h
@@ -32,10 +32,6 @@
               (HoldingSpaceItem::Type type, const base::FilePath& file_path),
               (override));
   MOCK_METHOD(void,
-              AddScreenCapture,
-              (HoldingSpaceItem::Type, const base::FilePath& file_path),
-              (override));
-  MOCK_METHOD(void,
               CopyImageToClipboard,
               (const HoldingSpaceItem& item, SuccessCallback callback),
               (override));

ash/resources/vector_icons/BUILD.gn

diff --git a/ash/resources/vector_icons/BUILD.gn b/ash/resources/vector_icons/BUILD.gn
index 35c01e2..d0de142 100644
--- a/ash/resources/vector_icons/BUILD.gn
+++ b/ash/resources/vector_icons/BUILD.gn
@@ -314,6 +314,10 @@
     "show_closed_caption.icon",
     "six_files.icon",
     "small_close_button.icon",
+    "snap_group_kebab.icon",
+    "snap_group_swap_windows.icon",
+    "snap_group_update_primary_window.icon",
+    "snap_group_update_secondary_window.icon",
     "sort_alphabetical.icon",
     "sort_color.icon",
     "stylus_battery_status_unknown.icon",

ash/resources/vector_icons/snap_group_kebab.icon

diff --git a/ash/resources/vector_icons/snap_group_kebab.icon b/ash/resources/vector_icons/snap_group_kebab.icon
new file mode 100644
index 0000000..d1cb7a8
--- /dev/null
+++ b/ash/resources/vector_icons/snap_group_kebab.icon
@@ -0,0 +1,23 @@
+// 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.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 10, 14,
+CUBIC_TO, 11.1f, 14, 12, 14.9f, 12, 16,
+CUBIC_TO, 12, 17.11f, 11.1f, 18, 10, 18,
+CUBIC_TO, 8.9f, 18, 8, 17.11f, 8, 16,
+CUBIC_TO, 8, 14.9f, 8.9f, 14, 10, 14,
+CLOSE,
+MOVE_TO, 10, 12,
+CUBIC_TO, 8.9f, 12, 8, 11.11f, 8, 10,
+CUBIC_TO, 8, 8.9f, 8.9f, 8, 10, 8,
+CUBIC_TO, 11.1f, 8, 12, 8.9f, 12, 10,
+CUBIC_TO, 12, 11.11f, 11.1f, 12, 10, 12,
+CLOSE,
+MOVE_TO, 10, 6,
+CUBIC_TO, 8.9f, 6, 8, 5.11f, 8, 4,
+CUBIC_TO, 8, 2.9f, 8.9f, 2, 10, 2,
+CUBIC_TO, 11.1f, 2, 12, 2.9f, 12, 4,
+CUBIC_TO, 12, 5.11f, 11.1f, 6, 10, 6,
+CLOSE
\ No newline at end of file

ash/resources/vector_icons/snap_group_swap_windows.icon

diff --git a/ash/resources/vector_icons/snap_group_swap_windows.icon b/ash/resources/vector_icons/snap_group_swap_windows.icon
new file mode 100644
index 0000000..c063736ed
--- /dev/null
+++ b/ash/resources/vector_icons/snap_group_swap_windows.icon
@@ -0,0 +1,28 @@
+// 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.
+
+CANVAS_DIMENSIONS, 24,
+MOVE_TO, 7, 20,
+LINE_TO, 2, 15,
+LINE_TO, 7, 10,
+LINE_TO, 8.4f, 11.43f,
+LINE_TO, 5.83f, 14,
+H_LINE_TO, 13,
+V_LINE_TO, 16,
+H_LINE_TO, 5.83f,
+LINE_TO, 8.4f, 18.58f,
+LINE_TO, 7, 20,
+CLOSE,
+MOVE_TO, 17, 14,
+LINE_TO, 15.6f, 12.58f,
+LINE_TO, 18.18f, 10,
+H_LINE_TO, 11,
+V_LINE_TO, 8,
+H_LINE_TO, 18.18f,
+LINE_TO, 15.6f, 5.43f,
+LINE_TO, 17, 4,
+LINE_TO, 22, 9,
+LINE_TO, 17, 14,
+CLOSE,
+NEW_PATH
\ No newline at end of file

ash/resources/vector_icons/snap_group_update_primary_window.icon

diff --git a/ash/resources/vector_icons/snap_group_update_primary_window.icon b/ash/resources/vector_icons/snap_group_update_primary_window.icon
new file mode 100644
index 0000000..9d152f1
--- /dev/null
+++ b/ash/resources/vector_icons/snap_group_update_primary_window.icon
@@ -0,0 +1,27 @@
+// 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.
+
+CANVAS_DIMENSIONS, 24,
+MOVE_TO, 4.8f, 12,
+CUBIC_TO, 4.8f, 16.01f, 7.95f, 19.2f, 11.75f, 19.2f,
+CUBIC_TO, 13.37f, 19.2f, 14.86f, 18.63f, 16.04f, 17.67f,
+LINE_TO, 17.56f, 19.53f,
+CUBIC_TO, 15.97f, 20.82f, 13.95f, 21.6f, 11.75f, 21.6f,
+CUBIC_TO, 6.56f, 21.6f, 2.4f, 17.27f, 2.4f, 12,
+CUBIC_TO, 2.4f, 6.73f, 6.56f, 2.4f, 11.75f, 2.4f,
+CUBIC_TO, 13.95f, 2.4f, 15.97f, 3.18f, 17.56f, 4.47f,
+LINE_TO, 16.04f, 6.33f,
+CUBIC_TO, 14.86f, 5.37f, 13.37f, 4.8f, 11.75f, 4.8f,
+CUBIC_TO, 7.95f, 4.8f, 4.8f, 7.99f, 4.8f, 12,
+CLOSE,
+NEW_PATH,
+MOVE_TO, 21.6f, 10.8f,
+V_LINE_TO, 13.2f,
+LINE_TO, 13.5f, 13.2f,
+V_LINE_TO, 16.16f,
+LINE_TO, 9, 12,
+LINE_TO, 13.5f, 7.84f,
+V_LINE_TO, 10.8f,
+LINE_TO, 21.6f, 10.8f,
+CLOSE
\ No newline at end of file

ash/resources/vector_icons/snap_group_update_secondary_window.icon

diff --git a/ash/resources/vector_icons/snap_group_update_secondary_window.icon b/ash/resources/vector_icons/snap_group_update_secondary_window.icon
new file mode 100644
index 0000000..47e69160
--- /dev/null
+++ b/ash/resources/vector_icons/snap_group_update_secondary_window.icon
@@ -0,0 +1,27 @@
+// 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.
+
+CANVAS_DIMENSIONS, 24,
+MOVE_TO, 19.2f, 12,
+CUBIC_TO, 19.2f, 7.99f, 16.05f, 4.8f, 12.25f, 4.8f,
+CUBIC_TO, 10.63f, 4.8f, 9.14f, 5.37f, 7.96f, 6.33f,
+LINE_TO, 6.44f, 4.47f,
+CUBIC_TO, 8.03f, 3.18f, 10.05f, 2.4f, 12.25f, 2.4f,
+CUBIC_TO, 17.44f, 2.4f, 21.6f, 6.73f, 21.6f, 12,
+CUBIC_TO, 21.6f, 17.27f, 17.44f, 21.6f, 12.25f, 21.6f,
+CUBIC_TO, 10.05f, 21.6f, 8.03f, 20.82f, 6.44f, 19.53f,
+LINE_TO, 7.96f, 17.67f,
+CUBIC_TO, 9.14f, 18.63f, 10.63f, 19.2f, 12.25f, 19.2f,
+CUBIC_TO, 16.05f, 19.2f, 19.2f, 16.01f, 19.2f, 12,
+CLOSE,
+NEW_PATH,
+MOVE_TO, 2.4f, 13.2f,
+V_LINE_TO, 10.8f,
+LINE_TO, 10.5f, 10.8f,
+V_LINE_TO, 7.84f,
+LINE_TO, 15, 12,
+LINE_TO, 10.5f, 16.16f,
+V_LINE_TO, 13.2f,
+LINE_TO, 2.4f, 13.2f,
+CLOSE
\ No newline at end of file

ash/search_box/search_box_view_base.cc

diff --git a/ash/search_box/search_box_view_base.cc b/ash/search_box/search_box_view_base.cc
index 2553415..cab5b473 100644
--- a/ash/search_box/search_box_view_base.cc
+++ b/ash/search_box/search_box_view_base.cc
@@ -586,7 +586,12 @@
 }
 
 gfx::Size SearchBoxViewBase::CalculatePreferredSize() const {
-  return gfx::Size(kSearchBoxPreferredWidth, kSearchBoxPreferredHeight);
+  const int iph_height =
+      iph_view_tracker_.view()
+          ? iph_view_tracker_.view()->GetPreferredSize().height()
+          : 0;
+  return gfx::Size(kSearchBoxPreferredWidth,
+                   kSearchBoxPreferredHeight + iph_height);
 }
 
 void SearchBoxViewBase::OnEnabledChanged() {

ash/shell.cc

diff --git a/ash/shell.cc b/ash/shell.cc
index 4548445fe..a5fdc3d 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -123,6 +123,7 @@
 #include "ash/system/audio/display_speaker_controller.h"
 #include "ash/system/bluetooth/bluetooth_device_status_ui_handler.h"
 #include "ash/system/bluetooth/bluetooth_notification_controller.h"
+#include "ash/system/bluetooth/bluetooth_state_cache.h"
 #include "ash/system/brightness/brightness_controller_chromeos.h"
 #include "ash/system/brightness_control_delegate.h"
 #include "ash/system/camera/autozoom_controller_impl.h"
@@ -1573,6 +1574,7 @@
           user_activity_detector_.get(), std::move(fingerprint));
   video_activity_notifier_ =
       std::make_unique<VideoActivityNotifier>(video_detector_.get());
+  bluetooth_state_cache_ = std::make_unique<BluetoothStateCache>();
   bluetooth_device_status_ui_handler_ =
       std::make_unique<BluetoothDeviceStatusUiHandler>();
   bluetooth_notification_controller_ =

ash/shell.h

diff --git a/ash/shell.h b/ash/shell.h
index ff0b1e23..d588d4a 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -112,6 +112,7 @@
 class BacklightsForcedOffSetter;
 class BluetoothDeviceStatusUiHandler;
 class BluetoothNotificationController;
+class BluetoothStateCache;
 class BrightnessControlDelegate;
 class CalendarController;
 class CameraEffectsController;
@@ -422,6 +423,9 @@
   BacklightsForcedOffSetter* backlights_forced_off_setter() {
     return backlights_forced_off_setter_.get();
   }
+  BluetoothStateCache* bluetooth_state_cache() {
+    return bluetooth_state_cache_.get();
+  }
   BrightnessControlDelegate* brightness_control_delegate() {
     return brightness_control_delegate_.get();
   }
@@ -1076,6 +1080,7 @@
       resolution_notification_controller_;
   std::unique_ptr<BluetoothNotificationController>
       bluetooth_notification_controller_;
+  std::unique_ptr<BluetoothStateCache> bluetooth_state_cache_;
   std::unique_ptr<BluetoothDeviceStatusUiHandler>
       bluetooth_device_status_ui_handler_;
   std::unique_ptr<KeyboardControllerImpl> keyboard_controller_;

ash/strings/ash_strings_bs.xtb

diff --git a/ash/strings/ash_strings_bs.xtb b/ash/strings/ash_strings_bs.xtb
index 2700660..54f8440 100644
--- a/ash/strings/ash_strings_bs.xtb
+++ b/ash/strings/ash_strings_bs.xtb
@@ -4,6 +4,7 @@
 <translation id="1012876632442809908">USB-C uređaj (prednji priključak)</translation>
 <translation id="1013598600051641573">Rezolucija uređaja <ph name="DISPLAY_NAME" /> je promijenjena na <ph name="RESOLUTION" /> (<ph name="REFRESH_RATE" /> Hz) Kliknite Potvrdi da zadržite promjene. Prethodne postavke će se vratiti za <ph name="TIMEOUT_SECONDS" />.</translation>
 <translation id="1013923882670373915">Bluetooth uređaj "<ph name="DEVICE_NAME" />" traži odobrenje za uparivanje. Unesite ovaj PIN kôd na taj uređaj: <ph name="PINCODE" /></translation>
+<translation id="1017556409696559990">Minimiziranje gornjeg prozora kada u Chromeu nema historije vraćanja</translation>
 <translation id="1024364763893396229">Sačuvajte uređaj <ph name="NAME" /></translation>
 <translation id="1032891413405719768">Baterija pisaljke je slaba</translation>
 <translation id="1036073649888683237">Da upravljate obavještenjima, idite u Postavke</translation>
@@ -343,6 +344,7 @@
 <translation id="2620436844016719705">Sistem</translation>
 <translation id="2621713457727696555">Osigurano</translation>
 <translation id="263399434338050016">"Odaberite sve"</translation>
+<translation id="2644422758626431000">Kačenje prozora na lijevoj strani</translation>
 <translation id="2645435784669275700">ChromeOS</translation>
 <translation id="2647092942972307022">Dostupno <ph name="USED_MEMORY" /> od <ph name="TOTAL_MEMORY" /></translation>
 <translation id="2653019840645008922">Snimanje prozora</translation>
@@ -1053,6 +1055,7 @@
 <translation id="5911909173233110115"><ph name="USERNAME" /> (<ph name="MAIL" />)</translation>
 <translation id="5916664084637901428">Uključeno</translation>
 <translation id="5920710855273935292">Mikrofon je isključen.</translation>
+<translation id="5922962980596822074">Prolazak kroz prozore od posljednjeg korištenog prozora</translation>
 <translation id="5924855612669061715">Pristupna tačka je uključena</translation>
 <translation id="5946788582095584774">Funkcija <ph name="FEATURE_NAME" /> je uključena.</translation>
 <translation id="5947494881799873997">Vrati</translation>
@@ -1142,6 +1145,7 @@
 <translation id="6352082849089527770">Nepoznate mreže</translation>
 <translation id="6359587239691116345">Preuzmite najnovije funkcije i poboljšanja sigurnosti. Ako odbijete ovo ažuriranje, vaš uređaj možda više neće funkcionirati ispravno i možete iskusiti probleme sa sigurnošću i performansama.</translation>
 <translation id="6376931439017688372">Bluetooth je uključen</translation>
+<translation id="6378515133128829137">Kačenje prozora na desnoj strani</translation>
 <translation id="6381109794406942707">Da otključate uređaj, unesite PIN.</translation>
 <translation id="638716340450135524">Uključi pristup kameri</translation>
 <translation id="639644700271529076">Tipka CAPS LOCK je isključena</translation>
@@ -1161,6 +1165,7 @@
 <translation id="6459472438155181876">Proširivanje ekrana na <ph name="DISPLAY_NAME" /></translation>
 <translation id="6477681113376365978">Nije moguće preuzeti datoteku</translation>
 <translation id="6482559668224714696">Povećalo za cijeli ekran</translation>
+<translation id="6483727822843292440">Prolazak kroz prozore od najmanje korištenog prozora</translation>
 <translation id="6490471652906364588">USB-C uređaj (desni priključak)</translation>
 <translation id="6491071886865974820"><ph name="MANAGER" /> zahtijeva da ažurirate ovaj uređaj <ph name="DEVICE_TYPE" /> prije isteka roka</translation>
 <translation id="649452524636452238">PIN pametne kartice</translation>
@@ -1214,6 +1219,7 @@
 <translation id="6683022854667115063">Slušalice</translation>
 <translation id="6696025732084565524">Vašoj odvojivoj tastaturi je potrebno važno ažuriranje</translation>
 <translation id="6700713906295497288">IME dugme menija</translation>
+<translation id="6705577071209924099">Podesi osvjetljenje</translation>
 <translation id="6707693040195709527">Kasnite s vraćanjem uređaja na prethodnu verziju</translation>
 <translation id="6710213216561001401">Nazad</translation>
 <translation id="6723839937902243910">Uključivanje/isključivanje</translation>

ash/strings/ash_strings_cy.xtb

diff --git a/ash/strings/ash_strings_cy.xtb b/ash/strings/ash_strings_cy.xtb
index 1a511804..b7777d5e 100644
--- a/ash/strings/ash_strings_cy.xtb
+++ b/ash/strings/ash_strings_cy.xtb
@@ -1214,6 +1214,7 @@
 <translation id="6683022854667115063">Clustffonau</translation>
 <translation id="6696025732084565524">Mae angen diweddariad critigol ar eich bysellfwrdd datodadwy</translation>
 <translation id="6700713906295497288">Botwm dewislen IME</translation>
+<translation id="6705577071209924099">Addasu'r Goleuadau</translation>
 <translation id="6707693040195709527">Mae newid dyfais i'r fersiwn flaenorol yn ddyledus</translation>
 <translation id="6710213216561001401">Blaenorol</translation>
 <translation id="6723839937902243910">Pŵer</translation>

ash/strings/ash_strings_de.xtb

diff --git a/ash/strings/ash_strings_de.xtb b/ash/strings/ash_strings_de.xtb
index e5878c25..f7a766d 100644
--- a/ash/strings/ash_strings_de.xtb
+++ b/ash/strings/ash_strings_de.xtb
@@ -4,6 +4,7 @@
 <translation id="1012876632442809908">USB-C-Gerät (Port vorne)</translation>
 <translation id="1013598600051641573">"<ph name="DISPLAY_NAME" />" wurde auf <ph name="RESOLUTION" /> (<ph name="REFRESH_RATE" /> Hz) umgestellt. Bitte bestätigen, um die Änderungen beizubehalten. Die vorherigen Einstellungen werden in <ph name="TIMEOUT_SECONDS" /> wiederhergestellt.</translation>
 <translation id="1013923882670373915">Das Bluetooth-Gerät „<ph name="DEVICE_NAME" />“ bittet um Erlaubnis für Kopplung. Gib folgenden PIN-Code auf dem Gerät ein: <ph name="PINCODE" />.</translation>
+<translation id="1017556409696559990">Oberes Fenster minimieren, wenn es in Chrome keinen Zurück-Verlauf gibt</translation>
 <translation id="1024364763893396229"><ph name="NAME" /> speichern</translation>
 <translation id="1032891413405719768">Die Batterie des Eingabestifts ist schwach</translation>
 <translation id="1036073649888683237">Benachrichtigungen unter Einstellungen verwalten</translation>
@@ -343,6 +344,7 @@
 <translation id="2620436844016719705">System</translation>
 <translation id="2621713457727696555">Gesichert</translation>
 <translation id="263399434338050016">„Alles auswählen“</translation>
+<translation id="2644422758626431000">Fenster links anpinnen</translation>
 <translation id="2645435784669275700">Chrome OS</translation>
 <translation id="2647092942972307022"><ph name="USED_MEMORY" /> von <ph name="TOTAL_MEMORY" /> verfügbar</translation>
 <translation id="2653019840645008922">Fensteraufnahme</translation>
@@ -1052,6 +1054,7 @@
 <translation id="5911909173233110115"><ph name="USERNAME" /> (<ph name="MAIL" />)</translation>
 <translation id="5916664084637901428">An</translation>
 <translation id="5920710855273935292">Mikrofon ist stummgeschaltet.</translation>
+<translation id="5922962980596822074">Fenster vom zuletzt verwendeten Fenster durchgehen</translation>
 <translation id="5924855612669061715">Hotspot aktiviert</translation>
 <translation id="5946788582095584774"><ph name="FEATURE_NAME" /> ist aktiviert.</translation>
 <translation id="5947494881799873997">Rückgängig machen</translation>
@@ -1141,6 +1144,7 @@
 <translation id="6352082849089527770">Unbekannte Netzwerke</translation>
 <translation id="6359587239691116345">Hol dir die neuesten Funktionen und Sicherheitsoptimierungen. Wenn du dieses Update ablehnst, funktioniert dein Gerät möglicherweise nicht mehr richtig und es können Sicherheits- und Leistungsprobleme auftreten.</translation>
 <translation id="6376931439017688372">Bluetooth ist aktiviert</translation>
+<translation id="6378515133128829137">Fenster rechts anpinnen</translation>
 <translation id="6381109794406942707">Gib deine PIN ein, um das Gerät zu entsperren.</translation>
 <translation id="638716340450135524">Kamerazugriff aktivieren</translation>
 <translation id="639644700271529076">Feststelltaste Aus</translation>
@@ -1160,6 +1164,7 @@
 <translation id="6459472438155181876">Bildschirm wird auf <ph name="DISPLAY_NAME" /> erweitert...</translation>
 <translation id="6477681113376365978">Datei kann nicht heruntergeladen werden</translation>
 <translation id="6482559668224714696">Vollbildlupe</translation>
+<translation id="6483727822843292440">Fenster vom am wenigsten verwendeten Fenster durchgehen</translation>
 <translation id="6490471652906364588">USB-C-Gerät (Port rechts)</translation>
 <translation id="6491071886865974820"><ph name="MANAGER" /> erfordert, dass dein Gerät (<ph name="DEVICE_TYPE" />) vor Ablauf der Frist aktualisiert wird</translation>
 <translation id="649452524636452238">Smartcard-PIN</translation>

ash/strings/ash_strings_en-GB.xtb

diff --git a/ash/strings/ash_strings_en-GB.xtb b/ash/strings/ash_strings_en-GB.xtb
index d10b97f7..632a0a66 100644
--- a/ash/strings/ash_strings_en-GB.xtb
+++ b/ash/strings/ash_strings_en-GB.xtb
@@ -1214,6 +1214,7 @@
 <translation id="6683022854667115063">Headphones</translation>
 <translation id="6696025732084565524">Your detachable keyboard needs a critical update</translation>
 <translation id="6700713906295497288">IME menu button</translation>
+<translation id="6705577071209924099">Adjust lighting</translation>
 <translation id="6707693040195709527">Device change to previous version is overdue</translation>
 <translation id="6710213216561001401">Previous</translation>
 <translation id="6723839937902243910">Power</translation>

ash/strings/ash_strings_fi.xtb

diff --git a/ash/strings/ash_strings_fi.xtb b/ash/strings/ash_strings_fi.xtb
index 9bf23d6..2928a23 100644
--- a/ash/strings/ash_strings_fi.xtb
+++ b/ash/strings/ash_strings_fi.xtb
@@ -1214,6 +1214,7 @@
 <translation id="6683022854667115063">Kuulokkeet</translation>
 <translation id="6696025732084565524">Irrotettavaan näppäimistöösi täytyy asentaa kriittinen päivitys</translation>
 <translation id="6700713906295497288">IME-valikkopainike</translation>
+<translation id="6705577071209924099">Säädä valaistusta</translation>
 <translation id="6707693040195709527">Laitteen päivitys aiempaan versioon on myöhässä</translation>
 <translation id="6710213216561001401">Edellinen</translation>
 <translation id="6723839937902243910">Virta</translation>

ash/strings/ash_strings_gu.xtb

diff --git a/ash/strings/ash_strings_gu.xtb b/ash/strings/ash_strings_gu.xtb
index 04813aed..aead802 100644
--- a/ash/strings/ash_strings_gu.xtb
+++ b/ash/strings/ash_strings_gu.xtb
@@ -84,9 +84,11 @@
 <translation id="1316069254387866896">હંમેશાં શેલ્ફ બતાવો</translation>
 <translation id="132346741904777634">કૅમેરાને ઉપરના ડાબા ખૂણામાં સ્નેપ કર્યો. સિસ્ટમની સપાટીને ઓવરલેપ કરે છે.</translation>
 <translation id="1333308631814936910"><ph name="DISPLAY_NAME" /> કનેક્ટ થયું</translation>
+<translation id="1340378040547539434">પેજને નાનું કરો</translation>
 <translation id="1341651618736211726">ઓવરફ્લો</translation>
 <translation id="1346748346194534595">જમણે</translation>
 <translation id="1351937230027495976">મેનૂ સંકુચિત કરો</translation>
+<translation id="1360220746312242196">પેજમાં શોધતી વખતે, શોધ માટે પાછલા મેળ પર જાઓ</translation>
 <translation id="1364382257761975320">તમારી Chromebook અનલૉક કરવા માટે, તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરો</translation>
 <translation id="1365866993922957110">ઑટોમૅટિક અપડેટ મેળવો</translation>
 <translation id="1372545819342940910">પછીથી ઉપયોગ માટે ડૅસ્ક સાચવો</translation>
@@ -118,6 +120,7 @@
 <translation id="1516740043221086139">ખલેલ પાડશો નહીં ચાલુ છે.</translation>
 <translation id="1520303207432623762">{NUM_APPS,plural, =1{નોટિફિકેશનની સેટિંગ બતાવો. ઍપ માટે નોટિફિકેશન બંધ છે}one{નોટિફિકેશનની સેટિંગ બતાવો. # ઍપ માટે નોટિફિકેશન બંધ છે}other{નોટિફિકેશનની સેટિંગ બતાવો. # ઍપ માટે નોટિફિકેશન બંધ છે}}</translation>
 <translation id="1525508553941733066">છોડી દો</translation>
+<translation id="1526448108126799339">નવા ટૅબને નવી વિંડોમાં ખોલો</translation>
 <translation id="1528259147807435347">ગયા અઠવાડિયે ફેરફાર કરવામાં આવ્યો હતો</translation>
 <translation id="1536604384701784949"><ph name="USER_EMAIL_ADDRESS" />નો ઉપયોગ કરવા માટે તમારે સૌથી પહેલાં બધા એકાઉન્ટમાંથી સાઇન આઉટ કરવું જરૂરી છે. સાઇન આઉટ કરવા માટે પાછળ જવા માટે, 'રદ કરો' પસંદ કરો. પછી, સ્ટેટસ એરિયા ખોલવા માટે, સમય પસંદ કરો અને 'સાઇન આઉટ' પસંદ કરો. પછી <ph name="USER_EMAIL_ADDRESS_2" />માં ફરી સાઇન ઇન કરો.</translation>
 <translation id="15373452373711364">મોટું માઉસ કર્સર</translation>
@@ -140,6 +143,7 @@
 <translation id="1637505162081889933"><ph name="NUM_DEVICES" /> ડિવાઇસ</translation>
 <translation id="1639239467298939599">લોડ થઇ રહી છે</translation>
 <translation id="1647986356840967552">પાછલું પેજ</translation>
+<translation id="1651914502370159744">ઇતિહાસ પેજ ખોલો</translation>
 <translation id="1654477262762802994">વૉઇસ ક્વેરી શરૂ કરો</translation>
 <translation id="1668469839109562275">બિલ્ટ-ઇન VPN</translation>
 <translation id="1677472565718498478"><ph name="TIME" /> બાકી</translation>
@@ -250,6 +254,7 @@
 <translation id="2165966740263283349">સ્ટોરેજનો વપરાશ</translation>
 <translation id="2170530631236737939">ઓવરવ્યૂમાંથી બહાર નીકળવા માટે, ત્રણ આંગળી વડે નીચેની તરફ સ્વાઇપ કરો</translation>
 <translation id="2185166372312820725">પાછલી ટૅબ પર જાઓ</translation>
+<translation id="2185444992308415167">ટૅબ 1થી 8 પર જાઓ</translation>
 <translation id="219905428774326614">લૉન્ચર, બધી ઍપ</translation>
 <translation id="2201071101391734388">તાજેતરના <ph name="TOTAL_COUNT" /> ફોટામાંથી <ph name="INDEX" /> નંબરનો ફોટો.</translation>
 <translation id="2208323208084708176">એકીકૃત ડેસ્કટૉપ મોડ</translation>
@@ -257,6 +262,7 @@
 <translation id="2222841058024245321">ડેસ્ક 7</translation>
 <translation id="2224075387478458881">સંરક્ષિત કન્ટેન્ટ દેખાય ત્યારે સ્ક્રીન રેકોર્ડિંગની મંજૂરી નથી</translation>
 <translation id="2227179592712503583">સૂચન દૂર કરો</translation>
+<translation id="2248634276911611268">લિંકને નવા ટૅબમાં ખોલો અને આ નવા ટૅબ પર સ્વિચ કરો</translation>
 <translation id="225680501294068881">ઉપકરણો માટે સ્કેન કરી રહ્યું છે...</translation>
 <translation id="225716114209817872">મહત્તમ</translation>
 <translation id="2257486738914982088"><ph name="FILENAME" /> ડાઉનલોડ કરતી વખતે કંઈક ખોટું થયું</translation>
@@ -265,6 +271,7 @@
 <translation id="2268813581635650749">બધાને સાઇન આઉટ કરો</translation>
 <translation id="2269016722240250274">કોઈ ઍપ્લિકેશન તમારા માઇક્રોફોનનો ઉપયોગ કરી રહી છે</translation>
 <translation id="2277103315734023688">આગળ લઈ જાઓ</translation>
+<translation id="2282073721614284166">ટૅબમાં લિંક ખોલો</translation>
 <translation id="2292698582925480719">પ્રદર્શન ધોરણ</translation>
 <translation id="229397294990920565">મોબાઇલ ડેટા બંધ થઈ રહ્યો છે…</translation>
 <translation id="2295777434187870477">માઇક્રોફોન ચાલુ છે, ટૉગલ કરવાથી ઇનપુટ મ્યૂટ થશે.</translation>
@@ -286,6 +293,7 @@
 <translation id="2367186422933365202">તમારી Chromebookમાં સાઇન ઇન કરી શકતા નથી</translation>
 <translation id="2367972762794486313">ઍપ્લિકેશનો બતાવો</translation>
 <translation id="2369165858548251131">ચીની ભાષામાં "નમસ્કાર"</translation>
+<translation id="2386292613071805067">પેજ પરનું બધું પસંદ કરો</translation>
 <translation id="2390318262976603432">લોકેલ સેટિંગ</translation>
 <translation id="2397416548179033562">Chrome મેનૂ દર્શાવો</translation>
 <translation id="240006516586367791">મીડિયા નિયંત્રણો</translation>
@@ -304,6 +312,7 @@
 <translation id="24452542372838207">નોટિફિકેશન વિસ્તૃત કરો</translation>
 <translation id="2449089818483227734">ઓછી બૅટરી</translation>
 <translation id="2450205753526923158">સ્ક્રીનશૉટ મોડ</translation>
+<translation id="2455994958736234930">ઍડ્રેસ બારમાં www. અને .com ઉમેરો, પછી વેબસાઇટ ખોલો</translation>
 <translation id="2456008742792828469">કૅલેન્ડર, <ph name="CURRENT_MONTH_YEAR" /></translation>
 <translation id="2473177541599297363">રિઝોલ્યુશન કન્ફર્મ કરો</translation>
 <translation id="2475982808118771221">કોઈ ભૂલ આવી છે</translation>
@@ -317,6 +326,7 @@
 <translation id="2530896289327917474">ટેક્સ્ટના કર્સર વડે બ્રાઉઝ કરવાનું ચાલુ અથવા બંધ કરો</translation>
 <translation id="2531025035050312891">ડિવાઇસ ધીમું છે</translation>
 <translation id="2542089167727451762">તમારા પ્રોફાઇલ ફોટા પર ટૅપ કરો</translation>
+<translation id="254900897760075745">પસંદ કરેલું કન્ટેન્ટ ક્લિપબોર્ડ પર કૉપિ કરો</translation>
 <translation id="255671100581129685">જાહેર સત્રમાં Google Assistant ઉપલબ્ધ હોતું નથી.</translation>
 <translation id="256712445991462162">ડૉક કરેલું મૅગ્નિફાયર</translation>
 <translation id="2573588302192866788"><ph name="NAME" /> કનેક્ટ કરી શકાયું નથી</translation>
@@ -443,8 +453,10 @@
 <translation id="3202010236269062730">{NUM_DEVICES,plural, =1{ઉપકરણ સાથે કનેક્ટ કર્યું}one{# ઉપકરણો સાથે કનેક્ટ કર્યું}other{# ઉપકરણો સાથે કનેક્ટ કર્યું}}</translation>
 <translation id="320207200541803018">ટાઇમર સેટ કરો</translation>
 <translation id="3203405173652969239">સ્વિચ ઍક્સેસ ચાલુ કર્યો</translation>
+<translation id="3206735939915734551">Caps Lock ચાલુ/બંધ કરો</translation>
 <translation id="3207953481422525583">વપરાશકર્તા સેટિંગ</translation>
 <translation id="3208321278970793882">ઍપ</translation>
+<translation id="3213571860604332401">લિંકને બુકમાર્ક તરીકે સાચવો</translation>
 <translation id="3217205077783620295">વૉલ્યૂમ ચાલુ છે, ટૉગલ કરવાથી ઑડિયો મ્યૂટ થશે.</translation>
 <translation id="3226991577105957773">+ વધુ <ph name="COUNT" /></translation>
 <translation id="3227137524299004712">માઇક્રોફોન</translation>
@@ -471,6 +483,7 @@
 <translation id="3340978935015468852">સેટિંગ</translation>
 <translation id="3341303451326249809">સ્ક્રીનશૉટ કૅપ્ચર કર્યો</translation>
 <translation id="334252345105450327">સ્ક્રીનશૉટ લો</translation>
+<translation id="334927402682780278">કર્સરથી લાઇનના છેડા સુધીની ટેક્સ્ટ પસંદ કરો</translation>
 <translation id="3349345708646875009">'કાર્યના મેનેજર' સુવિધા ખોલો</translation>
 <translation id="3351879221545518001">તમે હાલમાં સ્ક્રીનને કાસ્ટ કરી રહ્યા છો.</translation>
 <translation id="3354555338129305222">મારું ડિવાઇસ શા માટે ધીમું છે</translation>
@@ -485,6 +498,7 @@
 <translation id="3387527074123400161">ChromiumOS</translation>
 <translation id="3400357268283240774">વધારાના સેટિંગ</translation>
 <translation id="3405101454990027959">માઇક્રોફોનનો ઍક્સેસ ચાલુ કરો</translation>
+<translation id="3409584356742878290">ડેવલપર ટૂલ ઇન્સ્પેક્ટર બતાવો અથવા છુપાવો</translation>
 <translation id="3410336247007142655">ઘેરી થીમના સેટિંગ બતાવો</translation>
 <translation id="3413817803639110246">હજુ સુધી જોવા માટે કંઈ નથી</translation>
 <translation id="3417835166382867856">ટૅબ શોધો</translation>
@@ -495,6 +509,7 @@
 <translation id="3434107140712555581"><ph name="BATTERY_PERCENTAGE" />%</translation>
 <translation id="343571671045587506">રિમાઇન્ડરમાં ફેરફાર કરો</translation>
 <translation id="3435967511775410570">ફિંગરપ્રિન્ટ ઓળખવામાં આવી છે</translation>
+<translation id="3439896670700055005">કૅશ મેમરીમાં સાચવેલા કન્ટેન્ટનો ઉપયોગ કર્યા વિના વર્તમાન પેજ ફરીથી લોડ કરો</translation>
 <translation id="3441920967307853524"><ph name="RECEIVED_BYTES" />/<ph name="TOTAL_BYTES" /></translation>
 <translation id="3445288400492335833"><ph name="MINUTES" /> મિનિટ</translation>
 <translation id="3445925074670675829">USB-C ઉપકરણ</translation>
@@ -510,11 +525,13 @@
 <translation id="3510164367642747937">માઉસ કર્સરને હાઇલાઇટ કરો</translation>
 <translation id="3513798432020909783"><ph name="MANAGER_EMAIL" /> દ્વારા મેનેજ કરાતું એકાઉન્ટ</translation>
 <translation id="352245152354538528">{0,plural, =1{1 મિનિટની અંદર ડિવાઇસ અપડેટ કરો}one{# મિનિટની અંદર ડિવાઇસ અપડેટ કરો}other{# મિનિટની અંદર ડિવાઇસ અપડેટ કરો}}</translation>
+<translation id="3526440770046466733">લિંકને નવા ટૅબમાં ખોલો અને વર્તમાન ટૅબમાં રહો</translation>
 <translation id="353086728817903341"><ph name="NUM_DEVICES" /> ડિવાઇસ સાથે કનેક્ટેડ</translation>
 <translation id="3533126039236445965">શેલ્ફમાં ઉપલબ્ધ ઍપ</translation>
 <translation id="3542066395059568317">તમને સુઝાવો દેખાશે જેથી તમે જ્યાંથી છોડી દીધું હતું, ત્યાંથી તમે ચાલુ કરી શકો. તમે સુઝાવોને કાઢી નાખવા માટે, રાઇટ ક્લિક કરી શકો છો.</translation>
 <translation id="3546121235777416274">ચિત્ર-માં-ચિત્ર વિન્ડો પર ફોકસ કરો</translation>
 <translation id="3552189655002856821">વાઇ-ફાઇ બંધ છે</translation>
+<translation id="3554215588514239132">ડેવલપર ટૂલ પૅનલ બતાવો અથવા છુપાવો</translation>
 <translation id="3554637740840164787"><ph name="ITEM_TITLE" /> પિન કરી હતી</translation>
 <translation id="3558768885091059911">શું કૅમેરા અને માઇક્રોફોનનો ઍક્સેસ ચાલુ કરીએ?</translation>
 <translation id="3560174576767922131">વીડિયો રેકોર્ડ કરો</translation>
@@ -559,6 +576,7 @@
 <translation id="366222428570480733"><ph name="USER_EMAIL_ADDRESS" /> મેનેજ કરાયેલા વપરાશકર્તા</translation>
 <translation id="3666266999138159418">તમારી ફ્લોટિંગ વિન્ડો છુપાવવા માટે સ્વાઇપ કરો</translation>
 <translation id="367531336287639526">ઍડ્રેસ બારની ડાબી બાજુએ પહેલું આઇકન પસંદ કરો</translation>
+<translation id="3679827876008292680">વિન્ડોમાં છેલ્લા ટૅબ પર જાઓ</translation>
 <translation id="36813544980941320">તમારા ફોન અને <ph name="DEVICE_NAME" /> વચ્ચે વાઇ-ફાઇ નેટવર્ક શેર કરવામાં આવશે</translation>
 <translation id="3694122362646626770">વેબસાઇટ્સ</translation>
 <translation id="3702809606464356667">વર્તમાન ડેસ્ક પરથી વિન્ડો બતાવી રહ્યાં છીએ, બધી ડેસ્ક પરની વિન્ડો બતાવવા માટે ઉપરની ઍરો કી દબાવો</translation>
@@ -632,6 +650,7 @@
 <translation id="4057003836560082631"><ph name="TOTAL_COUNT" />માંથી <ph name="INDEX" /> ટૅબ બ્રાઉઝ કરો. <ph name="SITE_TITLE" />, <ph name="SITE_URL" /></translation>
 <translation id="4065525899979931964">{NUM_APPS,plural, =1{એક ઍપ માટે બંધ}one{# ઍપ માટે બંધ}other{# ઍપ માટે બંધ}}</translation>
 <translation id="4066027111132117168">ચાલુ છે, <ph name="REMAINING_TIME" /></translation>
+<translation id="4069532248403319695">ડાઉનલોડનું પેજ ખોલો</translation>
 <translation id="4072264167173457037">મધ્યમ સિગ્નલ</translation>
 <translation id="4086921558679520050">તમારા ડિવાઇસ પર વાસ્તવિક માઇકની સ્વિચ ચાલુ કરો</translation>
 <translation id="4101772068965291327">હોમ પેજ ખોલો</translation>
@@ -652,6 +671,7 @@
 <translation id="4177913004758410636">{0,plural, =1{એક દિવસની અંદર ડિવાઇસ અપડેટ કરો}one{# દિવસની અંદર ડિવાઇસ અપડેટ કરો}other{# દિવસની અંદર ડિવાઇસ અપડેટ કરો}}</translation>
 <translation id="4181841719683918333">ભાષાઓ</translation>
 <translation id="4185671786623711291">સક્રિય વિન્ડોને જમણી બાજુએ ડેસ્ક પર ખસેડો</translation>
+<translation id="4189826113259617332">વર્તમાન વિન્ડોમાંના બધા ખુલ્લા પેજને બુકમાર્ક તરીકે નવા ફોલ્ડરમાં સાચવો</translation>
 <translation id="4192112279662688596">અથવા</translation>
 <translation id="4193857202545160520">ક્લિક અને કીનો ઉપયોગ બતાવો</translation>
 <translation id="4195814663415092787">તમે જ્યાંથી છોડેલું ત્યાંથી ચાલુ કરો</translation>
@@ -683,6 +703,7 @@
 <translation id="430191667033048642"><ph name="MOVED_APP_NAME" />ને ફોલ્ડર <ph name="FOLDER_NAME" />માં ખસેડી.</translation>
 <translation id="4302592941791324970">ઉપલબ્ધ નથી</translation>
 <translation id="4303223480529385476">સ્ટેટસ એરિયા વધારો</translation>
+<translation id="4305133312001648038">પેજ પર ઝૂમ લેવલ રીસેટ કરો</translation>
 <translation id="4311195029067684288">પૂર્ણ</translation>
 <translation id="4312840429157639164">કૅમેરાને ઉપરના જમણા ખૂણામાં સ્નેપ કર્યો. સિસ્ટમની સપાટીને ઓવરલેપ કરે છે.</translation>
 <translation id="4316910396681052118">બધી ઍપ્લિકેશનો</translation>
@@ -692,6 +713,7 @@
 <translation id="4333628967105022692">એકથી વધુ વપરાશકર્તાઓએ સાઇન ઇન કર્યું હોય, ત્યારે Lacros કામ કરતું નથી.</translation>
 <translation id="4338109981321384717">બૃહદદર્શક કાચ</translation>
 <translation id="4371348193907997655">કાસ્ટ સેટિંગ</translation>
+<translation id="4375482231364171368">ઍડ્રેસ બારમાં શોધો</translation>
 <translation id="4378479437904450384"><ph name="WIRELESS_PROVIDER" />, સિગ્નલની પ્રબળતા <ph name="SIGNAL_STRENGTH" /> ટકા</translation>
 <translation id="4378551569595875038">કનેક્ટિંગ...</translation>
 <translation id="4379531060876907730">આ છે તમારા સ્ટાઇલસનાં સાધનો</translation>
@@ -731,6 +753,7 @@
 <translation id="453661520163887813">પૂર્ણપણે ચાર્જ થવામાં <ph name="TIME" /></translation>
 <translation id="4536664881735498710">RAMનો વપરાશ</translation>
 <translation id="4538824937723742295">પૂર્ણ સ્ક્રીનનો સ્ક્રીનશૉટ લો</translation>
+<translation id="4539127209940689201">વર્તમાન પેજ પ્રિન્ટ કરો</translation>
 <translation id="4544483149666270818">રેકોર્ડ કરવા માટે વિન્ડો પસંદ કરો</translation>
 <translation id="454541942614298893">મારું ડિવાઇસ</translation>
 <translation id="4548482551627849548">સક્રિય વિન્ડોને ડાબી બાજુએ ડેસ્ક પર ખસેડો</translation>
@@ -801,6 +824,7 @@
 <translation id="4864648187878336334">ડેસ્ક 15</translation>
 <translation id="4868492592575313542">સક્રિય કરેલું</translation>
 <translation id="4872237917498892622">Alt+Search અથવા Shift</translation>
+<translation id="4872852897273142380">(જો બતાવવામાં આવ્યો હોય, તો) બુકમાર્ક બાર પર ફોકસ કરો અથવા તેને હાઇલાઇટ કરો</translation>
 <translation id="4881695831933465202">ખોલો</translation>
 <translation id="4889868803215848840">સૂચનો બહેતર બનાવવા માટે, વૈકલ્પિક પ્રતિસાદ આપો:</translation>
 <translation id="4890187583552566966">તમારા વ્યવસ્થાપકે Google Assistant બંધ કરેલું છે.</translation>
@@ -927,11 +951,13 @@
 <translation id="544691375626129091">બધા ઉપલબ્ધ વપરાશકર્તાઓ પહેલેથી જ આ સત્ર પર ઉમેરવામાં આવ્યા છે.</translation>
 <translation id="54609108002486618">મેનેજ કરેલું</translation>
 <translation id="5460938382730614333">માર્કર ચાલુ છે.</translation>
+<translation id="5463129623250377817">પસંદ કરેલા કન્ટેન્ટને કટ કરીને ક્લિપબોર્ડ પર પેસ્ટ કરો</translation>
 <translation id="5465662442746197494">સહાયની જરૂર છે?</translation>
 <translation id="547979256943495781">શેલ્ફ જમણી બાજુએ છે</translation>
 <translation id="5491186829646618080">ફર્મવેયર અપડેટ ઉપલબ્ધ છે</translation>
 <translation id="5503884284981862082">Google Assistant ખોલો/બંધ કરો</translation>
 <translation id="5506975627792768506">મેગ્નિફાયર ચાલુ કે બંધ કરો</translation>
+<translation id="5512042095225963688">અગાઉનો શબ્દ ડિલીટ કરો</translation>
 <translation id="5519195206574732858">LTE</translation>
 <translation id="5520229639206813572">તમારા વ્યવસ્થાપકે બધી ઇ-સિમ પ્રોફાઇલ કાઢી નાખી છે. વધુ માહિતી માટે તમારા વ્યવસ્થાપકનો સંપર્ક કરો.</translation>
 <translation id="5523434445161341166"><ph name="FEATURE_NAME" /> કનેક્ટ થઈ રહ્યું છે.</translation>
@@ -942,9 +968,11 @@
 <translation id="5546397813406633847">વપરાશકર્તાને રિકવર કરો</translation>
 <translation id="554893713779400387">શ્રુતલેખન ટૉગલ કરો</translation>
 <translation id="5551456515017410630">કૅલેન્ડર ખોલો/બંધ કરો</translation>
+<translation id="5551974246223970793">પેજમાં શોધતી વખતે, શોધ માટે આગલા મેળ પર જાઓ</translation>
 <translation id="5558091555391176027">નજીકના શેર સુવિધાની ઉચ્ચ દૃશ્યતા ટૉગલ કરો</translation>
 <translation id="5560420195677022218">તમારા <ph name="DEVICE_TYPE" /> પર તમારા ફોનની ઍપ જુઓ</translation>
 <translation id="556042886152191864">બટન</translation>
+<translation id="5570122939431135380">નવા ટૅબને નવી છૂપી વિન્ડોમાં ખોલો</translation>
 <translation id="5571066253365925590">Bluetooth સક્ષમ છે</translation>
 <translation id="557563299383177668">આગલો ફકરો</translation>
 <translation id="5577082622442191756">બ્લૂટૂથ ટૉગલ કરો. <ph name="STATE_TEXT" />.</translation>
@@ -955,6 +983,7 @@
 <translation id="5597451508971090205"><ph name="SHORT_WEEKDAY" />, <ph name="DATE" /></translation>
 <translation id="5600837773213129531">બોલાયેલા પ્રતિસાદને બંધ કરવા માટે Ctrl + Alt + Z દબાવો.</translation>
 <translation id="5601503069213153581">PIN</translation>
+<translation id="5601571553788043181">ફાઇલને Chrome બ્રાઉઝરમાં ખોલો</translation>
 <translation id="5618148318840095371">અમે તમને વધુ સારા નેટવર્ક પર સ્વિચ કર્યા છે</translation>
 <translation id="5619862035903135339">વ્યવસ્થાપક પૉલિસીને કારણે સ્ક્રીન કૅપ્ચરની સુવિધા બંધ કરવામાં આવે છે</translation>
 <translation id="5625955975703555628">LTE+</translation>
@@ -997,6 +1026,7 @@
 <translation id="5777841717266010279">સ્ક્રીન શેરિંગ રોકીએ?</translation>
 <translation id="5779721926447984944">પિન કરેલી ફાઇલો</translation>
 <translation id="5788127256798019331">Play ફાઇલો</translation>
+<translation id="5788535737706478207">બંધ કરેલા છેલ્લા ટૅબ અથવા વિન્ડોને ફરીથી ખોલો</translation>
 <translation id="5790085346892983794">સફળતા</translation>
 <translation id="5804651031882187592">"સિમ કાર્ડ લૉક કરો" સેટિંગ બંધ કરો</translation>
 <translation id="5805809050170488595">સક્રિય કરવા માટે ક્લિક કરો <ph name="NETWORK_NAME" /></translation>
@@ -1180,6 +1210,7 @@
 <translation id="6670153871843998651">ડેસ્ક 3</translation>
 <translation id="6671495933530132209">છબી કૉપિ કરો</translation>
 <translation id="6671661918848783005">તમારી Chromebook અનલૉક કરી શકતા નથી</translation>
+<translation id="6682029141988159141">ક્લિપબોર્ડમાંના કન્ટેન્ટને પેસ્ટ કરો</translation>
 <translation id="6683022854667115063">હૅડફોન</translation>
 <translation id="6696025732084565524">અલગ પાડી શકાય તેવા તમારા કીબોર્ડ માટે મહત્ત્વપૂર્ણ અપડેટ જરૂરી છે</translation>
 <translation id="6700713906295497288">IME મેનૂ બટન</translation>
@@ -1201,6 +1232,7 @@
 <translation id="6777216307882431711">કનેક્ટ કરેલા બધા USB-C ડિવાઇસને પાવર સપ્લાય આપી રહ્યાં છીએ</translation>
 <translation id="6781002679438061620">ડેસ્ક 9</translation>
 <translation id="6782182743534150858">ડેસ્ક 13</translation>
+<translation id="6782919488259222803">વર્તમાન પેજમાં શોધો</translation>
 <translation id="6786750046913594791">ફોલ્ડર બંધ કરો</translation>
 <translation id="6787839852456839824">કીબોર્ડ શોર્ટકટ્સ</translation>
 <translation id="6790428901817661496">ચલાવો</translation>
@@ -1269,15 +1301,18 @@
 <translation id="7076878155205969899">સાઉન્ડ મ્યૂટ કરો</translation>
 <translation id="7086931198345821656">આ અપડેટ માટે તમારા <ph name="DEVICE_TYPE" />ને પાવરવોશ કરવું જરૂરી છે. બધો ડેટા ડિલીટ કરવામાં આવશે. નવીનતમ <ph name="SYSTEM_APP_NAME" /> અપડેટ વિશે વધુ જાણો.</translation>
 <translation id="7088960765736518739">સ્વિચ ઍક્સેસ</translation>
+<translation id="709015856939120012">પેજ પર મોટું કરો</translation>
 <translation id="7098053464892629930">બધી ઉપલબ્ધ સુવિધાઓ જોવા માટે, Google Play પરથી <ph name="NAME" />ની ઍપ ડાઉનલોડ કરો</translation>
 <translation id="7098389117866926363">USB-C ડિવાઇસ (પાછળની બાજુએ ડાબું પોર્ટ)</translation>
 <translation id="7100906357717321275">છુપાવેલી ફાઇલો Files ઍપમાં બતાવો</translation>
 <translation id="7106330611027933926">ડેસ્કબાર બતાવો</translation>
 <translation id="7116969082764510092">ડેસ્ક 11</translation>
 <translation id="7118268675952955085">સ્ક્રીનશૉટ</translation>
+<translation id="7119327711295338600">આગલો શબ્દ અથવા અક્ષર પસંદ કરો</translation>
 <translation id="7126996685418858413">ગયા અઠવાડિયે ખોલેલી</translation>
 <translation id="7130207228079676353">સૌથી વધુ શક્ય</translation>
 <translation id="7131634465328662194">તમે ઑટોમૅટિક રીતે સાઇન આઉટ થઈ જશો.</translation>
+<translation id="7138316363520807689">વર્તમાન ટૅબને બુકમાર્ક તરીકે સાચવો</translation>
 <translation id="7143207342074048698">કનેક્ટિંગ</translation>
 <translation id="7144942256906679589">બૅટરીનું સ્ટેટસ</translation>
 <translation id="7165278925115064263">Alt+Shift+K</translation>
@@ -1322,6 +1357,7 @@
 <translation id="7406608787870898861">તમારા મોબાઇલ નેટવર્કનું સેટઅપ કરવાનું પૂર્ણ કરો</translation>
 <translation id="740790383907119240">ઍપ શૉર્ટકટ</translation>
 <translation id="7413851974711031813">બંધ કરવા માટે Escape કી દબાવો</translation>
+<translation id="7416471219712049036">વર્તમાન પેજ સાચવો</translation>
 <translation id="742594950370306541">કૅમેરા ઉપયોગમાં છે.</translation>
 <translation id="742608627846767349">ગુડ મોર્નિંગ,</translation>
 <translation id="743058460480092004">કૅમેરા અને માઇક્રોફોન ઉપયોગમાં છે.</translation>
@@ -1381,15 +1417,19 @@
 <translation id="7670953955701272011">Google Calendarમાં આ તારીખ ખોલો</translation>
 <translation id="7671610481353807627">ઍપને રંગ અનુસાર સૉર્ટ કરવામાં આવી છે</translation>
 <translation id="7672095158465655885"><ph name="NAME" /> સાથે કનેક્ટેડ, <ph name="SUBTEXT" /></translation>
+<translation id="7682351277038250258">ક્લિપબોર્ડમાંના કન્ટેન્ટને સાદી ટેક્સ્ટ તરીકે પેસ્ટ કરો</translation>
 <translation id="7684531502177797067">કૅમેરા ઇનપુટને <ph name="CAMERA_NAME" /> પર સેટ કર્યું.</translation>
 <translation id="7689817529363080918">આ માઇક્રોફોનની પરવાનગી ધરાવતી <ph name="APP1_NAME" />, <ph name="APP2_NAME" /> અને બધી ઍપ તથા વેબસાઇટ માટે, માઇક્રોફોનના ઍક્સેસની મંજૂરી આપે છે</translation>
+<translation id="7704000866383261579">છેલ્લી ક્રિયા ફરીથી કરો</translation>
 <translation id="7705524343798198388">VPN</translation>
 <translation id="770741401784017797">GIF બનાવી રહ્યાં છીએ</translation>
 <translation id="7714767791242455379">નવું સેલ્યુલર નેટવર્ક ઉમેરો</translation>
 <translation id="7720400844887872976"><ph name="TIME" /> સુધી ચાલુ રાખો</translation>
 <translation id="7720410380936703141">ફરી પ્રયાસ કરો</translation>
 <translation id="7723389094756330927">{NUM_NOTIFICATIONS,plural, =1{1 નોટિફિકેશન}one{# નોટિફિકેશન}other{# નોટિફિકેશન}}</translation>
+<translation id="7723703419796509666">ડેવલપર ટૂલ કન્સોલ બતાવો અથવા છુપાવો</translation>
 <translation id="7724603315864178912">કાપો</translation>
+<translation id="7727952505535211425">નવા ટૅબમાં ઍડ્રેસ બારમાં વેબસાઇટ ખોલો</translation>
 <translation id="77365090426890123">મેમરીનો વપરાશ</translation>
 <translation id="7742327441377685481">કોઈ નોટિફિકેશન નથી</translation>
 <translation id="7749443890790263709">ડેસ્કની મહત્તમ સંખ્યા પર પહોંચી ગયા.</translation>
@@ -1416,6 +1456,7 @@
 <translation id="7872786842639831132">બંધ છે</translation>
 <translation id="7875575368831396199">એવું લાગે છે કે તમારા <ph name="DEVICE_TYPE" /> પર બ્લૂટૂથ બંધ કરેલું છે. કૃપા કરીને ફોન હબનો ઉપયોગ કરવા માટે બ્લૂટૂથ ચાલુ કરો.</translation>
 <translation id="7877557217297072640">{0,plural, =0{ડિવાઇસને હમણાં જ પાછલા વર્ઝનમાં બદલો}=1{ડિવાઇસને 1 સેકન્ડની અંદર પાછલા વર્ઝનમાં બદલો}one{ડિવાઇસને # સેકન્ડની અંદર પાછલા વર્ઝનમાં બદલો}other{ડિવાઇસને # સેકન્ડની અંદર પાછલા વર્ઝનમાં બદલો}}</translation>
+<translation id="7884902759927478774">ટૅબને ખેંચવાનું રદ કરો</translation>
 <translation id="7886169021410746335">ગોપનીયતા સેટિંગ ગોઠવો</translation>
 <translation id="7886277072580235377">જ્યારે તમે સાઇન આઉટ કરશો, ત્યારે તમારા ઇન્ટરનેટ સત્રની માહિતી સાફ કરવામાં આવશે. <ph name="LEARN_MORE" /></translation>
 <translation id="788781083998633524">ઇમેઇલ મોકલો</translation>
@@ -1446,6 +1487,7 @@
 <translation id="7994370417837006925">બહુવિધ સાઇન-ઇન</translation>
 <translation id="7995804128062002838">સ્ક્રીન કૅપ્ચર કરવામાં નિષ્ફળ રહ્યાં</translation>
 <translation id="8000066093800657092">નેટવર્ક નથી</translation>
+<translation id="8001755249288974029">કર્સરથી લાઇનની શરૂઆત સુધીની ટેક્સ્ટ પસંદ કરો</translation>
 <translation id="8004512796067398576">વૃદ્ધિ</translation>
 <translation id="8026334261755873520">બ્રાઉઝિંગ ડેટા સાફ કરો</translation>
 <translation id="8029247720646289474">હૉટસ્પૉટ કનેક્શન નિષ્ફળ થયું</translation>
@@ -1514,6 +1556,7 @@
 <translation id="8314772463905284467">Caps Lock ચાલુ છે</translation>
 <translation id="8341451174107936385"><ph name="UNLOCK_MORE_FEATURES" />  <ph name="GET_STARTED" /></translation>
 <translation id="8345019317483336363"><ph name="WINDOW_TITLE" /> વિન્ડો પસંદ કરી</translation>
+<translation id="8349964124165471584">નવી વિન્ડોમાં લિંક ખોલો</translation>
 <translation id="8351131234907093545">નોંધ બનાવો</translation>
 <translation id="8364673525741149932">શેલ્ફ પાર્ટીનું ટૉગલ. <ph name="STATE_TEXT" /></translation>
 <translation id="8369166482916924789">સાચવેલી ડેસ્ક, <ph name="SAVE_AND_RECALL_DESK_NAME" /></translation>
@@ -1544,6 +1587,7 @@
 <translation id="847056008324733326">પ્રદર્શન ધોરણનું સેટિંગ</translation>
 <translation id="8473301994082929012"><ph name="ORGANIZATION_NAME" />માં <ph name="FEATURE_STATE" /> <ph name="FEATURE_NAME" />છે.</translation>
 <translation id="8477270416194247200">રદ કરવા માટે Alt+Search અથવા Shift દબાવો.</translation>
+<translation id="8491237443345908933">નવા ટૅબમાં લિંક ખોલો</translation>
 <translation id="8492573885090281069"><ph name="DISPLAY_NAME" />, <ph name="SPECIFIED_RESOLUTION" />ને સપોર્ટ આપતું નથી. રિઝોલ્યુશનને <ph name="FALLBACK_RESOLUTION" /> પર બદલવામાં આવ્યું હતું. ફેરફારો રાખવા માટે કન્ફર્મ પર ક્લિક કરો. અગાઉના સેટિંગ <ph name="TIMEOUT_SECONDS" />માં રિસ્ટોર કરવામાં આવશે.</translation>
 <translation id="8496402167048257517">નજીકના શેર સુવિધાના સેટિંગ બતાવો</translation>
 <translation id="8507563469658346379">પ્રત્યેક, <ph name="REMAINING_TIME" /></translation>
@@ -1612,6 +1656,7 @@
 <translation id="8818320199597151042">પ્રોફાઇલ કાઢી નાખી રહ્યાં છીએ. થોડીવાર રાહ જુઓ.</translation>
 <translation id="8819728065740986820">અડૅપ્ટિવ ચાર્જિંગ ચાલુ છે</translation>
 <translation id="8825863694328519386">પાછળ જવા ડાબેથી સ્વાઇપ કરો</translation>
+<translation id="8832513206237979203">બુકમાર્ક બાર બતાવો અથવા છુપાવો</translation>
 <translation id="8834539327799336565">હાલમાં કનેક્ટેડ</translation>
 <translation id="8841375032071747811">પાછળ બટન</translation>
 <translation id="8843682306134542540">રોટેશન લૉક ટૉગલ કરો. <ph name="STATE_TEXT" /></translation>
@@ -1643,6 +1688,7 @@
 <translation id="8940956008527784070">બૅટરી ઓછી (<ph name="PERCENTAGE" />%)</translation>
 <translation id="8949925099261528566">કનેક્ટ કર્યું, કોઈ ઇન્ટરનેટ નથી</translation>
 <translation id="8951539504029375108">તમારી Chromebook સાથે ફક્ત મંજૂરી ધરાવતા Thunderbolt ડિવાઇસ સુસંગત હોય છે</translation>
+<translation id="8973885907461690937">મેનૂ આઇકન પર ફોકસ મૂકો</translation>
 <translation id="8980862970816311842">ઍપ ગ્રિડમાં ઍપ આઇકનને ફોલ્ડરની અંદર/બહાર ખસેડો</translation>
 <translation id="8982906748181120328">નજીકની દૃશ્યતા</translation>
 <translation id="8983038754672563810">HSPA</translation>
@@ -1678,7 +1724,9 @@
 <translation id="9105450214093926548">Lacros બ્રાઉઝર ચાલતું હોય, ત્યારે બીજા વપરાશકર્તા દ્વારા સાઇન ઇન કરવાને સપોર્ટ કરવામાં આવતો નથી. કૃપા કરીને તેના બદલે Lacrosમાં બીજી બ્રાઉઝર પ્રોફાઇલનો ઉપયોગ કરો કે Lacros બંધ કરો અને ફરી પ્રયાસ કરો.</translation>
 <translation id="9120448753905017833">અમે મોબાઇલ ડેટા મારફતે હૉટસ્પૉટનો ઉપયોગ શરૂ કરવા માટે વાઇ-ફાઇ બંધ કર્યું છે. આમ કરવાથી ડેટા વપરાશનો ખર્ચ લાગુ થઈ શકે છે.</translation>
 <translation id="9121941381564890244"><ph name="SNIP" /> અથવા <ph name="CTRL" /><ph name="SEPARATOR1" /><ph name="SHIFT" /><ph name="SEPARATOR2" /><ph name="OVERVIEW" /></translation>
+<translation id="9126339866969410112">ક્રિયામાં કરેલો છેલ્લો ફેરફાર રદ કરો</translation>
 <translation id="9133335900048457298">સંરક્ષિત કન્ટેન્ટ રેકોર્ડ કરી શકાતું નથી</translation>
+<translation id="9139720510312328767">આગલો અક્ષર ડિલીટ કરો</translation>
 <translation id="9161053988251441839">સૂચવેલ ઍપ્લિકેશનો</translation>
 <translation id="9168436347345867845">આ પછીથી કરો</translation>
 <translation id="9178475906033259337"><ph name="QUERY" /> માટે 1 પરિણામ બતાવી રહ્યાં છીએ</translation>

ash/strings/ash_strings_hr.xtb

diff --git a/ash/strings/ash_strings_hr.xtb b/ash/strings/ash_strings_hr.xtb
index ea60393..48978edf 100644
--- a/ash/strings/ash_strings_hr.xtb
+++ b/ash/strings/ash_strings_hr.xtb
@@ -4,6 +4,7 @@
 <translation id="1012876632442809908">USB-C uređaj (prednji priključak)</translation>
 <translation id="1013598600051641573">Razlučivost zaslona <ph name="DISPLAY_NAME" /> promijenjena je u <ph name="RESOLUTION" /> (<ph name="REFRESH_RATE" /> Hz). Kliknite Potvrdi da biste zadržali promjene. Prethodne postavke vratit će se za <ph name="TIMEOUT_SECONDS" />.</translation>
 <translation id="1013923882670373915">Bluetooth uređaj "<ph name="DEVICE_NAME" />" traži dopuštenje za uparivanje. Unesite ovaj PIN na tom uređaju: <ph name="PINCODE" />.</translation>
+<translation id="1017556409696559990">Minimiziranje gornjeg prozora kad nema povijesti povratka u Chromeu</translation>
 <translation id="1024364763893396229">Spremite uređaj <ph name="NAME" /></translation>
 <translation id="1032891413405719768">Baterija pisaljke gotovo je prazna</translation>
 <translation id="1036073649888683237">Da biste upravljali obavijestima, otvorite Postavke</translation>
@@ -343,6 +344,7 @@
 <translation id="2620436844016719705">Sustav</translation>
 <translation id="2621713457727696555">Zaštićeno</translation>
 <translation id="263399434338050016">"Odaberi sve"</translation>
+<translation id="2644422758626431000">Prikvačivanje prozora nalijevo</translation>
 <translation id="2645435784669275700">Chrome OS</translation>
 <translation id="2647092942972307022">Dostupno <ph name="USED_MEMORY" /> od <ph name="TOTAL_MEMORY" /></translation>
 <translation id="2653019840645008922">Snimanje prozora</translation>
@@ -1052,6 +1054,7 @@
 <translation id="5911909173233110115"><ph name="USERNAME" /> (<ph name="MAIL" />)</translation>
 <translation id="5916664084637901428">Uključi</translation>
 <translation id="5920710855273935292">Mikrofon je isključen.</translation>
+<translation id="5922962980596822074">Pregledavanje prozora iz posljednjeg upotrijebljenog prozora</translation>
 <translation id="5924855612669061715">Žarišna je točka uključena</translation>
 <translation id="5946788582095584774">Značajka <ph name="FEATURE_NAME" /> je uključena.</translation>
 <translation id="5947494881799873997">Vrati</translation>
@@ -1141,6 +1144,7 @@
 <translation id="6352082849089527770">Nepoznate mreže</translation>
 <translation id="6359587239691116345">Preuzmite najnovije značajke i sigurnosna poboljšanja. Ako odbijete ovo ažuriranje, vaš uređaj možda više neće pravilno funkcionirati i možda ćete imati problema sa sigurnošću i izvedbom.</translation>
 <translation id="6376931439017688372">Bluetooth je uključen</translation>
+<translation id="6378515133128829137">Prikvačivanje prozora udesno</translation>
 <translation id="6381109794406942707">Da biste otključali uređaj, unesite PIN.</translation>
 <translation id="638716340450135524">Uključi pristup kameri</translation>
 <translation id="639644700271529076">Tipka CAPS LOCK isključena</translation>
@@ -1160,6 +1164,7 @@
 <translation id="6459472438155181876">Proširivanje zaslona na zaslon <ph name="DISPLAY_NAME" /></translation>
 <translation id="6477681113376365978">Datoteku nije moguće preuzeti</translation>
 <translation id="6482559668224714696">Povećalo za cijeli zaslon</translation>
+<translation id="6483727822843292440">Pregledavanje prozora iz najmanje upotrijebljenog prozora</translation>
 <translation id="6490471652906364588">USB-C uređaj (desni priključak)</translation>
 <translation id="6491071886865974820"><ph name="MANAGER" /> zahtijeva da ažurirate svoj uređaj <ph name="DEVICE_TYPE" /> prije roka</translation>
 <translation id="649452524636452238">PIN za pametnu karticu</translation>
@@ -1213,6 +1218,7 @@
 <translation id="6683022854667115063">Slušalice</translation>
 <translation id="6696025732084565524">Potrebno je preuzeti važno ažuriranje za vašu odvojivu tipkovnicu</translation>
 <translation id="6700713906295497288">Gumb izbornika IME-a</translation>
+<translation id="6705577071209924099">Prilagodba osvjetljenja</translation>
 <translation id="6707693040195709527">Vraćanje uređaja na prethodnu verziju kasni</translation>
 <translation id="6710213216561001401">Prethodno</translation>
 <translation id="6723839937902243910">Napajanje</translation>

ash/strings/ash_strings_is.xtb

diff --git a/ash/strings/ash_strings_is.xtb b/ash/strings/ash_strings_is.xtb
index ee0d9c5..5cbaf9b3 100644
--- a/ash/strings/ash_strings_is.xtb
+++ b/ash/strings/ash_strings_is.xtb
@@ -1214,6 +1214,7 @@
 <translation id="6683022854667115063">Heyrnartól</translation>
 <translation id="6696025732084565524">Lausa lyklaborðið þarf að fá áríðandi uppfærslu</translation>
 <translation id="6700713906295497288">IME-valmyndarhnappur</translation>
+<translation id="6705577071209924099">Stilla lýsingu</translation>
 <translation id="6707693040195709527">Færsla tækisins í fyrri útgáfu er komin fram yfir tíma</translation>
 <translation id="6710213216561001401">Til baka</translation>
 <translation id="6723839937902243910">Orka</translation>

ash/strings/ash_strings_it.xtb

diff --git a/ash/strings/ash_strings_it.xtb b/ash/strings/ash_strings_it.xtb
index 8265e05..9089f4e8 100644
--- a/ash/strings/ash_strings_it.xtb
+++ b/ash/strings/ash_strings_it.xtb
@@ -4,6 +4,7 @@
 <translation id="1012876632442809908">Dispositivo USB-C (porta anteriore)</translation>
 <translation id="1013598600051641573">La risoluzione di <ph name="DISPLAY_NAME" /> è stata impostata su <ph name="RESOLUTION" /> (<ph name="REFRESH_RATE" /> Hz). Fai clic su Conferma per mantenere le modifiche. Le impostazioni precedenti verranno ripristinate tra <ph name="TIMEOUT_SECONDS" />.</translation>
 <translation id="1013923882670373915">Il dispositivo Bluetooth "<ph name="DEVICE_NAME" />" chiede l'autorizzazione per essere accoppiato. Inserisci questo codice PIN sul dispositivo: <ph name="PINCODE" /></translation>
+<translation id="1017556409696559990">Riduci a icona la finestra principale quando non è presente una cronologia precedente in Chrome</translation>
 <translation id="1024364763893396229">Salva <ph name="NAME" /></translation>
 <translation id="1032891413405719768">Batteria dello stilo in esaurimento</translation>
 <translation id="1036073649888683237">Per gestire le notifiche, vai alle Impostazioni</translation>
@@ -343,6 +344,7 @@
 <translation id="2620436844016719705">Sistema</translation>
 <translation id="2621713457727696555">Protetta</translation>
 <translation id="263399434338050016">"Seleziona tutto"</translation>
+<translation id="2644422758626431000">Blocca la finestra a sinistra</translation>
 <translation id="2645435784669275700">ChromeOS</translation>
 <translation id="2647092942972307022"><ph name="USED_MEMORY" /> su <ph name="TOTAL_MEMORY" /> disponibili</translation>
 <translation id="2653019840645008922">Acquisizione finestra</translation>
@@ -1050,6 +1052,7 @@
 <translation id="5911909173233110115"><ph name="USERNAME" /> (<ph name="MAIL" />)</translation>
 <translation id="5916664084637901428">On</translation>
 <translation id="5920710855273935292">L'audio del microfono è disattivato.</translation>
+<translation id="5922962980596822074">Passa da una finestra all'altra dalla finestra usata più recentemente</translation>
 <translation id="5924855612669061715">L'hotspot è attivato</translation>
 <translation id="5946788582095584774">La funzionalità <ph name="FEATURE_NAME" /> è attiva.</translation>
 <translation id="5947494881799873997">Ripristina</translation>
@@ -1139,6 +1142,7 @@
 <translation id="6352082849089527770">Reti sconosciute</translation>
 <translation id="6359587239691116345">Ottieni le funzionalità e i miglioramenti della sicurezza più recenti. Se rifiuti questo aggiornamento, il tuo dispositivo potrebbe non funzionare più correttamente e potresti riscontrare problemi di prestazioni e sicurezza.</translation>
 <translation id="6376931439017688372">Bluetooth attivo.</translation>
+<translation id="6378515133128829137">Blocca la finestra a destra</translation>
 <translation id="6381109794406942707">Per sbloccare il dispositivo, inserisci il PIN.</translation>
 <translation id="638716340450135524">Attiva l'accesso alla fotocamera</translation>
 <translation id="639644700271529076">Funzione BLOC MAIUSC non attiva</translation>
@@ -1158,6 +1162,7 @@
 <translation id="6459472438155181876">Estensione dello schermo su <ph name="DISPLAY_NAME" /></translation>
 <translation id="6477681113376365978">Impossibile scaricare il file</translation>
 <translation id="6482559668224714696">Lente d'ingrandimento a schermo intero</translation>
+<translation id="6483727822843292440">Passa da una finestra all'altra dalla finestra meno usata</translation>
 <translation id="6490471652906364588">Dispositivo USB-C (porta a destra)</translation>
 <translation id="6491071886865974820"><ph name="MANAGER" /> richiede l'aggiornamento di <ph name="DEVICE_TYPE" /> entro il termine ultimo</translation>
 <translation id="649452524636452238">PIN della smart card</translation>
@@ -1211,6 +1216,7 @@
 <translation id="6683022854667115063">Cuffie</translation>
 <translation id="6696025732084565524">La tastiera rimovibile richiede un aggiornamento critico</translation>
 <translation id="6700713906295497288">Pulsante di menu IME</translation>
+<translation id="6705577071209924099">Regola l'illuminazione</translation>
 <translation id="6707693040195709527">Il termine ultimo per il ripristino della versione precedente del dispositivo è trascorso</translation>
 <translation id="6710213216561001401">Precedente</translation>
 <translation id="6723839937902243910">Alimentazione</translation>

ash/strings/ash_strings_ka.xtb

diff --git a/ash/strings/ash_strings_ka.xtb b/ash/strings/ash_strings_ka.xtb
index 3ab6d5e..ddffb0b1 100644
--- a/ash/strings/ash_strings_ka.xtb
+++ b/ash/strings/ash_strings_ka.xtb
@@ -1214,6 +1214,7 @@
 <translation id="6683022854667115063">ყურსასმენები</translation>
 <translation id="6696025732084565524">თქვენი განცალკევებადი კლავიატურა საჭიროებს კრიტიკულ განახლებას</translation>
 <translation id="6700713906295497288">IME მენიუს ღილაკი</translation>
+<translation id="6705577071209924099">განათების კორექტირება</translation>
 <translation id="6707693040195709527">მოწყობილობის წინა ვერსიაზე დაბრუნება ვადაგადაცილებულია</translation>
 <translation id="6710213216561001401">წინა</translation>
 <translation id="6723839937902243910">ენერგია</translation>

ash/strings/ash_strings_km.xtb

diff --git a/ash/strings/ash_strings_km.xtb b/ash/strings/ash_strings_km.xtb
index 1098eaf7..c87c818 100644
--- a/ash/strings/ash_strings_km.xtb
+++ b/ash/strings/ash_strings_km.xtb
@@ -4,6 +4,7 @@
 <translation id="1012876632442809908">ឧបករណ៍ USB-C (រន្ធខាងមុខ)</translation>
 <translation id="1013598600051641573"><ph name="DISPLAY_NAME" /> បានប្ដូរទៅ <ph name="RESOLUTION" /> (<ph name="REFRESH_RATE" /> Hz)។ សូមចុច "បញ្ជាក់" ដើម្បីរក្សា​ការផ្លាស់ប្ដូរ។ ការកំណត់​មុននឹងត្រូវបានរក្សាទុក​ក្នុងរយៈពេល <ph name="TIMEOUT_SECONDS" />។</translation>
 <translation id="1013923882670373915">ឧបករណ៍ប៊្លូធូស "<ph name="DEVICE_NAME" />" ចង់បានការអនុញ្ញាតដើម្បីភ្ជាប់។ សូមបញ្ចូលលេខកូដសម្គាល់នៅលើឧបករណ៍នោះ៖ <ph name="PINCODE" /></translation>
+<translation id="1017556409696559990">បង្រួម​វិនដូ​ខាង​លើជាអប្បបរមា​​​ នៅ​ពេល​មិនមាន​ប្រវត្តិ​ថយក្រោយ​នៅ​ក្នុង Chrome</translation>
 <translation id="1024364763893396229">រក្សាទុក <ph name="NAME" /> របស់អ្នក</translation>
 <translation id="1032891413405719768">ថាមពល​ថ្មរបស់ប៊ិចនៅសល់តិច</translation>
 <translation id="1036073649888683237">ដើម្បីគ្រប់គ្រងការជូនដំណឹង សូមចូលទៅកាន់ការកំណត់</translation>
@@ -343,6 +344,7 @@
 <translation id="2620436844016719705">ប្រព័ន្ធ</translation>
 <translation id="2621713457727696555">មាន​សុវត្ថិភាព</translation>
 <translation id="263399434338050016">"ជ្រើសរើសទាំងអស់"</translation>
+<translation id="2644422758626431000">ខ្ទាស់​វិនដូ​ទៅ​ឆ្វេង</translation>
 <translation id="2645435784669275700">ChromeOS</translation>
 <translation id="2647092942972307022">អាច​ប្រើបាន <ph name="USED_MEMORY" /> នៃ <ph name="TOTAL_MEMORY" /></translation>
 <translation id="2653019840645008922">ថតវិនដូ</translation>
@@ -1053,6 +1055,7 @@
 <translation id="5911909173233110115"><ph name="USERNAME" /> (<ph name="MAIL" />)</translation>
 <translation id="5916664084637901428">បើក</translation>
 <translation id="5920710855273935292">បានបិទសំឡេងមីក្រូហ្វូន។</translation>
+<translation id="5922962980596822074">ពិនិត្យមើល​វិនដូ​ពី​វិនដូ​ដែល​បាន​ប្រើ​ថ្មីៗបំផុត</translation>
 <translation id="5924855612669061715">ហតស្ប៉ត​ត្រូវបានបើក</translation>
 <translation id="5946788582095584774"><ph name="FEATURE_NAME" /> បាន​បើក។</translation>
 <translation id="5947494881799873997">ត្រលប់ក្រោយ</translation>
@@ -1142,6 +1145,7 @@
 <translation id="6352082849089527770">បណ្ដាញដែលមិនស្គាល់</translation>
 <translation id="6359587239691116345">ទទួលបាន​មុខងារ និងការកែលម្អផ្នែកសុវត្ថិភាពចុងក្រោយបំផុត។ ប្រសិនបើ​អ្នក​បដិសេធ​ការដំឡើងកំណែ​នេះ ឧបករណ៍​របស់អ្នក​ប្រហែលជា​មិន​ដំណើរការ​ត្រឹមត្រូវ​ទៀតទេ ហើយ​អ្នកប្រហែល​ជាជួប​បញ្ហា​ពាក់ព័ន្ធ​នឹងសុវត្ថិភាព និងប្រតិបត្តិការ។</translation>
 <translation id="6376931439017688372">ប៊្លូធូស​ត្រូវបាន​បើក</translation>
+<translation id="6378515133128829137">ខ្ទាស់​វិនដូ​ទៅ​ស្ដាំ</translation>
 <translation id="6381109794406942707">ដើម្បីដោះសោឧបករណ៍នេះ សូមបញ្ចូលកូដ PIN របស់អ្នក។</translation>
 <translation id="638716340450135524">បើក​ការ​ចូលប្រើប្រាស់​កាមេរ៉ា</translation>
 <translation id="639644700271529076">CAPS LOCK ត្រូវបានបិទ</translation>
@@ -1161,6 +1165,7 @@
 <translation id="6459472438155181876">កំពុងពង្រីកអេក្រង់ទៅ <ph name="DISPLAY_NAME" /></translation>
 <translation id="6477681113376365978">មិនអាចទាញយកឯកសារបានទេ</translation>
 <translation id="6482559668224714696">កែវ​ពង្រីក​ពេញ​អេក្រង់</translation>
+<translation id="6483727822843292440">ពិនិត្យមើល​វិនដូ​នានាពី​វិនដូ​ដែលបានប្រើ​តិច​បំផុត</translation>
 <translation id="6490471652906364588">ឧបករណ៍ USB-C (រន្ធខាងស្តាំ)</translation>
 <translation id="6491071886865974820"><ph name="MANAGER" /> តម្រូវឱ្យ​អ្នក​ដំឡើងកំណែ <ph name="DEVICE_TYPE" /> របស់អ្នក​ឱ្យបានមុន​ថ្ងៃផុតកំណត់</translation>
 <translation id="649452524636452238">កូដ PIN របស់​កាត​ឆ្លាតវៃ</translation>
@@ -1214,6 +1219,7 @@
 <translation id="6683022854667115063">កាស</translation>
 <translation id="6696025732084565524">ក្ដារចុច​ដែល​អាច​ផ្ដាច់ចេញបាន​របស់អ្នក​ត្រូវ​ការ​កំណែថ្មីជា​ចាំបាច់</translation>
 <translation id="6700713906295497288">ប៊ូតុងម៉ឺនុយ IME</translation>
+<translation id="6705577071209924099">កែ​តម្រូវ​ពន្លឺ</translation>
 <translation id="6707693040195709527">ការប្ដូរកំណែ​ឧបករណ៍​ទៅកំណែមុន​គឺផុតកំណត់ហើយ</translation>
 <translation id="6710213216561001401">មុន</translation>
 <translation id="6723839937902243910">ថាមពល</translation>

ash/strings/ash_strings_kn.xtb

diff --git a/ash/strings/ash_strings_kn.xtb b/ash/strings/ash_strings_kn.xtb
index 730aeca6..15c619b 100644
--- a/ash/strings/ash_strings_kn.xtb
+++ b/ash/strings/ash_strings_kn.xtb
@@ -4,6 +4,7 @@
 <translation id="1012876632442809908">USB-C ಸಾಧನ (ಮುಂದಿನ ಪೋರ್ಟ್)</translation>
 <translation id="1013598600051641573"><ph name="DISPLAY_NAME" /> ರೆಸಲ್ಯೂಷನ್ <ph name="RESOLUTION" /> (<ph name="REFRESH_RATE" /> Hz) ಗೆ ಬದಲಾಗಿದೆ. ಬದಲಾವಣೆಗಳನ್ನು ಉಳಿಸಲು 'ಖಚಿತಪಡಿಸಿ' ಕ್ಲಿಕ್ ಮಾಡಿ. ಈ ಹಿಂದಿನ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು <ph name="TIMEOUT_SECONDS" /> ನಲ್ಲಿ ಮರುಸ್ಥಾಪಿಸಲಾಗುತ್ತದೆ.</translation>
 <translation id="1013923882670373915">ಬ್ಲೂಟೂತ್‌ ಸಾಧನವು "<ph name="DEVICE_NAME" />" ಜೋಡಣೆಗಾಗಿ ಅನುಮತಿಯನ್ನು ಬಯಸುತ್ತದೆ. ದಯವಿಟ್ಟು ಆ ಸಾಧನದಲ್ಲಿ ಈ PIN ಕೋಡ್ ನಮೂದಿಸಿ: <ph name="PINCODE" /></translation>
+<translation id="1017556409696559990">Chrome ನಲ್ಲಿ ಯಾವುದೇ ಹಿಂದಿನ ಇತಿಹಾಸವಿಲ್ಲದಿದ್ದಾಗ ಮೇಲಿನ ವಿಂಡೋವನ್ನು ಕುಗ್ಗಿಸಿ</translation>
 <translation id="1024364763893396229">ನಿಮ್ಮ <ph name="NAME" /> ಅನ್ನು ಉಳಿಸಿ</translation>
 <translation id="1032891413405719768">ಸ್ಟೈಲಸ್ ಬ್ಯಾಟರಿ ಕಡಿಮೆಯಾಗಿದೆ</translation>
 <translation id="1036073649888683237">ಅಧಿಸೂಚನೆಗಳನ್ನು ನಿರ್ವಹಿಸಲು, ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಹೋಗಿ</translation>
@@ -343,6 +344,7 @@
 <translation id="2620436844016719705">ಸಿಸ್ಟಂ</translation>
 <translation id="2621713457727696555">ಸುರಕ್ಷಿತವಾಗಿದೆ</translation>
 <translation id="263399434338050016">"ಎಲ್ಲವನ್ನೂ ಆಯ್ಕೆಮಾಡಿ"</translation>
+<translation id="2644422758626431000">ವಿಂಡೋವನ್ನು ಎಡಕ್ಕೆ ಪಿನ್ ಮಾಡಿ</translation>
 <translation id="2645435784669275700">ChromeOS</translation>
 <translation id="2647092942972307022">ಒಟ್ಟು <ph name="TOTAL_MEMORY" /> ರಲ್ಲಿ <ph name="USED_MEMORY" /> ಲಭ್ಯವಿದೆ</translation>
 <translation id="2653019840645008922">ವಿಂಡೋ ಕ್ಯಾಪ್ಚರ್</translation>
@@ -479,7 +481,7 @@
 <translation id="3321628682574733415">ತಪ್ಪಾದ ಪೋಷಕ ಕೋಡ್</translation>
 <translation id="332827762492701193">ಅಧಿಸೂಚನೆಗಳು ಮರೆಯಾಗಿವೆ</translation>
 <translation id="3338855835380298613">CPU ಬಳಕೆ</translation>
-<translation id="3339826665088060472">ಸ್ಕ್ರಿನ್ ಕ್ಯಾಪ್ಚರ್, ಸ್ಕ್ರೀನ್‌ಶಾಟ್‌ಗಳು ಮತ್ತು ಸ್ಕ್ರೀನ್ ರೆಕಾರ್ಡಿಂಗ್‌ಗಳನ್ನು ಸೆರೆಹಿಡಿಯುವ ಪರಿಕರಗಳು</translation>
+<translation id="3339826665088060472">ಸ್ಕ್ರೀನ್ ಕ್ಯಾಪ್ಚರ್, ಸ್ಕ್ರೀನ್‌ಶಾಟ್‌ಗಳು ಮತ್ತು ಸ್ಕ್ರೀನ್ ರೆಕಾರ್ಡಿಂಗ್‌ಗಳನ್ನು ಸೆರೆಹಿಡಿಯುವ ಟೂಲ್‌ಗಳು</translation>
 <translation id="3340978935015468852">ಸೆಟ್ಟಿಂಗ್‌ಗಳು</translation>
 <translation id="3341303451326249809">ಸ್ಕ್ರೀನ್‌ಶಾಟ್ ಕ್ಯಾಪ್ಚರ್ ಮಾಡಲಾಗಿದೆ</translation>
 <translation id="334252345105450327">ಸ್ಕ್ರೀನ್‌ಶಾಟ್ ತೆಗೆದುಕೊಳ್ಳಿ</translation>
@@ -1053,6 +1055,7 @@
 <translation id="5911909173233110115"><ph name="USERNAME" /> (<ph name="MAIL" />)</translation>
 <translation id="5916664084637901428">ಆನ್‌</translation>
 <translation id="5920710855273935292">ಮೈಕ್ ಅನ್ನು ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ.</translation>
+<translation id="5922962980596822074">ತೀರಾ ಇತ್ತೀಚಿಗೆ ಬಳಸಿದ ವಿಂಡೋ ಪ್ರಕಾರ ವಿಂಡೋಗಳನ್ನು ಬ್ರೌಸ್ ಮಾಡಿ</translation>
 <translation id="5924855612669061715">ಹಾಟ್‌ಸ್ಪಾಟ್ ಆನ್ ಆಗಿದೆ</translation>
 <translation id="5946788582095584774"><ph name="FEATURE_NAME" /> ಆನ್ ಆಗಿದೆ.</translation>
 <translation id="5947494881799873997">ಹಿಂತಿರುಗಿಸು</translation>
@@ -1142,6 +1145,7 @@
 <translation id="6352082849089527770">ಅಪರಿಚಿತ ನೆಟ್‌ವರ್ಕ್‌ಗಳು</translation>
 <translation id="6359587239691116345">ಇತ್ತೀಚಿನ ಫೀಚರ್‌ಗಳು ಮತ್ತು ಭದ್ರತಾ ಸುಧಾರಣೆಗಳನ್ನು ಪಡೆಯಿರಿ. ನೀವು ಈ ಅಪ್‌ಡೇಟ್‌ ಅನ್ನು ನಿರಾಕರಿಸಿದರೆ, ನಿಮ್ಮ ಸಾಧನವು ಇನ್ನು ಮುಂದೆ ಸರಿಯಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸದೇ ಇರಬಹುದು ಮತ್ತು ನೀವು ಭದ್ರತೆ ಮತ್ತು ಕಾರ್ಯಕ್ಷಮತೆಯ ಸಮಸ್ಯೆಗಳನ್ನು ಅನುಭವಿಸಬಹುದು.</translation>
 <translation id="6376931439017688372">ಬ್ಲೂಟೂತ್ ಆನ್ ಆಗಿದೆ</translation>
+<translation id="6378515133128829137">ವಿಂಡೋವನ್ನು ಬಲಕ್ಕೆ ಪಿನ್ ಮಾಡಿ</translation>
 <translation id="6381109794406942707">ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ನಿಮ್ಮ ಪಿನ್ ಅನ್ನು ನಮೂದಿಸಿ.</translation>
 <translation id="638716340450135524">ಕ್ಯಾಮರಾ ಬಳಕೆ ಆನ್ ಮಾಡಿ</translation>
 <translation id="639644700271529076">CAPS LOCK ಆಫ್ ಆಗಿದೆ</translation>
@@ -1161,6 +1165,7 @@
 <translation id="6459472438155181876"><ph name="DISPLAY_NAME" /> ಗೆ ಪರದೆಯನ್ನು ವಿಸ್ತರಿಸಲಾಗುತ್ತಿದೆ</translation>
 <translation id="6477681113376365978">ಫೈಲ್ ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ</translation>
 <translation id="6482559668224714696">ಪೂರ್ಣಪರದೆ ವರ್ಧಕ</translation>
+<translation id="6483727822843292440">ಕಡಿಮೆ ಬಳಸಿದ ವಿಂಡೋ ಪ್ರಕಾರ ವಿಂಡೋಗಳನ್ನು ಬ್ರೌಸ್ ಮಾಡಿ</translation>
 <translation id="6490471652906364588">USB-C ಸಾಧನ (ಬಲ ಪೋರ್ಟ್)</translation>
 <translation id="6491071886865974820">ಗಡುವಿನ ಮೊದಲು ನಿಮ್ಮ <ph name="DEVICE_TYPE" /> ಅನ್ನು ನೀವು ಅಪ್‌ಡೇಟ್ ಮಾಡಬೇಕೆಂದು <ph name="MANAGER" /> ಬಯಸುತ್ತದೆ</translation>
 <translation id="649452524636452238">ಸ್ಮಾರ್ಟ್ ಕಾರ್ಡ್ ಪಿನ್</translation>
@@ -1214,6 +1219,7 @@
 <translation id="6683022854667115063">ಹೆಡ್‌ಫೋನ್‌ಗಳು</translation>
 <translation id="6696025732084565524">ನಿಮ್ಮ ಪ್ರತ್ಯೇಕಿಸಬಹುದಾದ ಕೀಬೋರ್ಡ್‌ಗೆ ವಿಷಮಸ್ಥಿತಿ ಅಪ್‌ಡೇಟ್‌ನ ಅಗತ್ಯವಿದೆ</translation>
 <translation id="6700713906295497288">IME ಮೆನು ಬಟನ್</translation>
+<translation id="6705577071209924099">ಲೈಟಿಂಗ್ ಅನ್ನು ಸರಿಹೊಂದಿಸಿ</translation>
 <translation id="6707693040195709527">ಹಿಂದಿನ ಆವೃತ್ತಿಗೆ ಸಾಧನವನ್ನು ಬದಲಾಯಿಸುವುದು ವಿಳಂಬವಾಗಿದೆ</translation>
 <translation id="6710213216561001401">ಹಿಂದಿನದು</translation>
 <translation id="6723839937902243910">ಪವರ್‌</translation>

ash/strings/ash_strings_lo.xtb

diff --git a/ash/strings/ash_strings_lo.xtb b/ash/strings/ash_strings_lo.xtb
index bf19231..32d5d093 100644
--- a/ash/strings/ash_strings_lo.xtb
+++ b/ash/strings/ash_strings_lo.xtb
@@ -4,6 +4,7 @@
 <translation id="1012876632442809908">ອຸ​ປະ​ກອນ USB-C (ຜອດດ້ານໜ້າ)</translation>
 <translation id="1013598600051641573"><ph name="DISPLAY_NAME" /> ໄດ້ປ່ຽນເປັນ <ph name="RESOLUTION" /> (<ph name="REFRESH_RATE" /> Hz) ແລ້ວ. ຄລິກຢືນຢັນເພື່ອຮັກສາການປ່ຽນແປງໄວ້. ລະບົບຈະກູ້ຄືນການຕັ້ງຄ່າກ່ອນໜ້າໃນ <ph name="TIMEOUT_SECONDS" />.</translation>
 <translation id="1013923882670373915">ອຸປະກອນ Bluetooth "<ph name="DEVICE_NAME" />" ຢາກຂໍອະນຸຍາດຈັບຄູ່. ກະລຸນາປ້ອນລະຫັດ PIN ນີ້ເຂົ້າໄປໃນອຸປະກອນນັ້ນ: <ph name="PINCODE" /></translation>
+<translation id="1017556409696559990">ຫຍໍ້ໜ້າຈໍເທິງສຸດເມື່ອບໍ່ມີປະຫວັດຄືນຫຼັງໃນ Chrome</translation>
 <translation id="1024364763893396229">ບັນທຶກ <ph name="NAME" /> ຂອງທ່ານ</translation>
 <translation id="1032891413405719768">ແບັດເຕີຣີປາຍປາກກາເຫຼືອໜ້ອຍ</translation>
 <translation id="1036073649888683237">ກະລຸນາເຂົ້າໄປການຕັ້ງຄ່າເພື່ອຈັດການການແຈ້ງເຕືອນ</translation>
@@ -343,6 +344,7 @@
 <translation id="2620436844016719705">ລະ​ບົບ</translation>
 <translation id="2621713457727696555">ຮັກສາຄວາມປອດໄພແລ້ວ</translation>
 <translation id="263399434338050016">"ເລືອກທັງໝົດ"</translation>
+<translation id="2644422758626431000">ປັກໝຸດໜ້າຈໍໄວ້ທາງຊ້າຍ</translation>
 <translation id="2645435784669275700">ChromeOS</translation>
 <translation id="2647092942972307022">ເຫຼືອ <ph name="USED_MEMORY" /> ຈາກທັງໝົດ <ph name="TOTAL_MEMORY" /></translation>
 <translation id="2653019840645008922">ຖ່າຍຮູບໜ້າຈໍ</translation>
@@ -1053,6 +1055,7 @@
 <translation id="5911909173233110115"><ph name="USERNAME" /> (<ph name="MAIL" />)</translation>
 <translation id="5916664084637901428">ເປີດ</translation>
 <translation id="5920710855273935292">ໄມປິດສຽງຢູ່.</translation>
+<translation id="5922962980596822074">ເຂົ້າໄປໜ້າຈໍຕ່າງໆຈາກໜ້າຈໍທີ່ນຳໃຊ້ຫຼ້າສຸດ</translation>
 <translation id="5924855612669061715">ຮັອດສະປອດເປີດຢູ່</translation>
 <translation id="5946788582095584774"><ph name="FEATURE_NAME" /> ເປີດຢູ່.</translation>
 <translation id="5947494881799873997">ກັບຄືນ</translation>
@@ -1142,6 +1145,7 @@
 <translation id="6352082849089527770">ເຄືອຂ່າຍທີ່ບໍ່ຮູ້ຈັກ</translation>
 <translation id="6359587239691116345">ໃຊ້ຄຸນສົມບັດຫຼ້າສຸດ ແລະ ການປັບປຸງຄວາມປອດໄພ. ຖ້າທ່ານປະຕິເສດການອັບເດດນີ້, ອຸປະກອນຂອງທ່ານອາດຈະເຮັດວຽກບໍ່ໄດ້ຕາມປົກກະຕິອີກຕໍ່ໄປ ແລະ ທ່ານອາດພົບບັນຫາຄວາມປອດໄພ ແລະ ປະສິດທິພາບ.</translation>
 <translation id="6376931439017688372">Bluetooth ເປີດຢູ່</translation>
+<translation id="6378515133128829137">ປັກໝຸດໜ້າຈໍໄວ້ທາງຂວາ</translation>
 <translation id="6381109794406942707">ເພື່ອປົດລັອກອຸປະກອນ, ກະລຸນາປ້ອນ PIN ຂອງທ່ານ.</translation>
 <translation id="638716340450135524">ເປີດໃຊ້ສິດເຂົ້າເຖິງກ້ອງຖ່າຍຮູບ</translation>
 <translation id="639644700271529076">CAPS LOCK ປິດ</translation>
@@ -1161,6 +1165,7 @@
 <translation id="6459472438155181876">ກໍາລັງ​ຂະ​ຫຍາຍ​ຫນ້າ​ຈໍ​ເພື່ອ <ph name="DISPLAY_NAME" /></translation>
 <translation id="6477681113376365978">ບໍ່ສາມາດດາວໂຫຼດໄຟລ໌ໄດ້</translation>
 <translation id="6482559668224714696">ແວ່ນຂະຫຍາຍເຕັມຈໍ</translation>
+<translation id="6483727822843292440">ເຂົ້າໄປໜ້າຈໍຕ່າງໆຈາກໜ້າຈໍທີ່ນຳໃຊ້ໜ້ອຍທີ່ສຸດ</translation>
 <translation id="6490471652906364588">ອຸ​ປະ​ກອນ USB-C (ຊ່ອງ​ຂວາ)</translation>
 <translation id="6491071886865974820"><ph name="MANAGER" /> ຕ້ອງການໃຫ້ທ່ານອັບເດດ <ph name="DEVICE_TYPE" /> ຂອງທ່ານກ່ອນເວລາທີ່ກຳນົດໄວ້</translation>
 <translation id="649452524636452238">PIN ບັດອັດສະລິຍະ</translation>

ash/strings/ash_strings_ml.xtb

diff --git a/ash/strings/ash_strings_ml.xtb b/ash/strings/ash_strings_ml.xtb
index deb012a..a3da509 100644
--- a/ash/strings/ash_strings_ml.xtb
+++ b/ash/strings/ash_strings_ml.xtb
@@ -1214,6 +1214,7 @@
 <translation id="6683022854667115063">ഹെഡ്ഫോണുകൾ</translation>
 <translation id="6696025732084565524">നിങ്ങളുടെ വേർപെടുത്താനാകുന്ന കീബോഡിന് നിർണ്ണായക അപ്‌ഡേറ്റ് ആവശ്യമാണ്</translation>
 <translation id="6700713906295497288">IME മെനു ബട്ടൺ</translation>
+<translation id="6705577071209924099">ലൈറ്റിംഗ് ക്രമീകരിക്കുക</translation>
 <translation id="6707693040195709527">മുമ്പത്തെ പതിപ്പിലേക്ക് ഉപകരണം മാറ്റേണ്ട സമയം കഴിഞ്ഞു.</translation>
 <translation id="6710213216561001401">മുമ്പത്തേത്</translation>
 <translation id="6723839937902243910">പവർ</translation>

ash/strings/ash_strings_mr.xtb

diff --git a/ash/strings/ash_strings_mr.xtb b/ash/strings/ash_strings_mr.xtb
index ab80d55..4d3285c7 100644
--- a/ash/strings/ash_strings_mr.xtb
+++ b/ash/strings/ash_strings_mr.xtb
@@ -1214,6 +1214,7 @@
 <translation id="6683022854667115063">हेडफोन</translation>
 <translation id="6696025732084565524">तुमच्या वेगळ्या करण्यायोग्य कीबोर्डला गंभीर अपडेटची आवश्यकता आहे</translation>
 <translation id="6700713906295497288">IME मेनू बटण</translation>
+<translation id="6705577071209924099">प्रकाश अ‍ॅडजस्‍ट करा</translation>
 <translation id="6707693040195709527">डिव्हाइस मागील आवृत्तीवर बदलण्याची मुदत संपली आहे</translation>
 <translation id="6710213216561001401">मागील</translation>
 <translation id="6723839937902243910">सामर्थ्य</translation>

ash/strings/ash_strings_my.xtb

diff --git a/ash/strings/ash_strings_my.xtb b/ash/strings/ash_strings_my.xtb
index 3e6bec10..5a14f1a1 100644
--- a/ash/strings/ash_strings_my.xtb
+++ b/ash/strings/ash_strings_my.xtb
@@ -1214,6 +1214,7 @@
 <translation id="6683022854667115063">နားကြပ်</translation>
 <translation id="6696025732084565524">သင်၏ ဖြုတ်လွယ်တပ်လွယ်ကီးဘုတ်အတွက် အရေးကြီးသည့်အပ်ဒိတ် လိုအပ်နေသည်</translation>
 <translation id="6700713906295497288">IME မီနူးခလုတ်</translation>
+<translation id="6705577071209924099">အလင်း ချိန်ညှိရန်</translation>
 <translation id="6707693040195709527">စက်ကို ယခင်ဗားရှင်းသို့ပြောင်းရန် ရက်လွန်နေပါသည်</translation>
 <translation id="6710213216561001401">အရင်</translation>
 <translation id="6723839937902243910">ပါဝါ</translation>

ash/strings/ash_strings_nl.xtb

diff --git a/ash/strings/ash_strings_nl.xtb b/ash/strings/ash_strings_nl.xtb
index ab2176d..da35e045 100644
--- a/ash/strings/ash_strings_nl.xtb
+++ b/ash/strings/ash_strings_nl.xtb
@@ -4,6 +4,7 @@
 <translation id="1012876632442809908">USB-C-apparaat (poort aan voorkant)</translation>
 <translation id="1013598600051641573"><ph name="DISPLAY_NAME" /> gewijzigd in <ph name="RESOLUTION" /> (<ph name="REFRESH_RATE" /> Hz). Klik op Bevestigen om de wijzigingen te behouden. De vorige instellingen worden over <ph name="TIMEOUT_SECONDS" /> hersteld.</translation>
 <translation id="1013923882670373915">Bluetooth-apparaat '<ph name="DEVICE_NAME" />' wil rechten om te koppelen. Voer de volgende pincode in op dat apparaat: <ph name="PINCODE" /></translation>
+<translation id="1017556409696559990">Het bovenste venster minimaliseren als er geen geschiedenis voor teruggaan in Chrome is</translation>
 <translation id="1024364763893396229">Je <ph name="NAME" /> opslaan</translation>
 <translation id="1032891413405719768">Batterij van stylus bijna leeg</translation>
 <translation id="1036073649888683237">Ga naar Instellingen om meldingen te beheren</translation>
@@ -343,6 +344,7 @@
 <translation id="2620436844016719705">Systeem</translation>
 <translation id="2621713457727696555">Beveiligd</translation>
 <translation id="263399434338050016">'Alles selecteren'</translation>
+<translation id="2644422758626431000">Venster links vastzetten</translation>
 <translation id="2645435784669275700">Chrome OS</translation>
 <translation id="2647092942972307022"><ph name="USED_MEMORY" /> van <ph name="TOTAL_MEMORY" /> beschikbaar</translation>
 <translation id="2653019840645008922">Vensteropname</translation>
@@ -1053,6 +1055,7 @@
 <translation id="5911909173233110115"><ph name="USERNAME" /> (<ph name="MAIL" />)</translation>
 <translation id="5916664084637901428">Aan</translation>
 <translation id="5920710855273935292">Microfoon staat uit.</translation>
+<translation id="5922962980596822074">Vensters doorlopen vanaf het meest recent gebruikte venster</translation>
 <translation id="5924855612669061715">Hotspot staat aan</translation>
 <translation id="5946788582095584774"><ph name="FEATURE_NAME" /> staat aan.</translation>
 <translation id="5947494881799873997">Terugzetten</translation>
@@ -1142,6 +1145,7 @@
 <translation id="6352082849089527770">Onbekende netwerken</translation>
 <translation id="6359587239691116345">Krijg de nieuwste functies en beveiligingsverbeteringen. Als je deze update weigert, werkt je apparaat misschien niet meer goed en kun je beveiligings- en prestatieproblemen ondervinden.</translation>
 <translation id="6376931439017688372">Bluetooth staat aan</translation>
+<translation id="6378515133128829137">Venster rechts vastzetten</translation>
 <translation id="6381109794406942707">Geef je pincode op om het apparaat te ontgrendelen.</translation>
 <translation id="638716340450135524">Cameratoegang aanzetten</translation>
 <translation id="639644700271529076">CAPS LOCK staat uit</translation>
@@ -1161,6 +1165,7 @@
 <translation id="6459472438155181876">Scherm uitbreiden naar <ph name="DISPLAY_NAME" /></translation>
 <translation id="6477681113376365978">Kan bestand niet downloaden</translation>
 <translation id="6482559668224714696">Volledig scherm vergroten</translation>
+<translation id="6483727822843292440">Vensters doorlopen vanaf het minst gebruikte venster</translation>
 <translation id="6490471652906364588">USB-C-apparaat (poort aan rechterkant)</translation>
 <translation id="6491071886865974820"><ph name="MANAGER" /> vereist dat je je <ph name="DEVICE_TYPE" /> vóór de deadline updatet</translation>
 <translation id="649452524636452238">Pincode van smartkaart</translation>
@@ -1214,6 +1219,7 @@
 <translation id="6683022854667115063">Hoofdtelefoon</translation>
 <translation id="6696025732084565524">Je afneembare toetsenbord heeft een essentiële update nodig</translation>
 <translation id="6700713906295497288">IME-menuknop</translation>
+<translation id="6705577071209924099">Belichting aanpassen</translation>
 <translation id="6707693040195709527">Het apparaat had al moeten zijn teruggezet naar een oudere versie</translation>
 <translation id="6710213216561001401">Vorige</translation>
 <translation id="6723839937902243910">Voeding</translation>

ash/strings/ash_strings_no.xtb

diff --git a/ash/strings/ash_strings_no.xtb b/ash/strings/ash_strings_no.xtb
index aa20b0e..3fb4d930 100644
--- a/ash/strings/ash_strings_no.xtb
+++ b/ash/strings/ash_strings_no.xtb
@@ -1214,6 +1214,7 @@
 <translation id="6683022854667115063">Hodetelefoner</translation>
 <translation id="6696025732084565524">Det avtakbare tastaturet trenger en kritisk oppdatering</translation>
 <translation id="6700713906295497288">IME-menyknappen</translation>
+<translation id="6705577071209924099">Juster belysning</translation>
 <translation id="6707693040195709527">Nedgraderingen til en tidligere versjon på enheten har forfalt</translation>
 <translation id="6710213216561001401">Forrige</translation>
 <translation id="6723839937902243910">Strøm</translation>

ash/strings/ash_strings_pl.xtb

diff --git a/ash/strings/ash_strings_pl.xtb b/ash/strings/ash_strings_pl.xtb
index 3907a38..daf5a3e 100644
--- a/ash/strings/ash_strings_pl.xtb
+++ b/ash/strings/ash_strings_pl.xtb
@@ -4,6 +4,7 @@
 <translation id="1012876632442809908">Urządzenie USB-C (przedni port)</translation>
 <translation id="1013598600051641573">Rozdzielczość ekranu <ph name="DISPLAY_NAME" /> została zmieniona na <ph name="RESOLUTION" /> (<ph name="REFRESH_RATE" /> Hz). Kliknij „Potwierdź”, by zachować zmiany. Poprzednie ustawienia zostaną przywrócone za <ph name="TIMEOUT_SECONDS" />.</translation>
 <translation id="1013923882670373915">Urządzenie Bluetooth „<ph name="DEVICE_NAME" />” chce się sparować. Wpisz na nim ten kod PIN: <ph name="PINCODE" /></translation>
+<translation id="1017556409696559990">Gdy w Chrome nie ma historii, minimalizuj okno u góry</translation>
 <translation id="1024364763893396229">Zapisz urządzenie <ph name="NAME" /></translation>
 <translation id="1032891413405719768">Niski poziom baterii rysika</translation>
 <translation id="1036073649888683237">Aby zarządzać powiadomieniami, otwórz Ustawienia</translation>
@@ -343,6 +344,7 @@
 <translation id="2620436844016719705">System</translation>
 <translation id="2621713457727696555">Zabezpieczona</translation>
 <translation id="263399434338050016">„Wybierz wszystko”</translation>
+<translation id="2644422758626431000">Przypnij okno z lewej strony</translation>
 <translation id="2645435784669275700">Chrome OS</translation>
 <translation id="2647092942972307022">Zostało <ph name="USED_MEMORY" /> z <ph name="TOTAL_MEMORY" /></translation>
 <translation id="2653019840645008922">Przechwytywanie okna</translation>
@@ -1053,6 +1055,7 @@
 <translation id="5911909173233110115"><ph name="USERNAME" /> (<ph name="MAIL" />)</translation>
 <translation id="5916664084637901428">Włączone</translation>
 <translation id="5920710855273935292">Mikrofon jest wyciszony.</translation>
+<translation id="5922962980596822074">Przełączaj się między oknami od okna używanego ostatnio</translation>
 <translation id="5924855612669061715">Hotspot jest włączony</translation>
 <translation id="5946788582095584774">Funkcja <ph name="FEATURE_NAME" /> jest włączona.</translation>
 <translation id="5947494881799873997">Przywróć</translation>
@@ -1142,6 +1145,7 @@
 <translation id="6352082849089527770">Nieznane sieci</translation>
 <translation id="6359587239691116345">Zainstaluj najnowsze funkcje i poprawki zabezpieczeń. Jeśli odrzucisz tę aktualizację, urządzenie może przestać działać prawidłowo i możesz mieć problemy z bezpieczeństwem i wydajnością.</translation>
 <translation id="6376931439017688372">Bluetooth jest włączony</translation>
+<translation id="6378515133128829137">Przypnij okno z prawej strony</translation>
 <translation id="6381109794406942707">Aby odblokować urządzenie, wpisz kod PIN.</translation>
 <translation id="638716340450135524">Włącz dostęp do aparatu</translation>
 <translation id="639644700271529076">CAPS LOCK jest wyłączony</translation>
@@ -1161,6 +1165,7 @@
 <translation id="6459472438155181876">Rozszerzanie ekranu na <ph name="DISPLAY_NAME" /></translation>
 <translation id="6477681113376365978">Nie można pobrać pliku</translation>
 <translation id="6482559668224714696">Lupa pełnoekranowa</translation>
+<translation id="6483727822843292440">Przełączaj się między oknami od okna używanego najrzadziej</translation>
 <translation id="6490471652906364588">Urządzenie USB-C (prawy port)</translation>
 <translation id="6491071886865974820"><ph name="MANAGER" /> wymaga zaktualizowania tego urządzenia <ph name="DEVICE_TYPE" /> przed podanym terminem</translation>
 <translation id="649452524636452238">Kod PIN karty elektronicznej</translation>
@@ -1213,6 +1218,7 @@
 <translation id="6683022854667115063">Słuchawki</translation>
 <translation id="6696025732084565524">Odłączana klawiatura wymaga krytycznej aktualizacji</translation>
 <translation id="6700713906295497288">Przycisk menu IME</translation>
+<translation id="6705577071209924099">Dostosuj oświetlenie</translation>
 <translation id="6707693040195709527">Minął termin przywrócenia na tym urządzeniu wcześniejszej wersji systemu operacyjnego</translation>
 <translation id="6710213216561001401">Poprzedni</translation>
 <translation id="6723839937902243910">Zasilanie</translation>

ash/strings/ash_strings_pt-BR.xtb

diff --git a/ash/strings/ash_strings_pt-BR.xtb b/ash/strings/ash_strings_pt-BR.xtb
index a06977e..76f4dbf 100644
--- a/ash/strings/ash_strings_pt-BR.xtb
+++ b/ash/strings/ash_strings_pt-BR.xtb
@@ -4,6 +4,7 @@
 <translation id="1012876632442809908">Dispositivo USB-C (porta frontal)</translation>
 <translation id="1013598600051641573">A resolução de <ph name="DISPLAY_NAME" /> mudou para <ph name="RESOLUTION" /> (<ph name="REFRESH_RATE" /> Hz). Clique em "Confirmar" para manter as modificações. As configurações anteriores serão restauradas em <ph name="TIMEOUT_SECONDS" />.</translation>
 <translation id="1013923882670373915">O dispositivo Bluetooth "<ph name="DEVICE_NAME" />" deseja permissão para realizar o pareamento. Digite este código PIN no dispositivo: <ph name="PINCODE" /></translation>
+<translation id="1017556409696559990">Minimizar a janela superior quando não houver histórico no Chrome</translation>
 <translation id="1024364763893396229">Salve seu dispositivo <ph name="NAME" /></translation>
 <translation id="1032891413405719768">A bateria da stylus está fraca</translation>
 <translation id="1036073649888683237">Para gerenciar as notificações, acesse as Configurações</translation>
@@ -343,6 +344,7 @@
 <translation id="2620436844016719705">Sistema</translation>
 <translation id="2621713457727696555">Protegida</translation>
 <translation id="263399434338050016">"Selecionar todos"</translation>
+<translation id="2644422758626431000">Fixar janela à esquerda</translation>
 <translation id="2645435784669275700">ChromeOS</translation>
 <translation id="2647092942972307022"><ph name="USED_MEMORY" /> de <ph name="TOTAL_MEMORY" /> disponível</translation>
 <translation id="2653019840645008922">Captura de janela</translation>
@@ -1053,6 +1055,7 @@
 <translation id="5911909173233110115"><ph name="USERNAME" /> (<ph name="MAIL" />)</translation>
 <translation id="5916664084637901428">Ativado</translation>
 <translation id="5920710855273935292">O microfone está desativado.</translation>
+<translation id="5922962980596822074">Passar pelas janelas começando com a usada mais recentemente</translation>
 <translation id="5924855612669061715">O ponto de acesso está ativado</translation>
 <translation id="5946788582095584774">O recurso <ph name="FEATURE_NAME" /> está ativado.</translation>
 <translation id="5947494881799873997">Reverter</translation>
@@ -1142,6 +1145,7 @@
 <translation id="6352082849089527770">Redes desconhecidas</translation>
 <translation id="6359587239691116345">Instale os recursos e melhorias de segurança mais recentes. Caso você recuse essa atualização, o dispositivo pode deixar de funcionar corretamente e você pode enfrentar problemas de segurança e performance.</translation>
 <translation id="6376931439017688372">Bluetooth ativado</translation>
+<translation id="6378515133128829137">Fixar janela à direita</translation>
 <translation id="6381109794406942707">Para desbloquear o dispositivo, digite o PIN.</translation>
 <translation id="638716340450135524">Permitir o acesso à câmera</translation>
 <translation id="639644700271529076">CAPS LOCK está desativado</translation>
@@ -1161,6 +1165,7 @@
 <translation id="6459472438155181876">Estendendo tela para <ph name="DISPLAY_NAME" /></translation>
 <translation id="6477681113376365978">Não é possível fazer o download do arquivo</translation>
 <translation id="6482559668224714696">Lupa de tela cheia</translation>
+<translation id="6483727822843292440">Passar pelas janelas começando com a menos usada</translation>
 <translation id="6490471652906364588">Dispositivo USB-C (porta da direita)</translation>
 <translation id="6491071886865974820"><ph name="MANAGER" /> precisa que você atualize seu <ph name="DEVICE_TYPE" /> antes do fim do prazo</translation>
 <translation id="649452524636452238">PIN do cartão inteligente</translation>

ash/strings/ash_strings_ru.xtb

diff --git a/ash/strings/ash_strings_ru.xtb b/ash/strings/ash_strings_ru.xtb
index 798637d..fcc5e91 100644
--- a/ash/strings/ash_strings_ru.xtb
+++ b/ash/strings/ash_strings_ru.xtb
@@ -4,6 +4,7 @@
 <translation id="1012876632442809908">Устройство USB-C (порт спереди)</translation>
 <translation id="1013598600051641573">Для экрана "<ph name="DISPLAY_NAME" />" установлено разрешение <ph name="RESOLUTION" /> (<ph name="REFRESH_RATE" /> Гц). Чтобы сохранить изменения, нажмите "Подтвердить". Предыдущие настройки восстановятся через <ph name="TIMEOUT_SECONDS" />.</translation>
 <translation id="1013923882670373915">Устройству <ph name="DEVICE_NAME" /> требуется разрешение на подключение через Bluetooth. Введите на нем PIN-код: <ph name="PINCODE" /></translation>
+<translation id="1017556409696559990">Свернуть верхнее окно Chrome, если нет истории изменений</translation>
 <translation id="1024364763893396229">Сохраните <ph name="NAME" /></translation>
 <translation id="1032891413405719768">Батарея стилуса почти разряжена</translation>
 <translation id="1036073649888683237">Чтобы управлять уведомлениями, откройте настройки</translation>
@@ -343,6 +344,7 @@
 <translation id="2620436844016719705">Система</translation>
 <translation id="2621713457727696555">Защищена</translation>
 <translation id="263399434338050016">"Выбрать все"</translation>
+<translation id="2644422758626431000">Закрепить окно слева</translation>
 <translation id="2645435784669275700">ChromeOS</translation>
 <translation id="2647092942972307022">Доступно <ph name="USED_MEMORY" /> из <ph name="TOTAL_MEMORY" /></translation>
 <translation id="2653019840645008922">Съемка окна</translation>
@@ -1053,6 +1055,7 @@
 <translation id="5911909173233110115"><ph name="USERNAME" /> (<ph name="MAIL" />)</translation>
 <translation id="5916664084637901428">ВКЛ</translation>
 <translation id="5920710855273935292">Микрофон отключен.</translation>
+<translation id="5922962980596822074">Показать окна, начиная с недавно использованного</translation>
 <translation id="5924855612669061715">Точка доступа включена</translation>
 <translation id="5946788582095584774">Функция "<ph name="FEATURE_NAME" />" включена</translation>
 <translation id="5947494881799873997">Отменить</translation>
@@ -1142,6 +1145,7 @@
 <translation id="6352082849089527770">Неизвестные сети</translation>
 <translation id="6359587239691116345">Получите доступ к новым функциям и улучшениям безопасности. Если вы откажетесь от этого обновления, могут возникнуть сбои в работе устройства, а также проблемы с безопасностью и производительностью.</translation>
 <translation id="6376931439017688372">Bluetooth включен</translation>
+<translation id="6378515133128829137">Закрепить окно справа</translation>
 <translation id="6381109794406942707">Чтобы разблокировать устройство, введите PIN-код.</translation>
 <translation id="638716340450135524">Разрешить доступ к камере</translation>
 <translation id="639644700271529076">CAPS LOCK отключен</translation>
@@ -1161,6 +1165,7 @@
 <translation id="6459472438155181876">Расширение экрана на <ph name="DISPLAY_NAME" /></translation>
 <translation id="6477681113376365978">Не удалось скачать файл</translation>
 <translation id="6482559668224714696">Полноэкранная лупа</translation>
+<translation id="6483727822843292440">Показать окна, начиная с наименее используемого</translation>
 <translation id="6490471652906364588">Устройство USB-C (порт справа)</translation>
 <translation id="6491071886865974820">Согласно требованиям <ph name="MANAGER" /> вам нужно обновить устройство <ph name="DEVICE_TYPE" /> до истечения срока.</translation>
 <translation id="649452524636452238">PIN-код для смарт-карты</translation>

ash/strings/ash_strings_sq.xtb

diff --git a/ash/strings/ash_strings_sq.xtb b/ash/strings/ash_strings_sq.xtb
index 1dcd8d6b..080d2d0 100644
--- a/ash/strings/ash_strings_sq.xtb
+++ b/ash/strings/ash_strings_sq.xtb
@@ -234,7 +234,7 @@
 <translation id="2023558322300866873">Mund ta ndalosh regjistrimin e paketave në çdo kohë.</translation>
 <translation id="2034971124472263449">Ruaje gjithsesi</translation>
 <translation id="2049240716062114887">Emri i tryezës u ndryshua në "<ph name="DESK_NAME" />"</translation>
-<translation id="2050339315714019657">Portret (vertikal</translation>
+<translation id="2050339315714019657">Portret (vertikal)</translation>
 <translation id="2064048859448024834">Pamja paraprake e kamerës aktive</translation>
 <translation id="2067602449040652523">Ndriçimi i tastierës</translation>
 <translation id="2078034614700056995">Rrëshqit shpejt djathtas me katër gishta për të kaluar te tavolina tjetër e punës</translation>

ash/strings/ash_strings_sr-Latn.xtb

diff --git a/ash/strings/ash_strings_sr-Latn.xtb b/ash/strings/ash_strings_sr-Latn.xtb
index 348d1be..b8625f6 100644
--- a/ash/strings/ash_strings_sr-Latn.xtb
+++ b/ash/strings/ash_strings_sr-Latn.xtb
@@ -1215,6 +1215,7 @@
 <translation id="6683022854667115063">Slušalice</translation>
 <translation id="6696025732084565524">Treba da instalirate važno ažuriranje za odvojivu tastaturu</translation>
 <translation id="6700713906295497288">Dugme IME menija</translation>
+<translation id="6705577071209924099">Prilagodi osvetljenost</translation>
 <translation id="6707693040195709527">Rok za promenu verzije uređaja u prethodnu verziju je istekao</translation>
 <translation id="6710213216561001401">Prethodno</translation>
 <translation id="6723839937902243910">Energija</translation>

ash/strings/ash_strings_sr.xtb

diff --git a/ash/strings/ash_strings_sr.xtb b/ash/strings/ash_strings_sr.xtb
index 086f09ab..8d0fc6c4 100644
--- a/ash/strings/ash_strings_sr.xtb
+++ b/ash/strings/ash_strings_sr.xtb
@@ -1215,6 +1215,7 @@
 <translation id="6683022854667115063">Слушалице</translation>
 <translation id="6696025732084565524">Треба да инсталирате важно ажурирање за одвојиву тастатуру</translation>
 <translation id="6700713906295497288">Дугме IME менија</translation>
+<translation id="6705577071209924099">Прилагоди осветљеност</translation>
 <translation id="6707693040195709527">Рок за промену верзије уређаја у претходну верзију је истекао</translation>
 <translation id="6710213216561001401">Претходно</translation>
 <translation id="6723839937902243910">Енергија</translation>

ash/strings/ash_strings_th.xtb

diff --git a/ash/strings/ash_strings_th.xtb b/ash/strings/ash_strings_th.xtb
index 8d99221..d9530b0d 100644
--- a/ash/strings/ash_strings_th.xtb
+++ b/ash/strings/ash_strings_th.xtb
@@ -4,6 +4,7 @@
 <translation id="1012876632442809908">อุปกรณ์ USB-C (พอร์ตด้านหน้า)</translation>
 <translation id="1013598600051641573"><ph name="DISPLAY_NAME" /> เปลี่ยนเป็น <ph name="RESOLUTION" /> (<ph name="REFRESH_RATE" /> Hz) แล้ว คลิก "ยืนยัน" เพื่อเก็บการเปลี่ยนแปลงไว้ ระบบจะคืนการตั้งค่าก่อนหน้าใน <ph name="TIMEOUT_SECONDS" /></translation>
 <translation id="1013923882670373915">อุปกรณ์บลูทูธ "<ph name="DEVICE_NAME" />" ต้องการสิทธิ์ในการจับคู่ โปรดป้อนรหัส PIN นี้บนอุปกรณ์นั้น: <ph name="PINCODE" /></translation>
+<translation id="1017556409696559990">ย่อหน้าต่างด้านบนเมื่อไม่มีประวัติย้อนหลังใน Chrome</translation>
 <translation id="1024364763893396229">บันทึก <ph name="NAME" /> ของคุณ</translation>
 <translation id="1032891413405719768">แบตเตอรี่สไตลัสเหลือน้อย</translation>
 <translation id="1036073649888683237">หากต้องการจัดการการแจ้งเตือน ให้ไปที่การตั้งค่า</translation>
@@ -343,6 +344,7 @@
 <translation id="2620436844016719705">ระบบ</translation>
 <translation id="2621713457727696555">ปลอดภัย</translation>
 <translation id="263399434338050016">"เลือกทั้งหมด"</translation>
+<translation id="2644422758626431000">ปักหมุดหน้าต่างไว้ทางด้านซ้าย</translation>
 <translation id="2645435784669275700">Chrome OS</translation>
 <translation id="2647092942972307022">พื้นที่เหลือ <ph name="USED_MEMORY" /> จาก <ph name="TOTAL_MEMORY" /></translation>
 <translation id="2653019840645008922">การจับภาพหน้าต่าง</translation>
@@ -1049,6 +1051,7 @@
 <translation id="5911909173233110115"><ph name="USERNAME" /> (<ph name="MAIL" />)</translation>
 <translation id="5916664084637901428">เปิด</translation>
 <translation id="5920710855273935292">ปิดเสียงไมค์อยู่</translation>
+<translation id="5922962980596822074">ไปยังหน้าต่างต่างๆ โดยเริ่มจากหน้าต่างที่ใช้งานล่าสุด</translation>
 <translation id="5924855612669061715">ฮอตสปอตเปิดอยู่</translation>
 <translation id="5946788582095584774"><ph name="FEATURE_NAME" /> เปิดอยู่</translation>
 <translation id="5947494881799873997">ย้อนกลับ</translation>
@@ -1138,6 +1141,7 @@
 <translation id="6352082849089527770">เครือข่ายที่ไม่รู้จัก</translation>
 <translation id="6359587239691116345">รับฟีเจอร์และการปรับปรุงด้านความปลอดภัยล่าสุด หากปฏิเสธการอัปเดตนี้ อุปกรณ์อาจทำงานไม่ถูกต้องอีกต่อไป และคุณอาจพบปัญหาด้านความปลอดภัยและประสิทธิภาพ</translation>
 <translation id="6376931439017688372">บลูทูธเปิดอยู่</translation>
+<translation id="6378515133128829137">ปักหมุดหน้าต่างไว้ทางด้านขวา</translation>
 <translation id="6381109794406942707">ป้อน PIN เพื่อปลดล็อกอุปกรณ์</translation>
 <translation id="638716340450135524">เปิดการเข้าถึงกล้อง</translation>
 <translation id="639644700271529076">CAPS LOCK ปิดอยู่</translation>
@@ -1157,6 +1161,7 @@
 <translation id="6459472438155181876">ขยายหน้าจอไปยัง <ph name="DISPLAY_NAME" /></translation>
 <translation id="6477681113376365978">ดาวน์โหลดไฟล์ไม่ได้</translation>
 <translation id="6482559668224714696">แว่นขยายทั้งหน้าจอ</translation>
+<translation id="6483727822843292440">ไปยังหน้าต่างต่างๆ โดยเริ่มจากหน้าต่างที่ใช้งานน้อยที่สุด</translation>
 <translation id="6490471652906364588">อุปกรณ์ USB-C (พอร์ตด้านขวา)</translation>
 <translation id="6491071886865974820"><ph name="MANAGER" /> กำหนดให้คุณต้องอัปเดต <ph name="DEVICE_TYPE" /> ก่อนเวลาที่กำหนด</translation>
 <translation id="649452524636452238">PIN สมาร์ทการ์ด</translation>

ash/strings/ash_strings_uz.xtb

diff --git a/ash/strings/ash_strings_uz.xtb b/ash/strings/ash_strings_uz.xtb
index ef794a8..8c3a4d04 100644
--- a/ash/strings/ash_strings_uz.xtb
+++ b/ash/strings/ash_strings_uz.xtb
@@ -4,6 +4,7 @@
 <translation id="1012876632442809908">USB-C qurilma (old port)</translation>
 <translation id="1013598600051641573"><ph name="DISPLAY_NAME" /> tasviri <ph name="RESOLUTION" /> (<ph name="REFRESH_RATE" /> Hz) tiniqligiga oʻtkazildi. Tasdiqlash uchun bosing. Eski sozlamalar <ph name="TIMEOUT_SECONDS" /> dan keyin tiklanadi.</translation>
 <translation id="1013923882670373915">“<ph name="DEVICE_NAME" />” qurilmasi Bluetooth orqali bog‘lanishga ruxsat so‘ramoqda. Bu qurilmada quyidagi PIN-kodni kiriting: <ph name="PINCODE" /></translation>
+<translation id="1017556409696559990">Chrome orqaga qaytish tarixi yoʻqligida yuqori oynani kichraytirish</translation>
 <translation id="1024364763893396229"><ph name="NAME" /> nomli qurilmangizni saqlang</translation>
 <translation id="1032891413405719768">Stilus batareyasi quvvati kam</translation>
 <translation id="1036073649888683237">Bildirishnomalarni boshqarish uchun Sozlamalarni oching</translation>
@@ -234,7 +235,7 @@
 <translation id="2023558322300866873">Tarmoq paketlarini olish jarayonini istalgan vaqtda toʻxtatish mumkin</translation>
 <translation id="2034971124472263449">Baribir saqlansin</translation>
 <translation id="2049240716062114887">Ish stoli nomi yangilandi: <ph name="DESK_NAME" /></translation>
-<translation id="2050339315714019657">Bo‘yiga</translation>
+<translation id="2050339315714019657">Tik</translation>
 <translation id="2064048859448024834">Kamera orqali razm solish yoniq</translation>
 <translation id="2067602449040652523">Klaviatura yorqinligi</translation>
 <translation id="2078034614700056995">Keyingi ish stoliga qaytish uchun 4 ta barmoq bilan oʻngga suring</translation>
@@ -343,6 +344,7 @@
 <translation id="2620436844016719705">Tizim</translation>
 <translation id="2621713457727696555">Himoyalangan</translation>
 <translation id="263399434338050016">“Hammasini tanlash”</translation>
+<translation id="2644422758626431000">Oynani chapga qadash</translation>
 <translation id="2645435784669275700">ChromeOS</translation>
 <translation id="2647092942972307022"><ph name="USED_MEMORY" />/<ph name="TOTAL_MEMORY" /> boʻsh</translation>
 <translation id="2653019840645008922">Oynani tasvirga olish</translation>
@@ -1053,6 +1055,7 @@
 <translation id="5911909173233110115"><ph name="USERNAME" /> (<ph name="MAIL" />)</translation>
 <translation id="5916664084637901428">Yoniq</translation>
 <translation id="5920710855273935292">Ovozsiz.</translation>
+<translation id="5922962980596822074">Oxirgi ishlatilgan oynadan boshlab, oynalarni kezib chiqish</translation>
 <translation id="5924855612669061715">Hotspot yoniq</translation>
 <translation id="5946788582095584774"><ph name="FEATURE_NAME" /> yoniq.</translation>
 <translation id="5947494881799873997">Bekor qilish</translation>
@@ -1142,6 +1145,7 @@
 <translation id="6352082849089527770">Notanish tarmoqlar</translation>
 <translation id="6359587239691116345">Eng oxirgi funksiyalar va xavfsizlikka oid yangilanishlarni olish Bu yangilanishni rad qilsangiz, qurilmangiz ishlashi, xavfsizlik va unumdorlikda muammolar yuz berishi mumkin.</translation>
 <translation id="6376931439017688372">Bluetooth yoniq</translation>
+<translation id="6378515133128829137">Oynani oʻngga qadash</translation>
 <translation id="6381109794406942707">Qurilmani qulfdan chiqarish uchun PIN kodingizni kiriting.</translation>
 <translation id="638716340450135524">Kamera ruxsatini yoqing</translation>
 <translation id="639644700271529076">CAPS LOCK o‘chiq</translation>
@@ -1161,6 +1165,7 @@
 <translation id="6459472438155181876">Ekranni kengaytirish: <ph name="DISPLAY_NAME" /></translation>
 <translation id="6477681113376365978">Fayl yuklab olinmadi</translation>
 <translation id="6482559668224714696">Butun ekran rejimidagi lupa</translation>
+<translation id="6483727822843292440">Eng kam ishlatilgan oynadan boshlab, oynalarni kezib chiqish</translation>
 <translation id="6490471652906364588">USB-C qurilma (o‘ng port)</translation>
 <translation id="6491071886865974820"><ph name="MANAGER" /> ushbu <ph name="DEVICE_TYPE" /> tizimini muddati tugamasdan yangilashni talab qilmoqda</translation>
 <translation id="649452524636452238">Smart kartaning PIN kodi</translation>

ash/strings/ash_strings_vi.xtb

diff --git a/ash/strings/ash_strings_vi.xtb b/ash/strings/ash_strings_vi.xtb
index 51caac01..bfb46ad 100644
--- a/ash/strings/ash_strings_vi.xtb
+++ b/ash/strings/ash_strings_vi.xtb
@@ -1214,6 +1214,7 @@
 <translation id="6683022854667115063">Tai nghe</translation>
 <translation id="6696025732084565524">Bàn phím có thể tháo rời của bạn cần một bản cập nhật quan trọng</translation>
 <translation id="6700713906295497288">Nút menu IME</translation>
+<translation id="6705577071209924099">Điều chỉnh độ sáng</translation>
 <translation id="6707693040195709527">Việc hạ cấp hệ điều hành trên thiết bị về phiên bản trước đã quá hạn</translation>
 <translation id="6710213216561001401">Trước</translation>
 <translation id="6723839937902243910">Nguồn</translation>

ash/strings/ash_strings_zh-CN.xtb

diff --git a/ash/strings/ash_strings_zh-CN.xtb b/ash/strings/ash_strings_zh-CN.xtb
index c1f3ade..0144620 100644
--- a/ash/strings/ash_strings_zh-CN.xtb
+++ b/ash/strings/ash_strings_zh-CN.xtb
@@ -4,6 +4,7 @@
 <translation id="1012876632442809908">USB-C 设备（前方端口）</translation>
 <translation id="1013598600051641573">“<ph name="DISPLAY_NAME" />”的分辨率已改为 <ph name="RESOLUTION" />（<ph name="REFRESH_RATE" /> 赫兹）。点击“确认”即可保留更改。将在 <ph name="TIMEOUT_SECONDS" />后恢复以前的设置。</translation>
 <translation id="1013923882670373915">蓝牙设备“<ph name="DEVICE_NAME" />”需要配对许可。请在该设备上输入以下PIN码：<ph name="PINCODE" /></translation>
+<translation id="1017556409696559990">当 Chrome 中没有任何后退历史记录时，将顶部窗口最小化</translation>
 <translation id="1024364763893396229">保存您的“<ph name="NAME" />”</translation>
 <translation id="1032891413405719768">触控笔电池电量较低</translation>
 <translation id="1036073649888683237">如需管理通知，请转到“设置”</translation>
@@ -343,6 +344,7 @@
 <translation id="2620436844016719705">系统</translation>
 <translation id="2621713457727696555">受保护</translation>
 <translation id="263399434338050016">“全选”</translation>
+<translation id="2644422758626431000">将窗口固定到左侧</translation>
 <translation id="2645435784669275700">Chrome 操作系统</translation>
 <translation id="2647092942972307022">存储空间配额共 <ph name="TOTAL_MEMORY" />，剩余 <ph name="USED_MEMORY" /></translation>
 <translation id="2653019840645008922">窗口截取/录制</translation>
@@ -1053,6 +1055,7 @@
 <translation id="5911909173233110115"><ph name="USERNAME" /> (<ph name="MAIL" />)</translation>
 <translation id="5916664084637901428">已启用</translation>
 <translation id="5920710855273935292">麦克风已静音。</translation>
+<translation id="5922962980596822074">从最近使用的窗口逐一浏览窗口</translation>
 <translation id="5924855612669061715">热点已开启</translation>
 <translation id="5946788582095584774">“<ph name="FEATURE_NAME" />”功能已开启。</translation>
 <translation id="5947494881799873997">还原</translation>
@@ -1142,6 +1145,7 @@
 <translation id="6352082849089527770">未知网络</translation>
 <translation id="6359587239691116345">获取最新的功能和安全性方面的改进。如果您拒绝此更新，您的设备可能会无法继续正常运行，您则可能会遇到安全问题和性能问题。</translation>
 <translation id="6376931439017688372">蓝牙已开启</translation>
+<translation id="6378515133128829137">将窗口固定到右侧</translation>
 <translation id="6381109794406942707">要解锁此设备，请输入您的 PIN 码。</translation>
 <translation id="638716340450135524">开启摄像头使用权限</translation>
 <translation id="639644700271529076">CAPS LOCK 已关闭</translation>
@@ -1161,6 +1165,7 @@
 <translation id="6459472438155181876">正在将屏幕扩展到<ph name="DISPLAY_NAME" /></translation>
 <translation id="6477681113376365978">无法下载文件</translation>
 <translation id="6482559668224714696">全屏放大镜</translation>
+<translation id="6483727822843292440">从最少使用的窗口逐一浏览窗口</translation>
 <translation id="6490471652906364588">USB-C 设备（右侧端口）</translation>
 <translation id="6491071886865974820"><ph name="MANAGER" /> 要求您在截止日期之前更新 <ph name="DEVICE_TYPE" /></translation>
 <translation id="649452524636452238">智能卡 PIN 码</translation>
@@ -1214,6 +1219,7 @@
 <translation id="6683022854667115063">头戴式耳机</translation>
 <translation id="6696025732084565524">您的可拆卸式键盘需要安装一项重要更新</translation>
 <translation id="6700713906295497288">IME 菜单按钮</translation>
+<translation id="6705577071209924099">调整光效</translation>
 <translation id="6707693040195709527">将设备回滚到上一个版本的截止日期已过</translation>
 <translation id="6710213216561001401">上一项</translation>
 <translation id="6723839937902243910">电源</translation>

ash/style/pagination_view.cc

diff --git a/ash/style/pagination_view.cc b/ash/style/pagination_view.cc
index f5afb4e..e4e0d20 100644
--- a/ash/style/pagination_view.cc
+++ b/ash/style/pagination_view.cc
@@ -28,9 +28,6 @@
 
 namespace {
 
-// The default number of pages defined in the PaginationModel.
-constexpr int kDefaultTotalPages = -1;
-
 // Attributes of arrow buttons.
 constexpr int kArrowButtonIconSize = 20;
 constexpr ui::ColorId kArrowButtonColorId = cros_tokens::kCrosSysSecondary;
@@ -44,6 +41,17 @@
 constexpr ui::ColorId kIndicatorColorId = cros_tokens::kCrosSysPrimary;
 constexpr int kMaxNumVisibleIndicators = 5;
 
+// Get the width of the indicator container.
+int GetIndicatorContainerWidth(int total_pages) {
+  if (total_pages <= 0) {
+    return 0;
+  }
+
+  const int visible_num = std::min(total_pages, kMaxNumVisibleIndicators);
+  return visible_num * kIndicatorButtonSize +
+         (visible_num - 1) * kIndicatorSpacing;
+}
+
 // A structure holds the info needed by interpolation.
 template <typename T>
 struct InterpolationInterval {
@@ -314,8 +322,8 @@
   indicator_scroll_view_->SetVerticalScrollBarMode(
       views::ScrollView::ScrollBarMode::kDisabled);
 
-  if (model_->total_pages() != kDefaultTotalPages) {
-    TotalPagesChanged(kDefaultTotalPages, model_->total_pages());
+  if (model_->total_pages() > 0) {
+    TotalPagesChanged(0, model_->total_pages());
   }
 
   if (model_->is_valid_page(model_->selected_page())) {
@@ -327,11 +335,9 @@
 
 gfx::Size PaginationView::CalculatePreferredSize() const {
   const int total_pages = model_->total_pages();
-  const int visible_num = std::min(total_pages, kMaxNumVisibleIndicators);
   // Initialize container size with indicator container size.
-  int container_size = visible_num * kIndicatorButtonSize +
-                       (visible_num - 1) * kIndicatorSpacing;
-  if (total_pages > visible_num) {
+  int container_size = GetIndicatorContainerWidth(total_pages);
+  if (total_pages > kMaxNumVisibleIndicators) {
     // If the number of total pages exceeds visible maximum, add arrow buttons.
     container_size += 2 * (kArrowButtonIconSize + kArrowIndicatorSpacing);
   }
@@ -363,10 +369,8 @@
 
   // Set the indicator container.
   indicator_container_->SizeToPreferredSize();
-  const int visible_num =
-      std::min(model_->total_pages(), kMaxNumVisibleIndicators);
-  const int scroll_view_size = visible_num * kIndicatorButtonSize +
-                               (visible_num - 1) * kIndicatorSpacing;
+  const int scroll_view_size =
+      GetIndicatorContainerWidth(model_->total_pages());
   if (horizontal) {
     indicator_scroll_view_->SetBounds(offset, 0, scroll_view_size,
                                       kIndicatorButtonSize);
@@ -561,7 +565,12 @@
 
 void PaginationView::TotalPagesChanged(int previous_page_count,
                                        int new_page_count) {
-  DCHECK_NE(previous_page_count, new_page_count);
+  previous_page_count = std::max(0, previous_page_count);
+  new_page_count = std::max(0, new_page_count);
+  if (previous_page_count == new_page_count) {
+    return;
+  }
+
   if (previous_page_count < new_page_count) {
     // Add more indicators at the end of container.
     for (int i = previous_page_count; i < new_page_count; i++) {

ash/style/style_viewer/pagination_instances_grid_view_factory.cc

diff --git a/ash/style/style_viewer/pagination_instances_grid_view_factory.cc b/ash/style/style_viewer/pagination_instances_grid_view_factory.cc
index b44a6498..7de0239c 100644
--- a/ash/style/style_viewer/pagination_instances_grid_view_factory.cc
+++ b/ash/style/style_viewer/pagination_instances_grid_view_factory.cc
@@ -109,7 +109,9 @@
     model_observer_.Observe(model_);
     SetHorizontalScrollBarMode(views::ScrollView::ScrollBarMode::kDisabled);
     SetVerticalScrollBarMode(views::ScrollView::ScrollBarMode::kDisabled);
-    TotalPagesChanged(0, model_->total_pages());
+    if (model_->total_pages() > 0) {
+      TotalPagesChanged(0, model_->total_pages());
+    }
   }
 
   PaginationTestScrollView(const PaginationTestScrollView&) = delete;
@@ -128,6 +130,12 @@
 
   // PaginationModelObserver:
   void TotalPagesChanged(int previous_page_count, int new_page_count) override {
+    previous_page_count = std::max(0, previous_page_count);
+    new_page_count = std::max(0, new_page_count);
+    if (previous_page_count == new_page_count) {
+      return;
+    }
+
     // Synchronize the number of labels with total pages.
     if (previous_page_count < new_page_count) {
       for (int i = previous_page_count; i < new_page_count; i++) {

ash/system/bluetooth/bluetooth_feature_pod_controller.cc

diff --git a/ash/system/bluetooth/bluetooth_feature_pod_controller.cc b/ash/system/bluetooth/bluetooth_feature_pod_controller.cc
index 2f6ff735..d87b005 100644
--- a/ash/system/bluetooth/bluetooth_feature_pod_controller.cc
+++ b/ash/system/bluetooth/bluetooth_feature_pod_controller.cc
@@ -11,7 +11,9 @@
 #include "ash/public/cpp/bluetooth_config_service.h"
 #include "ash/public/cpp/hats_bluetooth_revamp_trigger.h"
 #include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
+#include "ash/system/bluetooth/bluetooth_state_cache.h"
 #include "ash/system/unified/feature_pod_button.h"
 #include "ash/system/unified/feature_tile.h"
 #include "ash/system/unified/quick_settings_metrics_util.h"
@@ -35,9 +37,9 @@
 
 BluetoothSystemState GetInitialSystemState() {
   if (features::IsQsRevampEnabled()) {
-    // Ensure the feature tile is visible while waiting for the async mojo query
-    // in the constructor. This simplifies the initial QS layout.
-    return BluetoothSystemState::kEnabled;
+    // Synchronously query the initial state so the feature tile doesn't flash
+    // with the wrong state. See b/266996235
+    return Shell::Get()->bluetooth_state_cache()->system_state();
   } else {
     return BluetoothSystemState::kUnavailable;
   }

ash/system/bluetooth/bluetooth_state_cache.cc

diff --git a/ash/system/bluetooth/bluetooth_state_cache.cc b/ash/system/bluetooth/bluetooth_state_cache.cc
new file mode 100644
index 0000000..657a122
--- /dev/null
+++ b/ash/system/bluetooth/bluetooth_state_cache.cc
@@ -0,0 +1,37 @@
+// 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 "ash/system/bluetooth/bluetooth_state_cache.h"
+
+#include "ash/public/cpp/bluetooth_config_service.h"
+#include "base/functional/bind.h"
+#include "base/task/single_thread_task_runner.h"
+#include "chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h"
+
+namespace ash {
+
+BluetoothStateCache::BluetoothStateCache() {
+  // Asynchronously bind to CrosBluetoothConfig so that we don't attempt to bind
+  // to it before it has initialized.
+  base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
+      FROM_HERE, base::BindOnce(&BluetoothStateCache::BindToCrosBluetoothConfig,
+                                weak_ptr_factory_.GetWeakPtr()));
+}
+
+BluetoothStateCache::~BluetoothStateCache() = default;
+
+void BluetoothStateCache::BindToCrosBluetoothConfig() {
+  GetBluetoothConfigService(
+      remote_cros_bluetooth_config_.BindNewPipeAndPassReceiver());
+  // Observing system properties also does a fetch of the initial properties.
+  remote_cros_bluetooth_config_->ObserveSystemProperties(
+      system_properties_observer_receiver_.BindNewPipeAndPassRemote());
+}
+
+void BluetoothStateCache::OnPropertiesUpdated(
+    bluetooth_config::mojom::BluetoothSystemPropertiesPtr properties) {
+  system_state_ = properties->system_state;
+}
+
+}  // namespace ash

ash/system/bluetooth/bluetooth_state_cache.h

diff --git a/ash/system/bluetooth/bluetooth_state_cache.h b/ash/system/bluetooth/bluetooth_state_cache.h
new file mode 100644
index 0000000..bf4e3598
--- /dev/null
+++ b/ash/system/bluetooth/bluetooth_state_cache.h
@@ -0,0 +1,54 @@
+// 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.
+
+#ifndef ASH_SYSTEM_BLUETOOTH_BLUETOOTH_STATE_CACHE_H_
+#define ASH_SYSTEM_BLUETOOTH_BLUETOOTH_STATE_CACHE_H_
+
+#include "ash/ash_export.h"
+#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
+#include "mojo/public/cpp/bindings/receiver.h"
+#include "mojo/public/cpp/bindings/remote.h"
+
+namespace ash {
+
+// Queries the Bluetooth adapter state on startup, then monitors it for changes.
+// Used by code that needs to query the adapter state synchronously (e.g. the
+// quick settings bubble).
+class ASH_EXPORT BluetoothStateCache
+    : public bluetooth_config::mojom::SystemPropertiesObserver {
+ public:
+  BluetoothStateCache();
+  BluetoothStateCache(const BluetoothStateCache&) = delete;
+  BluetoothStateCache& operator=(const BluetoothStateCache&) = delete;
+  ~BluetoothStateCache() override;
+
+  // Returns the cached system state.
+  bluetooth_config::mojom::BluetoothSystemState system_state() {
+    return system_state_;
+  }
+
+ private:
+  // Binds to the mojo interface for bluetooth config.
+  void BindToCrosBluetoothConfig();
+
+  // bluetooth_config::mojom::SystemPropertiesObserver:
+  void OnPropertiesUpdated(bluetooth_config::mojom::BluetoothSystemPropertiesPtr
+                               properties) override;
+
+  mojo::Remote<bluetooth_config::mojom::CrosBluetoothConfig>
+      remote_cros_bluetooth_config_;
+  mojo::Receiver<bluetooth_config::mojom::SystemPropertiesObserver>
+      system_properties_observer_receiver_{this};
+
+  // Most users have bluetooth enabled, so use that as the default until the
+  // initial value is available.
+  bluetooth_config::mojom::BluetoothSystemState system_state_ =
+      bluetooth_config::mojom::BluetoothSystemState::kEnabled;
+
+  base::WeakPtrFactory<BluetoothStateCache> weak_ptr_factory_{this};
+};
+
+}  // namespace ash
+
+#endif  // ASH_SYSTEM_BLUETOOTH_BLUETOOTH_STATE_CACHE_H_

ash/system/bluetooth/bluetooth_state_cache_unittest.cc

diff --git a/ash/system/bluetooth/bluetooth_state_cache_unittest.cc b/ash/system/bluetooth/bluetooth_state_cache_unittest.cc
new file mode 100644
index 0000000..c19bf6e1
--- /dev/null
+++ b/ash/system/bluetooth/bluetooth_state_cache_unittest.cc
@@ -0,0 +1,36 @@
+// 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 "ash/system/bluetooth/bluetooth_state_cache.h"
+
+#include "ash/shell.h"
+#include "ash/test/ash_test_base.h"
+#include "ash/test/ash_test_helper.h"
+#include "base/run_loop.h"
+#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h"
+#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-shared.h"
+
+namespace ash {
+
+using BluetoothStateCacheTest = AshTestBase;
+
+TEST_F(BluetoothStateCacheTest, Basics) {
+  auto* state_controller = ash_test_helper()
+                               ->bluetooth_config_test_helper()
+                               ->fake_adapter_state_controller();
+
+  state_controller->SetSystemState(
+      bluetooth_config::mojom::BluetoothSystemState::kDisabled);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(bluetooth_config::mojom::BluetoothSystemState::kDisabled,
+            Shell::Get()->bluetooth_state_cache()->system_state());
+
+  state_controller->SetSystemState(
+      bluetooth_config::mojom::BluetoothSystemState::kEnabled);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(bluetooth_config::mojom::BluetoothSystemState::kEnabled,
+            Shell::Get()->bluetooth_state_cache()->system_state());
+}
+
+}  // namespace ash

ash/system/input_device_settings/input_device_settings_controller_impl.cc

diff --git a/ash/system/input_device_settings/input_device_settings_controller_impl.cc b/ash/system/input_device_settings/input_device_settings_controller_impl.cc
index bc3a07a..467413b7 100644
--- a/ash/system/input_device_settings/input_device_settings_controller_impl.cc
+++ b/ash/system/input_device_settings/input_device_settings_controller_impl.cc
@@ -779,4 +779,25 @@
       policy_handler_->keyboard_policies(), keyboard);
 }
 
+// GetGeneralizedTopRowAreFKeys returns false if there is no keyboard. If there
+// is only internal keyboard, GetGeneralizedTopRowAreFKeys returns the
+// top_row_are_fkeys of it. If there are multiple keyboards,
+// GetGeneralizedTopRowAreFKeys returns the top_row_are_fkeys of latest external
+// keyboard which has the largest device id.
+bool InputDeviceSettingsControllerImpl::GetGeneralizedTopRowAreFKeys() {
+  auto external_iter = base::ranges::find(
+      keyboards_.rbegin(), keyboards_.rend(), /*value=*/true,
+      [](const auto& keyboard) { return keyboard.second->is_external; });
+  auto internal_iter = base::ranges::find(
+      keyboards_.rbegin(), keyboards_.rend(), /*value=*/false,
+      [](const auto& keyboard) { return keyboard.second->is_external; });
+  if (external_iter != keyboards_.rend()) {
+    return external_iter->second->settings->top_row_are_fkeys;
+  }
+  if (internal_iter != keyboards_.rend()) {
+    return internal_iter->second->settings->top_row_are_fkeys;
+  }
+  return false;
+}
+
 }  // namespace ash

ash/system/input_device_settings/input_device_settings_controller_impl.h

diff --git a/ash/system/input_device_settings/input_device_settings_controller_impl.h b/ash/system/input_device_settings/input_device_settings_controller_impl.h
index 71f80df..622d53c 100644
--- a/ash/system/input_device_settings/input_device_settings_controller_impl.h
+++ b/ash/system/input_device_settings/input_device_settings_controller_impl.h
@@ -82,6 +82,7 @@
   void OnPointingStickListUpdated(
       std::vector<ui::InputDevice> pointing_sticks_to_add,
       std::vector<DeviceId> pointing_stick_ids_to_remove);
+  bool GetGeneralizedTopRowAreFKeys();
 
   // SessionObserver:
   void OnActiveUserPrefServiceChanged(PrefService* pref_service) override;

ash/system/input_device_settings/input_device_settings_controller_unittest.cc

diff --git a/ash/system/input_device_settings/input_device_settings_controller_unittest.cc b/ash/system/input_device_settings/input_device_settings_controller_unittest.cc
index 57f9b5e4..c145500 100644
--- a/ash/system/input_device_settings/input_device_settings_controller_unittest.cc
+++ b/ash/system/input_device_settings/input_device_settings_controller_unittest.cc
@@ -20,6 +20,7 @@
 #include "ash/system/input_device_settings/pref_handlers/touchpad_pref_handler_impl.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
+#include "base/files/file_path.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/ranges/algorithm.h"
 #include "base/ranges/functional.h"
@@ -30,6 +31,7 @@
 #include "components/prefs/pref_service.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/user_manager/known_user.h"
+#include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/events/devices/device_data_manager_test_api.h"
 #include "ui/events/devices/input_device.h"
@@ -39,14 +41,32 @@
 using DeviceId = InputDeviceSettingsController::DeviceId;
 
 namespace {
-const ui::InputDevice kSampleKeyboardInternal = {5, ui::INPUT_DEVICE_INTERNAL,
-                                                 "kSampleKeyboardInternal"};
+const ui::InputDevice kSampleKeyboardInternal = {5,
+                                                 ui::INPUT_DEVICE_INTERNAL,
+                                                 "kSampleKeyboardInternal",
+                                                 "",
+                                                 base::FilePath(),
+                                                 0x1111,
+                                                 0x1111,
+                                                 0};
 const ui::InputDevice kSampleKeyboardBluetooth = {
     10, ui::INPUT_DEVICE_BLUETOOTH, "kSampleKeyboardBluetooth"};
-const ui::InputDevice kSampleKeyboardUsb = {15, ui::INPUT_DEVICE_USB,
-                                            "kSampleKeyboardUsb"};
-const ui::InputDevice kSampleKeyboardUsb2 = {20, ui::INPUT_DEVICE_USB,
-                                             "kSampleKeyboardUsb2"};
+const ui::InputDevice kSampleKeyboardUsb = {15,
+                                            ui::INPUT_DEVICE_USB,
+                                            "kSampleKeyboardUsb",
+                                            "",
+                                            base::FilePath(),
+                                            0x1111,
+                                            0x2222,
+                                            0};
+const ui::InputDevice kSampleKeyboardUsb2 = {20,
+                                             ui::INPUT_DEVICE_USB,
+                                             "kSampleKeyboardUsb2",
+                                             "",
+                                             base::FilePath(),
+                                             0x1111,
+                                             0x3333,
+                                             0};
 const ui::InputDevice kSampleTouchpadInternal = {1, ui::INPUT_DEVICE_INTERNAL,
                                                  "kSampleTouchpadInternal"};
 const ui::InputDevice kSamplePointingStickInternal = {
@@ -497,8 +517,10 @@
 TEST_F(InputDeviceSettingsControllerTest, KeyboardSettingsUpdateMultiple) {
   // The SetKeyboardSettings call should update both keyboards since they have
   // the same |device_key|.
+  ui::InputDevice sample_usb_keyboard_copy = kSampleKeyboardUsb;
+  sample_usb_keyboard_copy.id = kSampleKeyboardUsb2.id;
   ui::DeviceDataManagerTestApi().SetKeyboardDevices(
-      {kSampleKeyboardUsb, kSampleKeyboardUsb2});
+      {kSampleKeyboardUsb, sample_usb_keyboard_copy});
 
   EXPECT_EQ(observer_->num_keyboards_connected(), 2u);
   EXPECT_EQ(keyboard_pref_handler_->num_keyboard_settings_initialized(), 2u);
@@ -540,4 +562,29 @@
       /*expected_count=*/4u);
 }
 
+TEST_F(InputDeviceSettingsControllerTest, GetGeneralizedTopRowAreFKeys) {
+  // If there no keyboards, return false.
+  EXPECT_EQ(false, controller_->GetGeneralizedTopRowAreFKeys());
+
+  // If there is only internal keyboard, return its top_row_are_fkeys value.
+  ui::DeviceDataManagerTestApi().SetKeyboardDevices({kSampleKeyboardInternal});
+
+  auto internal_keyboard_settings = mojom::KeyboardSettings::New();
+  internal_keyboard_settings->top_row_are_fkeys = true;
+  controller_->SetKeyboardSettings((DeviceId)kSampleKeyboardInternal.id,
+                                   internal_keyboard_settings.Clone());
+  EXPECT_EQ(true, controller_->GetGeneralizedTopRowAreFKeys());
+
+  // If there are multiple external keyboards, return the top_row_are_fkeys
+  // value of the external keyboard which has the largest device id.
+  ui::DeviceDataManagerTestApi().SetKeyboardDevices(
+      {kSampleKeyboardInternal, kSampleKeyboardUsb, kSampleKeyboardUsb2});
+
+  auto settings = mojom::KeyboardSettings::New();
+  settings->top_row_are_fkeys = true;
+  controller_->SetKeyboardSettings((DeviceId)kSampleKeyboardUsb.id,
+                                   settings.Clone());
+  EXPECT_EQ(false, controller_->GetGeneralizedTopRowAreFKeys());
+}
+
 }  // namespace ash

ash/system/input_device_settings/input_device_settings_utils.cc

diff --git a/ash/system/input_device_settings/input_device_settings_utils.cc b/ash/system/input_device_settings/input_device_settings_utils.cc
index 44a3dd95..02b9038 100644
--- a/ash/system/input_device_settings/input_device_settings_utils.cc
+++ b/ash/system/input_device_settings/input_device_settings_utils.cc
@@ -10,6 +10,8 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
+#include "components/account_id/account_id.h"
+#include "components/user_manager/known_user.h"
 #include "ui/chromeos/events/mojom/modifier_key.mojom.h"
 
 namespace ash {
@@ -95,4 +97,16 @@
     bool force_persistence,
     const base::Value::Dict* existing_settings_dict);
 
+const base::Value::Dict* GetLoginScreenSettingsDict(
+    PrefService* local_state,
+    AccountId account_id,
+    const std::string& pref_name) {
+  const auto* dict_value =
+      user_manager::KnownUser(local_state).FindPath(account_id, pref_name);
+  if (!dict_value || !dict_value->is_dict()) {
+    return nullptr;
+  }
+  return &dict_value->GetDict();
+}
+
 }  // namespace ash

ash/system/input_device_settings/input_device_settings_utils.h

diff --git a/ash/system/input_device_settings/input_device_settings_utils.h b/ash/system/input_device_settings/input_device_settings_utils.h
index 6318609..8d7076b 100644
--- a/ash/system/input_device_settings/input_device_settings_utils.h
+++ b/ash/system/input_device_settings/input_device_settings_utils.h
@@ -11,6 +11,9 @@
 #include "base/values.h"
 #include "ui/events/devices/input_device.h"
 
+class AccountId;
+class PrefService;
+
 namespace ash {
 
 // Checks if a given value is within the bounds set by `ui::mojom::ModifierKey`.
@@ -75,6 +78,12 @@
     bool force_persistence,
     const base::Value::Dict* existing_settings_dict);
 
+// Retrieve cached internal/external device settings dictionary (if it exists).
+ASH_EXPORT const base::Value::Dict* GetLoginScreenSettingsDict(
+    PrefService* local_state,
+    AccountId account_id,
+    const std::string& pref_name);
+
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_INPUT_DEVICE_SETTINGS_INPUT_DEVICE_SETTINGS_UTILS_H_

ash/system/input_device_settings/input_device_settings_utils_unittest.cc

diff --git a/ash/system/input_device_settings/input_device_settings_utils_unittest.cc b/ash/system/input_device_settings/input_device_settings_utils_unittest.cc
index 9fe5166..0d02d330 100644
--- a/ash/system/input_device_settings/input_device_settings_utils_unittest.cc
+++ b/ash/system/input_device_settings/input_device_settings_utils_unittest.cc
@@ -6,10 +6,23 @@
 
 #include <cstdint>
 
+#include "base/values.h"
+#include "components/account_id/account_id.h"
+#include "components/prefs/pref_registry_simple.h"
+#include "components/prefs/pref_service.h"
+#include "components/prefs/testing_pref_service.h"
+#include "components/user_manager/known_user.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/events/devices/input_device.h"
 
 namespace ash {
+namespace {
+
+constexpr char kTestPrefKey[] = "test_key";
+const AccountId account_id = AccountId::FromUserEmail("example@email.com");
+
+}  // namespace
 
 class DeviceKeyTest : public testing::TestWithParam<
                           std::tuple<uint16_t, uint16_t, std::string>> {};
@@ -35,4 +48,18 @@
   EXPECT_EQ(expected_key, key);
 }
 
+TEST(GetLoginScreenSettingsDictTest, RetrieveSettingsDict) {
+  auto local_state = std::make_unique<TestingPrefServiceSimple>();
+  user_manager::KnownUser::RegisterPrefs(local_state->registry());
+  user_manager::KnownUser known_user(local_state.get());
+  const base::Value::Dict* settings =
+      GetLoginScreenSettingsDict(local_state.get(), account_id, kTestPrefKey);
+  EXPECT_EQ(nullptr, settings);
+  known_user.SetPath(account_id, kTestPrefKey,
+                     absl::make_optional<base::Value>(base::Value::Dict()));
+  const base::Value::Dict* valid_settings =
+      GetLoginScreenSettingsDict(local_state.get(), account_id, kTestPrefKey);
+  EXPECT_NE(nullptr, valid_settings);
+}
+
 }  // namespace ash

ash/system/input_device_settings/pref_handlers/keyboard_pref_handler_impl.cc

diff --git a/ash/system/input_device_settings/pref_handlers/keyboard_pref_handler_impl.cc b/ash/system/input_device_settings/pref_handlers/keyboard_pref_handler_impl.cc
index 96bf0f0ca..1eb743fa 100644
--- a/ash/system/input_device_settings/pref_handlers/keyboard_pref_handler_impl.cc
+++ b/ash/system/input_device_settings/pref_handlers/keyboard_pref_handler_impl.cc
@@ -301,18 +301,6 @@
   return settings;
 }
 
-const base::Value::Dict* GetLoginScreenSettingsDict(
-    PrefService* local_state,
-    AccountId account_id,
-    const std::string& pref_name) {
-  const auto* dict_value =
-      user_manager::KnownUser(local_state).FindPath(account_id, pref_name);
-  if (!dict_value || !dict_value->is_dict()) {
-    return nullptr;
-  }
-  return &dict_value->GetDict();
-}
-
 }  // namespace
 
 KeyboardPrefHandlerImpl::KeyboardPrefHandlerImpl() = default;

ash/webui/camera_app_ui/resources/strings/camera_strings_sq.xtb

diff --git a/ash/webui/camera_app_ui/resources/strings/camera_strings_sq.xtb b/ash/webui/camera_app_ui/resources/strings/camera_strings_sq.xtb
index a26348a..85b31d8d 100644
--- a/ash/webui/camera_app_ui/resources/strings/camera_strings_sq.xtb
+++ b/ash/webui/camera_app_ui/resources/strings/camera_strings_sq.xtb
@@ -27,7 +27,7 @@
 <translation id="199526504800285197">Regjistrimi ka ndaluar</translation>
 <translation id="1995951722691075581">Regjistrimi yt ndaloi për shkak të nivelit të ulët të hapësirës ruajtëse të pajisjes. Për të regjistruar video të tjera, duhet të lirosh hapësirën në pajisjen tënde.</translation>
 <translation id="2036868001356139588">Kohëzgjatja e kohëmatësit</translation>
-<translation id="2050339315714019657">Portret (vertikal</translation>
+<translation id="2050339315714019657">Portret (vertikal)</translation>
 <translation id="2064538373111010176"><ph name="CAMERA" /> aktive</translation>
 <translation id="2128052519899549250">Regjistro një video me regjistrimin me intervale</translation>
 <translation id="2134029355740465625">Cilësimet e videove</translation>

ash/webui/camera_app_ui/resources/strings/camera_strings_uz.xtb

diff --git a/ash/webui/camera_app_ui/resources/strings/camera_strings_uz.xtb b/ash/webui/camera_app_ui/resources/strings/camera_strings_uz.xtb
index 8805a30..2e9eb8e 100644
--- a/ash/webui/camera_app_ui/resources/strings/camera_strings_uz.xtb
+++ b/ash/webui/camera_app_ui/resources/strings/camera_strings_uz.xtb
@@ -27,7 +27,7 @@
 <translation id="199526504800285197">Yozib olish toʻxtatildi</translation>
 <translation id="1995951722691075581">Bu qurilma xotirasida joy oz qolgani uchun yozib olish toʻxtatildi. Koʻproq video yozish uchun qurilmangizda boʻsh joy oching.</translation>
 <translation id="2036868001356139588">Taymer davomiyligi</translation>
-<translation id="2050339315714019657">Bo‘yiga</translation>
+<translation id="2050339315714019657">Tik</translation>
 <translation id="2064538373111010176"><ph name="CAMERA" /> faol</translation>
 <translation id="2128052519899549250">Taymlaps video yozib olish</translation>
 <translation id="2134029355740465625">Video sozlamalari</translation>

ash/webui/common/resources/navigation_view_panel.html

diff --git a/ash/webui/common/resources/navigation_view_panel.html b/ash/webui/common/resources/navigation_view_panel.html
index 1c6509b..60b1599 100644
--- a/ash/webui/common/resources/navigation_view_panel.html
+++ b/ash/webui/common/resources/navigation_view_panel.html
@@ -14,6 +14,10 @@
     --left-aligned-top-offset: 120px;
   }
 
+  :host {
+    --navigation-view-panel-toolbar-height: 56px;
+  }
+
   :host([show-banner][show-tool-bar]) #container {
     display: grid;
     grid-template-areas: var(--areas-nav-banner);

ash/webui/common/resources/page_toolbar.html

diff --git a/ash/webui/common/resources/page_toolbar.html b/ash/webui/common/resources/page_toolbar.html
index 55a9f3f..5458f3d 100644
--- a/ash/webui/common/resources/page_toolbar.html
+++ b/ash/webui/common/resources/page_toolbar.html
@@ -3,7 +3,7 @@
     align-items: center;
     background: var(--cros-bg-color);
     display: flex;
-    height: 56px;
+    height: var(--navigation-view-panel-toolbar-height, 56px);
     width: 100%;
   }
 

ash/webui/personalization_app/resources/js/keyboard_backlight/color_selector_element.html

diff --git a/ash/webui/personalization_app/resources/js/keyboard_backlight/color_selector_element.html b/ash/webui/personalization_app/resources/js/keyboard_backlight/color_selector_element.html
index 1ca00fc4..6c83bd8 100644
--- a/ash/webui/personalization_app/resources/js/keyboard_backlight/color_selector_element.html
+++ b/ash/webui/personalization_app/resources/js/keyboard_backlight/color_selector_element.html
@@ -6,14 +6,10 @@
     position: relative;
   }
 
-  @media (max-width: 700px) {
-    #selector {
-      column-gap: 11px;
-    }
-
-    #selector > #wallpaperColorDescription {
-      margin-inline-start: -6px;
-    }
+  #wallpaperIconAndDesc {
+    column-gap: 5.5px;
+    display: flex;
+    flex-flow: row wrap;
   }
 
   #wallpaperColorDescription {
@@ -21,7 +17,6 @@
     font-size: 12px;
     height: 48px;
     line-height: 48px;
-    margin-inline-start: 5.5px;
   }
 
   .divider {
@@ -30,7 +25,7 @@
     height: 20px;
   }
 
-  .selectable:focus-visible {
+  .selectable color-icon:focus-visible {
     border-radius: 50%;
     outline: 2px solid var(--cros-focus-ring-color);
     outline-offset: -2px;
@@ -42,6 +37,7 @@
     flex-direction: column;
     position: absolute;
     top: var(--color-container-size);
+    z-index: 1;
   }
 
   #toastDot {
@@ -78,6 +74,40 @@
     display: flex;
     margin-inline-start: auto;
   }
+
+  @media (max-width: 690px) {
+    #selector {
+      column-gap: 11px;
+    }
+
+    :host-context(zone-customization) #selector {
+      column-gap: 0;
+    }
+
+    #toast.multizone-supported {
+      top: calc(var(--color-container-size) * 2);
+    }
+  }
+
+  @media (max-width: 823px) and (min-width: 691px) {
+    #wallpaperIconAndDesc {
+      flex-flow: column wrap;
+    }
+
+    #wallpaperColorDescription {
+      height: auto;
+      line-height: 12px;
+      margin-inline-start: -18px;
+    }
+
+    ::slotted(.customization-button-container) {
+      margin-block-start: -12px;
+    }
+
+    #toast.multizone-supported {
+      top: calc(var(--color-container-size) + 20px);
+    }
+  }
 </style>
 <div id="container">
   <iron-a11y-keys id="keys" keys="left right enter" on-keys-pressed="onKeysPress_">
@@ -88,14 +118,16 @@
     <template is="dom-if" if="[[!isMultiZoneRgbKeyboardSupported_]]">
       <div id$="[[wallpaperColorId_]]"
           class$="[[getWallpaperColorContainerClass_(selectedColor)]]"
-          tabindex="0"
           on-click="onWallpaperColorSelected_"
-          on-keypress="onWallpaperColorSelected_"
-          aria-label="$i18n{wallpaperColor}"
-          aria-checked$="[[getWallpaperColorAriaChecked_(selectedColor)]]"
-          title$="[[getWallpaperColorTitle_()]]"
-          role="radio">
-        <color-icon color-id="[[wallpaperColorId_]]"></color-icon>
+          on-keypress="onWallpaperColorSelected_">
+        <color-icon
+            tabindex="0"
+            aria-label="$i18n{wallpaperColor}"
+            aria-checked$="[[getWallpaperColorAriaChecked_(selectedColor)]]"
+            title$="[[getWallpaperColorTitle_()]]"
+            role="radio"
+            color-id="[[wallpaperColorId_]]">
+        </color-icon>
         <template is="dom-if" if="[[shouldShowNudge_]]">
           <div id="toast">
             <div id="toastDot"></div>
@@ -115,37 +147,51 @@
     <template is="dom-repeat" items="[[presetColorIds_]]" as="presetColorId">
       <div id$="[[presetColorId]]"
           class$="[[getPresetColorContainerClass_(presetColorId, presetColors_, selectedColor)]]"
-          tabindex$="[[getPresetColorTabIndex_(isMultiZoneRgbKeyboardSupported_, presetColorId)]]"
-          on-click="onPresetColorSelected_" on-keypress="onPresetColorSelected_"
-          aria-label$="[[getPresetColorAriaLabel_(presetColorId)]]"
-          role="radio"
-          aria-checked$="[[getPresetColorAriaChecked_(presetColorId, presetColors_, selectedColor)]]"
-          title$="[[getPresetColorAriaLabel_(presetColorId)]]">
-        <color-icon color-id="[[presetColorId]]"></color-icon>
+          on-click="onPresetColorSelected_" on-keypress="onPresetColorSelected_">
+        <color-icon
+            tabindex$="[[getPresetColorTabIndex_(isMultiZoneRgbKeyboardSupported_, presetColorId)]]"
+            aria-label$="[[getPresetColorAriaLabel_(presetColorId)]]"
+            role="radio"
+            aria-checked$="[[getPresetColorAriaChecked_(presetColorId, presetColors_, selectedColor)]]"
+            title$="[[getPresetColorAriaLabel_(presetColorId)]]"
+            color-id="[[presetColorId]]">
+        </color-icon>
       </div>
     </template>
     <template is="dom-if" if="[[!isCustomizedDialog]]">
       <div id$="[[rainbowColorId_]]"
           class$="[[getRainbowColorContainerClass_(selectedColor)]]"
-          on-click="onRainbowColorSelected_" on-keypress="onRainbowColorSelected_"
-          aria-label="$i18n{rainbowColor}" role="radio"
-          aria-checked$="[[getRainbowColorAriaChecked_(selectedColor)]]"
-          title="$i18n{rainbowColor}">
-        <color-icon color-id="[[rainbowColorId_]]"></color-icon>
+          on-click="onRainbowColorSelected_" on-keypress="onRainbowColorSelected_">
+        <color-icon
+            aria-label="$i18n{rainbowColor}"
+            role="radio"
+            aria-checked$="[[getRainbowColorAriaChecked_(selectedColor)]]"
+            title="$i18n{rainbowColor}"
+            color-id="[[rainbowColorId_]]">
+        </color-icon>
       </div>
     </template>
     <template is="dom-if" if="[[isMultiZoneRgbKeyboardSupported_]]">
       <div id$="[[wallpaperColorId_]]"
           class$="[[getWallpaperColorContainerClass_(selectedColor)]]"
           on-click="onWallpaperColorSelected_"
-          on-keypress="onWallpaperColorSelected_"
-          aria-label="$i18n{wallpaperColor}"
-          aria-checked$="[[getWallpaperColorAriaChecked_(selectedColor)]]"
-          title$="[[getWallpaperColorTitle_()]]"
-          role="radio">
-        <color-icon color-id="[[wallpaperColorId_]]"></color-icon>
+          on-keypress="onWallpaperColorSelected_">
+        <div id="wallpaperIconAndDesc">
+          <color-icon
+              aria-label="$i18n{wallpaperColor}"
+              aria-checked$="[[getWallpaperColorAriaChecked_(selectedColor)]]"
+              title$="[[getWallpaperColorTitle_()]]"
+              role="radio"
+              color-id="[[wallpaperColorId_]]">
+          </color-icon>
+          <template is="dom-if" if="[[!isCustomizedDialog]]">
+            <div id="wallpaperColorDescription">
+                $i18n{wallpaperColorDescription}
+            </div>
+          </template>
+        </div>
         <template is="dom-if" if="[[shouldShowNudge_]]">
-          <div id="toast">
+          <div id="toast" class="multizone-supported">
             <div id="toastDot"></div>
             <div id="toastContent">
               <svg width="16" height="14" viewBox="0 0 16 14" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -156,11 +202,6 @@
           </div>
         </template>
       </div>
-      <template is="dom-if" if="[[!isCustomizedDialog]]">
-        <div id="wallpaperColorDescription">
-            $i18n{wallpaperColorDescription}
-        </div>
-      </template>
       <slot name="button-container"></slot>
     </template>
   </iron-selector>

ash/webui/personalization_app/resources/js/keyboard_backlight/color_selector_element.ts

diff --git a/ash/webui/personalization_app/resources/js/keyboard_backlight/color_selector_element.ts b/ash/webui/personalization_app/resources/js/keyboard_backlight/color_selector_element.ts
index 8d42b81..e2692dc 100644
--- a/ash/webui/personalization_app/resources/js/keyboard_backlight/color_selector_element.ts
+++ b/ash/webui/personalization_app/resources/js/keyboard_backlight/color_selector_element.ts
@@ -182,14 +182,20 @@
       default:
         return;
     }
-    // Remove focus state of previous button.
+    // Remove focus state of color icon in previous button.
     if (prevButton) {
-      prevButton.removeAttribute('tabindex');
+      const colorIconElem = this.getColorIconElement_(prevButton);
+      if (colorIconElem) {
+        colorIconElem.removeAttribute('tabindex');
+      }
     }
-    // Add focus state for new button.
+    // Add focus state for the color icon in new button.
     if (this.ironSelectedColor_) {
-      this.ironSelectedColor_.setAttribute('tabindex', '0');
-      this.ironSelectedColor_.focus();
+      const colorIconElem = this.getColorIconElement_(this.ironSelectedColor_);
+      if (colorIconElem) {
+        colorIconElem.setAttribute('tabindex', '0');
+        colorIconElem.focus();
+      }
     }
     e.detail.keyboardEvent.preventDefault();
   }
@@ -245,6 +251,11 @@
     }
   }
 
+  private getColorIconElement_(button: HTMLElement): HTMLElement {
+    return this.shadowRoot!.getElementById(button.id)!.querySelector(
+               'color-icon') as HTMLElement;
+  }
+
   private getColorSelectorAriaLabel_(): string {
     return loadTimeData.getString('keyboardBacklightTitle');
   }

ash/webui/personalization_app/resources/js/keyboard_backlight/zone_customization_element.html

diff --git a/ash/webui/personalization_app/resources/js/keyboard_backlight/zone_customization_element.html b/ash/webui/personalization_app/resources/js/keyboard_backlight/zone_customization_element.html
index ffebbf2..d5a5da1d 100644
--- a/ash/webui/personalization_app/resources/js/keyboard_backlight/zone_customization_element.html
+++ b/ash/webui/personalization_app/resources/js/keyboard_backlight/zone_customization_element.html
@@ -8,6 +8,12 @@
     width: 642px;
   }
 
+  @media (max-width: 650px) {
+    cr-dialog::part(dialog) {
+      width: 560px;
+    }
+  }
+
   #zoneSelector {
     background-color: var(--cros-tab-slider-track-color);
     border-radius: 24px;
@@ -33,6 +39,7 @@
     cursor: pointer;
     font: var(--cros-button-2-font);
     height: 100%;
+    padding: 6px 0 6px 0;
     position: relative;
     width: 100%;
   }
@@ -46,7 +53,7 @@
     align-items: center;
     display: grid;
     grid-template-columns: auto minmax(0, 1fr);
-    padding: 6px 0 6px 0;
+    height: 100%;
     width: 100%;
   }
 

ash/webui/personalization_app/resources/js/keyboard_backlight/zone_customization_element.ts

diff --git a/ash/webui/personalization_app/resources/js/keyboard_backlight/zone_customization_element.ts b/ash/webui/personalization_app/resources/js/keyboard_backlight/zone_customization_element.ts
index 1da7a35e..14b8a13 100644
--- a/ash/webui/personalization_app/resources/js/keyboard_backlight/zone_customization_element.ts
+++ b/ash/webui/personalization_app/resources/js/keyboard_backlight/zone_customization_element.ts
@@ -101,6 +101,8 @@
 
   showModal() {
     this.$.dialog.showModal();
+    // Scroll to the top of the page to view the zone customization dialog.
+    window.scrollTo(0, 0);
   }
 
   private computeZoneIdxs_(): number[] {

ash/webui/personalization_app/resources/js/wallpaper/wallpaper_selected_element.ts

diff --git a/ash/webui/personalization_app/resources/js/wallpaper/wallpaper_selected_element.ts b/ash/webui/personalization_app/resources/js/wallpaper/wallpaper_selected_element.ts
index 76a85132..572b8f6 100644
--- a/ash/webui/personalization_app/resources/js/wallpaper/wallpaper_selected_element.ts
+++ b/ash/webui/personalization_app/resources/js/wallpaper/wallpaper_selected_element.ts
@@ -420,6 +420,7 @@
 
   private closeDailyRefreshConfirmationDialog_() {
     this.shouldShowDailyRefreshConfirmationDialog_ = false;
+    this.shadowRoot!.getElementById('dailyRefresh')?.focus();
   }
 
   private onAcceptDailyRefreshDialog_() {

ash/webui/shortcut_customization_ui/resources/BUILD.gn

diff --git a/ash/webui/shortcut_customization_ui/resources/BUILD.gn b/ash/webui/shortcut_customization_ui/resources/BUILD.gn
index 752aae3..9526fdc 100644
--- a/ash/webui/shortcut_customization_ui/resources/BUILD.gn
+++ b/ash/webui/shortcut_customization_ui/resources/BUILD.gn
@@ -30,8 +30,9 @@
   "js/fake_shortcut_provider.ts",
   "js/mojo_interface_provider.ts",
   "js/mojo_utils.ts",
-  "js/search/fake_shortcut_search_handler.ts",
   "js/router.ts",
+  "js/search/fake_shortcut_search_handler.ts",
+  "js/search/search_result_bolding.ts",
   "js/search/shortcut_search_handler.ts",
   "js/shortcut_types.ts",
   "js/shortcut_utils.ts",

ash/webui/shortcut_customization_ui/resources/js/accelerator_row.ts

diff --git a/ash/webui/shortcut_customization_ui/resources/js/accelerator_row.ts b/ash/webui/shortcut_customization_ui/resources/js/accelerator_row.ts
index 05c82f68..3ad36ef 100644
--- a/ash/webui/shortcut_customization_ui/resources/js/accelerator_row.ts
+++ b/ash/webui/shortcut_customization_ui/resources/js/accelerator_row.ts
@@ -66,6 +66,7 @@
       action: {
         type: Number,
         value: 0,
+        reflectToAttribute: true,
       },
 
       source: {

ash/webui/shortcut_customization_ui/resources/js/accelerator_subsection.html

diff --git a/ash/webui/shortcut_customization_ui/resources/js/accelerator_subsection.html b/ash/webui/shortcut_customization_ui/resources/js/accelerator_subsection.html
index 3af940b..04f376e 100644
--- a/ash/webui/shortcut_customization_ui/resources/js/accelerator_subsection.html
+++ b/ash/webui/shortcut_customization_ui/resources/js/accelerator_subsection.html
@@ -8,6 +8,15 @@
     height: 48px;
   }
 
+  accelerator-row {
+    /**
+     * scroll-margin-top is used to position this element when it's scrolled
+     * to the top of the page by shortcuts-page when a search result is
+     * selected. Without this, the element would be hidden by the toolbar.
+     */
+    scroll-margin-top: var(--navigation-view-panel-toolbar-height);
+  }
+
   accelerator-row:not(:last-of-type) {
     border-bottom: var(--cr-separator-line);
   }

ash/webui/shortcut_customization_ui/resources/js/fake_data.ts

diff --git a/ash/webui/shortcut_customization_ui/resources/js/fake_data.ts b/ash/webui/shortcut_customization_ui/resources/js/fake_data.ts
index 21933a8..69a315b 100644
--- a/ash/webui/shortcut_customization_ui/resources/js/fake_data.ts
+++ b/ash/webui/shortcut_customization_ui/resources/js/fake_data.ts
@@ -454,41 +454,45 @@
   relevanceScore: 0.95,
 };
 
-// The following code is used to add fake accelerator entries for each icon.
-// When useFakeProvider is true, this will display all available icons for
-// the purposes of debugging.
-const createFakeMojoAccelInfo = (keyDisplay: string): MojoAcceleratorInfo => {
-  return {
-    type: AcceleratorType.kDefault,
-    state: AcceleratorState.kEnabled,
-    locked: true,
-    layoutProperties: {
-      standardAccelerator: {
-        keyDisplay: stringToMojoString16(keyDisplay),
-        accelerator: {
-          modifiers: 0,
-          keyCode: 0,
-          keyState: 0,
-          timeStamp: fakeTimestamp,
-        },
-      },
-      textAccelerator: undefined,
-    },
-  };
-};
-
-const createFakeMojoLayoutInfo =
-    (description: string, action: number): MojoLayoutInfo => {
+export const createFakeMojoAccelInfo =
+    (keyDisplay: string = 'a'): MojoAcceleratorInfo => {
       return {
-        category: AcceleratorCategory.kBrowser,
-        subCategory: AcceleratorSubcategory.kTabs,
-        description: stringToMojoString16(description),
-        style: LayoutStyle.kDefault,
-        source: AcceleratorSource.kAmbient,
-        action,
+        type: AcceleratorType.kDefault,
+        state: AcceleratorState.kEnabled,
+        locked: true,
+        layoutProperties: {
+          standardAccelerator: {
+            keyDisplay: stringToMojoString16(keyDisplay),
+            accelerator: {
+              modifiers: 0,
+              keyCode: 0,
+              keyState: 0,
+              timeStamp: fakeTimestamp,
+            },
+          },
+          textAccelerator: undefined,
+        },
       };
     };
 
+export const createFakeMojoLayoutInfo =
+    (description: string, action: number,
+     category: AcceleratorCategory = AcceleratorCategory.kBrowser,
+     source: AcceleratorSource = AcceleratorSource.kAmbient):
+        MojoLayoutInfo => {
+          return {
+            category,
+            subCategory: AcceleratorSubcategory.kTabs,
+            description: stringToMojoString16(description),
+            style: LayoutStyle.kDefault,
+            source,
+            action,
+          };
+        };
+
+// The following code is used to add fake accelerator entries for each icon.
+// When useFakeProvider is true, this will display all available icons for
+// the purposes of debugging.
 const icons = Object.keys(keyToIconNameMap);
 
 for (const [index, iconName] of icons.entries()) {

ash/webui/shortcut_customization_ui/resources/js/router.ts

diff --git a/ash/webui/shortcut_customization_ui/resources/js/router.ts b/ash/webui/shortcut_customization_ui/resources/js/router.ts
index 60b8ab51..ad2071eb 100644
--- a/ash/webui/shortcut_customization_ui/resources/js/router.ts
+++ b/ash/webui/shortcut_customization_ui/resources/js/router.ts
@@ -4,6 +4,8 @@
 
 import {assert} from 'chrome://resources/js/assert_ts.js';
 
+import {SHORTCUTS_APP_URL} from './shortcut_utils.js';
+
 export interface RouteObserver {
   onRouteChanged(url: URL): void;
 }
@@ -50,6 +52,13 @@
       observer.onRouteChanged(url);
     });
   }
+
+  /**
+   * Resets the route to the home page, without notifying observers.
+   */
+  resetRoute(): void {
+    window.history.pushState({}, '', SHORTCUTS_APP_URL);
+  }
 }
 
 Router.setInstance(new Router());

ash/webui/shortcut_customization_ui/resources/js/search/search_result_bolding.ts

diff --git a/ash/webui/shortcut_customization_ui/resources/js/search/search_result_bolding.ts b/ash/webui/shortcut_customization_ui/resources/js/search/search_result_bolding.ts
new file mode 100644
index 0000000..2ce42f95
--- /dev/null
+++ b/ash/webui/shortcut_customization_ui/resources/js/search/search_result_bolding.ts
@@ -0,0 +1,455 @@
+// 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.
+
+// TODO(cambickel): Move this code into a shared location, and update Settings
+// search code to use it.
+
+/**
+ * Returns the HTML for the given description based on the query text.
+ * <b> tags are wrapped around matching sections of the description.
+ * For example, a query "open tab" and a description "Open new tab" would return
+ * "<b>Open</b> new <b>tab</b>".
+ * @param description Search result description to apply bolding to.
+ * @param query The text that the user searched for to generate this result.
+ * @return An innerHTML string of |description| with any
+ *     character that is in |query| bolded.
+ */
+export function getBoldedDescription(
+    description: string, query: string): string {
+  if (description.match(/\s/) ||
+      description.toLocaleLowerCase() !== description.toLocaleUpperCase()) {
+    // If the result text includes blankspaces (as they commonly will in
+    // languages like Arabic and Hindi), or if the result text includes
+    // at least one character such that the lowercase is different from
+    // the uppercase (as they commonly will in languages like English
+    // and Russian), tokenize the result text by blankspaces, and bold based
+    // off of matching substrings in the tokens.
+    return getTokenizeMatchedBoldTagged(description, query);
+  }
+
+  // If the result text does not contain blankspaces or characters that
+  // have upper/lower case differentiation (as they commonly do in languages
+  // like Chinese and Japanese), bold exact characters that match.
+  return getMatchingIndividualCharsBolded(description, query);
+}
+
+/**
+ * Tokenize the result and query text, and match the tokens even if they
+ * are out of order. Both the result and query tokens are compared without
+ * hyphens or accents on characters. Result text is simply tokenized by
+ * blankspaces. On the other hand, query text is tokenized within
+ * generateQueryTokens(). As each result token is processed, it is compared
+ * with every query token. Bold the segment of the result token that is a
+ * query token. e.g. Smaller query block: if "wif on" is
+ * queried, a result text of "Turn on Wi-Fi" should have "on" and "Wi-F"
+ * bolded. e.g. Larger query block: If "onwifi" is queried, a result text of
+ * "Turn on Wi-Fi" should have "Wi-Fi" bolded.
+ * @param description Search result description to apply bolding to.
+ * @param query The text that the user searched for to generate this result.
+ * @return Result string with <b> tags around query sub string.
+ */
+function getTokenizeMatchedBoldTagged(
+    description: string, query: string): string {
+  // Lowercase, remove hyphens, and remove accents from the query.
+  const normalizedQuery = normalizeString(query);
+
+  const queryTokens = generateQueryTokens(description, normalizedQuery);
+
+  // Get innerHtmlTokens with bold tags around matching segments.
+  const innerHtmlTokensWithBoldTags = description.split(/\s/).map(
+      innerHtmlToken => getModifiedInnerHtmlToken(
+          innerHtmlToken, normalizedQuery, queryTokens));
+
+  // Get all blankspace types.
+  const blankspaces = description.match(/\s/g);
+
+  if (!blankspaces) {
+    // No blankspaces, return |innterHtmlTokensWithBoldTags| as a string.
+    return innerHtmlTokensWithBoldTags.join('');
+  }
+
+  // Add blankspaces make to where they were located in the string, and
+  // form one string to be added to the html.
+  // e.g |blankspaces| = [' ', '\xa0']
+  //     |innerHtmlTokensWithBoldTags| = ['a', '<b>b</b>', 'c']
+  // returns 'a <b>b</b>&nbps;c'
+  return innerHtmlTokensWithBoldTags
+      .map((token, idx) => {
+        return idx !== blankspaces.length ? token + blankspaces[idx] : token;
+      })
+      .join('');
+}
+
+/**
+ * Bolds individual characters in the result text that are characters in the
+ * search query, regardless of order. Some languages represent words with
+ * single characters and do not include spaces. In those instances, use
+ * exact character matching.
+ *     e.g |description| = "一二三四"
+ *         |query| = "三一"
+ *         returns "<b>一</b>二<b>三</b>四"
+ * @param description Search result description to apply bolding to.
+ * @param query The text that the user searched for to generate this result.
+ * @return An innerHTML string of |description| with any
+ *     character that is in |query| bolded.
+ */
+function getMatchingIndividualCharsBolded(
+    description: string, query: string): string {
+  return boldSubStrings(
+      /*sourceString=*/ description,
+      /*substringsToBold=*/ query.split(''));
+}
+
+/**
+ * @param innerHtmlToken A case sensitive segment of the result
+ *     text which may or may not contain hyphens or accents on
+ *     characters, and does not contain blank spaces.
+ * @param normalizedQuery A lowercased query which does not contain
+ *     hyphens.
+ * @param queryTokens See generateQueryTokens().
+ * @return The innerHtmlToken with <b> tags around segments that
+ *     match queryTokens, but also includes hyphens and accents
+ *     on characters.
+ */
+function getModifiedInnerHtmlToken(
+    innerHtmlToken: string, normalizedQuery: string,
+    queryTokens: string[]): string {
+  // For comparison purposes with query tokens, lowercase the html token to
+  // be displayed, remove hyphens, and remove accents. The resulting
+  // |normalizedToken| will not be the displayed token.
+  const normalizedToken = normalizeString(innerHtmlToken);
+  if (normalizedQuery.includes(normalizedToken)) {
+    // Bold the entire html token to be displayed, if the result is a
+    // substring of the query, regardless of blank spaces that may or
+    // may not have not been extraneous.
+    return normalizedToken ? innerHtmlToken.bold() : innerHtmlToken;
+  }
+
+  // Filters out query tokens that are not substrings of the currently
+  // processing text token to be displayed.
+  const queryTokenFilter = (queryToken: string): boolean => {
+    return !!queryToken && normalizedToken.includes(queryToken);
+  };
+
+  // Maps the queryToken to the segment(s) of the html token that contain
+  // the queryToken interweaved with any of the hyphens that were
+  // filtered out during normalization. For example, |innerHtmlToken| =
+  // 'Wi-Fi-no-blankspsc-WiFi', (i.e. |normalizedToken| =
+  // 'WiFinoblankspcWiFi') and |queryTokenLowerCaseNoSpecial| = 'wif', the
+  // resulting mapping would be ['Wi-F', 'WiF'].
+  const queryTokenToSegment = (queryToken: string): string[] => {
+    const regExpStr = queryToken.split('').join(`${HYPHENS_REGEX_STR}*`);
+
+    // Since |queryToken| does not contain accents and |innerHtmlToken| may
+    // have accents matches must be made without accents on characters.
+    const innerHtmlTokenNoAccents = removeAccents(innerHtmlToken);
+    const matchesNoAccents: string[] =
+        innerHtmlTokenNoAccents.match(new RegExp(regExpStr, 'g')) || [];
+
+    // Return matches with original accents restored.
+    return matchesNoAccents.map(
+        match => innerHtmlToken.toLocaleLowerCase().substr(
+            innerHtmlTokenNoAccents.indexOf(match), match.length));
+  };
+
+  // Contains lowercase segments of the innerHtmlToken that may or may not
+  // contain hyphens and accents on characters.
+  const matches =
+      queryTokens.filter(queryTokenFilter).map(queryTokenToSegment).flat();
+
+  if (!matches.length) {
+    // No matches, return token to displayed as is.
+    return innerHtmlToken;
+  }
+
+  // Get the length of the longest matched substring(s).
+  const maxStrLen =
+      matches.reduce((a, b) => a.length > b.length ? a : b).length;
+
+  // Bold the longest substring(s).
+  const bolded =
+      matches.filter(sourceString => sourceString.length === maxStrLen);
+  return boldSubStrings(
+      /*sourceString=*/ innerHtmlToken, /*substringsToBold=*/ bolded);
+}
+
+/**
+ * Query tokens are created first by splitting the |normalizedQuery| with
+ * blankspaces into query segments. Then, each query segment is compared
+ * to the the normalized result text (result text without hyphens or
+ * accents). Query tokens are created by finding the longest common
+ * substring(s) between a query segment and the normalized result text. Each
+ * query segment is mapped to an array of their query tokens. Finally, the
+ * longest query token(s) for each query segment are extracted. In the event
+ * that query segments are more than one character long, query tokens that
+ * are only one character long are ignored.
+ * @param description Search result description to apply bolding to.
+ * @param normalizedQuery A lowercased query which does not contain
+ *     hyphens or accents.
+ * @return QueryTokens that do not contain
+ *     blankspaces and are substrings of the normalized result text
+ */
+function generateQueryTokens(
+    description: string, normalizedQuery: string): string[] {
+  const normalizedResultText = normalizeString(description);
+
+  const segmentToTokenMap = new Map<string, string[]>();
+  normalizedQuery.split(/\s/).forEach(querySegment => {
+    const queryTokens =
+        longestCommonSubstrings(querySegment, normalizedResultText);
+    if (segmentToTokenMap.has(querySegment)) {
+      const segmentTokens =
+          segmentToTokenMap.get(querySegment)!.concat(queryTokens);
+      segmentToTokenMap.set(querySegment, segmentTokens);
+      return;
+    }
+    segmentToTokenMap.set(querySegment, queryTokens);
+  });
+
+  // For each segment, only return the longest token. For example, in the
+  // case that |resultText_| is "Search and Assistant", a |querySegment| key
+  // of "ssistan" will yield a |queryToken| value array containing "ssistan"
+  // (longest common substring for "Assistant") and "an" (longest common
+  // substring for "and"). Only the queryToken "ssistan" should be kept
+  // since it's the longest queryToken.
+  const getLongestTokensPerSegment =
+      ([querySegment, queryTokens]: [string, string[]]): string[] => {
+        // If there are no queryTokens, return none.
+        // Example: |normalizedResultText| = "search and assistant"
+        //          |normalizedQuery| = "hi goog"
+        //          |querySegment| = "goog"
+        //          |queryTokens| = []
+        // Since |querySegment| does not share any substrings with
+        // |normalizedResultText|, no queryTokens available.
+        if (!queryTokens.length) {
+          return [];
+        }
+
+        const maxLengthQueryToken =
+            Math.max(...queryTokens.map(queryToken => queryToken.length));
+
+        // If the |querySegment| is more than one character long and the
+        // longest queryToken(s) are one character long, discard all
+        // queryToken(s). This prevents random single characters in in the
+        // result text from bolding. Example: |normalizedResultText| = "search
+        // and assistant"
+        //          |normalizedQuery| = "hi goog"
+        //          |querySegment| = "hi"
+        //          |queryTokens| = ["h", "i"]
+        // Here, |querySegment| "hi" shares a common substring "h" with
+        // |normalizedResultText|'s "search" and "i" with
+        // |normalizedResultText|'s "assistant". Since the queryTokens for
+        // the length two querySegment are only one character long, discard
+        // the queryTokens.
+        if (maxLengthQueryToken === 1 && querySegment.length > 1) {
+          return [];
+        }
+
+        return queryTokens.filter(
+            queryToken => queryToken.length === maxLengthQueryToken);
+      };
+
+  // A 2D array such that each array contains queryTokens of a querySegment.
+  // Note that the order of key value pairs is maintained in the
+  // |segmentToTokenMap| relative to the |normalizedQuery|, and the order
+  // of the queryTokens within each inner array is also maintained relative
+  // to the |normalizedQuery|.
+  const inOrderTokenGroups =
+      Array.from(segmentToTokenMap).map(getLongestTokensPerSegment);
+
+  // Flatten the 2D |inOrderTokenGroups|, and remove duplicate queryTokens.
+  // Note that even though joining |inOrderTokens| will always form a
+  // subsequence of |normalizedQuery|, it will not be a subsequence of
+  // |normalizedResultText|.
+  // Example: |description| = "Touchpad tap-to-click"
+  //          |normalizedResultText| = "touchpad taptoclick"
+  //          |normalizedQuery| = "tap to cli"
+  //          |inOrderTokenGroups| = [['tap']. ['to', 'to']. ['cli']]
+  //          |inOrderTokens| = ['tap', 'to', 'cli']
+  // |inOrderTokenGroups| contains an inner array of two 'to's because
+  // the |querySegment| = 'to' matches with 'touchpad' and 'taptoclick'.
+  // Duplicate entries are removed in |inOrderTokens| because
+  // if a |queryToken| is merged to form a compound worded queryToken, it
+  // should not be used to bold another |resultText| word. In the fictitious
+  // case that |inOrderTokenGroups| is [['tap']. ['to', 'xy']. ['cli']],
+  // |inOrderTokens| will be ['tap', 'to', 'xy', 'cli'], and only 'Tap-to'
+  // will be bolded. This is fine because 'toxy' is a subsequence of a
+  // |querySegment| the user inputted, and the order of bolding
+  // will prefer the user's input in these extenuating circumstances.
+  const inOrderTokens = [...new Set(inOrderTokenGroups.flat())];
+  return mergeValidTokensToCompounded(description, inOrderTokens);
+}
+
+/**
+ * Possibly merges costituent queryTokens in |inOrderQueryTokens| to form
+ * new, longer, valid queryTokens that match with normalized compounded
+ * words in |description|.
+ * @param description Search result description to apply bolding to.
+ * @param inOrderQueryTokens An array of valid queryTokens
+ *     that do not contain dups.
+ * @return An array of queryTokens of equal or lesser size
+ *     than |inOrderQueryTokens|, each of which do not contain blankspaces
+ *     and are substrings of the normalized result text.
+ */
+function mergeValidTokensToCompounded(
+    description: string, inOrderQueryTokens: string[]): string[] {
+  // If |description| does not contain any hyphens, this will be
+  // be the same as |inOrderQueryTokens|.
+  const longestCompoundWordTokens: string[] = [];
+
+  // Instead of stripping all hyphen as would be the case if the result
+  // text were normalized, convert all hyphens to |DELOCALIZED_HYPHEN|. This
+  // string will be compared with compound query tokens to find query tokens
+  // that are compound substrings longer than the constituent query tokens.
+  const hyphenatedResultText =
+      removeAccents(description).replace(HYPHENS_REGEX, DELOCALIZED_HYPHEN);
+
+  // Create the longest combined tokens delimited by |DELOCALIZED_HYPHEN|s
+  // that are a substrings of |hyphenatedResultText|. Worst case visit each
+  // token twice. Note that if a token is used to form a compound word, it
+  // will no longer be present for other words.
+  // Example: |description| = "Touchpad tap-to-click"
+  //          |query| = "tap to clic"
+  // The token "to" will fail to highlight "To" in "Touchpad", and instead
+  // will be combined with "tap" and "clic" to bold "tap-to-click".
+  let i = 0;
+  while (i < inOrderQueryTokens.length) {
+    let prefixToken = inOrderQueryTokens[i];
+    i++;
+    while (i < inOrderQueryTokens.length) {
+      // Create a compound token with the next token within
+      // |inOrderQueryTokens|.
+      const compoundToken =
+          prefixToken + DELOCALIZED_HYPHEN + inOrderQueryTokens[i];
+
+      // If the constructed compoundToken from valid queryTokens is not a
+      // substring of the |hyphenatedResultText|, break from the inner loop
+      // and set the outer loop to start with the token that broke the
+      // compounded match.
+      if (!hyphenatedResultText.includes(compoundToken)) {
+        break;
+      }
+
+      prefixToken = compoundToken;
+      i++;
+    }
+    longestCompoundWordTokens.push(prefixToken);
+  }
+
+  // Normalize the compound tokens that include |DELOCALIZED_HYPHEN|s.
+  return longestCompoundWordTokens.map(token => normalizeString(token));
+}
+
+/**
+ * Bolds all strings in |substringsToBold| that occur in |sourceString|,
+ * regardless of case.
+ *     e.g. |sourceString| = "Turn on Wi-Fi"
+ *          |substringsToBold| = ['o', 'wi-f', 'ur']
+ *          returns 'T<b>ur</b>n <b>o</b>n <b>Wi-F</b>i'
+ * @param sourceString The case sensitive string to be bolded.
+ * @param substringsToBold The case-insensitive substrings
+ *     that will be bolded in the |sourceString|, if they are html substrings
+ *     of the |sourceString|.
+ * @return An innerHTML string of |sourceString| with any
+ *     |substringsToBold| regardless of case bolded.
+ */
+function boldSubStrings(
+    sourceString: string, substringsToBold: string[]): string {
+  if (!substringsToBold || !substringsToBold.length) {
+    return sourceString;
+  }
+  const subStrRegex =
+      new RegExp('(\)(' + substringsToBold.join('|') + ')(\)', 'ig');
+  return sourceString.replace(subStrRegex, (match) => match.bold());
+}
+
+/**
+ * Used to locate matches such that the query text omits a hyphen when the
+ * matching result text contains a hyphen.
+ */
+const DELOCALIZED_HYPHEN: string = '-';
+
+/**
+ * A list of hyphens in all languages that will be ignored during the
+ * tokenization and comparison of search result text.
+ * Hyphen characters list is taken from here: http://jkorpela.fi/dashes.html.
+ * U+002D(-), U+007E(~), U+058A(֊), U+05BE(־), U+1806(᠆), U+2010(‐),
+ * U+2011(‑), U+2012(‒), U+2013(–), U+2014(—), U+2015(―), U+2053(⁓),
+ * U+207B(⁻), U+208B(₋), U+2212(−), U+2E3A(⸺ ), U+2E3B(⸻  ), U+301C(〜),
+ * U+3030(〰), U+30A0(゠), U+FE58(﹘), U+FE63(﹣), U+FF0D(－).
+ */
+const HYPHENS: string[] = [
+  '-', '~', '֊', '־', '᠆', '‐',  '‑',  '‒',  '–',  '—',  '―',  '⁓',
+  '⁻', '₋', '−', '⸺', '⸻', '〜', '〰', '゠', '﹘', '﹣', '－',
+];
+
+/**
+ * String form of the regexp expressing hyphen chars.
+ */
+const HYPHENS_REGEX_STR: string = `[${HYPHENS.join('')}]`;
+
+/**
+ * Regexp expressing hyphen chars.
+ */
+const HYPHENS_REGEX = new RegExp(HYPHENS_REGEX_STR, 'g');
+
+/**
+ * @param sourceString The string to be modified.
+ * @return The sourceString lowercased with accents in the range
+ *     \u0300 - \u036f removed.
+ */
+function removeAccents(sourceString: string): string {
+  return sourceString.toLocaleLowerCase().normalize('NFD').replace(
+      /[\u0300-\u036f]/g, '');
+}
+
+/**
+ * Used to convert the query and result into the same format without hyphens
+ * and accents so that easy string comparisons can be performed. e.g.
+ * |sourceString| = 'BRÛLÉE' returns "brulee"
+ * @param sourceString The string to be normalized.
+ * @return The sourceString lowercased with accents in the range
+ *     \u0300 - \u036f removed, and with hyphens removed.
+ */
+function normalizeString(sourceString: string): string {
+  return removeAccents(sourceString).replace(HYPHENS_REGEX, '');
+}
+
+/**
+ * This solution uses DP and has the complexity of O(M*N), where M and N are
+ * the lengths of |string1| and |string2| respectively.
+ *
+ * @param string1 The first case sensitive string to be compared.
+ * @param string2 The second case sensitive string to be compared.
+ * @return An array of the longest common substrings starting
+ *     from the earliest to latest match, all of which have the same length.
+ *     Returns empty array if there are none.
+ */
+function longestCommonSubstrings(string1: string, string2: string): string[] {
+  let maxLength = 0;
+  let string1StartingIndices: number[] = [];
+  const dp = Array(string1.length + 1)
+                 .fill([])
+                 .map(() => Array(string2.length + 1).fill(0));
+
+  for (let i = string1.length - 1; i >= 0; i--) {
+    for (let j = string2.length - 1; j >= 0; j--) {
+      if (string1[i] !== string2[j]) {
+        continue;
+      }
+      dp[i][j] = dp[i + 1][j + 1] + 1;
+      if (maxLength === dp[i][j]) {
+        string1StartingIndices.unshift(i);
+      }
+      if (maxLength < dp[i][j]) {
+        maxLength = dp[i][j];
+        string1StartingIndices = [i];
+      }
+    }
+  }
+
+  return string1StartingIndices.map(idx => {
+    return string1.substr(idx, maxLength);
+  });
+}

ash/webui/shortcut_customization_ui/resources/js/shortcut_customization_app.ts

diff --git a/ash/webui/shortcut_customization_ui/resources/js/shortcut_customization_app.ts b/ash/webui/shortcut_customization_ui/resources/js/shortcut_customization_app.ts
index aefe00c..12b30ae 100644
--- a/ash/webui/shortcut_customization_ui/resources/js/shortcut_customization_app.ts
+++ b/ash/webui/shortcut_customization_ui/resources/js/shortcut_customization_app.ts
@@ -217,9 +217,9 @@
     }
 
     // Select the correct page based on the category from the URL.
+    // Scrolling to the specific shortcut from the URL is handled
+    // in shortcuts_page.ts.
     this.$.navigationPanel.selectPageById(`category-${category}`);
-
-    // TODO(cambickel) focus on the shortcut with the action from the URL.
   }
 
   private onRequestUpdateAccelerators(e: RequestUpdateAcceleratorEvent): void {

ash/webui/shortcut_customization_ui/resources/js/shortcuts_page.ts

diff --git a/ash/webui/shortcut_customization_ui/resources/js/shortcuts_page.ts b/ash/webui/shortcut_customization_ui/resources/js/shortcuts_page.ts
index 56991ef..dda9703 100644
--- a/ash/webui/shortcut_customization_ui/resources/js/shortcuts_page.ts
+++ b/ash/webui/shortcut_customization_ui/resources/js/shortcuts_page.ts
@@ -8,10 +8,12 @@
 
 import {assert} from 'chrome://resources/js/assert_ts.js';
 import {PolymerElementProperties} from 'chrome://resources/polymer/v3_0/polymer/interfaces.js';
-import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+import {afterNextRender, microTask, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {AcceleratorLookupManager} from './accelerator_lookup_manager.js';
+import {AcceleratorRowElement} from './accelerator_row.js';
 import {AcceleratorSubsectionElement} from './accelerator_subsection.js';
+import {RouteObserver, Router} from './router.js';
 import {AcceleratorCategory, AcceleratorSubcategory} from './shortcut_types';
 import {getTemplate} from './shortcuts_page.html.js';
 
@@ -22,7 +24,8 @@
  *
  * TODO(jimmyxgong): Implement this skeleton element.
  */
-export class ShortcutsPageElement extends PolymerElement {
+export class ShortcutsPageElement extends PolymerElement implements
+    RouteObserver {
   static get is(): string {
     return 'shortcuts-page';
   }
@@ -44,17 +47,27 @@
     };
   }
 
-  initialData: {category: AcceleratorCategory};
-  private subcategories: AcceleratorSubcategory[];
+  initialData: {category: AcceleratorCategory}|null;
+  subcategories: AcceleratorSubcategory[];
   private lookupManager: AcceleratorLookupManager =
       AcceleratorLookupManager.getInstance();
 
   override connectedCallback(): void {
     super.connectedCallback();
     this.updateAccelerators();
+    Router.getInstance().addObserver(this);
+  }
+
+  override disconnectedCallback(): void {
+    super.disconnectedCallback();
+    Router.getInstance().removeObserver(this);
   }
 
   updateAccelerators(): void {
+    if (!this.initialData) {
+      return;
+    }
+
     const subcatMap =
         this.lookupManager.getSubcategories(this.initialData.category);
     if (subcatMap === undefined) {
@@ -81,6 +94,88 @@
     }
   }
 
+  /**
+   * 'navigation-view-panel' is responsible for calling this function when
+   * the active page changes.
+   * @param isActive True if this page is the new active page.
+   */
+  onNavigationPageChanged({isActive}: {isActive: boolean}): void {
+    if (isActive) {
+      afterNextRender(this, () => {
+        // Scroll to the specific accelerator if this page change was caused by
+        // clicking on a search result. If the page change was manual, the
+        // method below will be a no-op.
+        const didScroll = this.maybeScrollToAcceleratorRowBasedOnUrl(
+            new URL(window.location.href));
+
+        if (didScroll) {
+          // Reset the route after scrolling so the app doesn't re-scroll when
+          // the user manually changes pages.
+          Router.getInstance().resetRoute();
+        }
+      });
+    }
+  }
+
+  /**
+   * This method is called by the Router when the URL is updated via
+   * the Router's `navigateTo` method.
+   *
+   * For this element, listening to route changes allows it to potentially
+   * scroll to one of its child accelerators if the URL contains the correct
+   * search params. This will happen if the route change was caused by selecting
+   * a search result.
+   */
+  onRouteChanged(url: URL): void {
+    this.maybeScrollToAcceleratorRowBasedOnUrl(url);
+  }
+
+  /**
+   * Scroll the URL-selected accelerator to the top of the page.
+   * If the URL does not contain the correct search params (`action` and
+   * `category`), then this method is a no-op.
+   * @returns True if the scroll event happened.
+   */
+  private maybeScrollToAcceleratorRowBasedOnUrl(url: URL): boolean {
+    const action = url.searchParams.get('action');
+    const category = url.searchParams.get('category');
+    if (!action || !category) {
+      // This route change did not include the params that would trigger a
+      // scroll event.
+      return false;
+    }
+
+    if (this.initialData?.category.toString() !== category) {
+      // Only focus the element if we're in the correct category.
+      return false;
+    }
+
+    const acceleratorSubsections =
+        this.shadowRoot?.querySelectorAll<AcceleratorSubsectionElement>(
+            'accelerator-subsection');
+    assert(
+        acceleratorSubsections,
+        'Expected this element to contain accelerator-subsection elements.');
+
+    for (let i = 0; i < acceleratorSubsections.length; i++) {
+      const matchingAcceleratorRow =
+          acceleratorSubsections[i]
+              .shadowRoot?.querySelector<AcceleratorRowElement>(
+                  `accelerator-row[action="${action}"]`);
+      if (matchingAcceleratorRow) {
+        // Use microtask timing to ensure that the scrolling action happens.
+        microTask.run(() => {
+          matchingAcceleratorRow.scrollIntoView({behavior: 'smooth'});
+        });
+
+        // The scroll event did happen, so return true.
+        return true;
+      }
+    }
+
+    return false;
+  }
+
   static get template(): HTMLTemplateElement {
     return getTemplate();
   }

ash/wm/desks/templates/saved_desk_controller.cc

diff --git a/ash/wm/desks/templates/saved_desk_controller.cc b/ash/wm/desks/templates/saved_desk_controller.cc
index 81443d2..1300cb1 100644
--- a/ash/wm/desks/templates/saved_desk_controller.cc
+++ b/ash/wm/desks/templates/saved_desk_controller.cc
@@ -8,6 +8,7 @@
 #include "ash/public/cpp/saved_desk_delegate.h"
 #include "ash/shell.h"
 #include "ash/wm/desks/desks_controller.h"
+#include "base/check.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/time/time.h"
 #include "base/values.h"
@@ -55,17 +56,29 @@
   return desk_template;
 }
 
+// Pointer to the global `SavedDeskController` instance.
+SavedDeskController* g_instance = nullptr;
+
 }  // namespace
 
-SavedDeskController::SavedDeskController() = default;
+SavedDeskController::SavedDeskController() {
+  CHECK(!g_instance);
+  g_instance = this;
+}
 
-SavedDeskController::~SavedDeskController() = default;
+SavedDeskController::~SavedDeskController() {
+  g_instance = nullptr;
+}
+
+SavedDeskController* SavedDeskController::Get() {
+  return g_instance;
+}
 
 std::vector<AdminTemplateMetadata>
 SavedDeskController::GetAdminTemplateMetadata() const {
   return {AdminTemplateMetadata{
       .uuid = base::GUID::ParseLowercase(kPlaceholderUuid),
-      .name = kPlaceholderName}};
+      .name = base::UTF8ToUTF16(base::StringPiece(kPlaceholderName))}};
 }
 
 bool SavedDeskController::LaunchAdminTemplate(const base::GUID& template_uuid) {

ash/wm/desks/templates/saved_desk_controller.h

diff --git a/ash/wm/desks/templates/saved_desk_controller.h b/ash/wm/desks/templates/saved_desk_controller.h
index ce082022..70da972 100644
--- a/ash/wm/desks/templates/saved_desk_controller.h
+++ b/ash/wm/desks/templates/saved_desk_controller.h
@@ -18,7 +18,7 @@
   base::GUID uuid;
 
   // Name of the admin template, as it appears to the user.
-  std::string name;
+  std::u16string name;
 };
 
 // The saved desk controller has functionality for listing and launching saved
@@ -28,14 +28,16 @@
   SavedDeskController();
   SavedDeskController(const SavedDeskController&) = delete;
   SavedDeskController& operator=(const SavedDeskController&) = delete;
-  ~SavedDeskController();
+  virtual ~SavedDeskController();
+
+  static SavedDeskController* Get();
 
   // Returns metadata for all currently available admin templates.
-  std::vector<AdminTemplateMetadata> GetAdminTemplateMetadata() const;
+  virtual std::vector<AdminTemplateMetadata> GetAdminTemplateMetadata() const;
 
   // Launch the template identified by `template_uuid`. Returns false if the
   // template doesn't exist.
-  bool LaunchAdminTemplate(const base::GUID& template_uuid);
+  virtual bool LaunchAdminTemplate(const base::GUID& template_uuid);
 };
 
 }  // namespace ash

ash/wm/snap_group/snap_group_controller.cc

diff --git a/ash/wm/snap_group/snap_group_controller.cc b/ash/wm/snap_group/snap_group_controller.cc
index ea88db0..5b3763b 100644
--- a/ash/wm/snap_group/snap_group_controller.cc
+++ b/ash/wm/snap_group/snap_group_controller.cc
@@ -66,15 +66,24 @@
 
 bool SnapGroupController::RemoveSnapGroupContainingWindow(
     aura::Window* window) {
-  if (window_to_snap_group_map_.find(window) ==
-      window_to_snap_group_map_.end()) {
+  SnapGroup* snap_group = GetSnapGroupForGivenWindow(window);
+  if (snap_group == nullptr) {
     return false;
   }
 
-  SnapGroup* snap_group = window_to_snap_group_map_.find(window)->second;
   return RemoveSnapGroup(snap_group);
 }
 
+SnapGroup* SnapGroupController::GetSnapGroupForGivenWindow(
+    aura::Window* window) {
+  if (window_to_snap_group_map_.find(window) ==
+      window_to_snap_group_map_.end()) {
+    return nullptr;
+  }
+
+  return window_to_snap_group_map_.find(window)->second;
+}
+
 bool SnapGroupController::IsArm1AutomaticallyLockEnabled() const {
   return features::IsSnapGroupEnabled() &&
          features::kAutomaticallyLockGroup.Get();

ash/wm/snap_group/snap_group_controller.h

diff --git a/ash/wm/snap_group/snap_group_controller.h b/ash/wm/snap_group/snap_group_controller.h
index ade50f1..4763afd8 100644
--- a/ash/wm/snap_group/snap_group_controller.h
+++ b/ash/wm/snap_group/snap_group_controller.h
@@ -51,6 +51,10 @@
   // given `window` has been removed successfully. Returns false otherwise.
   bool RemoveSnapGroupContainingWindow(aura::Window* window);
 
+  // Returns the corresponding `SnapGroup` if the given `window` belongs to a
+  // snap group or nullptr otherwise.
+  SnapGroup* GetSnapGroupForGivenWindow(aura::Window* window);
+
   // Returns true if the feature flag `kSnapGroup` is enabled and the feature
   // param `kAutomaticallyLockGroup` is true, i.e. a snap group will be created
   // automatically on two windows snapped.

ash/wm/snap_group/snap_group_expanded_menu_view.cc

diff --git a/ash/wm/snap_group/snap_group_expanded_menu_view.cc b/ash/wm/snap_group/snap_group_expanded_menu_view.cc
new file mode 100644
index 0000000..7058f822
--- /dev/null
+++ b/ash/wm/snap_group/snap_group_expanded_menu_view.cc
@@ -0,0 +1,101 @@
+// 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 "ash/wm/snap_group/snap_group_expanded_menu_view.h"
+
+#include <memory>
+
+#include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/strings/grit/ash_strings.h"
+#include "ash/style/ash_color_id.h"
+#include "ash/style/icon_button.h"
+#include "ash/wm/snap_group/snap_group.h"
+#include "ash/wm/snap_group/snap_group_lock_or_unlock_button.h"
+#include "ash/wm/splitview/split_view_constants.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_forward.h"
+#include "base/functional/callback_helpers.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/metadata/metadata_impl_macros.h"
+#include "ui/compositor/layer.h"
+#include "ui/views/background.h"
+#include "ui/views/layout/box_layout.h"
+#include "ui/views/view.h"
+
+namespace ash {
+
+namespace {
+
+constexpr auto kExpandedMenuPadding = gfx::Insets::VH(8, 3);
+constexpr int kSpaceBetweenButton = 3;
+
+}  // namespace
+
+SnapGroupExpandedMenuView::SnapGroupExpandedMenuView(SnapGroup* snap_group)
+    : swap_windows_button_(AddChildView(std::make_unique<IconButton>(
+          base::BindRepeating(
+              &SnapGroupExpandedMenuView::OnSwapWindowsButtonPressed,
+              base::Unretained(this)),
+          IconButton::Type::kMediumFloating,
+          &kSnapGroupSwapWindowsIcon,
+          IDS_ASH_SNAP_GROUP_SWAP_WINDOWS,
+          /*is_togglable=*/false,
+          /*has_border=*/true))),
+      update_primary_window_button_(AddChildView(std::make_unique<IconButton>(
+          base::BindRepeating(
+              &SnapGroupExpandedMenuView::OnUpdatePrimaryWindowButtonPressed,
+              base::Unretained(this)),
+          IconButton::Type::kMediumFloating,
+          &kSnapGroupUpdatePrimaryWindowIcon,
+          IDS_ASH_SNAP_GROUP_UPDATE_LEFT_WINDOW,
+          /*is_togglable=*/false,
+          /*has_border=*/true))),
+      update_secondary_window_button_(AddChildView(std::make_unique<IconButton>(
+          base::BindRepeating(
+              &SnapGroupExpandedMenuView::OnUpdateSecondaryWindowButtonPressed,
+              base::Unretained(this)),
+          IconButton::Type::kMediumFloating,
+          &kSnapGroupUpdateSecondaryWindowIcon,
+          IDS_ASH_SNAP_GROUP_UPDATE_RIGHT_WINDOW,
+          /*is_togglable=*/false,
+          /*has_border=*/true))),
+      unlock_button_(AddChildView(std::make_unique<SnapGroupLockOrUnlockButton>(
+          snap_group->window1(),
+          snap_group->window2()))) {
+  SetPaintToLayer();
+  SetBackground(views::CreateThemedSolidBackground(kColorAshShieldAndBase80));
+  layer()->SetFillsBoundsOpaquely(false);
+  layer()->SetRoundedCornerRadius(
+      gfx::RoundedCornersF(kExpandedMenuRoundedCornerRadius));
+
+  auto* box_layout = SetLayoutManager(std::make_unique<views::BoxLayout>(
+      views::BoxLayout::Orientation::kVertical, kExpandedMenuPadding,
+      kSpaceBetweenButton));
+  box_layout->set_cross_axis_alignment(
+      views::BoxLayout::CrossAxisAlignment::kCenter);
+  box_layout->set_main_axis_alignment(
+      views::BoxLayout::MainAxisAlignment::kCenter);
+}
+
+SnapGroupExpandedMenuView::~SnapGroupExpandedMenuView() = default;
+
+void SnapGroupExpandedMenuView::OnUpdatePrimaryWindowButtonPressed() {
+  // TODO(b/267663000): Implement this function.
+  base::DoNothing();
+}
+
+void SnapGroupExpandedMenuView::OnUpdateSecondaryWindowButtonPressed() {
+  // TODO(b/267663000): Implement this function.
+  base::DoNothing();
+}
+
+void SnapGroupExpandedMenuView::OnSwapWindowsButtonPressed() {
+  // TODO(b/267663000): Implement this function.
+  base::DoNothing();
+}
+
+BEGIN_METADATA(SnapGroupExpandedMenuView, views::View)
+END_METADATA
+
+}  // namespace ash

ash/wm/snap_group/snap_group_expanded_menu_view.h

diff --git a/ash/wm/snap_group/snap_group_expanded_menu_view.h b/ash/wm/snap_group/snap_group_expanded_menu_view.h
new file mode 100644
index 0000000..2f783b7
--- /dev/null
+++ b/ash/wm/snap_group/snap_group_expanded_menu_view.h
@@ -0,0 +1,67 @@
+// 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.
+
+#ifndef ASH_WM_SNAP_GROUP_SNAP_GROUP_EXPANDED_MENU_VIEW_H_
+#define ASH_WM_SNAP_GROUP_SNAP_GROUP_EXPANDED_MENU_VIEW_H_
+
+#include "ui/views/view.h"
+
+namespace ash {
+
+class IconButton;
+class SnapGroup;
+class SnapGroupLockOrUnlockButton;
+
+// A view that acts as the contents view of the snap group expanded menu widget
+// which will show or hide on the kebab button toggled. Note that this view will
+// only be available for the clamshell mode, the tablet mode is to be
+// implemented.
+class SnapGroupExpandedMenuView : public views::View {
+ public:
+  METADATA_HEADER(SnapGroupExpandedMenuView);
+
+  explicit SnapGroupExpandedMenuView(SnapGroup* snap_group);
+  SnapGroupExpandedMenuView(const SnapGroupExpandedMenuView&) = delete;
+  SnapGroupExpandedMenuView& operator=(const SnapGroupExpandedMenuView&) =
+      delete;
+  ~SnapGroupExpandedMenuView() override;
+
+  IconButton* swap_windows_button_for_testing() const {
+    return swap_windows_button_;
+  }
+  IconButton* update_primary_window_button_for_testing() const {
+    return update_primary_window_button_;
+  }
+  IconButton* update_secondary_window_button_for_testing() const {
+    return update_secondary_window_button_;
+  }
+  SnapGroupLockOrUnlockButton* unlock_button_for_testing() const {
+    return unlock_button_;
+  }
+
+ private:
+  // Called when the `swap_windows_button_` is clicked to swap the two windows
+  // in the snap group.
+  void OnSwapWindowsButtonPressed();
+
+  // Called when the `update_primary_window_button_` is clicked to update the
+  // primary window in the snap group by invoking the overview session shown
+  // on the other half of the screen.
+  void OnUpdatePrimaryWindowButtonPressed();
+
+  // Called when the `update_secondary_window_button_` is clicked. to update
+  // the secondary window in the snap group by invoking the overview session
+  // shown on the other half of the screen.
+  void OnUpdateSecondaryWindowButtonPressed();
+
+  // Child views of this class, which are listed from top to bottom.
+  IconButton* swap_windows_button_;
+  IconButton* update_primary_window_button_;
+  IconButton* update_secondary_window_button_;
+  SnapGroupLockOrUnlockButton* unlock_button_;
+};
+
+}  // namespace ash
+
+#endif  // ASH_WM_SNAP_GROUP_SNAP_GROUP_EXPANDED_MENU_VIEW_H_

ash/wm/snap_group/snap_group_lock_button.h

diff --git a/ash/wm/snap_group/snap_group_lock_button.h b/ash/wm/snap_group/snap_group_lock_button.h
deleted file mode 100644
index 4aba100b..0000000
--- a/ash/wm/snap_group/snap_group_lock_button.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// 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.
-
-#ifndef ASH_WM_SNAP_GROUP_SNAP_GROUP_LOCK_BUTTON_H_
-#define ASH_WM_SNAP_GROUP_SNAP_GROUP_LOCK_BUTTON_H_
-
-#include "ui/base/metadata/metadata_header_macros.h"
-#include "ui/views/controls/button/image_button.h"
-
-namespace aura {
-class Window;
-}  // namespace aura
-
-namespace ash {
-
-// Contents view of the lock widget that appears below the resize widget when
-// two windows are snapped. It acts as the entry point for the creating or
-// removing the `SnapGroup`. This entry point is guarded by the feature flag
-// `kSnapGroup` and will only be enabled when the feature param
-// `kAutomaticallyLockGroup` is false.
-class SnapGroupLockButton : public views::ImageButton {
- public:
-  METADATA_HEADER(SnapGroupLockButton);
-  SnapGroupLockButton(aura::Window* window1, aura::Window* window2);
-  SnapGroupLockButton(const SnapGroupLockButton&) = delete;
-  SnapGroupLockButton& operator=(const SnapGroupLockButton&) = delete;
-  ~SnapGroupLockButton() override;
-
-  // Called on lock button is pressed to create or remove a snap group and
-  // `RefreshLockButton()`.
-  void OnLockButtonPressed();
-
- private:
-  // Updates the lock icon and tooltip to reflect the lock button state.
-  void RefreshLockButton();
-
-  aura::Window* window1_;
-  aura::Window* window2_;
-};
-
-}  // namespace ash
-
-#endif  // ASH_WM_SNAP_GROUP_SNAP_GROUP_LOCK_BUTTON_H_
\ No newline at end of file

ash/wm/snap_group/snap_group_lock_or_unlock_button.cc

diff --git a/ash/wm/snap_group/snap_group_lock_button.cc b/ash/wm/snap_group/snap_group_lock_or_unlock_button.cc
similarity index 74%
rename from ash/wm/snap_group/snap_group_lock_button.cc
rename to ash/wm/snap_group/snap_group_lock_or_unlock_button.cc
index 177de69c..1fc4daa 100644
--- a/ash/wm/snap_group/snap_group_lock_button.cc
+++ b/ash/wm/snap_group/snap_group_lock_or_unlock_button.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/wm/snap_group/snap_group_lock_button.h"
+#include "ash/wm/snap_group/snap_group_lock_or_unlock_button.h"
 
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
@@ -10,6 +10,8 @@
 #include "ash/style/ash_color_id.h"
 #include "ash/wm/snap_group/snap_group_constants.h"
 #include "ash/wm/snap_group/snap_group_controller.h"
+#include "ash/wm/splitview/split_view_controller.h"
+#include "ash/wm/splitview/split_view_divider.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
 #include "ui/base/models/image_model.h"
@@ -19,10 +21,11 @@
 
 namespace ash {
 
-SnapGroupLockButton::SnapGroupLockButton(aura::Window* window1,
-                                         aura::Window* window2)
-    : ImageButton(base::BindRepeating(&SnapGroupLockButton::OnLockButtonPressed,
-                                      base::Unretained(this))),
+SnapGroupLockOrUnlockButton::SnapGroupLockOrUnlockButton(aura::Window* window1,
+                                                         aura::Window* window2)
+    : ImageButton(
+          base::BindRepeating(&SnapGroupLockOrUnlockButton::OnLockButtonPressed,
+                              base::Unretained(this))),
       window1_(window1),
       window2_(window2) {
   SetImageHorizontalAlignment(ALIGN_CENTER);
@@ -34,9 +37,9 @@
   RefreshLockButton();
 }
 
-SnapGroupLockButton::~SnapGroupLockButton() = default;
+SnapGroupLockOrUnlockButton::~SnapGroupLockOrUnlockButton() = default;
 
-void SnapGroupLockButton::OnLockButtonPressed() {
+void SnapGroupLockOrUnlockButton::OnLockButtonPressed() {
   DCHECK(window1_);
   DCHECK(window2_);
   SnapGroupController* snap_group_controller =
@@ -53,7 +56,7 @@
   RefreshLockButton();
 }
 
-void SnapGroupLockButton::RefreshLockButton() {
+void SnapGroupLockOrUnlockButton::RefreshLockButton() {
   const bool locked =
       Shell::Get()->snap_group_controller()->AreWindowsInSnapGroup(window1_,
                                                                    window2_);
@@ -67,7 +70,7 @@
              : IDS_ASH_SNAP_GROUP_CLICK_TO_LOCK_WINDOWS));
 }
 
-BEGIN_METADATA(SnapGroupLockButton, views::ImageButton)
+BEGIN_METADATA(SnapGroupLockOrUnlockButton, views::ImageButton)
 END_METADATA
 
-}  // namespace ash
\ No newline at end of file
+}  // namespace ash

ash/wm/snap_group/snap_group_lock_or_unlock_button.h

diff --git a/ash/wm/snap_group/snap_group_lock_or_unlock_button.h b/ash/wm/snap_group/snap_group_lock_or_unlock_button.h
new file mode 100644
index 0000000..ccd0753f
--- /dev/null
+++ b/ash/wm/snap_group/snap_group_lock_or_unlock_button.h
@@ -0,0 +1,44 @@
+// 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.
+
+#ifndef ASH_WM_SNAP_GROUP_SNAP_GROUP_LOCK_OR_UNLOCK_BUTTON_H_
+#define ASH_WM_SNAP_GROUP_SNAP_GROUP_LOCK_OR_UNLOCK_BUTTON_H_
+
+#include "ui/base/metadata/metadata_header_macros.h"
+#include "ui/views/controls/button/image_button.h"
+
+namespace aura {
+class Window;
+}  // namespace aura
+
+namespace ash {
+
+// Contents view of the lock widget that appears below the resize widget when
+// two windows are snapped. It acts as the entry point for the creating or
+// removing the `SnapGroup`. This entry point is guarded by the feature flag
+// `kSnapGroup`.
+class SnapGroupLockOrUnlockButton : public views::ImageButton {
+ public:
+  METADATA_HEADER(SnapGroupLockOrUnlockButton);
+  SnapGroupLockOrUnlockButton(aura::Window* window1, aura::Window* window2);
+  SnapGroupLockOrUnlockButton(const SnapGroupLockOrUnlockButton&) = delete;
+  SnapGroupLockOrUnlockButton& operator=(const SnapGroupLockOrUnlockButton&) =
+      delete;
+  ~SnapGroupLockOrUnlockButton() override;
+
+  // Called on lock button is pressed to create or remove a snap group and
+  // `RefreshLockButton()`.
+  void OnLockButtonPressed();
+
+ private:
+  // Updates the lock icon and tooltip to reflect the lock button state.
+  void RefreshLockButton();
+
+  aura::Window* window1_;
+  aura::Window* window2_;
+};
+
+}  // namespace ash
+
+#endif  // ASH_WM_SNAP_GROUP_SNAP_GROUP_LOCK_OR_UNLOCK_BUTTON_H_

ash/wm/snap_group/snap_group_unittest.cc

diff --git a/ash/wm/snap_group/snap_group_unittest.cc b/ash/wm/snap_group/snap_group_unittest.cc
index 1893877..695a13d 100644
--- a/ash/wm/snap_group/snap_group_unittest.cc
+++ b/ash/wm/snap_group/snap_group_unittest.cc
@@ -12,6 +12,7 @@
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/style/ash_color_id.h"
+#include "ash/style/icon_button.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_util.h"
 #include "ash/wm/mru_window_tracker.h"
@@ -19,10 +20,12 @@
 #include "ash/wm/overview/overview_item.h"
 #include "ash/wm/overview/overview_test_util.h"
 #include "ash/wm/snap_group/snap_group_controller.h"
-#include "ash/wm/snap_group/snap_group_lock_button.h"
+#include "ash/wm/snap_group/snap_group_expanded_menu_view.h"
+#include "ash/wm/snap_group/snap_group_lock_or_unlock_button.h"
 #include "ash/wm/splitview/split_view_constants.h"
 #include "ash/wm/splitview/split_view_controller.h"
 #include "ash/wm/splitview/split_view_divider.h"
+#include "ash/wm/splitview/split_view_divider_view.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/wm_event.h"
 #include "ash/wm/workspace/multi_window_resize_controller.h"
@@ -62,6 +65,49 @@
   return display::Screen::GetScreen()->GetPrimaryDisplay().work_area();
 }
 
+IconButton* kebab_button() {
+  SplitViewDividerView* divider_view =
+      split_view_divider()->divider_view_for_testing();
+  CHECK(divider_view);
+  return divider_view->kebab_button_for_testing();
+}
+
+views::Widget* snap_group_expanded_menu_widget() {
+  SplitViewDividerView* divider_view =
+      split_view_divider()->divider_view_for_testing();
+  CHECK(divider_view);
+  return divider_view->snap_group_expanded_menu_widget_for_testing();
+}
+
+SnapGroupExpandedMenuView* snap_group_expanded_menu_view() {
+  SplitViewDividerView* divider_view =
+      split_view_divider()->divider_view_for_testing();
+  CHECK(divider_view);
+  return divider_view->snap_group_expanded_menu_view_for_testing();
+}
+
+IconButton* swap_windows_button() {
+  DCHECK(snap_group_expanded_menu_view());
+  return snap_group_expanded_menu_view()->swap_windows_button_for_testing();
+}
+
+IconButton* update_primary_window_button() {
+  DCHECK(snap_group_expanded_menu_view());
+  return snap_group_expanded_menu_view()
+      ->update_primary_window_button_for_testing();
+}
+
+IconButton* update_secondary_window_button() {
+  DCHECK(snap_group_expanded_menu_view());
+  return snap_group_expanded_menu_view()
+      ->update_secondary_window_button_for_testing();
+}
+
+SnapGroupLockOrUnlockButton* unlock_button() {
+  DCHECK(snap_group_expanded_menu_view());
+  return snap_group_expanded_menu_view()->unlock_button_for_testing();
+}
+
 }  // namespace
 
 class SnapGroupTest : public AshTestBase {
@@ -265,6 +311,7 @@
     EXPECT_TRUE(split_view_divider());
     EXPECT_EQ(0.5f, *WindowState::Get(window1)->snap_ratio());
     EXPECT_EQ(0.5f, *WindowState::Get(window2)->snap_ratio());
+    EXPECT_TRUE(kebab_button());
   }
 
  private:
@@ -460,7 +507,7 @@
 }
 
 // Tests that the hit area of the split view divider can be outside of its
-// bounds with the extra insets with a value of `kSplitViewDividerExtraInset`.
+// bounds with the extra insets whose value is `kSplitViewDividerExtraInset`.
 TEST_F(SnapGroupEntryPointArm1Test, SplitViewDividerEnlargedHitArea) {
   std::unique_ptr<aura::Window> w1(CreateTestWindow());
   std::unique_ptr<aura::Window> w2(CreateTestWindow());
@@ -482,6 +529,31 @@
             cached_divider_center_point + move_vector);
 }
 
+// Tests that the snap group expanded menu with four buttons will show on mouse
+// cliked on the kebab button and hide when clicking again.
+TEST_F(SnapGroupEntryPointArm1Test, ExpandedMenuViewTest) {
+  std::unique_ptr<aura::Window> w1(CreateTestWindow());
+  std::unique_ptr<aura::Window> w2(CreateTestWindow());
+  SnapTwoTestWindowsInArm1(w1.get(), w2.get(), /*horizontal=*/true);
+
+  gfx::Rect kebab_button_bounds_in_screen = kebab_button()->GetBoundsInScreen();
+  auto* event_generator = GetEventGenerator();
+  event_generator->MoveMouseTo(kebab_button_bounds_in_screen.CenterPoint());
+  event_generator->PressLeftButton();
+  event_generator->ReleaseLeftButton();
+  EXPECT_TRUE(snap_group_expanded_menu_widget());
+  EXPECT_TRUE(snap_group_expanded_menu_view());
+  EXPECT_TRUE(swap_windows_button());
+  EXPECT_TRUE(update_primary_window_button());
+  EXPECT_TRUE(update_secondary_window_button());
+  EXPECT_TRUE(unlock_button());
+
+  event_generator->PressLeftButton();
+  event_generator->ReleaseLeftButton();
+  EXPECT_FALSE(snap_group_expanded_menu_widget());
+  EXPECT_FALSE(snap_group_expanded_menu_view());
+}
+
 // A test fixture that tests the user-initiated snap group entry point. This
 // entry point is guarded by the feature flag `kSnapGroup` and will only be
 // enabled when the feature param `kAutomaticallyLockGroup` is false.
@@ -572,7 +644,7 @@
  private:
   // Verifies that the icon image and the tooltip of the lock button gets
   // updated correctly based on the `locked` state.
-  void VerifyLockButton(bool locked, SnapGroupLockButton* lock_button) {
+  void VerifyLockButton(bool locked, SnapGroupLockOrUnlockButton* lock_button) {
     const SkColor color =
         lock_button->GetColorProvider()->GetColor(kColorAshIconColorPrimary);
     const gfx::ImageSkia locked_icon_image =

ash/wm/splitview/split_view_constants.h

diff --git a/ash/wm/splitview/split_view_constants.h b/ash/wm/splitview/split_view_constants.h
index a1e8291..4f7343f 100644
--- a/ash/wm/splitview/split_view_constants.h
+++ b/ash/wm/splitview/split_view_constants.h
@@ -86,6 +86,9 @@
 // make it easier to handle located event.
 constexpr gfx::Insets kSplitViewDividerExtraInset = gfx::Insets::VH(0, -2);
 
+// Corner radius for the expanded menu that shows on toggling the kebab button.
+constexpr int kExpandedMenuRoundedCornerRadius = 20;
+
 }  // namespace ash
 
 #endif  // ASH_WM_SPLITVIEW_SPLIT_VIEW_CONSTANTS_H_

ash/wm/splitview/split_view_controller.cc

diff --git a/ash/wm/splitview/split_view_controller.cc b/ash/wm/splitview/split_view_controller.cc
index 1989bf85..191ea65f 100644
--- a/ash/wm/splitview/split_view_controller.cc
+++ b/ash/wm/splitview/split_view_controller.cc
@@ -2640,15 +2640,6 @@
     UpdateSnappedBounds(window == primary_window_ ? secondary_window_
                                                   : primary_window_);
   }
-
-  if (state_ == State::kBothSnapped &&
-      ShouldAutomaticallyGroupOnWindowsSnappedInClamshell()) {
-    SnapGroupController* snap_group_controller =
-        Shell::Get()->snap_group_controller();
-    snap_group_controller->AddSnapGroup(primary_window_, secondary_window_);
-    DCHECK(snap_group_controller->AreWindowsInSnapGroup(primary_window_,
-                                                        secondary_window_));
-  }
 }
 
 void SplitViewController::OnSnappedWindowDetached(aura::Window* window,

ash/wm/splitview/split_view_divider.h

diff --git a/ash/wm/splitview/split_view_divider.h b/ash/wm/splitview/split_view_divider.h
index 1e01ab0..dd976c2d 100644
--- a/ash/wm/splitview/split_view_divider.h
+++ b/ash/wm/splitview/split_view_divider.h
@@ -114,6 +114,10 @@
   void OnTransientChildRemoved(aura::Window* window,
                                aura::Window* transient) override;
 
+  SplitViewDividerView* divider_view_for_testing() const {
+    return divider_view_;
+  }
+
  private:
   void CreateDividerWidget(SplitViewController* controller);
 

ash/wm/splitview/split_view_divider_view.cc

diff --git a/ash/wm/splitview/split_view_divider_view.cc b/ash/wm/splitview/split_view_divider_view.cc
index 3225ac3..3f42407 100644
--- a/ash/wm/splitview/split_view_divider_view.cc
+++ b/ash/wm/splitview/split_view_divider_view.cc
@@ -12,6 +12,9 @@
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/style/ash_color_provider.h"
 #include "ash/system/screen_layout_observer.h"
+#include "ash/wm/snap_group/snap_group.h"
+#include "ash/wm/snap_group/snap_group_controller.h"
+#include "ash/wm/snap_group/snap_group_expanded_menu_view.h"
 #include "ash/wm/splitview/split_view_constants.h"
 #include "ash/wm/splitview/split_view_controller.h"
 #include "ash/wm/splitview/split_view_divider.h"
@@ -21,7 +24,9 @@
 #include "ui/base/metadata/metadata_impl_macros.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
+#include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rounded_corners_f.h"
+#include "ui/gfx/geometry/size.h"
 #include "ui/views/background.h"
 #include "ui/views/highlight_border.h"
 
@@ -29,6 +34,11 @@
 
 namespace {
 
+constexpr int kKebabButtonDistanceFromBottom = 24;
+constexpr gfx::Size kKebabButtonSize{4, 24};
+constexpr int kDistanceBetweenKebabButtonAndExpandedMenu = 8;
+constexpr int kExpandedMenuHeight = 150;
+
 bool IsInTabletMode() {
   TabletModeController* tablet_mode_controller =
       Shell::Get()->tablet_mode_controller();
@@ -50,6 +60,20 @@
   SetBackground(
       views::CreateSolidBackground(AshColorProvider::Get()->GetBaseLayerColor(
           AshColorProvider::BaseLayerType::kOpaque)));
+
+  if (ShouldAutomaticallyGroupOnWindowsSnappedInClamshell()) {
+    kebab_button_ = AddChildView(std::make_unique<IconButton>(
+        base::BindRepeating(&SplitViewDividerView::OnKebabButtonPressed,
+                            base::Unretained(this)),
+        IconButton::Type::kMediumFloating, &kSnapGroupKebabIcon,
+        IDS_ASH_SNAP_GROUP_MORE_OPTIONS,
+        /*is_togglable=*/false,
+        /*has_border=*/false));
+    kebab_button_->SetPaintToLayer();
+    kebab_button_->layer()->SetFillsBoundsOpaquely(false);
+    kebab_button_->SetPreferredSize(kKebabButtonSize);
+    kebab_button_->SetVisible(true);
+  }
 }
 
 void SplitViewDividerView::DoSpawningAnimation(int spawn_position) {
@@ -99,6 +123,31 @@
   SetBoundsRect(GetLocalBounds());
   divider_handler_view_->Refresh(
       split_view_controller_->is_resizing_with_divider());
+
+  if (ShouldAutomaticallyGroupOnWindowsSnappedInClamshell()) {
+    const gfx::Size kebab_button_size = kebab_button_->GetPreferredSize();
+    const gfx::Rect kebab_button_bounds(
+        (width() - kebab_button_size.width()) / 2.f,
+        height() - kebab_button_size.height() - kKebabButtonDistanceFromBottom,
+        kebab_button_size.width(), kebab_button_size.height());
+    kebab_button_->SetBoundsRect(kebab_button_bounds);
+
+    if (snap_group_expanded_menu_widget_) {
+      gfx::Rect divider_bounds_in_screen =
+          split_view_controller_->split_view_divider()
+              ->GetDividerBoundsInScreen(
+                  /*is_dragging=*/false);
+      const gfx::Rect expanded_menu_bounds(
+          divider_bounds_in_screen.x() + kSplitviewDividerShortSideLength / 2 -
+              kExpandedMenuRoundedCornerRadius,
+          kebab_button_bounds.y() - kExpandedMenuHeight -
+              kDistanceBetweenKebabButtonAndExpandedMenu,
+          kExpandedMenuRoundedCornerRadius * 2, kExpandedMenuHeight);
+      divider_bounds_in_screen.ClampToCenteredSize(
+          gfx::Size(kExpandedMenuRoundedCornerRadius * 2, kExpandedMenuHeight));
+      snap_group_expanded_menu_widget_->SetBounds(expanded_menu_bounds);
+    }
+  }
 }
 
 void SplitViewDividerView::OnThemeChanged() {
@@ -210,6 +259,30 @@
       split_view_controller_->is_resizing_with_divider());
 }
 
+void SplitViewDividerView::OnKebabButtonPressed() {
+  should_show_expanded_menu_ = !should_show_expanded_menu_;
+  if (!should_show_expanded_menu_) {
+    snap_group_expanded_menu_widget_.reset();
+    snap_group_expanded_menu_view_ = nullptr;
+    return;
+  }
+
+  if (!snap_group_expanded_menu_widget_) {
+    snap_group_expanded_menu_widget_ = std::make_unique<views::Widget>();
+    snap_group_expanded_menu_widget_->Init(CreateWidgetInitParams(
+        split_view_controller_->root_window(), "SnapGroupExpandedMenuWidget"));
+    SnapGroupController* snap_group_controller =
+        Shell::Get()->snap_group_controller();
+    SnapGroup* snap_group = snap_group_controller->GetSnapGroupForGivenWindow(
+        split_view_controller_->primary_window());
+    snap_group_expanded_menu_view_ =
+        snap_group_expanded_menu_widget_->SetContentsView(
+            std::make_unique<SnapGroupExpandedMenuView>(snap_group));
+  }
+  snap_group_expanded_menu_widget_->Show();
+  Layout();
+}
+
 BEGIN_METADATA(SplitViewDividerView, views::View)
 END_METADATA
 

ash/wm/splitview/split_view_divider_view.h

diff --git a/ash/wm/splitview/split_view_divider_view.h b/ash/wm/splitview/split_view_divider_view.h
index 4350951..cfd05684 100644
--- a/ash/wm/splitview/split_view_divider_view.h
+++ b/ash/wm/splitview/split_view_divider_view.h
@@ -5,6 +5,7 @@
 #ifndef ASH_WM_SPLITVIEW_SPLIT_VIEW_DIVIDER_VIEW_H_
 #define ASH_WM_SPLITVIEW_SPLIT_VIEW_DIVIDER_VIEW_H_
 
+#include "ash/style/icon_button.h"
 #include "ui/views/view.h"
 #include "ui/views/view_targeter_delegate.h"
 #include "ui/views/widget/unique_widget_ptr.h"
@@ -14,6 +15,7 @@
 class SplitViewController;
 class SplitViewDivider;
 class SplitViewDividerHandlerView;
+class SnapGroupExpandedMenuView;
 
 // A view that acts as the contents view of the split view divider widget.
 class SplitViewDividerView : public views::View,
@@ -42,12 +44,37 @@
   bool DoesIntersectRect(const views::View* target,
                          const gfx::Rect& rect) const override;
 
+  IconButton* kebab_button_for_testing() const { return kebab_button_; }
+  views::Widget* snap_group_expanded_menu_widget_for_testing() const {
+    return snap_group_expanded_menu_widget_.get();
+  }
+  SnapGroupExpandedMenuView* snap_group_expanded_menu_view_for_testing() const {
+    return snap_group_expanded_menu_view_;
+  }
+
  private:
   void OnResizeStatusChanged();
 
+  // Called when the `kebab_button_` is pressed which toggles between showing or
+  // hiding the `snap_group_expanded_menu_widget_`.
+  void OnKebabButtonPressed();
+
   SplitViewController* split_view_controller_;
   SplitViewDividerHandlerView* divider_handler_view_ = nullptr;
   SplitViewDivider* divider_;
+
+  // A vertical 3-dot button that shows on the split view divider when
+  // `ShouldAutomaticallyGroupOnWindowsSnappedInClamshell()` is true.
+  IconButton* kebab_button_;
+
+  // The snap group expanded menu widget and its contents view.
+  views::UniqueWidgetPtr snap_group_expanded_menu_widget_;
+  SnapGroupExpandedMenuView* snap_group_expanded_menu_view_ = nullptr;
+
+  // True if the `snap_group_expanded_menu_widget_` should show
+  // `OnKebabButtonPressed()` and false otherwise. The value will be updated on
+  // the `kebab_button_` is clicked.
+  bool should_show_expanded_menu_ = false;
 };
 
 }  // namespace ash

ash/wm/workspace/multi_window_resize_controller.cc

diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc
index 63d56f2..6ff7dca 100644
--- a/ash/wm/workspace/multi_window_resize_controller.cc
+++ b/ash/wm/workspace/multi_window_resize_controller.cc
@@ -14,7 +14,7 @@
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/snap_group/snap_group_constants.h"
 #include "ash/wm/snap_group/snap_group_controller.h"
-#include "ash/wm/snap_group/snap_group_lock_button.h"
+#include "ash/wm/snap_group/snap_group_lock_or_unlock_button.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/wm_metrics.h"
 #include "ash/wm/workspace/workspace_window_resizer.h"
@@ -562,7 +562,7 @@
       lock_widget_->Init(CreateWidgetParams(
           parent_window, /*widget_name=*/"SnapGroupLockWidget"));
       lock_button_ = lock_widget_->SetContentsView(
-          std::make_unique<SnapGroupLockButton>(window1, window2));
+          std::make_unique<SnapGroupLockOrUnlockButton>(window1, window2));
 
       gfx::Rect lock_widget_show_bounds_in_screen =
           ConvertRectToScreen(windows_.window1->parent(),

ash/wm/workspace/multi_window_resize_controller.h

diff --git a/ash/wm/workspace/multi_window_resize_controller.h b/ash/wm/workspace/multi_window_resize_controller.h
index f64347f..d47e51f 100644
--- a/ash/wm/workspace/multi_window_resize_controller.h
+++ b/ash/wm/workspace/multi_window_resize_controller.h
@@ -10,7 +10,6 @@
 
 #include "ash/ash_export.h"
 #include "ash/wm/overview/overview_observer.h"
-#include "ash/wm/snap_group/snap_group_lock_button.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_state_observer.h"
 #include "base/scoped_multi_source_observation.h"
@@ -23,14 +22,16 @@
 
 namespace gfx {
 class PointF;
-}
+}  // namespace gfx
 
 namespace views {
 class Widget;
-}
+}  // namespace views
 
 namespace ash {
+
 class MultiWindowResizeControllerTest;
+class SnapGroupLockOrUnlockButton;
 class WorkspaceWindowResizer;
 
 // MultiWindowResizeController is responsible for determining and showing a
@@ -78,7 +79,9 @@
   void OnOverviewModeStarting() override;
   void OnOverviewModeEndingAnimationComplete(bool canceled) override;
 
-  SnapGroupLockButton* lock_button_for_testing() const { return lock_button_; }
+  SnapGroupLockOrUnlockButton* lock_button_for_testing() const {
+    return lock_button_;
+  }
 
  private:
   friend class MultiWindowResizeControllerTest;
@@ -220,7 +223,7 @@
   std::unique_ptr<views::Widget> lock_widget_;
 
   // The contents view of the `lock_widget_`.
-  SnapGroupLockButton* lock_button_;
+  SnapGroupLockOrUnlockButton* lock_button_;
 
   // If non-null we're in a resize loop.
   std::unique_ptr<WorkspaceWindowResizer> window_resizer_;

base/allocator/partition_alloc_features.cc

diff --git a/base/allocator/partition_alloc_features.cc b/base/allocator/partition_alloc_features.cc
index 2fe053e..f8c7f91 100644
--- a/base/allocator/partition_alloc_features.cc
+++ b/base/allocator/partition_alloc_features.cc
@@ -138,6 +138,8 @@
     {BackupRefPtrMode::kDisabled, "disabled"},
     {BackupRefPtrMode::kEnabled, "enabled"},
     {BackupRefPtrMode::kEnabledWithoutZapping, "enabled-without-zapping"},
+    {BackupRefPtrMode::kEnabledWithoutMemoryReclaimer,
+     "enabled-without-memory-reclaimer"},
     {BackupRefPtrMode::kDisabledButSplitPartitions2Way,
      "disabled-but-2-way-split"},
     {BackupRefPtrMode::kDisabledButSplitPartitions3Way,

base/allocator/partition_alloc_features.h

diff --git a/base/allocator/partition_alloc_features.h b/base/allocator/partition_alloc_features.h
index d47050e..567348b 100644
--- a/base/allocator/partition_alloc_features.h
+++ b/base/allocator/partition_alloc_features.h
@@ -90,6 +90,10 @@
   // Same as kEnabled but without zapping quarantined objects.
   kEnabledWithoutZapping,
 
+  // Same as kEnabled but without registering the main partition to memory
+  // reclaimer.
+  kEnabledWithoutMemoryReclaimer,
+
   // BRP is disabled, but the main partition is split out, as if BRP was enabled
   // in the "previous slot" mode.
   kDisabledButSplitPartitions2Way,

base/allocator/partition_alloc_support.cc

diff --git a/base/allocator/partition_alloc_support.cc b/base/allocator/partition_alloc_support.cc
index 007bf25..6405b5e6 100644
--- a/base/allocator/partition_alloc_support.cc
+++ b/base/allocator/partition_alloc_support.cc
@@ -338,6 +338,13 @@
         brp_group_name = "EnabledBeforeAllocWithoutZapping";
 #endif
         break;
+      case features::BackupRefPtrMode::kEnabledWithoutMemoryReclaimer:
+#if BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
+        brp_group_name = "EnabledPrevSlotWithoutMemoryReclaimer";
+#else
+        brp_group_name = "EnabledBeforeAllocWithoutMemoryReclaimer";
+#endif
+        break;
       case features::BackupRefPtrMode::kDisabledButSplitPartitions2Way:
         brp_group_name = "DisabledBut2WaySplit";
         break;
@@ -852,6 +859,7 @@
   bool use_dedicated_aligned_partition = false;
   bool add_dummy_ref_count = false;
   bool process_affected_by_brp_flag = false;
+  bool disable_memory_reclaimer = false;
 
 #if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) &&  \
      BUILDFLAG(ENABLE_BACKUP_REF_PTR_SUPPORT)) || \
@@ -889,6 +897,9 @@
         // Do nothing. Equivalent to !IsEnabled(kPartitionAllocBackupRefPtr).
         break;
 
+      case base::features::BackupRefPtrMode::kEnabledWithoutMemoryReclaimer:
+        disable_memory_reclaimer = true;
+        ABSL_FALLTHROUGH_INTENDED;
       case base::features::BackupRefPtrMode::kEnabled:
         enable_brp_zapping = true;
         ABSL_FALLTHROUGH_INTENDED;
@@ -929,9 +940,13 @@
 #endif  // BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) &&
         // BUILDFLAG(ENABLE_BACKUP_REF_PTR_SUPPORT)
 
-  return {enable_brp,           enable_brp_zapping,
-          split_main_partition, use_dedicated_aligned_partition,
-          add_dummy_ref_count,  process_affected_by_brp_flag};
+  return {enable_brp,
+          enable_brp_zapping,
+          !disable_memory_reclaimer,
+          split_main_partition,
+          use_dedicated_aligned_partition,
+          add_dummy_ref_count,
+          process_affected_by_brp_flag};
 }
 
 void PartitionAllocSupport::ReconfigureEarlyish(
@@ -1055,6 +1070,8 @@
   allocator_shim::ConfigurePartitions(
       allocator_shim::EnableBrp(brp_config.enable_brp),
       allocator_shim::EnableBrpZapping(brp_config.enable_brp_zapping),
+      allocator_shim::EnableBrpPartitionMemoryReclaimer(
+          brp_config.enable_brp_partition_memory_reclaimer),
       allocator_shim::SplitMainPartition(brp_config.split_main_partition),
       allocator_shim::UseDedicatedAlignedPartition(
           brp_config.use_dedicated_aligned_partition),

base/allocator/partition_alloc_support.h

diff --git a/base/allocator/partition_alloc_support.h b/base/allocator/partition_alloc_support.h
index fb9f67a..f9095a3 100644
--- a/base/allocator/partition_alloc_support.h
+++ b/base/allocator/partition_alloc_support.h
@@ -46,6 +46,7 @@
   struct BrpConfiguration {
     bool enable_brp = false;
     bool enable_brp_zapping = false;
+    bool enable_brp_partition_memory_reclaimer = false;
     bool split_main_partition = false;
     bool use_dedicated_aligned_partition = false;
     bool add_dummy_ref_count = false;

base/allocator/partition_allocator/shim/allocator_shim.h

diff --git a/base/allocator/partition_allocator/shim/allocator_shim.h b/base/allocator/partition_allocator/shim/allocator_shim.h
index 558e9a2..1d5a6e8 100644
--- a/base/allocator/partition_allocator/shim/allocator_shim.h
+++ b/base/allocator/partition_allocator/shim/allocator_shim.h
@@ -189,6 +189,8 @@
 
 using EnableBrp = base::StrongAlias<class EnableBrpTag, bool>;
 using EnableBrpZapping = base::StrongAlias<class EnableBrpZappingTag, bool>;
+using EnableBrpPartitionMemoryReclaimer =
+    base::StrongAlias<class EnableBrpPartitionMemoryReclaimerTag, bool>;
 using SplitMainPartition = base::StrongAlias<class SplitMainPartitionTag, bool>;
 using UseDedicatedAlignedPartition =
     base::StrongAlias<class UseDedicatedAlignedPartitionTag, bool>;
@@ -202,6 +204,7 @@
 BASE_EXPORT void ConfigurePartitions(
     EnableBrp enable_brp,
     EnableBrpZapping enable_brp_zapping,
+    EnableBrpPartitionMemoryReclaimer enable_brp_memory_reclaimer,
     SplitMainPartition split_main_partition,
     UseDedicatedAlignedPartition use_dedicated_aligned_partition,
     AddDummyRefCount add_dummy_ref_count,

base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc.cc

diff --git a/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc.cc b/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc.cc
index 49e8f25..9804fff3 100644
--- a/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc.cc
+++ b/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc.cc
@@ -584,6 +584,7 @@
 void ConfigurePartitions(
     EnableBrp enable_brp,
     EnableBrpZapping enable_brp_zapping,
+    EnableBrpPartitionMemoryReclaimer enable_brp_memory_reclaimer,
     SplitMainPartition split_main_partition,
     UseDedicatedAlignedPartition use_dedicated_aligned_partition,
     AddDummyRefCount add_dummy_ref_count,
@@ -692,6 +693,14 @@
   // is replaced, it must've been g_original_root.
   PA_CHECK(current_aligned_root == g_original_root);
 
+  if (enable_brp_memory_reclaimer) {
+    partition_alloc::MemoryReclaimer::Instance()->RegisterPartition(new_root);
+    if (new_aligned_root != new_root) {
+      partition_alloc::MemoryReclaimer::Instance()->RegisterPartition(
+          new_aligned_root);
+    }
+  }
+
   // Purge memory, now that the traffic to the original partition is cut off.
   current_root->PurgeMemory(
       partition_alloc::PurgeFlags::kDecommitEmptySlotSpans |

base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java

diff --git a/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java b/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java
index 7a814bf..05d28c2 100644
--- a/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java
+++ b/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java
@@ -53,6 +53,8 @@
  * validation errors on low Android versions.
  */
 public class ApiCompatibilityUtils {
+    private static final String TAG = "ApiCompatUtil";
+
     private ApiCompatibilityUtils() {
     }
 
@@ -331,7 +333,8 @@
             int mode = field.getInt(null);
             method.invoke(options, mode);
         } catch (IllegalAccessException | InvocationTargetException | NoSuchFieldException
-                | NoSuchMethodException | RuntimeException e) {
+                | NoSuchMethodException e) {
+            Log.e(TAG, "Reflection failure: " + e);
             assert false : "PendingIntent from background activity may fail to run.";
         }
     }

build/fuchsia/linux_internal.sdk.sha1

diff --git a/build/fuchsia/linux_internal.sdk.sha1 b/build/fuchsia/linux_internal.sdk.sha1
index cbd816d2..19c1876 100644
--- a/build/fuchsia/linux_internal.sdk.sha1
+++ b/build/fuchsia/linux_internal.sdk.sha1
@@ -1 +1 @@
-12.20230407.1.1
+12.20230407.2.1

build/fuchsia/update_images.py

diff --git a/build/fuchsia/update_images.py b/build/fuchsia/update_images.py
index 1d6cee5..f8aa019 100755
--- a/build/fuchsia/update_images.py
+++ b/build/fuchsia/update_images.py
@@ -161,22 +161,25 @@
   }
 
 
-def GetImageLocationInfo(default_bucket: str) -> Dict[str, str]:
+def GetImageLocationInfo(default_bucket: str,
+                         allow_override: bool = True) -> Dict[str, str]:
   """Figures out where to pull the image from.
 
   Defaults to the provided default bucket and generates the hash from defaults.
-  If sdk_override.txt exists, it uses that bucket instead.
+  If sdk_override.txt exists (and is allowed) it uses that bucket instead.
 
   Args:
     default_bucket: a given default for what bucket to use
+    allow_override: allow SDK override to be used.
 
   Returns:
     A dictionary containing the bucket and image_hash
   """
-  # if sdk_override.txt exists, use the image from that bucket
-  override = _GetImageOverrideInfo()
-  if override:
-    return override
+  # if sdk_override.txt exists (and is allowed) use the image from that bucket.
+  if allow_override:
+    override = _GetImageOverrideInfo()
+    if override:
+      return override
 
   # Use the bucket in sdk-bucket.txt if an entry exists.
   # Otherwise use the default bucket.
@@ -209,6 +212,13 @@
       '--image-root-dir',
       default=IMAGES_ROOT,
       help='Specify the root directory of the downloaded images. Optional')
+  parser.add_argument(
+      '--allow-override',
+      default=True,
+      action=argparse.BooleanOptionalAction,
+      type=bool,
+      help='Whether sdk_override.txt can be used for fetching the image, if '
+      'it exists.')
   args = parser.parse_args()
 
   logging.basicConfig(level=logging.DEBUG if args.verbose else logging.INFO)
@@ -220,7 +230,7 @@
   # Check whether there's Fuchsia support for this platform.
   get_host_os()
 
-  image_info = GetImageLocationInfo(args.default_bucket)
+  image_info = GetImageLocationInfo(args.default_bucket, args.allow_override)
 
   bucket = image_info['bucket']
   image_hash = image_info['image_hash']

build/fuchsia/update_images_test.py

diff --git a/build/fuchsia/update_images_test.py b/build/fuchsia/update_images_test.py
index 49d7f2f..f5be774c 100755
--- a/build/fuchsia/update_images_test.py
+++ b/build/fuchsia/update_images_test.py
@@ -76,6 +76,22 @@
     actual = GetImageLocationInfo('my-bucket')
     self.assertEqual(actual, override_info)
 
+  def testNoAllowOverride(self, mock_image_override, mock_override_bucket,
+                          mock_image_hash):
+    override_info = {
+        'bucket': 'override-bucket',
+        'image_hash': 'override-hash',
+    }
+    mock_image_override.return_value = override_info
+    mock_override_bucket.return_value = None
+    mock_image_hash.return_value = 'image-hash'
+
+    actual = GetImageLocationInfo('my-bucket', allow_override=False)
+    self.assertEqual(actual, {
+        'bucket': 'my-bucket',
+        'image_hash': 'image-hash',
+    })
+
 
 if __name__ == '__main__':
   unittest.main()

buildtools/deps_revisions.gni

diff --git a/buildtools/deps_revisions.gni b/buildtools/deps_revisions.gni
index 9af5861..38940b2 100644
--- a/buildtools/deps_revisions.gni
+++ b/buildtools/deps_revisions.gni
@@ -5,5 +5,5 @@
 declare_args() {
   # Used to cause full rebuilds on libc++ rolls. This should be kept in sync
   # with the libcxx_revision vars in //DEPS.
-  libcxx_revision = "ab37483b426c16ce33f8f0064be571513d5a8c34"
+  libcxx_revision = "ee488d060889fc9208b22536955a7176ae9a404d"
 }

chrome/VERSION

diff --git a/chrome/VERSION b/chrome/VERSION
index eb85decc..2784d68 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
 MAJOR=114
 MINOR=0
-BUILD=5701
+BUILD=5702
 PATCH=0

chrome/android/chrome_java_sources.gni

diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
index 74ca4ee1..ef88ef4 100644
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -490,6 +490,7 @@
   "java/src/org/chromium/chrome/browser/customtabs/features/CustomTabNavigationBarController.java",
   "java/src/org/chromium/chrome/browser/customtabs/features/ImmersiveModeController.java",
   "java/src/org/chromium/chrome/browser/customtabs/features/TabInteractionRecorder.java",
+  "java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/CustomTabDragBar.java",
   "java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/CustomTabHeightStrategy.java",
   "java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabBaseStrategy.java",
   "java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabBottomSheetStrategy.java",

chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceOnTabletTest.java

diff --git a/chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceOnTabletTest.java b/chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceOnTabletTest.java
index 132ac09..8d6061e 100644
--- a/chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceOnTabletTest.java
+++ b/chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceOnTabletTest.java
@@ -16,6 +16,7 @@
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.CommandLineFlags;
+import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.DoNotBatch;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.Restriction;
@@ -83,6 +84,7 @@
     @MediumTest
     @Feature({"StartSurface"})
     @CommandLineFlags.Add({INSTANT_START_TEST_BASE_PARAMS})
+    @DisabledTest(message = "https://crbug.com/1431467")
     public void testStartSurfaceOnTabletWithNtpExist() throws IOException {
         // The existing NTP isn't the last active Tab.
         String modifiedNtpUrl = UrlConstants.NTP_URL + "/1";

chrome/android/features/tab_ui/java/res/layout/tab_selection_editor_action_view.xml

diff --git a/chrome/android/features/tab_ui/java/res/layout/tab_selection_editor_action_view.xml b/chrome/android/features/tab_ui/java/res/layout/tab_selection_editor_action_view.xml
index ca03bcfb..c58d133 100644
--- a/chrome/android/features/tab_ui/java/res/layout/tab_selection_editor_action_view.xml
+++ b/chrome/android/features/tab_ui/java/res/layout/tab_selection_editor_action_view.xml
@@ -12,6 +12,7 @@
     android:layout_height="wrap_content"
     android:layout_centerVertical="true"
     android:drawablePadding="@dimen/tab_selection_editor_action_view_padding"
+     android:maxLines="1"
     android:id="@+id/tab_selection_editor_action_view"
     android:enabled="false"
     style="@style/TextButton.OnAccent1"/>

chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorActionViewLayout.java

diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorActionViewLayout.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorActionViewLayout.java
index acfb435..f5719ce 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorActionViewLayout.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorActionViewLayout.java
@@ -163,45 +163,46 @@
             return;
         }
 
-        // Get empty size without spacer and action views.
+        // Get empty size without action views.
         removeAllActionViews();
         mMenuButton.setVisibility(View.VISIBLE);
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
         final int width = getMeasuredWidth();
 
-        // Calculate the remaining room used by the menu, number roll view, etc.
-        int usedRoom = getPaddingLeft() + getPaddingRight();
-        int requiredWidth = usedRoom;
-        for (int i = 0; i < getChildCount(); i++) {
-            // NumberRollView size is dynamically restricted.
-            if (getChildAt(i) instanceof NumberRollView) continue;
-
-            usedRoom += getChildAt(i).getMeasuredWidth();
-        }
+        // The width that is required by visible views.
+        int requiredWidth = getPaddingLeft() + getPaddingRight();
+        // The width including the menu button assuming it is visible.
+        int usedWidth = requiredWidth + mMenuButton.getMeasuredWidth();
 
         mVisibleActions.clear();
 
-        // Add all action views leaving room using the remaining room.
-        boolean allActionViewsShown = true;
+        // Add all action views that fit.
+        boolean hasForcedAnyActionViewToMenu = false;
+        final int childMeasureSpec =
+                View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
         for (TabSelectionEditorMenuItem menuItem : mMenuItemsWithActionView) {
             final View actionView = menuItem.getActionView();
-            actionView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
+            actionView.measure(childMeasureSpec, childMeasureSpec);
             final int actionViewWidth = actionView.getMeasuredWidth();
-            if (usedRoom + actionViewWidth > width || !allActionViewsShown) {
-                // The ActionView was removed. Ensure it still has a LayoutParams.
+            if (usedWidth + actionViewWidth > width || hasForcedAnyActionViewToMenu) {
+                // The ActionView doesn't fit. Ensure it still has a LayoutParams.
                 actionView.setLayoutParams(mActionViewParams);
-                allActionViewsShown = false;
+                hasForcedAnyActionViewToMenu = true;
                 continue;
             }
 
             // Add views in front of the menu button.
             addView(actionView, getChildCount() - 1, mActionViewParams);
             mVisibleActions.add(menuItem);
-            usedRoom += actionViewWidth;
+            usedWidth += actionViewWidth;
             requiredWidth += actionViewWidth;
         }
-        mDelegate.setVisibleActionViews(mVisibleActions);
-        if (mHasMenuOnlyItems || !allActionViewsShown) {
+        if (mDelegate != null) {
+            // Any items in mVisibleActions will appear in the Toolbar. The remaining items will be
+            // forced into the overflow menu.
+            mDelegate.setVisibleActionViews(mVisibleActions);
+        }
+        if (mHasMenuOnlyItems || hasForcedAnyActionViewToMenu) {
             mMenuButton.setVisibility(View.VISIBLE);
             requiredWidth += mMenuButton.getMeasuredWidth();
         } else {
@@ -227,6 +228,10 @@
     }
 
     private void update() {
-        measure(View.MeasureSpec.EXACTLY, View.MeasureSpec.AT_MOST);
+        int widthMeasureSpec =
+                View.MeasureSpec.makeMeasureSpec(getMeasuredWidth(), View.MeasureSpec.AT_MOST);
+        int heightMeasureSpec =
+                View.MeasureSpec.makeMeasureSpec(getMeasuredHeight(), View.MeasureSpec.EXACTLY);
+        measure(widthMeasureSpec, heightMeasureSpec);
     }
 }

chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorMenu.java

diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorMenu.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorMenu.java
index b4915d03..77d603019 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorMenu.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorMenu.java
@@ -63,7 +63,6 @@
             Context context, TabSelectionEditorActionViewLayout actionViewLayout) {
         mContext = context;
         mActionViewLayout = actionViewLayout;
-        mActionViewLayout.setActionViewLayoutDelegate(this);
 
         mModelList = new ModelList();
         mAdapter = new ModelListAdapter(mModelList) {
@@ -85,6 +84,7 @@
         mListView.setOnItemClickListener(this);
 
         mActionViewLayout.setListMenuButtonDelegate(() -> this);
+        mActionViewLayout.setActionViewLayoutDelegate(this);
     }
 
     private void registerItemTypes() {

chrome/android/java/res/drawable/lens_camera_icon.xml

diff --git a/chrome/android/java/res/drawable/lens_camera_icon.xml b/chrome/android/java/res/drawable/lens_camera_icon.xml
index 616cf94e..bd2232c 100644
--- a/chrome/android/java/res/drawable/lens_camera_icon.xml
+++ b/chrome/android/java/res/drawable/lens_camera_icon.xml
@@ -4,27 +4,6 @@
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
-    <path
-        android:fillColor="#4285F4"
-        android:pathData="M 12 9.52 C 13.9329966244 9.52 15.5 11.0870033756 15.5 13.02 C 15.5 14.9529966244 13.9329966244 16.52 12 16.52 C 10.0670033756 16.52 8.5 14.9529966244 8.5 13.02 C 8.5 11.0870033756 10.0670033756 9.52 12 9.52 Z" />
-    <path
-        android:fillColor="#EA4335"
-        android:pathData="M20,9v5.02V17c0,0.21-0.04,0.41-0.1,0.6v0v0c-0.2,0.62-0.68,1.1-1.29,1.29h0v0 C18.41,18.96,18.21,19,18,19H8.99l2,2h5.51H18c0.55,0,1.08-0.11,1.56-0.31c0.48-0.2,0.91-0.5,1.27-0.86 c0.18-0.18,0.34-0.38,0.49-0.59c0.29-0.43,0.5-0.91,0.6-1.43C21.97,17.55,22,17.28,22,17v-1.5v-3.48V10.5l-2.1-2.1 C19.96,8.59,20,8.79,20,9z" />
-    <path
-        android:fillColor="#4285F4"
-        android:pathData="M4,9c0-0.21,0.04-0.41,0.1-0.6C4.3,7.78,4.78,7.3,5.4,7.1C5.59,7.04,5.79,7,6,7h12 c0.21,0,0.41,0.04,0.6,0.1c0,0,0,0,0,0L16.5,5l-2-2h-1.68H12h-0.82H9.5l-2,2H6C3.79,5,2,6.79,2,9v1.5v1.51l2,2V9z" />
-    <path
-        android:fillColor="#34A853"
-        android:pathData="M18,5h-1.5l2.1,2.1c0.15,0.05,0.3,0.12,0.43,0.2c0.27,0.16,0.5,0.39,0.66,0.66 c0.08,0.13,0.15,0.28,0.2,0.43v0l2.1,2.1V9C22,6.79,20.21,5,18,5z" />
-    <path
-        android:fillColor="#FBBC04"
-        android:pathData="M6,21h4.99l-2-2H6c-1.1,0-2-0.9-2-2v-2.99l-2-2V17C2,19.21,3.79,21,6,21z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" android:tint="?attr/colorControlNormal">
+<path android:fillColor="@android:color/white" android:pathData="M760,520L840,520L840,360Q840,294 793,247Q746,200 680,200L600,200L560,120L400,120L360,200L280,200Q214,200 167,247Q120,294 120,360L120,480L200,480L200,360Q200,327 223.5,303.5Q247,280 280,280L680,280Q713,280 736.5,303.5Q760,327 760,360L760,520ZM280,840L480,840L480,760L280,760Q247,760 223.5,736.5Q200,713 200,680L200,600L120,600L120,680Q120,746 167,793Q214,840 280,840ZM720,800Q753,800 776.5,776.5Q800,753 800,720Q800,687 776.5,663.5Q753,640 720,640Q687,640 663.5,663.5Q640,687 640,720Q640,753 663.5,776.5Q687,800 720,800ZM480,640Q530,640 565,605Q600,570 600,520Q600,470 565,435Q530,400 480,400Q430,400 395,435Q360,470 360,520Q360,570 395,605Q430,640 480,640Z"/>
+</vector>

chrome/android/java/res/layout/custom_tabs_handle_view.xml

diff --git a/chrome/android/java/res/layout/custom_tabs_handle_view.xml b/chrome/android/java/res/layout/custom_tabs_handle_view.xml
index bf806bf..c3f6834 100644
--- a/chrome/android/java/res/layout/custom_tabs_handle_view.xml
+++ b/chrome/android/java/res/layout/custom_tabs_handle_view.xml
@@ -12,18 +12,25 @@
     android:layout_height="match_parent"
     android:background="@drawable/custom_tabs_handle_view_shape"
     tools:ignore="UselessParent">
-    <FrameLayout
+    <org.chromium.chrome.browser.customtabs.features.partialcustomtab.CustomTabDragBar
         android:id="@+id/drag_bar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/custom_tabs_handle_height"
+        android:importantForAccessibility="no"
         android:background="@drawable/custom_tabs_handle_view_shape">
-        <ImageView
-            android:id="@+id/drag_handlebar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|center_horizontal"
-            android:importantForAccessibility="no"
-            android:src="@drawable/drag_handlebar"
-            android:tint="@macro/drag_handlebar_color" />
-    </FrameLayout>
+    </org.chromium.chrome.browser.customtabs.features.partialcustomtab.CustomTabDragBar>
+    <ImageView
+        android:id="@+id/drag_handle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|center_horizontal"
+        android:clickable="true"
+        android:focusable="true"
+        android:src="@drawable/drag_handlebar"
+        android:paddingTop="@dimen/custom_tabs_drag_handle_padding_top"
+        android:paddingBottom="@dimen/custom_tabs_drag_handle_padding_bottom"
+        android:paddingStart="@dimen/custom_tabs_drag_handle_padding_side"
+        android:paddingEnd="@dimen/custom_tabs_drag_handle_padding_side"
+        android:contentDescription="@string/accessibility_custom_tab_drag_handle"
+        android:tint="@macro/drag_handlebar_color" />
 </FrameLayout>

chrome/android/java/res/values/dimens.xml

diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
index 2ca7427..9ad0fea1 100644
--- a/chrome/android/java/res/values/dimens.xml
+++ b/chrome/android/java/res/values/dimens.xml
@@ -226,6 +226,9 @@
     <dimen name="bookmark_widget_min_height">48dp</dimen>
 
     <!-- Custom Tabs dimensions -->
+    <dimen name="custom_tabs_drag_handle_padding_top">12dp</dimen>
+    <dimen name="custom_tabs_drag_handle_padding_bottom">32dp</dimen>
+    <dimen name="custom_tabs_drag_handle_padding_side">4dp</dimen>
     <dimen name="custom_tabs_toolbar_maxWidth">60dp</dimen>
     <dimen name="custom_tabs_toolbar_vertical_padding">16dp</dimen>
     <dimen name="custom_tabs_toolbar_horizontal_margin_no_start">8dp</dimen>

chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
index 094d77e3f..24846e79 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
@@ -432,8 +432,8 @@
         try {
             Method method = Activity.class.getMethod("getLaunchedFromPackage");
             return (String) method.invoke(mActivity);
-        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException
-                | RuntimeException e) {
+        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+            Log.e(TAG, "Reflection failure: " + e);
             assert false : "Activity.getLaunchedFromPackage() failed.";
         }
         return null;

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
index 4480473..dc81823 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
@@ -28,6 +28,7 @@
 import androidx.core.os.BuildCompat;
 
 import org.chromium.base.IntentUtils;
+import org.chromium.base.Log;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BackupSigninProcessor;
@@ -61,6 +62,8 @@
  * The activity for custom tabs. It will be launched on top of a client's task.
  */
 public class CustomTabActivity extends BaseCustomTabActivity {
+    private static final String TAG = "CustomTabActivity";
+
     private CustomTabsSessionToken mSession;
 
     private final CustomTabsConnection mConnection = CustomTabsConnection.getInstance();
@@ -192,8 +195,8 @@
             Method method = Activity.class.getMethod(
                     "setAllowCrossUidActivitySwitchFromBelow", boolean.class);
             method.invoke(this, true);
-        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException
-                | RuntimeException e) {
+        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+            Log.e(TAG, "Reflection failure: " + e);
             assert false : "CCT may not be launched or finished by background apps";
         }
     }

chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/CustomTabDragBar.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/CustomTabDragBar.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/CustomTabDragBar.java
new file mode 100644
index 0000000..2477bf28
--- /dev/null
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/CustomTabDragBar.java
@@ -0,0 +1,40 @@
+// 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.
+
+package org.chromium.chrome.browser.customtabs.features.partialcustomtab;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.widget.FrameLayout;
+
+import org.chromium.chrome.browser.customtabs.features.toolbar.CustomTabToolbar.HandleStrategy;
+
+/**
+ * Top strip view of the custom tab toolbar. Pass forward touch events to
+ * {@link CustomTabHandleStrategy} for dragging CCT up and down.
+ */
+public class CustomTabDragBar extends FrameLayout {
+    private HandleStrategy mHandleStrategy;
+
+    public CustomTabDragBar(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public void setHandleStrategy(HandleStrategy handleStrategy) {
+        mHandleStrategy = handleStrategy;
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        return mHandleStrategy != null ? mHandleStrategy.onTouchEvent(event) : false;
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent event) {
+        return mHandleStrategy != null ? mHandleStrategy.onInterceptTouchEvent(event) : false;
+    }
+}

chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabBaseStrategy.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabBaseStrategy.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabBaseStrategy.java
index 1de4116..553acac 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabBaseStrategy.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabBaseStrategy.java
@@ -326,7 +326,7 @@
         View dragBar = mActivity.findViewById(R.id.drag_bar);
         if (dragBar != null) dragBar.setVisibility(isFullHeight() ? View.GONE : View.VISIBLE);
 
-        View dragHandlebar = mActivity.findViewById(R.id.drag_handlebar);
+        View dragHandlebar = mActivity.findViewById(R.id.drag_handle);
         if (dragHandlebar != null) {
             dragHandlebar.setVisibility(dragHandlebarVisibility);
         }

chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabBottomSheetStrategy.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabBottomSheetStrategy.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabBottomSheetStrategy.java
index 5de0ce9..f9dd509 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabBottomSheetStrategy.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabBottomSheetStrategy.java
@@ -15,6 +15,7 @@
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
 import android.app.Activity;
+import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Build;
@@ -24,6 +25,8 @@
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityManager;
 import android.view.animation.AccelerateInterpolator;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -268,9 +271,34 @@
         PartialCustomTabHandleStrategy handleStrategy = mHandleStrategyFactory.create(
                 getStrategyType(), mActivity, this::isFullHeight, () -> mStatus, this);
         toolbar.setHandleStrategy(handleStrategy);
+        var dragBar = (CustomTabDragBar) mActivity.findViewById(R.id.drag_bar);
+        dragBar.setHandleStrategy(handleStrategy);
+        View dragHandle = mActivity.findViewById(R.id.drag_handle);
+        dragHandle.setOnClickListener(v -> onDragBarTapped());
+
         updateDragBarVisibility();
     }
 
+    private void onDragBarTapped() {
+        if (mStatus == HeightStatus.TRANSITION) {
+            mStatus = mTabAnimator.getTargetStatus();
+            mTabAnimator.cancel();
+        }
+        int newStatus;
+        switch (mStatus) {
+            case HeightStatus.INITIAL_HEIGHT:
+                newStatus = HeightStatus.TOP;
+                break;
+            case HeightStatus.TOP:
+                newStatus = HeightStatus.INITIAL_HEIGHT;
+                break;
+            default:
+                assert false : "Invalid height status: " + mStatus;
+                newStatus = HeightStatus.INITIAL_HEIGHT;
+        }
+        animateTabTo(newStatus, false);
+    }
+
     // ConfigurationChangedObserver implementation.
 
     @Override
@@ -328,7 +356,7 @@
         // that has the rounded corner.
         getDragBarBackground().setColor(color);
 
-        ImageView handle = (ImageView) mActivity.findViewById(R.id.drag_handlebar);
+        ImageView handle = (ImageView) mActivity.findViewById(R.id.drag_handle);
         int handleColor = mActivity.getColor(R.color.drag_handlebar_color_baseline);
         if (scrimFraction > 0.f) {
             handle.setColorFilter(ColorUtils.getColorWithOverlay(
@@ -616,6 +644,16 @@
             mSoftKeyboardRunnable = null;
             mVersionCompat.setImeStateCallback(this::onImeStateChanged);
         }
+
+        var am = (AccessibilityManager) mActivity.getSystemService(Context.ACCESSIBILITY_SERVICE);
+        if (am != null && am.isTouchExplorationEnabled()) {
+            int textId = mStatus == HeightStatus.TOP ? R.string.accessibility_custom_tab_expanded
+                                                     : R.string.accessibility_custom_tab_collapsed;
+            var event = AccessibilityEvent.obtain();
+            event.setEventType(AccessibilityEvent.TYPE_ANNOUNCEMENT);
+            event.getText().add(mActivity.getResources().getString(textId));
+            am.sendAccessibilityEvent(event);
+        }
     }
 
     @VisibleForTesting
@@ -933,5 +971,9 @@
         private boolean wasAutoResized() {
             return mAutoResize;
         }
+
+        private void cancel() {
+            mAnimator.cancel();
+        }
     }
 }

chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhoneTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhoneTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhoneTest.java
index 38b30dff..f8ba27b5 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhoneTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhoneTest.java
@@ -16,6 +16,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import android.graphics.Canvas;
 import android.graphics.drawable.ColorDrawable;
@@ -58,10 +59,12 @@
 import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities;
 import org.chromium.chrome.browser.tasks.tab_management.TabUiTestHelper;
 import org.chromium.chrome.browser.theme.ThemeColorProvider;
+import org.chromium.chrome.browser.toolbar.ButtonData;
 import org.chromium.chrome.browser.toolbar.ButtonDataImpl;
 import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarButtonVariant;
 import org.chromium.chrome.browser.toolbar.menu_button.MenuButton;
 import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator;
+import org.chromium.chrome.browser.toolbar.optional_button.OptionalButtonCoordinator;
 import org.chromium.chrome.browser.ui.appmenu.AppMenuCoordinator;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
@@ -98,6 +101,8 @@
     ThemeColorProvider mThemeColorProvider;
     @Mock
     GradientDrawable mLocationbarBackgroundDrawable;
+    @Mock
+    OptionalButtonCoordinator mOptionalButtonCoordinator;
 
     private Canvas mCanvas = new Canvas();
     private ToolbarPhone mToolbar;
@@ -632,6 +637,105 @@
         LayoutTestUtils.waitForLayout(cta.getLayoutManager(), LayoutType.TAB_SWITCHER);
     }
 
+    @Test
+    @MediumTest
+    public void testOptionalButton_NotDrawnWhenZeroWidth() {
+        Drawable drawable = AppCompatResources.getDrawable(
+                mActivityTestRule.getActivity(), R.drawable.ic_toolbar_share_offset_24dp);
+        ButtonData buttonData = new ButtonDataImpl(true, drawable, null,
+                mActivityTestRule.getActivity().getString(R.string.share), false, null, true,
+                AdaptiveToolbarButtonVariant.UNKNOWN);
+
+        // Show a button, this will inflate the optional button view and create its coordinator.
+        TestThreadUtils.runOnUiThreadBlocking(() -> { mToolbar.updateOptionalButton(buttonData); });
+
+        CriteriaHelper.pollUiThread(()
+                                            -> mToolbar.getOptionalButtonViewForTesting() != null
+                        && mToolbar.getOptionalButtonViewForTesting().getVisibility()
+                                == View.VISIBLE);
+
+        // Replace the coordinator with a mock, and set the button to visible with 0 width.
+        View optionalButtonView = mToolbar.findViewById(R.id.optional_toolbar_button_container);
+        when(mOptionalButtonCoordinator.getViewForDrawing()).thenReturn(optionalButtonView);
+        when(mOptionalButtonCoordinator.getViewWidth()).thenReturn(0);
+        when(mOptionalButtonCoordinator.getViewVisibility()).thenReturn(View.VISIBLE);
+
+        mToolbar.setOptionalButtonCoordinatorForTesting(mOptionalButtonCoordinator);
+
+        TestThreadUtils.runOnUiThreadBlocking(() -> {
+            // Draw the toolbar.
+            mToolbar.draWithoutBackground(mCanvas);
+            // Optional button shouldn't be drawn because its width is zero.
+            verify(mOptionalButtonCoordinator, never()).getViewForDrawing();
+        });
+    }
+
+    @Test
+    @MediumTest
+    public void testOptionalButton_NotDrawnWhenNotVisible() {
+        Drawable drawable = AppCompatResources.getDrawable(
+                mActivityTestRule.getActivity(), R.drawable.ic_toolbar_share_offset_24dp);
+        ButtonData buttonData = new ButtonDataImpl(true, drawable, null,
+                mActivityTestRule.getActivity().getString(R.string.share), false, null, true,
+                AdaptiveToolbarButtonVariant.UNKNOWN);
+
+        // Show a button, this will inflate the optional button view and create its coordinator.
+        TestThreadUtils.runOnUiThreadBlocking(() -> { mToolbar.updateOptionalButton(buttonData); });
+
+        CriteriaHelper.pollUiThread(()
+                                            -> mToolbar.getOptionalButtonViewForTesting() != null
+                        && mToolbar.getOptionalButtonViewForTesting().getVisibility()
+                                == View.VISIBLE);
+
+        // Replace the coordinator with a mock, and set the button to gone with regular width.
+        View optionalButtonView = mToolbar.findViewById(R.id.optional_toolbar_button_container);
+        when(mOptionalButtonCoordinator.getViewForDrawing()).thenReturn(optionalButtonView);
+        when(mOptionalButtonCoordinator.getViewWidth()).thenReturn(optionalButtonView.getWidth());
+        when(mOptionalButtonCoordinator.getViewVisibility()).thenReturn(View.GONE);
+
+        mToolbar.setOptionalButtonCoordinatorForTesting(mOptionalButtonCoordinator);
+
+        TestThreadUtils.runOnUiThreadBlocking(() -> {
+            // Draw the toolbar.
+            mToolbar.draWithoutBackground(mCanvas);
+            // Optional button shouldn't be drawn because its visibility is gone.
+            verify(mOptionalButtonCoordinator, never()).getViewForDrawing();
+        });
+    }
+
+    @Test
+    @MediumTest
+    public void testOptionalButton_DrawnWhenVisible() {
+        Drawable drawable = AppCompatResources.getDrawable(
+                mActivityTestRule.getActivity(), R.drawable.ic_toolbar_share_offset_24dp);
+        ButtonData buttonData = new ButtonDataImpl(true, drawable, null,
+                mActivityTestRule.getActivity().getString(R.string.share), false, null, true,
+                AdaptiveToolbarButtonVariant.UNKNOWN);
+
+        // Show a button, this will inflate the optional button view and create its coordinator.
+        TestThreadUtils.runOnUiThreadBlocking(() -> { mToolbar.updateOptionalButton(buttonData); });
+
+        CriteriaHelper.pollUiThread(()
+                                            -> mToolbar.getOptionalButtonViewForTesting() != null
+                        && mToolbar.getOptionalButtonViewForTesting().getVisibility()
+                                == View.VISIBLE);
+
+        // Replace the coordinator with a mock, and set the button to visible with regular width.
+        View optionalButtonView = mToolbar.findViewById(R.id.optional_toolbar_button_container);
+        when(mOptionalButtonCoordinator.getViewForDrawing()).thenReturn(optionalButtonView);
+        when(mOptionalButtonCoordinator.getViewWidth()).thenReturn(optionalButtonView.getWidth());
+        when(mOptionalButtonCoordinator.getViewVisibility()).thenReturn(View.VISIBLE);
+
+        mToolbar.setOptionalButtonCoordinatorForTesting(mOptionalButtonCoordinator);
+
+        TestThreadUtils.runOnUiThreadBlocking(() -> {
+            // Draw the toolbar.
+            mToolbar.draWithoutBackground(mCanvas);
+            // Optional button should be drawn.
+            verify(mOptionalButtonCoordinator, atLeastOnce()).getViewForDrawing();
+        });
+    }
+
     private static class TestControlsVisibilityDelegate
             extends BrowserStateBrowserControlsVisibilityDelegate {
         public TestControlsVisibilityDelegate() {

chrome/android/junit/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabTestRule.java

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabTestRule.java b/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabTestRule.java
index cbd055dd..282c1b9 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabTestRule.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabTestRule.java
@@ -132,7 +132,7 @@
     @Mock
     View mToolbarCoordinator;
     @Mock
-    View mDragBar;
+    CustomTabDragBar mDragBar;
     @Mock
     View mDragHandlebar;
     @Mock
@@ -170,7 +170,7 @@
         when(mActivity.findViewById(R.id.custom_tabs_handle_view_stub)).thenReturn(mHandleViewStub);
         when(mActivity.findViewById(R.id.custom_tabs_handle_view)).thenReturn(mHandleView);
         when(mActivity.findViewById(R.id.drag_bar)).thenReturn(mDragBar);
-        when(mActivity.findViewById(R.id.drag_handlebar)).thenReturn(mDragHandlebar);
+        when(mActivity.findViewById(R.id.drag_handle)).thenReturn(mDragHandlebar);
         mAttributes = new WindowManager.LayoutParams();
         when(mWindow.getAttributes()).thenReturn(mAttributes);
         when(mWindow.getDecorView()).thenReturn(mDecorView);

chrome/app/resources/chromium_strings_ja.xtb

diff --git a/chrome/app/resources/chromium_strings_ja.xtb b/chrome/app/resources/chromium_strings_ja.xtb
index 523e541..d3d28e8d 100644
--- a/chrome/app/resources/chromium_strings_ja.xtb
+++ b/chrome/app/resources/chromium_strings_ja.xtb
@@ -165,7 +165,7 @@
 <translation id="4708774505295300557">前回このパソコンで別のユーザー（<ph name="ACCOUNT_EMAIL_LAST" />）が Chromium にログインしました。情報を個別に保持するには、新しい Chromium ユーザーを作成してください。</translation>
 <translation id="4746050847053251315">今すぐ Chromium を終了しますか？</translation>
 <translation id="4748217263233248895">Chromium の特別なセキュリティ アップデートが適用されました。今すぐ再起動してください。タブは復元されます。</translation>
-<translation id="4765210420921718862">この設定は Chromium の設定でいつでも変更できます。テストは、現在の方法での広告配信と並行して実施されるため、すぐに変更が行われるわけではありません。</translation>
+<translation id="4765210420921718862">この設定は Chromium の設定でいつでも変更できます。テストは、現在の方法での広告配信と並行して実施されるため、すぐに変化が現れるわけではありません。</translation>
 <translation id="4788777615168560705">Chromium でパスワードを確認できません。24 時間後にもう一度お試しいただくか、<ph name="BEGIN_LINK" />Google アカウントでパスワードをご確認ください<ph name="END_LINK" />。</translation>
 <translation id="479167709087336770">Google 検索と同じスペルチェックが使用されます。ブラウザに入力したテキストは Google に送信されます。この動作はいつでも設定で変更できます。</translation>
 <translation id="4888717733111232871">mDNS トラフィックを許可する Chromium のインバウンド ルールです。</translation>

chrome/app/resources/generated_resources_bs.xtb

diff --git a/chrome/app/resources/generated_resources_bs.xtb b/chrome/app/resources/generated_resources_bs.xtb
index 84e8330..4c172cf 100644
--- a/chrome/app/resources/generated_resources_bs.xtb
+++ b/chrome/app/resources/generated_resources_bs.xtb
@@ -701,6 +701,7 @@
 <translation id="1593594475886691512">Formatiranje...</translation>
 <translation id="159359590073980872">Keš memorija slike</translation>
 <translation id="1593926297800505364">Sačuvaj način plaćanja</translation>
+<translation id="1594703455918849716">Odlazak na stranicu Provjera</translation>
 <translation id="1595492813686795610">Nadograđivanje Linuxa</translation>
 <translation id="1596286373007273895">Dostupno</translation>
 <translation id="1596709061955594992">Bluetooth je isključen. Da vidite dostupne uređaje, uključite Bluetooth.</translation>
@@ -1693,6 +1694,7 @@
 <translation id="2399699884460174994">Obavještenja su uključena</translation>
 <translation id="2399939490305346086">Podaci za prijavu sigurnosnog ključa</translation>
 <translation id="2400664245143453337">Potrebno je odmah ažurirati</translation>
+<translation id="2402226831639195063">Tonovi</translation>
 <translation id="2406153734066939945">Izbrisati ovaj profil i njegove podatke?</translation>
 <translation id="2408018932941436077">Pohranjivanje kartice</translation>
 <translation id="2408955596600435184">Unesite svoj PIN</translation>
@@ -1704,6 +1706,7 @@
 <translation id="241082044617551207">Nepoznati dodatak</translation>
 <translation id="2410940059315936967">Web lokacija koju posjetite može ugraditi sadržaj s drugih web lokacija, naprimjer slike, oglase i tekst. Kolačići koje postavljaju ove druge web lokacije se nazivaju kolačićima treće strane.</translation>
 <translation id="2411666601450687801">Na ovom uređaju nisu dozvoljene virtuelne mašine</translation>
+<translation id="2412015533711271895">Roditelj ili staratelj mora reći da možeš koristiti ekstenziju</translation>
 <translation id="2412753904894530585">Kerberos</translation>
 <translation id="2414886740292270097">Tamno</translation>
 <translation id="2416435988630956212">Funkcijske tipke tastature</translation>
@@ -3029,6 +3032,7 @@
 <translation id="3609277884604412258">Brzo pretraživanje</translation>
 <translation id="3610241585790874201">Pohranjivanje podataka na uređaju nije dozvoljeno</translation>
 <translation id="3610369246614755442">Ventilator priključne stanice treba servisirati</translation>
+<translation id="3610961622607302617">Promjena lozinke za web lokaciju <ph name="WEBSITE" /></translation>
 <translation id="361106536627977100">Podaci Flasha</translation>
 <translation id="3611655097742243705">Posjetite Play trgovinu da pronađete više aplikacija</translation>
 <translation id="3611658447322220736">Nedavno zatvorene web lokacije mogu završiti slanje i primanje podataka</translation>
@@ -3085,6 +3089,7 @@
 <translation id="3651488188562686558">Prekini vezu s WiFi mrežom</translation>
 <translation id="3652817283076144888">Pokretanje</translation>
 <translation id="3653160965917900914">Dijeljenje fajlova na mreži</translation>
+<translation id="3653887973853407813">Ne možeš koristiti ekstenziju. Roditelj ili staratelj je isključio "Odobrenja za web lokacije, aplikacije i ekstenzije" za Chrome.</translation>
 <translation id="3653999333232393305">Nastavi dozvoljavati da <ph name="HOST" /> pristupa vašem mikrofonu</translation>
 <translation id="3654045516529121250">Čitanje vaših postavki pristupačnosti</translation>
 <translation id="3655712721956801464">{NUM_FILES,plural, =1{Ima trajan pristup jednom fajlu.}one{Ima trajan pristup # fajlu.}few{Ima trajan pristup za # fajla}other{Ima trajan pristup za # fajlova}}</translation>
@@ -5157,6 +5162,7 @@
 <translation id="5517304475148761050">Ovoj aplikaciji je potreban pristup Play trgovini</translation>
 <translation id="5517412723934627386"><ph name="NETWORK_TYPE" /> – <ph name="NETWORK_DISPLAY_NAME" /></translation>
 <translation id="5518219166343146486">PItaj kada web lokacija želi vidjeti tekst i slike kopirane u međumemoriju</translation>
+<translation id="5518949581554491184">Postavi uz Android telefon</translation>
 <translation id="5519195206574732858">LTE</translation>
 <translation id="5521078259930077036">Je li ovo početna stranica koju ste očekivali?</translation>
 <translation id="5522156646677899028">Ova ekstenzija sadrži opasan sugurnosni propust.</translation>
@@ -6045,6 +6051,7 @@
 <translation id="6318125393809743217">Uključi fajl policies.json u konfiguracije pravila.</translation>
 <translation id="6318407754858604988">Preuzimanje je započeto</translation>
 <translation id="6318944945640833942">Otkrivanje štampača nije uspjelo. Ponovo unesite adresu štampača.</translation>
+<translation id="6320808462673705899">Nema nijedne oznake koja se podudara s pretraživanjem.</translation>
 <translation id="6322370287306604163">Otključavajte brže pomoću otiska prsta</translation>
 <translation id="6322559670748154781">Ovaj fajl se ne preuzima često i blokirala ga je Napredna zaštita</translation>
 <translation id="6324916366299863871">Uredite prečicu</translation>
@@ -6493,6 +6500,7 @@
 <translation id="6725206449694821596">Internetski protokol za štampanje (IPP)</translation>
 <translation id="6725970970008349185">Broj kandidata za prikaz po stranici</translation>
 <translation id="672609503628871915">Pogledajte šta je novo</translation>
+<translation id="6726800386221816228">Posebni znakovi</translation>
 <translation id="67269783048918309">Šaljite podatke o korištenju i dijagnostici. Ovaj uređaj trenutno automatski šalje Googleu podatke o dijagnostici, uređaju i korištenju aplikacija. Ovo se neće koristiti za identifikaciju vašeg djeteta i pomoći će stabilnosti sistema i aplikacije, kao i drugim unapređenjima. Neki zbirni podaci će također pomoći Googleovim aplikacijama i partnerima, kao što su Androidovi programeri. Ovu <ph name="BEGIN_LINK1" />postavku<ph name="END_LINK1" /> je nametnuo vlasnik. Ako je za vaše dijete uključena postavka za dodatnu Aktivnost na webu i u aplikacijama, ovi podaci mogu biti sačuvani na njegovom Google računu. <ph name="BEGIN_LINK2" />Saznajte više<ph name="END_LINK2" /></translation>
 <translation id="6728528977475057549">IBAN se završava ciframa <ph name="LAST_FOUR_DIGITS" /></translation>
 <translation id="6729192290958770680">Unesite korisničko ime</translation>
@@ -6895,6 +6903,7 @@
 <translation id="7063129466199351735">Obrađivanje prečica...</translation>
 <translation id="7063311912041006059">URL sa simbolom <ph name="SPECIAL_SYMBOL" /> umjesto upita</translation>
 <translation id="706342288220489463">Dozvolite Asistentu da koristi informacije na vašem ekranu radi pružanja pomoći</translation>
+<translation id="70641621694466590">Odlazak na stranicu Lozinke</translation>
 <translation id="7064734931812204395">Konfiguriranje spremnika Linuxa. To može potrajati do 30 minuta.</translation>
 <translation id="7065223852455347715">Ovaj uređaj je zaključan u načinu koji sprječava prijavljivanje za preduzeća.  Ako želite prijaviti uređaj, najprije trebate proći kroz oporavak uređaja.</translation>
 <translation id="7065534935986314333">O sistemu</translation>
@@ -7396,6 +7405,7 @@
 <translation id="7541773865713908457"><ph name="ACTION_NAME" /> pomoću aplikacije <ph name="APP_NAME" /></translation>
 <translation id="754207240458482646">Mreža je sinhronizirana s drugim uređajima na vašem računu. <ph name="LINK_BEGIN" />Saznajte više<ph name="LINK_END" /></translation>
 <translation id="7543104066686362383">Omogućite funkcije otklanjanja grešaka na ovom uređaju <ph name="IDS_SHORT_PRODUCT_NAME" /></translation>
+<translation id="7544977292347272434">Pitaj roditelja da dozvoli ekstenziju</translation>
 <translation id="7545466883021407599">Povezivanje sa serverom nije uspjelo. Provjerite mrežnu vezu i pokušajte ponovo. Ako se problemi nastave, pokušajte ponovo pokrenuti Chromebook. Kȏd greške: <ph name="ERROR_CODE" />.</translation>
 <translation id="7547317915858803630">Opasnost: vaše postavke za <ph name="PRODUCT_NAME" /> su pohranjene na mrežnom disku. To može uzrokovati usporavanje rada, padove proizvoda pa čak i gubitak podataka.</translation>
 <translation id="7548856833046333824">Limunada</translation>
@@ -7624,6 +7634,7 @@
 <translation id="7728668285692163452">Promjena kanala će se primijeniti kasnije</translation>
 <translation id="7730449930968088409">Snimanje sadržaja vašeg ekrana</translation>
 <translation id="7730683939467795481">Ovu stranicu je promijenila ekstenzija "<ph name="EXTENSION_NAME" />"</translation>
+<translation id="773511996612364297">Znakovi naglaska</translation>
 <translation id="7735165285389721951">U toku je još jedno postavljanje Steama. Pričekajte da se završi prije nego što ponovo pokušate</translation>
 <translation id="7737115349420013392">Uparivanje s uređajem "<ph name="DEVICE_NAME" />" ...</translation>
 <translation id="7737203573077018777">Primljeno uputstvo: <ph name="PROOF_OF_POSSESSION_INSTRUCTION_NAME" /></translation>
@@ -7706,6 +7717,7 @@
 <translation id="7792388396321542707">Zaustavi dijeljenje</translation>
 <translation id="779308894558717334">Svijetlozelena</translation>
 <translation id="7793098747275782155">Tamnoplava</translation>
+<translation id="7796453472368605346">Dijakritički znakovi</translation>
 <translation id="7797571222998226653">Isključeno</translation>
 <translation id="7798504574384119986">Prikaži odobrenja za web</translation>
 <translation id="7798844538707273832">Automatski je blokirano odobrenje za <ph name="PERMISSION" /></translation>
@@ -7790,6 +7802,7 @@
 <translation id="7876027585589532670">Nije moguće urediti prečicu</translation>
 <translation id="7877451762676714207">Nepoznata greška servera. Pokušajte ponovo ili kontaktirajte administratora servera.</translation>
 <translation id="7878945852730162014">Upravljajte fajlovima dok se preuzimaju i otvorite ih kada se preuzimanje završi</translation>
+<translation id="7879172417209159252">Nije moguće koristiti ekstenziju</translation>
 <translation id="7879478708475862060">Prati način rada unosa</translation>
 <translation id="7879631849810108578">Prečica je postavljena: <ph name="IDS_SHORT_SET_COMMAND" /></translation>
 <translation id="7880823633812189969">Lokalni podaci će se izbrisati nakon ponovnog pokretanja</translation>

chrome/app/resources/generated_resources_cy.xtb

diff --git a/chrome/app/resources/generated_resources_cy.xtb b/chrome/app/resources/generated_resources_cy.xtb
index eca1888..94a6905 100644
--- a/chrome/app/resources/generated_resources_cy.xtb
+++ b/chrome/app/resources/generated_resources_cy.xtb
@@ -3033,6 +3033,7 @@
 <translation id="3609277884604412258">Chwilio cyflym</translation>
 <translation id="3610241585790874201">Ni chaniateir i gadw data ar eich dyfais</translation>
 <translation id="3610369246614755442">Mae angen gwasanaeth ar ffan y doc</translation>
+<translation id="3610961622607302617">Newid cyfrinair ar gyfer <ph name="WEBSITE" /></translation>
 <translation id="361106536627977100">Data Flash</translation>
 <translation id="3611655097742243705">Ewch i Play Store i ddod o hyd i ragor o apiau</translation>
 <translation id="3611658447322220736">Gall gwefannau sydd wedi'u cau'n ddiweddar orffen anfon a derbyn data</translation>
@@ -6049,6 +6050,7 @@
 <translation id="6318125393809743217">Cynhwyswch ffeil policies.json gyda ffurfweddiadau polisi.</translation>
 <translation id="6318407754858604988">Wedi dechrau lawrlwytho</translation>
 <translation id="6318944945640833942">Methu â chanfod argraffydd. Rhowch gyfeiriad yr argraffydd eto.</translation>
+<translation id="6320808462673705899">Nid oes unrhyw nodau tudalen sy'n cyfateb i'ch chwiliad.</translation>
 <translation id="6322370287306604163">Datgloi'n gyflymach ag olion bysedd</translation>
 <translation id="6322559670748154781">Nid yw'r ffeil hon yn cael ei lawrlwyrtho yn aml ac mae wedi'i rhwystro gan Advanced Protection</translation>
 <translation id="6324916366299863871">Golygu'r llwybr byr</translation>

chrome/app/resources/generated_resources_de.xtb

diff --git a/chrome/app/resources/generated_resources_de.xtb b/chrome/app/resources/generated_resources_de.xtb
index 631c6470..c1b053912 100644
--- a/chrome/app/resources/generated_resources_de.xtb
+++ b/chrome/app/resources/generated_resources_de.xtb
@@ -693,6 +693,7 @@
 <translation id="1593594475886691512">Formatierung wird ausgeführt...</translation>
 <translation id="159359590073980872">Bilder-Cache</translation>
 <translation id="1593926297800505364">Zahlungsmethode speichern</translation>
+<translation id="1594703455918849716">Zur Seite „Überprüfung“</translation>
 <translation id="1595492813686795610">Linux wird aktualisiert</translation>
 <translation id="1596286373007273895">Verfügbar</translation>
 <translation id="1596709061955594992">Bluetooth ist deaktiviert. Schalte es ein, um verfügbare Geräte zu sehen.</translation>
@@ -1676,6 +1677,7 @@
 <translation id="2399699884460174994">Benachrichtigungen aktiviert</translation>
 <translation id="2399939490305346086">Anmeldedaten auf Sicherheitsschlüssel</translation>
 <translation id="2400664245143453337">Sofortiges Update erforderlich</translation>
+<translation id="2402226831639195063">Töne</translation>
 <translation id="2406153734066939945">Dieses Profil und die zugehörigen Daten löschen?</translation>
 <translation id="2408018932941436077">Karte wird gespeichert</translation>
 <translation id="2408955596600435184">PIN eingeben</translation>
@@ -1687,6 +1689,7 @@
 <translation id="241082044617551207">Unbekanntes Plug-in</translation>
 <translation id="2410940059315936967">Auf einer Website, die du besuchst, können Inhalte von anderen Websites eingebettet sein, z. B. Bilder, Werbung und Text. Cookies, die von diesen anderen Websites gesetzt werden, werden als Drittanbieter-Cookies bezeichnet.</translation>
 <translation id="2411666601450687801">Auf diesem Gerät sind keine virtuellen Maschinen zulässig</translation>
+<translation id="2412015533711271895">Deine Eltern oder Erziehungsberechtigten müssen sagen, dass du diese Erweiterung verwenden darfst</translation>
 <translation id="2412753904894530585">Kerberos</translation>
 <translation id="2414886740292270097">Dunkel</translation>
 <translation id="2416435988630956212">Funktionstasten der Tastatur</translation>
@@ -3068,6 +3071,7 @@
 <translation id="3651488188562686558">Die WLAN-Verbindung trennen</translation>
 <translation id="3652817283076144888">Initialisierung läuft</translation>
 <translation id="3653160965917900914">Netzwerkfreigaben</translation>
+<translation id="3653887973853407813">Du kannst diese Erweiterung nicht verwenden. Deine Eltern oder Erziehungsberechtigten haben „Berechtigungen für Websites, Apps und Erweiterungen“ für Chrome deaktiviert.</translation>
 <translation id="3653999333232393305"><ph name="HOST" /> weiterhin Zugriff auf mein Mikrofon gestatten</translation>
 <translation id="3654045516529121250">Einstellungen für Bedienungshilfen lesen</translation>
 <translation id="3655712721956801464">{NUM_FILES,plural, =1{Dauerhafter Zugriff auf eine Datei}other{Dauerhafter Zugriff auf # Dateien}}</translation>
@@ -5139,6 +5143,7 @@
 <translation id="5517304475148761050">Diese App benötigt Zugriff auf den Google Play Store</translation>
 <translation id="5517412723934627386"><ph name="NETWORK_TYPE" /> – <ph name="NETWORK_DISPLAY_NAME" /></translation>
 <translation id="5518219166343146486">Nachfragen, wenn eine Website Texte und Bilder aus der Zwischenablage abrufen möchte</translation>
+<translation id="5518949581554491184">Mit Android-Smartphone einrichten</translation>
 <translation id="5519195206574732858">LTE</translation>
 <translation id="5521078259930077036">Ist das deine erwartete Startseite?</translation>
 <translation id="5522156646677899028">Diese Erweiterung enthält eine schwere Sicherheitslücke.</translation>
@@ -6468,6 +6473,7 @@
 <translation id="6725206449694821596">Internet Printing Protocol (IPP)</translation>
 <translation id="6725970970008349185">Anzahl von Kandidaten, die pro Seite angezeigt werden sollen</translation>
 <translation id="672609503628871915">Neuigkeiten</translation>
+<translation id="6726800386221816228">Sonderzeichen</translation>
 <translation id="67269783048918309">Du hast die Möglichkeit, Nutzungsdaten &amp; Fehlerberichte zu senden. Dieses Gerät sendet momentan automatisch Diagnose- sowie Geräte- und App-Nutzungsdaten an Google. Dein Kind wird mithilfe dieser Daten nicht identifiziert, sie helfen jedoch beispielsweise dabei, die Stabilität des Systems und der Apps zu verbessern. Einige aggregierte Daten sind auch für Apps und Partner von Google, beispielsweise Android-Entwickler, nützlich. Diese <ph name="BEGIN_LINK1" />Einstellung<ph name="END_LINK1" /> wird vom Inhaber erzwungen. Wenn zusätzlich die Einstellung "Web- &amp; App-Aktivitäten" für dein Kind aktiviert ist, werden diese Daten in seinem Google-Konto gespeichert. <ph name="BEGIN_LINK2" />Weitere Informationen<ph name="END_LINK2" /></translation>
 <translation id="6728528977475057549">IBAN, die mit <ph name="LAST_FOUR_DIGITS" /> endet</translation>
 <translation id="6729192290958770680">Nutzername eingeben</translation>
@@ -6870,6 +6876,7 @@
 <translation id="7063129466199351735">Verknüpfungen werden bearbeitet...</translation>
 <translation id="7063311912041006059">URL mit <ph name="SPECIAL_SYMBOL" /> statt der Suchanfrage</translation>
 <translation id="706342288220489463">Assistant erlauben, Informationen auf deinem Bildschirm zum besseren Beantworten von Fragen zu verwenden</translation>
+<translation id="70641621694466590">Zur Seite „Passwörter“</translation>
 <translation id="7064734931812204395">Der Linux-Container wird konfiguriert. Dies kann bis zu 30 Minuten dauern.</translation>
 <translation id="7065223852455347715">Dieses Gerät ist gesperrt, sodass keine Unternehmensanmeldung möglich ist. Wenn du das Gerät anmelden möchtest, musst du zunächst eine Gerätewiederherstellung durchführen.</translation>
 <translation id="7065534935986314333">Systeminformationen</translation>
@@ -7371,6 +7378,7 @@
 <translation id="7541773865713908457"><ph name="ACTION_NAME" /> mit der App "<ph name="APP_NAME" />"</translation>
 <translation id="754207240458482646">Mit anderen Geräten in deinem Konto synchronisiert. <ph name="LINK_BEGIN" />Weitere Informationen<ph name="LINK_END" /></translation>
 <translation id="7543104066686362383">Debugging-Funktionen auf diesem <ph name="IDS_SHORT_PRODUCT_NAME" />-Gerät aktivieren</translation>
+<translation id="7544977292347272434">Bitte deine Eltern, die Erweiterung zu erlauben</translation>
 <translation id="7545466883021407599">Keine Verbindung mit dem Server möglich. Prüfe deine Netzwerkverbindung und versuche es noch einmal. Falls weiterhin Probleme auftreten, versuche, dein Chromebook neu zu starten. Fehlercode: <ph name="ERROR_CODE" />.</translation>
 <translation id="7547317915858803630">Warnung: Deine <ph name="PRODUCT_NAME" />-Einstellungen werden auf einem Netzlaufwerk gespeichert. Dies kann zu einer Verlangsamung, zu Abstürzen oder sogar zu Datenverlust führen.</translation>
 <translation id="7548856833046333824">Cocktail</translation>
@@ -7599,6 +7607,7 @@
 <translation id="7728668285692163452">Die Kanaländerung erfolgt später</translation>
 <translation id="7730449930968088409">Inhalt deines Bildschirms erfassen</translation>
 <translation id="7730683939467795481">Diese Seite wurde durch die Erweiterung "<ph name="EXTENSION_NAME" />" geändert.</translation>
+<translation id="773511996612364297">Akzentzeichen</translation>
 <translation id="7735165285389721951">Es läuft bereits eine Einrichtung für Steam. Bitte warte, bis dieser Vorgang abgeschlossen ist, bevor du es noch einmal versuchst.</translation>
 <translation id="7737115349420013392">Wird mit "<ph name="DEVICE_NAME" />" gekoppelt…</translation>
 <translation id="7737203573077018777">Anweisung „<ph name="PROOF_OF_POSSESSION_INSTRUCTION_NAME" />“ erhalten</translation>
@@ -7681,6 +7690,7 @@
 <translation id="7792388396321542707">Freigabe beenden</translation>
 <translation id="779308894558717334">Hellgrün</translation>
 <translation id="7793098747275782155">Dunkelblau</translation>
+<translation id="7796453472368605346">Diakritische Zeichen</translation>
 <translation id="7797571222998226653">Aus</translation>
 <translation id="7798504574384119986">Webberechtigungen ansehen</translation>
 <translation id="7798844538707273832"><ph name="PERMISSION" /> automatisch blockiert</translation>
@@ -7765,6 +7775,7 @@
 <translation id="7876027585589532670">Verknüpfung kann nicht bearbeitet werden</translation>
 <translation id="7877451762676714207">Unbekannter Serverfehler. Bitte versuche es erneut oder wende dich an den Serveradministrator.</translation>
 <translation id="7878945852730162014">Dateien beim Download verwalten und nach Abschluss öffnen</translation>
+<translation id="7879172417209159252">Erweiterung kann nicht verwendet werden</translation>
 <translation id="7879478708475862060">Dieselbe Methode wie bei der Eingabe verwenden</translation>
 <translation id="7879631849810108578">Tastenkombination festgelegt: <ph name="IDS_SHORT_SET_COMMAND" /></translation>
 <translation id="7880823633812189969">Lokale Daten werden beim nächsten Neustart gelöscht</translation>

chrome/app/resources/generated_resources_en-GB.xtb

diff --git a/chrome/app/resources/generated_resources_en-GB.xtb b/chrome/app/resources/generated_resources_en-GB.xtb
index bf3bcb1..0642277b 100644
--- a/chrome/app/resources/generated_resources_en-GB.xtb
+++ b/chrome/app/resources/generated_resources_en-GB.xtb
@@ -3030,6 +3030,7 @@
 <translation id="3609277884604412258">Quick search</translation>
 <translation id="3610241585790874201">Not allowed to save data on your device</translation>
 <translation id="3610369246614755442">Dock fan needs service</translation>
+<translation id="3610961622607302617">Change password for <ph name="WEBSITE" /></translation>
 <translation id="361106536627977100">Flash data</translation>
 <translation id="3611655097742243705">Visit the Play Store to find more apps</translation>
 <translation id="3611658447322220736">Recently closed sites can finish sending and receiving data</translation>
@@ -6046,6 +6047,7 @@
 <translation id="6318125393809743217">Include a policies.json file with policy configurations.</translation>
 <translation id="6318407754858604988">Download started</translation>
 <translation id="6318944945640833942">Couldn't detect a printer. Please enter printer address again.</translation>
+<translation id="6320808462673705899">There are no bookmarks that match your search.</translation>
 <translation id="6322370287306604163">Unlock faster with fingerprint</translation>
 <translation id="6322559670748154781">This file is not commonly downloaded and has been blocked by Advanced Protection</translation>
 <translation id="6324916366299863871">Edit shortcut</translation>

chrome/app/resources/generated_resources_fi.xtb

diff --git a/chrome/app/resources/generated_resources_fi.xtb b/chrome/app/resources/generated_resources_fi.xtb
index 6c5e7d7d..5b648d4 100644
--- a/chrome/app/resources/generated_resources_fi.xtb
+++ b/chrome/app/resources/generated_resources_fi.xtb
@@ -3029,6 +3029,7 @@
 <translation id="3609277884604412258">Pikahaku</translation>
 <translation id="3610241585790874201">Datan tallentaminen laitteelle on kielletty</translation>
 <translation id="3610369246614755442">Telineen tuuletin kaipaa huoltoa</translation>
+<translation id="3610961622607302617">Vaihda salasana: <ph name="WEBSITE" />.</translation>
 <translation id="361106536627977100">Flash-tiedot</translation>
 <translation id="3611655097742243705">Löydät lisää sovelluksia Play Kaupasta</translation>
 <translation id="3611658447322220736">Äskettäin suljetut sivustot saavat viimeistellä datan lähetyksen ja vastaanoton</translation>
@@ -6042,6 +6043,7 @@
 <translation id="6318125393809743217">Sisällytä käytäntömäärityksiin policies.json-tiedosto.</translation>
 <translation id="6318407754858604988">Lataus aloitettu</translation>
 <translation id="6318944945640833942">Tulostinta ei havaittu. Syötä tulostimen osoite uudelleen.</translation>
+<translation id="6320808462673705899">Hakuasi vastaavia kirjanmerkkejä ei ole.</translation>
 <translation id="6322370287306604163">Avaa lukitus nopeammin sormenjäljellä</translation>
 <translation id="6322559670748154781">Tätä tiedostoa ei yleensä ladata, ja Lisäsuojaus on estänyt sen</translation>
 <translation id="6324916366299863871">Muokkaa pikanäppäintä</translation>

chrome/app/resources/generated_resources_fr.xtb

diff --git a/chrome/app/resources/generated_resources_fr.xtb b/chrome/app/resources/generated_resources_fr.xtb
index 85aac5b..127968a 100644
--- a/chrome/app/resources/generated_resources_fr.xtb
+++ b/chrome/app/resources/generated_resources_fr.xtb
@@ -807,7 +807,7 @@
 <translation id="1676902103953506022">Détails des identifiants pour <ph name="USERNAME" /> sur <ph name="DOMAIN" /></translation>
 <translation id="1677306805708094828">Impossible d'ajouter <ph name="EXTENSION_TYPE_PARAMETER" /></translation>
 <translation id="1677472565718498478">Temps restant : <ph name="TIME" /></translation>
-<translation id="1679068421605151609">Outils de développement</translation>
+<translation id="1679068421605151609">Outils pour les développeurs</translation>
 <translation id="1679810534535368772">Voulez-vous vraiment quitter cet écran ?</translation>
 <translation id="167983332380191032">Le service de gestion a renvoyé une erreur HTTP.</translation>
 <translation id="167997285881077031">Paramètres de voix de la synthèse vocale</translation>
@@ -832,7 +832,7 @@
 <translation id="169675691788639886">Serveur SSH configuré sur l'appareil. Ne vous connectez pas avec un compte sensible.</translation>
 <translation id="1697150536837697295">Art</translation>
 <translation id="1697686431566694143">Modifier le fichier</translation>
-<translation id="1700079447639026019">Sites ne pouvant pas utiliser de cookies</translation>
+<translation id="1700079447639026019">Sites jamais autorisés à utiliser des cookies</translation>
 <translation id="1700201317341192482">Supprimer votre carte virtuelle</translation>
 <translation id="1703331064825191675">Ne vous souciez plus jamais de vos mots de passe</translation>
 <translation id="1703666494654169921">Ne pas autoriser les sites à utiliser des données ni des appareils de réalité virtuelle</translation>
@@ -1607,7 +1607,7 @@
 <translation id="2335111415680198280">{0,plural, =1{Fermer # fenêtre}one{Fermer # fenêtre}other{Fermer # fenêtres}}</translation>
 <translation id="2335122562899522968">Cette page place des cookies.</translation>
 <translation id="2336228925368920074">Ajouter tous les onglets aux favoris...</translation>
-<translation id="2336376423977300504">Toujours effacer les cookies à la fermeture du navigateur</translation>
+<translation id="2336376423977300504">Toujours effacer les cookies à la fermeture des fenêtres</translation>
 <translation id="2336381494582898602">Powerwash</translation>
 <translation id="2337236196941929873">Chrome précharge les pages qu'il estime que vous pourriez consulter. Pour cela, il peut utiliser des cookies (si vous les autorisez), et chiffrer et envoyer ces pages via Google pour cacher votre identité aux sites.</translation>
 <translation id="2340239562261172947">Impossible de télécharger <ph name="FILE_NAME" /> de manière sécurisée</translation>
@@ -2215,7 +2215,7 @@
 <translation id="2868746137289129307">Cette extension est obsolète et désactivée par une stratégie d'entreprise. Il se peut qu'elle soit activée automatiquement lors de la publication d'une version plus récente.</translation>
 <translation id="2870560284913253234">Site</translation>
 <translation id="2870909136778269686">Mise à jour en cours…</translation>
-<translation id="2871733351037274014">Précharger des pages</translation>
+<translation id="2871733351037274014">Précharger les pages</translation>
 <translation id="2871813825302180988">Ce compte est déjà utilisé sur cet appareil.</translation>
 <translation id="287205682142673348">Transfert de port</translation>
 <translation id="287286579981869940">Ajouter <ph name="PROVIDER_NAME" />…</translation>
@@ -3014,7 +3014,7 @@
 <translation id="3605156246402033687">{COUNT,plural, =1{{COUNT} compte utilise le même mot de passe}one{{COUNT} compte utilise le même mot de passe}other{{COUNT} comptes utilisent le même mot de passe}}</translation>
 <translation id="3605780360466892872">Businessman</translation>
 <translation id="3609277884604412258">Recherche rapide</translation>
-<translation id="3610241585790874201">Non autorisé à enregistrer des données sur votre appareil</translation>
+<translation id="3610241585790874201">Non autorisés à enregistrer des données sur votre appareil</translation>
 <translation id="3610369246614755442">Le ventilateur de la station doit être réparé</translation>
 <translation id="361106536627977100">Données Flash</translation>
 <translation id="3611655097742243705">Accédez au Play Store pour trouver des applis</translation>
@@ -3682,7 +3682,7 @@
 <translation id="4175737294868205930">Stockage persistant</translation>
 <translation id="4176463684765177261">Désactivé</translation>
 <translation id="4176864026061939326">Cet appareil est géré. L'administrateur de votre appareil doit créer un profil pour le compte <ph name="USER_EMAIL_ADDRESS" />.</translation>
-<translation id="4177501066905053472">Thèmes publicitaires</translation>
+<translation id="4177501066905053472">Thèmes des annonces</translation>
 <translation id="4180788401304023883">Supprimer le certificat "<ph name="CERTIFICATE_NAME" />" émis par l'autorité de certification ?</translation>
 <translation id="4181602000363099176">20x</translation>
 <translation id="4181841719683918333">Langues</translation>
@@ -4073,7 +4073,7 @@
 <translation id="4533985347672295764">Temps CPU</translation>
 <translation id="4534661889221639075">Réessayez.</translation>
 <translation id="4535127706710932914">Profil par défaut</translation>
-<translation id="4536140153723794651">Sites autorisés à utiliser des cookies</translation>
+<translation id="4536140153723794651">Sites toujours autorisés à utiliser des cookies</translation>
 <translation id="4536769240747010177">Fonctionnalités de partage de connexion :</translation>
 <translation id="4538417792467843292">Supprimer le mot</translation>
 <translation id="4538792345715658285">Installée conformément à une règle d'entreprise</translation>
@@ -4577,7 +4577,7 @@
 <translation id="4992458225095111526">Confirmer la réinitialisation Powerwash</translation>
 <translation id="4992473555164495036">Votre administrateur a limité les modes de saisie disponibles.</translation>
 <translation id="4994754230098574403">Configuration</translation>
-<translation id="4995293419989417004">En savoir plus sur les thèmes publicitaires</translation>
+<translation id="4995293419989417004">En savoir plus sur les thèmes des annonces</translation>
 <translation id="4996851818599058005">{NUM_VMS,plural, =0{Aucune VM <ph name="VM_TYPE" /> trouvée}=1{1 VM <ph name="VM_TYPE" /> trouvée : <ph name="VM_NAME_LIST" />}one{{NUM_VMS} VM <ph name="VM_TYPE" /> trouvée : <ph name="VM_NAME_LIST" />}other{{NUM_VMS} VM <ph name="VM_TYPE" /> trouvées : <ph name="VM_NAME_LIST" />}}</translation>
 <translation id="4997086284911172121">Aucune connexion Internet.</translation>
 <translation id="4998430619171209993">Activé</translation>
@@ -4683,7 +4683,7 @@
 <translation id="5094721898978802975">Communiquer avec les applications natives associées</translation>
 <translation id="5097002363526479830">Échec de la connexion au réseau "<ph name="NAME" />" : <ph name="DETAILS" /></translation>
 <translation id="5097306410549350357">En savoir plus sur l'utilisation de la localisation</translation>
-<translation id="5097349930204431044">Les sites que vous consultez peuvent déterminer vos centres d'intérêt, puis vous suggérer des annonces durant votre navigation</translation>
+<translation id="5097349930204431044">Les sites que vous consultez peuvent déterminer ce que vous aimez, puis vous montrer des annonces alors que vous continuez de naviguer</translation>
 <translation id="5097649414558628673">Outil : <ph name="PRINT_NAME" /></translation>
 <translation id="5097874180538493929">Clic automatique à l'arrêt du curseur</translation>
 <translation id="5101839224773798795">Cliquer automatiquement en cas d'arrêt du curseur</translation>
@@ -6112,7 +6112,7 @@
 <translation id="6406303162637086258">Simuler le redémarrage du navigateur</translation>
 <translation id="6406506848690869874">Synchronisation</translation>
 <translation id="6406708970972405507">Paramètres – <ph name="SECTION_TITLE" /></translation>
-<translation id="6407398811519202484">Autorisé à enregistrer des données sur votre appareil</translation>
+<translation id="6407398811519202484">Autorisés à enregistrer des données sur votre appareil</translation>
 <translation id="6408118934673775994">Accéder aux données des sites <ph name="WEBSITE_1" />, <ph name="WEBSITE_2" /> et <ph name="WEBSITE_3" />, et les modifier</translation>
 <translation id="6410257289063177456">Fichiers image</translation>
 <translation id="6410328738210026208">Changer de version et Powerwash</translation>
@@ -6939,7 +6939,7 @@
 <translation id="7123302939607518173">Ajoutez un centre d'intérêt ou un site si vous pensez que les annonces qui y sont liées peuvent vous être utiles.</translation>
 <translation id="7124013154139278147">Associer un contacteur à "Précédent"</translation>
 <translation id="7124712201233930202">Les règles de votre organisation ne sont pas respectées</translation>
-<translation id="7125029162161377569">Avec les essais Privacy Sandbox, les sites peuvent offrir la même expérience de navigation en utilisant moins d'infos personnelles. Cela signifie plus de confidentialité pour vous et moins de suivi intersites. Nous ajouterons des essais dès qu'ils seront prêts à être testés.</translation>
+<translation id="7125029162161377569">Avec les essais Privacy Sandbox, les sites peuvent offrir la même expérience de navigation en utilisant moins de vos infos. Cela signifie plus de confidentialité pour vous et moins de suivi intersites. Nous ajouterons des essais dès qu'ils seront prêts à être testés.</translation>
 <translation id="7125148293026877011">Supprimer Crostini</translation>
 <translation id="7127980134843952133">Historique des téléchargements</translation>
 <translation id="7128151990937044829">Afficher un symbole dans la barre d'adresse lorsqu'une notification est bloquée</translation>
@@ -7483,7 +7483,7 @@
 <translation id="7634280112532283638">Réduction du spam et de la fraude</translation>
 <translation id="7634566076839829401">Une erreur s'est produite. Veuillez réessayer.</translation>
 <translation id="7635048370253485243">Épinglée par votre administrateur</translation>
-<translation id="7635711411613274199">Lorsque vous naviguez, la personnalisation des annonces dépend de ce paramètre, des <ph name="BEGIN_LINK1" />thèmes publicitaires<ph name="LINK_END1" />, des <ph name="BEGIN_LINK2" />paramètres des cookies<ph name="LINK_END2" /> et de si le site que vous consultez personnalise les annonces</translation>
+<translation id="7635711411613274199">Lorsque vous naviguez, ce paramètre, de même que les <ph name="BEGIN_LINK1" />thèmes des annonces<ph name="LINK_END1" />, vos <ph name="BEGIN_LINK2" />paramètres de cookies<ph name="LINK_END2" /> et le fait que le site que vous consultez personnalise ou non les annonces, déterminent si l'annonce que vous voyez est personnalisée ou pas</translation>
 <translation id="7636919061354591437">Installer sur cet appareil</translation>
 <translation id="7637253234491814483">Appuyez sur le lecteur d'empreinte digitale en haut à droite du clavier, à côté du bouton Marche/Arrêt. Les données liées à votre empreinte digitale sont stockées de façon sécurisée et ne quittent jamais votre <ph name="DEVICE_TYPE" />.</translation>
 <translation id="7637272932128132922">Lorsque cet onglet était inactif, l'économiseur de mémoire a libéré de la mémoire pour d'autres tâches. Vous pouvez modifier cette option à tout moment dans <ph name="SETTINGS_LINK" />.</translation>
@@ -8351,7 +8351,7 @@
 <translation id="8373652277231415614">Répertoires partagés par Crostini</translation>
 <translation id="8374243500935816406">Ne pas autoriser les sites à gérer les fenêtres sur tous vos écrans</translation>
 <translation id="8376137163494131156">Décrivez-nous le problème lié à Google Cast.</translation>
-<translation id="8376384591331888629">Inclure les cookies tiers de ce site</translation>
+<translation id="8376384591331888629">Y compris les cookies tiers de ce site</translation>
 <translation id="8376451933628734023">Si cette appli Web essaie de se faire passer pour une autre, désinstallez-la.</translation>
 <translation id="8377625247046155446">Elle ne sera enregistrée que sur cet appareil. Elle y restera une fois que vous aurez fermé toutes les fenêtres de navigation privée.</translation>
 <translation id="8378714024927312812">Géré par votre organisation</translation>
@@ -8669,7 +8669,7 @@
 <translation id="8665180165765946056">Sauvegarde terminée</translation>
 <translation id="866611985033792019">Considérer ce certificat comme fiable pour identifier les utilisateurs de messageries</translation>
 <translation id="8666321716757704924">Autorisations de nouveau accordées pour <ph name="WEBSITE" /></translation>
-<translation id="8666759526542103597">À propos de la personnalisation des annonces basée sur un navigateur</translation>
+<translation id="8666759526542103597">À propos de la personnalisation des annonces basée sur le navigateur</translation>
 <translation id="8667261224612332309">Certains de vos mots de passe peuvent être améliorés</translation>
 <translation id="8667328578593601900"><ph name="FULLSCREEN_ORIGIN" /> est maintenant en mode plein écran et a désactivé le curseur de votre souris.</translation>
 <translation id="8667760277771450375">Nous étudions différents moyens de limiter le suivi intersites tout en permettant aux sites de lutter contre le spam publicitaire et la fraude.</translation>

chrome/app/resources/generated_resources_gu.xtb

diff --git a/chrome/app/resources/generated_resources_gu.xtb b/chrome/app/resources/generated_resources_gu.xtb
index 5029a952..b7eacf08 100644
--- a/chrome/app/resources/generated_resources_gu.xtb
+++ b/chrome/app/resources/generated_resources_gu.xtb
@@ -503,6 +503,7 @@
 <translation id="1427269577154060167">દેશ</translation>
 <translation id="142765311413773645"><ph name="APP_NAME" />ની સમયસીમા સમાપ્ત થઈ ગઈ છે</translation>
 <translation id="1428373049397869723">તમે Finder અથવા અન્ય ઍપમાં, આ ઍપ વડે સપોર્ટેડ ફાઇલો ખોલી શકો છો અને તેમાં ફેરફાર કરી શકો છો. આ ઍપમાં ડિફૉલ્ટ તરીકે ખોલવામાં આવે તેવી ફાઇલોને નિયંત્રિત કરવા માટે, <ph name="BEGIN_LINK" />તમારા ડિવાઇસ પર ડિફૉલ્ટ ઍપને સેટ કરવાની રીત વિશે જાણો<ph name="END_LINK" />.</translation>
+<translation id="1428657116642077141">આ સાઇટ પર તમે પાસવર્ડ માટેની એક નોંધ સાચવી છે. તેને જોવા માટે, શોધ અને ઍડ્રેસ બારમાં 'તમારા પાસવર્ડ મેનેજ કરો' પસંદ કરો.</translation>
 <translation id="1428770807407000502">સિંક બંધ કરીએ?</translation>
 <translation id="1429300045468813835">બધી એન્ટ્રી સાફ કરી</translation>
 <translation id="1430915738399379752">પ્રિન્ટ</translation>
@@ -1254,6 +1255,7 @@
 <translation id="2073148037220830746">{NUM_EXTENSIONS,plural, =1{એક્સ્ટેંશન ઇન્સ્ટૉલ કરવા માટે ક્લિક કરો}one{આ એક્સ્ટેંશન ઇન્સ્ટૉલ કરવા માટે ક્લિક કરો}other{આ એક્સ્ટેંશન ઇન્સ્ટૉલ કરવા માટે ક્લિક કરો}}</translation>
 <translation id="2073496667646280609">શક્ય છે કે તમારી પાસે તમારા ડિવાઇસમાં અથવા બૅકઅપ લેવા માટે પસંદ કરેલા સ્થાનમાં પર્યાપ્ત ખાલી સ્ટોરેજ ન હોય. સ્પેસ ખાલી કરી જુઓ અથવા અલગ સ્થાન પસંદ કરી જુઓ.</translation>
 <translation id="2073505299004274893"><ph name="CHARACTER_LIMIT" /> અથવા તેથી ઓછા અક્ષરોનો ઉપયોગ કરો</translation>
+<translation id="2074060876831574159">સાચવેલા પાસવર્ડ અહીં દેખાશે.  &lt;a target='_blank' href='chrome://password-manager/'&gt;પાસવર્ડ આયાત કરો&lt;/a&gt;</translation>
 <translation id="2075474481720804517"><ph name="BATTERY_PERCENTAGE" />% બૅટરી</translation>
 <translation id="2076269580855484719">આ પ્લગિન છુપાવો </translation>
 <translation id="2076672359661571384">મધ્યમ (ભલામણ કરેલ)</translation>
@@ -1503,6 +1505,7 @@
     <ph name="BEGIN_PARAGRAPH2" />એકવાર ઇન્સ્ટૉલેશન શરૂ થયા પછી, તેને રદ કરી શકાશે નહીં.<ph name="END_PARAGRAPH2" /></translation>
 <translation id="2270627217422354837">આ ડોમેન્સમાં કોઈપણ ઉપકરણ સાથે ડેટા વિનિમય કરો: <ph name="DOMAINS" /></translation>
 <translation id="2270666014403455717">“પસંદ કરો” માટે સ્વિચની સોંપણી કરો</translation>
+<translation id="2271986192355138465">વેબ ઍપ કેવી રીતે ઇન્સ્ટોલ કરવી તે જાણો</translation>
 <translation id="2272430695183451567">એકેય સ્વિચની સોંપણી કરી નથી</translation>
 <translation id="2272570998639520080">માર્ટીની કાચ</translation>
 <translation id="2272830751703114341">સૌથી ઉપરની પંક્તિમાં કીના વર્તનને સ્વિચ કરવા માટે સિસ્ટમ/લૉન્ચર કીને ચાલુ કરો</translation>
@@ -3158,6 +3161,7 @@
 <translation id="3728188878314831180">તમારા ફોનમાંના નોટિફિકેશન Chromebook પર મેળવો</translation>
 <translation id="3728681439294129328">નેટવર્ક ઍડ્રેસ ગોઠવો</translation>
 <translation id="3729506734996624908">મંજૂર કરેલી સાઇટની સૂચિ</translation>
+<translation id="3729957991398443677">તમારો પાસવર્ડ જોવા અથવા તેના વિશે એક નોંધ ઉમેરવા માટે, શોધ અને ઍડ્રેસ બારમાં 'તમારા પાસવર્ડ મેનેજ કરો' પસંદ કરો</translation>
 <translation id="3730076362938942381">સ્ટાઇલસ વડે લખાણની ઍપના સેટિંગ</translation>
 <translation id="3732078975418297900">લાઇન <ph name="ERROR_LINE" />માં ભૂલ આવી છે</translation>
 <translation id="3732530910372558017">પિનમાં વધુમા વધુ 63 અક્ષર હોવા જોઈએ</translation>
@@ -5890,6 +5894,7 @@
 <translation id="6200151268994853226">એક્સ્ટેન્શન મેનેજ કરો</translation>
 <translation id="6201608810045805374">શું આ એકાઉન્ટ કાઢી નાખીએ?</translation>
 <translation id="6202304368170870640">તમે તમારા ડિવાઇસમાં સાઇન ઇન કરવા અથવા અનલૉક કરવા માટે તમારા પિનનો ઉપયોગ કરી શકો છો.</translation>
+<translation id="6203247599828309566">આ સાઇટ પર તમે પાસવર્ડ માટેની એક નોંધ સાચવી છે. તેને જોવા માટે, કી આઇકન પર ક્લિક કરો.</translation>
 <translation id="6205314730813004066">જાહેરાત સંબંધી પ્રાઇવસી</translation>
 <translation id="6206199626856438589">ખુલ્લી ટૅબ સહિત, પ્રદર્શિત થયેલી સાઇટમાંથી તમને સાઇન આઉટ કરવામાં આવશે</translation>
 <translation id="6206311232642889873">છબીની કૉ&amp;પિ બનાવો</translation>
@@ -7002,6 +7007,7 @@
 <translation id="720715819012336933">{NUM_PAGES,plural, =1{પેજમાંથી બહાર નીકળો}one{પેજમાંથી બહાર નીકળો}other{પેજમાંથી બહાર નીકળો}}</translation>
 <translation id="7207457272187520234">વપરાશ અને નિદાનનો ડેટા મોકલો. આ ડિવાઇસ હાલમાં Googleને નિદાન, ડિવાઇસ અને ઍપ વપરાશનો ડેટા ઑટોમૅટિક રીતે મોકલી રહ્યું છે. આ સિસ્ટમ અને ઍપની સ્થિરતા અને અન્ય સુધારણાઓમાં સહાય કરશે. એકત્ર કરેલો કેટલોક ડેટા Google ઍપ અને ભાગીદારો, જેમ કે Android ડેવલપરને પણ સહાય કરશે. આ સેટિંગ માલિક દ્વારા લાગુ કરવામાં આવ્યું છે. જો તમારી વધારાની વેબ અને ઍપ પ્રવૃત્તિનું સેટિંગ ચાલુ હોય, તો આ ડેટા તમારા Google એકાઉન્ટમાં સાચવવામાં આવી શકે છે.</translation>
 <translation id="7207631048330366454">ઍપ શોધો</translation>
+<translation id="7210257969463271891">વેબ ઍપ કે જે તમે ઇન્સ્ટૉલ કરો છો તે અહીં દેખાય છે</translation>
 <translation id="7210471695184432500">આ ડિવાઇસ પર Google Password Managerમાં પાસવર્ડ આયાત કરવા માટે, કોઈ CSV ફાઇલ પસંદ કરો</translation>
 <translation id="7210499381659830293">એક્સ્ટેંશન પ્રિન્ટર</translation>
 <translation id="7211783048245131419">હજી સુધી કોઈ સ્વિચની સોંપણી કરવામાં આવી નથી</translation>
@@ -9261,6 +9267,7 @@
 <translation id="9179524979050048593">સાઇન ઇન સ્ક્રીન વપરાશકર્તાનું નામ</translation>
 <translation id="9180281769944411366">આ પ્રક્રિયામાં થોડો સમય લાગી શકે છે. Linux કન્ટેઇનર શરૂ કરી રહ્યાં છીએ.</translation>
 <translation id="9180380851667544951">સાઇટ તમારી સ્ક્રીનને શેર કરી શકે છે</translation>
+<translation id="9180847522826713506">તમારો પાસવર્ડ જોવા માટે અથવા તેના વિશેની એક નોંધ ઉમેરવા માટે, કી આઇકન પર ક્લિક કરો</translation>
 <translation id="9182556968660520230">સાઇટને સુરક્ષિત કન્ટેન્ટ ચલાવવાની મંજૂરી આપશો નહીં</translation>
 <translation id="9183331776983279456">4 અઠવાડિયાથી વધુ જૂની સાઇટને Chrome ઑટોમૅટિક રીતે ડિલીટ કરે છે. તમે ફરી વાર મુલાકાત લો છો તે સાઇટ ફરીથી સૂચિમાં દેખાઈ શકે છે. અથવા તમે કોઈ સાઇટને તમને જાહેરાતોનું સૂચન કરવાથી બ્લૉક કરી શકો છો.</translation>
 <translation id="918352324374649435">{COUNT,plural, =1{ઍપ}one{# ઍપ}other{# ઍપ}}</translation>

chrome/app/resources/generated_resources_hr.xtb

diff --git a/chrome/app/resources/generated_resources_hr.xtb b/chrome/app/resources/generated_resources_hr.xtb
index a700ce7..7aa9f2b 100644
--- a/chrome/app/resources/generated_resources_hr.xtb
+++ b/chrome/app/resources/generated_resources_hr.xtb
@@ -698,6 +698,7 @@
 <translation id="1593594475886691512">Formatiranje...</translation>
 <translation id="159359590073980872">Predmemorija slike</translation>
 <translation id="1593926297800505364">Spremanje načina plaćanja</translation>
+<translation id="1594703455918849716">Prelazak na stranicu Provjera</translation>
 <translation id="1595492813686795610">Linux se nadograđuje</translation>
 <translation id="1596286373007273895">Dostupno</translation>
 <translation id="1596709061955594992">Bluetooth je isključen. Da biste vidjeli dostupne uređaje, uključite Bluetooth.</translation>
@@ -1682,6 +1683,7 @@
 <translation id="2399699884460174994">Obavijesti uključene</translation>
 <translation id="2399939490305346086">Podaci za prijavu na sigurnosnom ključu</translation>
 <translation id="2400664245143453337">Odmah je potrebno ažuriranje</translation>
+<translation id="2402226831639195063">Tonovi</translation>
 <translation id="2406153734066939945">Želite li izbrisati ovaj profil i podatke na njemu?</translation>
 <translation id="2408018932941436077">Spremanje kartice</translation>
 <translation id="2408955596600435184">Unesite PIN</translation>
@@ -1693,6 +1695,7 @@
 <translation id="241082044617551207">Nepoznati dodatak</translation>
 <translation id="2410940059315936967">Web-lokacija koju posjetite može ugraditi sadržaj s drugih web-lokacija, primjerice slike, oglase i tekst. Kolačići koje postavljaju te druge web-lokacije nazivaju se kolačićima treće strane.</translation>
 <translation id="2411666601450687801">Na ovom uređaju nije dopušten nijedan virtualni uređaj</translation>
+<translation id="2412015533711271895">Tvoj roditelj ili skrbnik kaže da je u redu da koristiš to proširenje.</translation>
 <translation id="2412753904894530585">Kerberos</translation>
 <translation id="2414886740292270097">Tamno</translation>
 <translation id="2416435988630956212">Funkcijske tipke na tipkovnici</translation>
@@ -3018,6 +3021,7 @@
 <translation id="3609277884604412258">Brzo pretraživanje</translation>
 <translation id="3610241585790874201">Spremanje podataka na uređaj nije dopušteno</translation>
 <translation id="3610369246614755442">Potrebno je servisirati ventilator priključne stanice</translation>
+<translation id="3610961622607302617">Promijenite zaporku za <ph name="WEBSITE" /></translation>
 <translation id="361106536627977100">Podaci Flasha</translation>
 <translation id="3611655097742243705">Posjetite Trgovinu Play da biste pronašli više aplikacija</translation>
 <translation id="3611658447322220736">Nedavno zatvorene web-lokacije mogu dovršiti slanje i primanje podataka</translation>
@@ -3074,6 +3078,7 @@
 <translation id="3651488188562686558">prekinuti vezu s Wi-Fijem</translation>
 <translation id="3652817283076144888">Inicijalizacija</translation>
 <translation id="3653160965917900914">Mrežna dijeljenja datoteka</translation>
+<translation id="3653887973853407813">Ne možeš upotrebljavati to proširenje. Tvoj roditelj ili skrbnik isključio je opciju Dopuštenja za web-lokacije, aplikacije i proširenja za Chrome.</translation>
 <translation id="3653999333232393305">Nastavi dopuštati hostu <ph name="HOST" /> pristup mikrofonu</translation>
 <translation id="3654045516529121250">čitati postavke pristupačnosti</translation>
 <translation id="3655712721956801464">{NUM_FILES,plural, =1{Ima trajni pristup jednoj datoteci.}one{Ima trajni pristup # datoteci.}few{Ima trajni pristup do # datoteke.}other{Ima trajni pristup do # datoteka.}}</translation>
@@ -5145,6 +5150,7 @@
 <translation id="5517304475148761050">Ova aplikacija treba pristup Trgovini Play</translation>
 <translation id="5517412723934627386"><ph name="NETWORK_TYPE" /> – <ph name="NETWORK_DISPLAY_NAME" /></translation>
 <translation id="5518219166343146486">Traži dopuštenje kada web-lokacija želi vidjeti tekst i slike kopirane u međuspremnik</translation>
+<translation id="5518949581554491184">Postavljanje pomoću Android telefona</translation>
 <translation id="5519195206574732858">LTE</translation>
 <translation id="5521078259930077036">Je li to početna stranica koju ste očekivali?</translation>
 <translation id="5522156646677899028">To proširenje sadrži ozbiljni sigurnosni propust.</translation>
@@ -6030,6 +6036,7 @@
 <translation id="6318125393809743217">Uključi policies.json datoteku s konfiguracijama pravila.</translation>
 <translation id="6318407754858604988">Preuzimanje je započelo</translation>
 <translation id="6318944945640833942">Pisač nije otkriven. Ponovo unesite adresu pisača.</translation>
+<translation id="6320808462673705899">S vašim pretraživanjem ne podudara se nijedna oznaka.</translation>
 <translation id="6322370287306604163">Brže otključavanje otiskom prsta</translation>
 <translation id="6322559670748154781">Ova se datoteka rijetko preuzima te ju je Napredna zaštita blokirala</translation>
 <translation id="6324916366299863871">Uređivanje prečaca</translation>
@@ -6478,6 +6485,7 @@
 <translation id="6725206449694821596">Internet Printing Protocol (IPP)</translation>
 <translation id="6725970970008349185">Broj kandidata za prikazivanje po stranici</translation>
 <translation id="672609503628871915">Pogledajte što je novo</translation>
+<translation id="6726800386221816228">Posebni znakovi</translation>
 <translation id="67269783048918309">Slanje podataka o upotrebi i dijagnostici. Ovaj uređaj trenutačno Googleu automatski šalje dijagnostičke podatke te podatke o upotrebi uređaja i aplikacija. Ti se podaci neće upotrebljavati za identifikaciju vašeg djeteta, a pomoći će poboljšati sustav, stabilnost aplikacija i drugo. Neki skupni podaci pomoći će i Googleovim aplikacijama i partnerima, na primjer razvojnim programerima za Android. Ovu <ph name="BEGIN_LINK1" />postavku<ph name="END_LINK1" /> zadao je vlasnik. Ako je za vaše dijete uključena dodatna postavka Aktivnost na webu i u aplikacijama, ti se podaci mogu spremati na djetetov Google račun. <ph name="BEGIN_LINK2" />Saznajte više<ph name="END_LINK2" /></translation>
 <translation id="6728528977475057549">IBAN koji završava znamenkama <ph name="LAST_FOUR_DIGITS" /></translation>
 <translation id="6729192290958770680">Unesite svoje korisničko ime</translation>
@@ -6880,6 +6888,7 @@
 <translation id="7063129466199351735">Obrada prečaca...</translation>
 <translation id="7063311912041006059">URL sa simbolom <ph name="SPECIAL_SYMBOL" /> umjesto upita</translation>
 <translation id="706342288220489463">Dopustite Asistentu da koristi informacije na zaslonu kako bi vam pomogao</translation>
+<translation id="70641621694466590">Prelazak na stranicu Zaporke</translation>
 <translation id="7064734931812204395">Konfigurira se Linuxov spremnik. To može potrajati 30 minuta.</translation>
 <translation id="7065223852455347715">Ovaj je uređaj zaključan u načinu koji sprječava registraciju u organizaciji. Ako želite registrirati uređaj, prvo morate izvršiti njegov oporavak.</translation>
 <translation id="7065534935986314333">O sustavu</translation>
@@ -7381,6 +7390,7 @@
 <translation id="7541773865713908457"><ph name="ACTION_NAME" /> pomoću aplikacije <ph name="APP_NAME" /></translation>
 <translation id="754207240458482646">Sinkronizirano s drugim uređajima na vašem računu. <ph name="LINK_BEGIN" />Saznajte više<ph name="LINK_END" /></translation>
 <translation id="7543104066686362383">Omogući značajke za otklanjanje pogrešaka na ovom uređaju <ph name="IDS_SHORT_PRODUCT_NAME" /></translation>
+<translation id="7544977292347272434">Zamoli roditelja da dopusti proširenje</translation>
 <translation id="7545466883021407599">Povezivanje s poslužiteljem nije uspjelo. Provjerite mrežnu vezu i pokušajte ponovo. Ako i dalje imate poteškoća, pokušajte ponovo pokrenuti Chromebook. Kôd pogreške: <ph name="ERROR_CODE" />.</translation>
 <translation id="7547317915858803630">Upozorenje: vaše postavke za uslugu <ph name="PRODUCT_NAME" /> pohranjene su na mrežnom disku. To može uzrokovati sporiji rad, padove pa čak i gubitak podataka.</translation>
 <translation id="7548856833046333824">Limunada</translation>
@@ -7609,6 +7619,7 @@
 <translation id="7728668285692163452">Promjena kanala primijenit će se kasnije</translation>
 <translation id="7730449930968088409">snimiti sadržaj vašeg zaslona</translation>
 <translation id="7730683939467795481">Stranicu je promijenilo proširenje "<ph name="EXTENSION_NAME" />"</translation>
+<translation id="773511996612364297">Znakovi za naglaske</translation>
 <translation id="7735165285389721951">Pokrenuto je postavljanje drugog Steama. Pričekajte da se dovrši pa pokušajte ponovo</translation>
 <translation id="7737115349420013392">Uparivanje s uređajem "<ph name="DEVICE_NAME" />" ...</translation>
 <translation id="7737203573077018777">Primljena je uputa <ph name="PROOF_OF_POSSESSION_INSTRUCTION_NAME" /></translation>
@@ -7691,6 +7702,7 @@
 <translation id="7792388396321542707">Zaustavi dijeljenje</translation>
 <translation id="779308894558717334">Svijetlozelena</translation>
 <translation id="7793098747275782155">Tamnoplava</translation>
+<translation id="7796453472368605346">Dijakritički znakovi</translation>
 <translation id="7797571222998226653">Isključeno</translation>
 <translation id="7798504574384119986">Prikaz dopuštenja za web</translation>
 <translation id="7798844538707273832">Automatski je blokirano dopuštenje <ph name="PERMISSION" /></translation>
@@ -7775,6 +7787,7 @@
 <translation id="7876027585589532670">Uređivanje prečaca nije moguće</translation>
 <translation id="7877451762676714207">Nepoznata pogreška poslužitelja. Pokušajte ponovo ili se obratite administratoru poslužitelja.</translation>
 <translation id="7878945852730162014">Upravljajte datotekama prilikom preuzimanja i otvorite ih kad se završi preuzimanje</translation>
+<translation id="7879172417209159252">Nije moguće koristiti proširenje</translation>
 <translation id="7879478708475862060">Praćenje načina unosa</translation>
 <translation id="7879631849810108578">Skup prečaca: <ph name="IDS_SHORT_SET_COMMAND" /></translation>
 <translation id="7880823633812189969">Lokalni podaci izbrisat će se prilikom ponovnog pokretanja</translation>

chrome/app/resources/generated_resources_is.xtb

diff --git a/chrome/app/resources/generated_resources_is.xtb b/chrome/app/resources/generated_resources_is.xtb
index b0fb084..fdb27032 100644
--- a/chrome/app/resources/generated_resources_is.xtb
+++ b/chrome/app/resources/generated_resources_is.xtb
@@ -3031,6 +3031,7 @@
 <translation id="3609277884604412258">Flýtileit</translation>
 <translation id="3610241585790874201">Má ekki vista gögn í tækinu</translation>
 <translation id="3610369246614755442">Athuga þarf viftu dokkunnar</translation>
+<translation id="3610961622607302617">Breyta aðgangsorðinu fyrir <ph name="WEBSITE" /></translation>
 <translation id="361106536627977100">Flash-gögn</translation>
 <translation id="3611655097742243705">Farðu í Play Store til að finna fleiri forrit</translation>
 <translation id="3611658447322220736">Vefsvæði sem nýlega var lokað geta lokið við að senda og taka á móti gögnum</translation>
@@ -6047,6 +6048,7 @@
 <translation id="6318125393809743217">Hafa policies.json skrá með reglustillingum með.</translation>
 <translation id="6318407754858604988">Niðurhal hafið</translation>
 <translation id="6318944945640833942">Ekki tókst að greina prentara. Sláðu veffang prentara inn aftur.</translation>
+<translation id="6320808462673705899">Engin bókamerki passa við leitina þína.</translation>
 <translation id="6322370287306604163">Þú ert fljótari að taka úr lás með fingrafari</translation>
 <translation id="6322559670748154781">Þessi skrá er ekki sótt oft og ítarleg vernd setti hana á bannlista</translation>
 <translation id="6324916366299863871">Breyta flýtileið</translation>

chrome/app/resources/generated_resources_it.xtb

diff --git a/chrome/app/resources/generated_resources_it.xtb b/chrome/app/resources/generated_resources_it.xtb
index cc6e4bf..a6336cf 100644
--- a/chrome/app/resources/generated_resources_it.xtb
+++ b/chrome/app/resources/generated_resources_it.xtb
@@ -285,7 +285,7 @@
 <translation id="1235924639474699896">{COUNT,plural, =1{testo}other{# segmenti di testo}}</translation>
 <translation id="1236009322878349843">Modifica telefono</translation>
 <translation id="1239594683407221485">Esplora i contenuti del dispositivo nell'app File.</translation>
-<translation id="1240903469550363138">Per continuare, <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" /> condividerà il tuo nome, il tuo indirizzo email e l'immagine del tuo profilo con questo sito. Leggi le <ph name="BEGIN_LINK1" />norme sulla privacy<ph name="END_LINK1" /> e i <ph name="BEGIN_LINK2" />Termini di servizio<ph name="END_LINK2" /> del sito.</translation>
+<translation id="1240903469550363138">Per continuare, <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" /> condividerà il tuo nome, il tuo indirizzo email e l'immagine del tuo profilo con questo sito. Leggi le <ph name="BEGIN_LINK1" />Norme sulla privacy<ph name="END_LINK1" /> e i <ph name="BEGIN_LINK2" />Termini di servizio<ph name="END_LINK2" /> del sito.</translation>
 <translation id="1241066500170667906">Seleziona lo stato dell'esperimento <ph name="EXPERIMENT_NAME" /></translation>
 <translation id="124116460088058876">Altre lingue</translation>
 <translation id="1242633766021457174"><ph name="THIRD_PARTY_TOOL_NAME" /> vuole ripristinare le impostazioni.</translation>
@@ -696,6 +696,7 @@
 <translation id="1593594475886691512">Formattazione in corso...</translation>
 <translation id="159359590073980872">Cache immagini</translation>
 <translation id="1593926297800505364">Salva il metodo di pagamento</translation>
+<translation id="1594703455918849716">Vai alla pagina Controllo</translation>
 <translation id="1595492813686795610">Upgrade di Linux…</translation>
 <translation id="1596286373007273895">Disponibile</translation>
 <translation id="1596709061955594992">Il Bluetooth non è attivo. Attivalo per vedere i dispositivi disponibili.</translation>
@@ -1679,6 +1680,7 @@
 <translation id="2399699884460174994">Notifiche attivate</translation>
 <translation id="2399939490305346086">Dati di accesso del token di sicurezza</translation>
 <translation id="2400664245143453337">È richiesto l'aggiornamento immediato</translation>
+<translation id="2402226831639195063">Toni</translation>
 <translation id="2406153734066939945">Vuoi eliminare questo profilo e i relativi dati?</translation>
 <translation id="2408018932941436077">Salvataggio della carta</translation>
 <translation id="2408955596600435184">Inserisci il codice PIN</translation>
@@ -1690,6 +1692,7 @@
 <translation id="241082044617551207">Plug-in sconosciuto</translation>
 <translation id="2410940059315936967">Un sito visitato può incorporare contenuti di altri siti, ad esempio immagini, annunci e testo. I cookie impostati da questi altri siti vengono chiamati cookie di terze parti.</translation>
 <translation id="2411666601450687801">Nessuna macchina virtuale consentita su questo dispositivo</translation>
+<translation id="2412015533711271895">Uno dei tuoi genitori o il tuo tutore deve autorizzarti a usare questa estensione</translation>
 <translation id="2412753904894530585">Kerberos</translation>
 <translation id="2414886740292270097">Scuro</translation>
 <translation id="2416435988630956212">Tasti funzione della tastiera</translation>
@@ -3015,6 +3018,7 @@
 <translation id="3609277884604412258">Ricerca rapida</translation>
 <translation id="3610241585790874201">Non autorizzati a salvare dati sul dispositivo</translation>
 <translation id="3610369246614755442">Assistenza necessaria per la ventola del dock</translation>
+<translation id="3610961622607302617">Modifica password per <ph name="WEBSITE" /></translation>
 <translation id="361106536627977100">Dati Flash</translation>
 <translation id="3611655097742243705">Visita il Play Store per trovare altre app</translation>
 <translation id="3611658447322220736">I siti chiusi di recente possono terminare l'invio e la ricezione di dati</translation>
@@ -3071,6 +3075,7 @@
 <translation id="3651488188562686558">Disconnessione dalla rete Wi-Fi</translation>
 <translation id="3652817283076144888">Inizializzazione in corso</translation>
 <translation id="3653160965917900914">Condivisioni file di rete</translation>
+<translation id="3653887973853407813">Non puoi usare questa estensione. Uno dei tuoi genitori o il tuo tutore ha disattivato l'opzione "Autorizzazioni per siti, app ed estensioni" per Chrome.</translation>
 <translation id="3653999333232393305">Continua a consentire l'accesso di <ph name="HOST" /> al microfono</translation>
 <translation id="3654045516529121250">Lettura delle impostazioni di accessibilità</translation>
 <translation id="3655712721956801464">{NUM_FILES,plural, =1{Ha accesso permanente a un file.}other{Ha accesso permanente a # file.}}</translation>
@@ -5142,6 +5147,7 @@
 <translation id="5517304475148761050">L'app richiede l'accesso al Play Store</translation>
 <translation id="5517412723934627386"><ph name="NETWORK_TYPE" />: <ph name="NETWORK_DISPLAY_NAME" /></translation>
 <translation id="5518219166343146486">Chiedi conferma quando un sito vuole leggere il testo e le immagini copiati negli appunti</translation>
+<translation id="5518949581554491184">Configura con telefono Android</translation>
 <translation id="5519195206574732858">LTE</translation>
 <translation id="5521078259930077036">È la pagina iniziale prevista?</translation>
 <translation id="5522156646677899028">Questa estensione contiene una grave vulnerabilità di sicurezza.</translation>
@@ -6027,6 +6033,7 @@
 <translation id="6318125393809743217">Includi un file policies.json con le configurazioni dei criteri.</translation>
 <translation id="6318407754858604988">Download iniziato</translation>
 <translation id="6318944945640833942">Impossibile rilevare una stampante. Inserisci di nuovo l'indirizzo della stampante.</translation>
+<translation id="6320808462673705899">Non è presente nessun preferito corrispondente alla ricerca.</translation>
 <translation id="6322370287306604163">Sblocco più veloce con l'impronta</translation>
 <translation id="6322559670748154781">Questo file non viene comunemente scaricato ed è stato bloccato dalla protezione avanzata</translation>
 <translation id="6324916366299863871">Modifica scorciatoia</translation>
@@ -6471,6 +6478,7 @@
 <translation id="6725206449694821596">Protocollo di stampa Internet (IPP)</translation>
 <translation id="6725970970008349185">Numero di candidati da visualizzare per pagina</translation>
 <translation id="672609503628871915">Scopri le novità</translation>
+<translation id="6726800386221816228">Caratteri speciali</translation>
 <translation id="67269783048918309">Invia dati diagnostici e sull'utilizzo. Questo dispositivo attualmente invia a Google dati diagnostici e sull'utilizzo delle app e del dispositivo. Non verranno utilizzati per identificare tuo figlio e contribuiranno alla stabilità di app e sistema, nonché ad altri miglioramenti. Alcuni dati aggregati saranno utili anche alle app e ai partner di Google, ad esempio agli sviluppatori Android. Questa <ph name="BEGIN_LINK1" />impostazione<ph name="END_LINK1" /> è applicata dal proprietario. Se l'impostazione Attività web e app aggiuntiva è attiva per tuo figlio, questi dati potrebbero essere salvati nel suo Account Google. <ph name="BEGIN_LINK2" />Ulteriori informazioni<ph name="END_LINK2" /></translation>
 <translation id="6728528977475057549">IBAN che termina con <ph name="LAST_FOUR_DIGITS" /></translation>
 <translation id="6729192290958770680">Inserisci il tuo nome utente</translation>
@@ -6873,6 +6881,7 @@
 <translation id="7063129466199351735">Elaborazione delle scorciatoie...</translation>
 <translation id="7063311912041006059">URL con <ph name="SPECIAL_SYMBOL" /> al posto della query</translation>
 <translation id="706342288220489463">Consenti all'assistente di usare le informazioni visualizzate sullo schermo per aiutarti</translation>
+<translation id="70641621694466590">Vai alla pagina Password</translation>
 <translation id="7064734931812204395">Configurazione del contenitore Linux. L'operazione potrebbe richiedere fino a 30 minuti.</translation>
 <translation id="7065223852455347715">Questo dispositivo è bloccato su una modalità che impedisce la registrazione aziendale. Se desideri registrare il dispositivo, devi prima eseguire il ripristino.</translation>
 <translation id="7065534935986314333">Informazioni sul sistema</translation>
@@ -7374,6 +7383,7 @@
 <translation id="7541773865713908457"><ph name="ACTION_NAME" /> con l'app <ph name="APP_NAME" /></translation>
 <translation id="754207240458482646">Sincronizzata con altri dispositivi sul tuo account. <ph name="LINK_BEGIN" />Ulteriori informazioni<ph name="LINK_END" /></translation>
 <translation id="7543104066686362383">Attiva funzioni di debug su questo dispositivo <ph name="IDS_SHORT_PRODUCT_NAME" /></translation>
+<translation id="7544977292347272434">Chiedi a uno dei tuoi genitori di consentire un'estensione</translation>
 <translation id="7545466883021407599">Impossibile connettersi al server. Controlla la connessione di rete e riprova. Se continui ad avere problemi, prova a riavviare Chromebook. Codice di errore: <ph name="ERROR_CODE" />.</translation>
 <translation id="7547317915858803630">Avviso. Le tue impostazioni <ph name="PRODUCT_NAME" /> sono memorizzate su un'unità di rete. Potrebbero verificarsi rallentamenti, arresti anomali o persino perdite di dati.</translation>
 <translation id="7548856833046333824">Limonata</translation>
@@ -7602,6 +7612,7 @@
 <translation id="7728668285692163452">La modifica al canale verrà applicata più tardi</translation>
 <translation id="7730449930968088409">Acquisizione dei contenuti dello schermo</translation>
 <translation id="7730683939467795481">Questa pagina è stata modificata dall'estensione "<ph name="EXTENSION_NAME" />"</translation>
+<translation id="773511996612364297">Accenti</translation>
 <translation id="7735165285389721951">È in corso un'altra configurazione di Steam. Attendi che venga completata prima di riprovare</translation>
 <translation id="7737115349420013392">Accoppiamento con "<ph name="DEVICE_NAME" />"…</translation>
 <translation id="7737203573077018777">È stata ricevuta l'istruzione <ph name="PROOF_OF_POSSESSION_INSTRUCTION_NAME" /></translation>
@@ -7684,6 +7695,7 @@
 <translation id="7792388396321542707">Interrompi condivisione</translation>
 <translation id="779308894558717334">Verde chiaro</translation>
 <translation id="7793098747275782155">Blu scuro</translation>
+<translation id="7796453472368605346">Segni diacritici</translation>
 <translation id="7797571222998226653">Off</translation>
 <translation id="7798504574384119986">Visualizza autorizzazioni web</translation>
 <translation id="7798844538707273832">Autorizzazione <ph name="PERMISSION" /> bloccata automaticamente</translation>
@@ -7768,6 +7780,7 @@
 <translation id="7876027585589532670">Impossibile modificare la scorciatoia</translation>
 <translation id="7877451762676714207">Errore del server sconosciuto. Riprova o contatta l'amministratore del server.</translation>
 <translation id="7878945852730162014">Gestisci i file mentre vengono scaricati e aprili al termine del processo</translation>
+<translation id="7879172417209159252">Impossibile usare l'estensione</translation>
 <translation id="7879478708475862060">Segui modalità immissione</translation>
 <translation id="7879631849810108578">Scorciatoia impostata: <ph name="IDS_SHORT_SET_COMMAND" /></translation>
 <translation id="7880823633812189969">I dati locali verranno eliminati al riavvio</translation>

chrome/app/resources/generated_resources_ja.xtb

diff --git a/chrome/app/resources/generated_resources_ja.xtb b/chrome/app/resources/generated_resources_ja.xtb
index 14333a66..546833c 100644
--- a/chrome/app/resources/generated_resources_ja.xtb
+++ b/chrome/app/resources/generated_resources_ja.xtb
@@ -77,7 +77,7 @@
 <translation id="1061373870045429865">このリンクの QR コードを作成</translation>
 <translation id="1061904396131502319">もうすぐ休憩の時間です</translation>
 <translation id="1062407476771304334">置換</translation>
-<translation id="1062628064301375934">ウェブにおけるプライバシーの強化にご協力ください</translation>
+<translation id="1062628064301375934">ウェブのプライバシー強化にご協力ください</translation>
 <translation id="1067048845568873861">作成日</translation>
 <translation id="1067661089446014701">セキュリティ強化のため、Google アカウントに保存する前にデバイス上でパスワードを暗号化できます。</translation>
 <translation id="1067922213147265141">他の Google サービス</translation>
@@ -1861,7 +1861,7 @@
 <translation id="2561211427862644160">すべてのブックマークをこちらで確認できます</translation>
 <translation id="2564520396658920462">AppleScript からの JavaScript の実行がオフになっています。オンにするには、メニューバーから [表示] &gt; [デベロッパー] &gt; [Apple Events からの JavaScript を許可] を選択してください。詳しくは、https://support.google.com/chrome/?p=applescript をご覧ください。</translation>
 <translation id="2564653188463346023">拡張スペルチェック</translation>
-<translation id="2568694057933302218">シークレット モードのとき、サイトは Cookie を使用して他のサイトでの閲覧アクティビティを確認することができません。閲覧アクティビティは、広告のカスタマイズなどには使用されません。一部のサイトで機能を使用できなくなる可能性があります。</translation>
+<translation id="2568694057933302218">シークレット モードのとき、サイトは Cookie を使用して他のサイトでの閲覧アクティビティを確認することができません。閲覧アクティビティは、広告のパーソナライズなどには使用されません。一部のサイトで機能を使用できなくなる可能性があります。</translation>
 <translation id="2568774940984945469">情報バー コンテナ</translation>
 <translation id="2569972178052279830">販売店の名前</translation>
 <translation id="257088987046510401">テーマ</translation>
@@ -4137,7 +4137,7 @@
 <translation id="4595560905247879544">アプリと拡張機能は管理者（<ph name="CUSTODIAN_NAME" />）だけが変更できます。</translation>
 <translation id="4596295440756783523">これらのサーバーを識別する証明書がファイルに格納されています</translation>
 <translation id="4598345735110653698">パスキーを管理</translation>
-<translation id="4598549027014564149">シークレット モードのとき、サイトは Cookie を使用して関連サイトを含む他のサイトでの閲覧アクティビティを確認することができません。閲覧アクティビティは、広告のカスタマイズなどには使用されません。一部のサイトで機能を使用できなくなる可能性があります。</translation>
+<translation id="4598549027014564149">シークレット モードのとき、サイトは Cookie を使用して関連サイトを含む他のサイトでの閲覧アクティビティを確認することができません。閲覧アクティビティは、広告のパーソナライズなどには使用されません。一部のサイトで機能を使用できなくなる可能性があります。</translation>
 <translation id="4598556348158889687">ストレージ管理</translation>
 <translation id="4598776695426288251">複数のデバイスから Wi-Fi に接続できます</translation>
 <translation id="4600071396330666617">サジェストの候補数</translation>
@@ -4893,7 +4893,7 @@
 <translation id="5299109548848736476">Do Not Track</translation>
 <translation id="5299558715747014286">タブグループの表示と管理</translation>
 <translation id="5300287940468717207">サイトの権限をリセットしますか。</translation>
-<translation id="5300426565656326054">ブラウザベースの広告のカスタマイズ</translation>
+<translation id="5300426565656326054">ブラウザベースの広告のパーソナライズ</translation>
 <translation id="5300589172476337783">表示</translation>
 <translation id="5300719150368506519">アクセスしたページの URL を Google に送信</translation>
 <translation id="5301751748813680278">ゲストとしてログインしています。</translation>
@@ -6923,7 +6923,7 @@
 <translation id="7123302939607518173">項目に関連する広告が有用であると思われる場合、興味 / 関心またはサイトを追加してください。</translation>
 <translation id="7124013154139278147">スイッチを「前へ」に割り当てます</translation>
 <translation id="7124712201233930202">組織のポリシーに違反しています</translation>
-<translation id="7125029162161377569">プライバシー サンドボックスの試用版を使うと、使用されるユーザーデータの量を抑えつつ、同じようにサイトをブラウジングできる可能性があります。それによってユーザーのプライバシー保護が強化され、クロスサイト トラッキングが制限されます。テストの準備が整い次第、他の新しい試用版も追加されます。</translation>
+<translation id="7125029162161377569">プライバシー サンドボックスの試用版を使うと、使用するユーザー情報量を減らしながら、これまでと同様にブラウジングできる可能性があります。それによってユーザーのプライバシー保護が強化され、クロスサイト トラッキングが制限されます。テストの準備が整い次第、他の新しい試用版も追加されます。</translation>
 <translation id="7125148293026877011">Crostini を削除</translation>
 <translation id="7127980134843952133">ダウンロード履歴</translation>
 <translation id="7128151990937044829">通知がブロックされたときにアドレスバーにインジケーターを表示する</translation>
@@ -7678,7 +7678,7 @@
 <translation id="7798844538707273832"><ph name="PERMISSION" />を自動ブロック</translation>
 <translation id="7800518121066352902">反時計回りに回転(&amp;O)</translation>
 <translation id="7801679634091975683">ここで加えた変更は、Lacros Chrome ブラウザにのみ反映されます。Chrome ブラウザの設定に変更を加えるには、Chrome ブラウザを開いて [設定] に移動してください。</translation>
-<translation id="780301667611848630">いいえ、結構です</translation>
+<translation id="780301667611848630">同意しない</translation>
 <translation id="7804072833593604762">タブが閉じられました</translation>
 <translation id="7805768142964895445">ステータス</translation>
 <translation id="7805906048382884326">ヒントを閉じる</translation>
@@ -8279,7 +8279,7 @@
 <translation id="8322814362483282060">このページはマイクへのアクセスを禁止されています。</translation>
 <translation id="8323167517179506834">URL を入力してください</translation>
 <translation id="8323317289166663449">自分のパソコンとすべてのウェブサイト上にある自分の全データの読み取りと変更</translation>
-<translation id="8324784016256120271">サイトは、Cookie を使用して別のサイトでのあなたの閲覧アクティビティを確認できます（広告のカスタマイズなどが行えます）</translation>
+<translation id="8324784016256120271">サイトは、Cookie を使用して別のサイトでのあなたの閲覧アクティビティを確認できます（広告のパーソナライズなどが行えます）</translation>
 <translation id="8325413836429495820">クリップボードの読み取りを許可しないサイト</translation>
 <translation id="8326478304147373412">PKCS #7、証明書チェーン</translation>
 <translation id="8327386430364625757">数字フォント</translation>

chrome/app/resources/generated_resources_ka.xtb

diff --git a/chrome/app/resources/generated_resources_ka.xtb b/chrome/app/resources/generated_resources_ka.xtb
index 282fbca..8f5fa346 100644
--- a/chrome/app/resources/generated_resources_ka.xtb
+++ b/chrome/app/resources/generated_resources_ka.xtb
@@ -3015,6 +3015,7 @@
 <translation id="3609277884604412258">სწრაფი ძიება</translation>
 <translation id="3610241585790874201">თქვენს მოწყობილობაზე მონაცემების შენახვა დაშვებული არ არის</translation>
 <translation id="3610369246614755442">სამაგრის ვენტილატორი საჭიროებს ტექნიკურ მომსახურებას</translation>
+<translation id="3610961622607302617">პაროლის შეცვლა <ph name="WEBSITE" />-ისთვის</translation>
 <translation id="361106536627977100">ფლეშ მონაცემები</translation>
 <translation id="3611655097742243705">სხვა აპების საპოვნელად ეწვიეთ Play Store-ს</translation>
 <translation id="3611658447322220736">ბოლო დროს დახურულ საიტებს შეუძლია მონაცემთა გაგზავნისა და მიღების დასრულება</translation>
@@ -6030,6 +6031,7 @@
 <translation id="6318125393809743217">წესების კონფიგურაციების შემცველი policies.json ფაილის დართვა.</translation>
 <translation id="6318407754858604988">ჩამოტვირთვა დაიწყო</translation>
 <translation id="6318944945640833942">პრინტერის აღმოჩენა ვერ მოხერხდა. გთხოვთ, ხელახლა შეიყვანოთ პრინტერის მისამართი.</translation>
+<translation id="6320808462673705899">თქვენს საძიებო მოთხოვნას სანიშნეები არ ემთხვევა.</translation>
 <translation id="6322370287306604163">განბლოკეთ უფრო სწრაფად თითის ანაბეჭდის მეშვეობით</translation>
 <translation id="6322559670748154781">ამ ფაილის ჩამოტვირთვა ხშირად არ ხორციელდება ხოლმე, ამიტომ ის დაიბლოკა დამატებითი დაცვის მიერ</translation>
 <translation id="6324916366299863871">მალსახმობის რედაქტირება</translation>

chrome/app/resources/generated_resources_km.xtb

diff --git a/chrome/app/resources/generated_resources_km.xtb b/chrome/app/resources/generated_resources_km.xtb
index c1f35ff..27661b0 100644
--- a/chrome/app/resources/generated_resources_km.xtb
+++ b/chrome/app/resources/generated_resources_km.xtb
@@ -699,6 +699,7 @@
 <translation id="1593594475886691512">កំពុងសម្អាត...</translation>
 <translation id="159359590073980872">ឃ្លាំងសម្ងាត់រូបភាព</translation>
 <translation id="1593926297800505364">រក្សាទុកវិធី​បង់ប្រាក់</translation>
+<translation id="1594703455918849716">ចូល​ទៅកាន់​ទំព័រការពិនិត្យ</translation>
 <translation id="1595492813686795610">Linux កំពុង​ដំឡើងកំណែ</translation>
 <translation id="1596286373007273895">អាចប្រើបាន</translation>
 <translation id="1596709061955594992">ប៊្លូធូសត្រូវ​បានបិទ។ ដើម្បីមើល​ឧបករណ៍ដែលអាច​ប្រើបាន សូមបើក​ប៊្លូធូស។</translation>
@@ -1694,6 +1695,7 @@
 <translation id="2399699884460174994">បានបើកការជូនដំណឹង</translation>
 <translation id="2399939490305346086">ទិន្នន័យ​ចូលគណនីរបស់​សោសុវត្ថិភាព</translation>
 <translation id="2400664245143453337">តម្រូវឱ្យមាន​ការដំឡើង​កំណែភ្លាមៗ</translation>
+<translation id="2402226831639195063">សំឡេង</translation>
 <translation id="2406153734066939945">លុបកម្រងព័ត៌មាន​នេះ និងទិន្នន័យ​របស់វាឬ?</translation>
 <translation id="2408018932941436077">កំពុង​រក្សាទុកបណ្ណ</translation>
 <translation id="2408955596600435184">បញ្ចូល​កូដ PIN របស់​អ្នក</translation>
@@ -1705,6 +1707,7 @@
 <translation id="241082044617551207">កម្មវិធីជំនួយដែលមិនស្គាល់</translation>
 <translation id="2410940059315936967">គេហទំព័រ​ដែលអ្នកចូលមើល​អាច​បង្កប់ខ្លឹមសារ​ពីគេហទំព័រ​ផ្សេងទៀត ដូចជា​រូបភាព ការផ្សាយពាណិជ្ជកម្ម និង​អក្សរ​ជាដើម។ ខូគី​ដែលបានកំណត់ដោយ​គេហទំព័រផ្សេងទៀត​ទាំង​នេះត្រូវបាន​ហៅ​ថា​ខូគី​ភាគីទីបី។</translation>
 <translation id="2411666601450687801">មិនមាន​ម៉ាស៊ីននិម្មិត​ត្រូ​វបាន​អនុញ្ញាត​នៅលើ​ឧបករណ៍​នេះ​ទេ</translation>
+<translation id="2412015533711271895">ត្រូវមានការយល់ព្រមពីមាតាបិតា ឬ​អាណាព្យាបាល​របស់​អ្នក ទើប​អ្នកអាចប្រើ​​កម្មវិធីបន្ថែម​នេះបាន</translation>
 <translation id="2412753904894530585">Kerberos</translation>
 <translation id="2414886740292270097">ងងឹត</translation>
 <translation id="2416435988630956212">គ្រាប់ចុច​មុខងារ​នៅលើក្ដារចុច</translation>
@@ -3030,6 +3033,7 @@
 <translation id="3609277884604412258">ការស្វែងរករហ័ស</translation>
 <translation id="3610241585790874201">មិនបានអនុញ្ញាត​ឱ្យរក្សាទុក​ទិន្នន័យ​នៅលើ​ឧបករណ៍​របស់អ្នកទេ</translation>
 <translation id="3610369246614755442">កង្ហារឧបករណ៍​ភ្ជាប់​តម្រូវឱ្យមានការ​ជួលជុល</translation>
+<translation id="3610961622607302617">ផ្លាស់ប្ដូរពាក្យសម្ងាត់សម្រាប់ <ph name="WEBSITE" /></translation>
 <translation id="361106536627977100">ទិន្នន័យ Flash</translation>
 <translation id="3611655097742243705">ចូល​ទៅកាន់ Play Store ដើម្បីស្វែងរក​កម្មវិធីច្រើនទៀត</translation>
 <translation id="3611658447322220736">គេហទំព័រដែលបានបិទថ្មីៗអាចបញ្ចប់ការផ្ញើ និងទទួលទិន្នន័យ</translation>
@@ -3086,6 +3090,7 @@
 <translation id="3651488188562686558">ផ្តាច់​ពី Wi-Fi</translation>
 <translation id="3652817283076144888">កំពុង​ចាប់ផ្ដើម</translation>
 <translation id="3653160965917900914">ការចែករំលែក​ឯកសារ​តាមបណ្ដាញ</translation>
+<translation id="3653887973853407813">អ្នក​មិន​អាច​ប្រើកម្មវិធី​បន្ថែម​នេះ​បាន​ទេ។ មាតាបិតា ឬអាណាព្យាបាល​របស់​អ្នក​បានបិទ “ការ​អនុញ្ញាត​សម្រាប់​គេហទំព័រ កម្មវិធី និង​កម្មវិធី​បន្ថែម” លើ Chrome។</translation>
 <translation id="3653999333232393305">បន្តអនុញ្ញាត <ph name="HOST" /> ឲ្យចូលប្រើម៉ៃក្រូហ្វូនរបស់អ្នក</translation>
 <translation id="3654045516529121250">អានការកំណត់លទ្ធភាពប្រើប្រាស់របស់អ្នក</translation>
 <translation id="3655712721956801464">{NUM_FILES,plural, =1{វាមានការចូលប្រើឯកសារមួយជាប្រចាំ។}other{វាមានការចូលប្រើឯកសារ # ជាប្រចាំ។}}</translation>
@@ -5158,6 +5163,7 @@
 <translation id="5517304475148761050">កម្មវិធី​នេះ​ត្រូវការ​សិទ្ធិចូល​ប្រើប្រាស់ Play Store</translation>
 <translation id="5517412723934627386"><ph name="NETWORK_TYPE" /> - <ph name="NETWORK_DISPLAY_NAME" /></translation>
 <translation id="5518219166343146486">សួរនៅពេល​ដែល​ទំព័រ​ចង់​មើល​អត្ថបទ និង​រូបភាព​ដែល​បាន​ចម្លង​ទៅ​អង្គចងចាំ</translation>
+<translation id="5518949581554491184">រៀបចំ​ដោយ​ប្រើ​ទូរសព្ទ Android</translation>
 <translation id="5519195206574732858">LTE</translation>
 <translation id="5521078259930077036">តើនេះជាទំព័រដើមដែលអ្នកចង់បានឬ?</translation>
 <translation id="5522156646677899028">កម្មវិធីបន្ថែមផ្ទុកភាពងាយរងគ្រោះផ្នែកសុវត្ថិភាពធ្ងន់ធ្ងរ។</translation>
@@ -6047,6 +6053,7 @@
 <translation id="6318125393809743217">រួមបញ្ចូល​ឯកសារ policies.json ជាមួយ​ការកំណត់រចនាសម្ព័ន្ធ​គោលការណ៍។</translation>
 <translation id="6318407754858604988">បាន​ចាប់ផ្ដើម​ការទាញយក</translation>
 <translation id="6318944945640833942">រកមិនឃើញ​ម៉ាស៊ីន​បោះពុម្ព​ទេ។ សូមបញ្ចូល​អាសយដ្ឋាន​ម៉ាស៊ីន​បោះពុម្ព​ម្តងទៀត។</translation>
+<translation id="6320808462673705899">មិនមាន​ចំណាំ​ដែល​ត្រូវនឹង​ការ​ស្វែងរក​របស់​អ្នក​ទេ។</translation>
 <translation id="6322370287306604163">ដោះសោកាន់តែរហ័សដោយប្រើស្នាម​ម្រាមដៃ</translation>
 <translation id="6322559670748154781">ឯកសារនេះ​មិនត្រូវបាន​ទាញយកជាទូទៅ​ទេ និងត្រូវបាន​ទប់ស្កាត់​ដោយការ​ការពារ​កម្រិតខ្ពស់</translation>
 <translation id="6324916366299863871">កែសម្រួលផ្លូវកាត់</translation>
@@ -6491,6 +6498,7 @@
 <translation id="6725206449694821596">ប្រូតូកូលបោះពុម្ពលើអ៊ីនធឺណិត (IPP)</translation>
 <translation id="6725970970008349185">ចំនួនបេក្ខជនដើម្បីបង្ហាញក្នុងមួយទំព័រ</translation>
 <translation id="672609503628871915">មើលអ្វីដែលថ្មី</translation>
+<translation id="6726800386221816228">តួ​អក្សរ​ពិសេស</translation>
 <translation id="67269783048918309">បញ្ជូន​ទិន្នន័យ​ប្រើប្រាស់ និង​វិភាគ។ បច្ចុប្បន្ននេះ ឧបករណ៍នេះ​កំពុងបញ្ជូន​ទិន្នន័យនៃការ​វិភាគ ឧបករណ៍ និងការ​ប្រើប្រាស់​កម្មវិធី​ទៅ Google ដោយស្វ័យប្រវត្តិ។ សកម្មភាពនេះ​នឹងមិនត្រូវ​បានធ្វើឡើង ដើម្បី​កំណត់​អត្តសញ្ញាណ​កូន​របស់អ្នក​នោះទេ តែការធ្វើបែបនេះ​នឹងជួយដល់ស្ថិរភាពកម្មវិធី និងប្រព័ន្ធ ព្រមទាំង​ការកែលម្អ​ផ្សេងទៀត។ ទិន្នន័យ​ប្រមូលបាន​មួយចំនួន​ក៏នឹង​ជួយដល់​កម្មវិធី និង​ដៃគូ Google ដូចជា​អ្នកអភិវឌ្ឍន៍ Android ផងដែរ។ <ph name="BEGIN_LINK1" />ការកំណត់<ph name="END_LINK1" />នេះត្រូវបាន​អនុវត្ត​ដោយម្ចាស់។ ប្រសិនបើ​ការកំណត់​សកម្មភាព​កម្មវិធី និង​គេហទំព័រ​បន្ថែម​ត្រូវបាន​បើកសម្រាប់​កូនរបស់អ្នក នោះទិន្នន័យនេះ​អាចត្រូវ​បានរក្សាទុក​ទៅក្នុង​គណនី Google របស់គាត់។ <ph name="BEGIN_LINK2" />ស្វែងយល់​បន្ថែម<ph name="END_LINK2" /></translation>
 <translation id="6728528977475057549">IBAN ដែលបញ្ចប់​ដោយ <ph name="LAST_FOUR_DIGITS" /></translation>
 <translation id="6729192290958770680">បញ្ចូល​ឈ្មោះ​អ្នក​ប្រើប្រាស់​របស់​អ្នក</translation>
@@ -6893,6 +6901,7 @@
 <translation id="7063129466199351735">កំពុងដំណើរការផ្លូវកាត់...</translation>
 <translation id="7063311912041006059">URL ដែលមាន <ph name="SPECIAL_SYMBOL" /> ជំនួសឱ្យសំណួរ</translation>
 <translation id="706342288220489463">អនុញ្ញាតឱ្យ​ជំនួយការ​របស់អ្នក​ប្រើព័ត៌មាននៅលើអេក្រង់របស់អ្នក ដើម្បីជួយ</translation>
+<translation id="70641621694466590">ចូល​ទៅកាន់​ទំព័រ​ពាក្យសម្ងាត់</translation>
 <translation id="7064734931812204395">កំណត់រចនាសម្ព័ន្ធទម្រង់ផ្ទុក Linux។ សកម្មភាពនេះ​​អាច​ចំណាយ​ពេល​រហូតដល់ 30 នាទី​។</translation>
 <translation id="7065223852455347715">ឧបករណ៍នេះបានចាក់សោក្នុងរបៀបដែលរារាំងការចុះឈ្មោះសហគ្រាស។  ប្រសិនបើអ្នកចង់ចុះឈ្មោះឧបករណ៍ អ្នកត្រូវចូលទៅកាន់ការសង្គ្រោះឧបករណ៍ជាមុនសិន។</translation>
 <translation id="7065534935986314333">អំពីប្រព័ន្ធ</translation>
@@ -7394,6 +7403,7 @@
 <translation id="7541773865713908457"><ph name="ACTION_NAME" /> ដោយប្រើ​កម្មវិធី <ph name="APP_NAME" /></translation>
 <translation id="754207240458482646">បានធ្វើសមកាលកម្ម​ជាមួយឧបករណ៍ផ្សេងទៀតនៅលើគណនីរបស់អ្នក។ <ph name="LINK_BEGIN" />ស្វែងយល់បន្ថែម<ph name="LINK_END" /></translation>
 <translation id="7543104066686362383">បើកដំណើរការលក្ខណៈពិសេសកម្ចាត់កំហុសនៅលើឧបករណ៍ <ph name="IDS_SHORT_PRODUCT_NAME" /> នេះ</translation>
+<translation id="7544977292347272434">ស្នើសុំមាតាបិតា​របស់​អ្នកឱ្យ​អនុញ្ញាត​កម្មវិធីបន្ថែម​</translation>
 <translation id="7545466883021407599">មិនអាច​ភ្ជាប់ជាមួយ​ម៉ាស៊ីនមេបានទេ។ សូមពិនិត្យការតភ្ជាប់បណ្ដាញរបស់អ្នក រួចព្យាយាមម្តងទៀត។ ប្រសិនបើអ្នក​នៅតែ​មានបញ្ហា​ដដែល សូមសាកល្បង​ចាប់ផ្ដើម Chromebook របស់អ្នក​ឡើងវិញ​។ លេខ​កូដ​បញ្ហា៖ <ph name="ERROR_CODE" />។</translation>
 <translation id="7547317915858803630">ការព្រមាន៖ ការកំណត់ <ph name="PRODUCT_NAME" />របស់អ្នកត្រូវបានផ្ទុកនៅលើដ្រាយបណ្តាញ។ វាអាចបណ្តាលឲ្យមានការយឺតយ៉ាវ គាំង និងបាត់បង់ទិន្នន័យជាដើម។</translation>
 <translation id="7548856833046333824">ក្រូចឆ្មា</translation>
@@ -7622,6 +7632,7 @@
 <translation id="7728668285692163452">ការប្តូរ​បណ្តាញ​នឹង​ត្រូវបាន​អនុវត្ត​នៅ​ពេលក្រោយ</translation>
 <translation id="7730449930968088409">ចាប់យកមាតិកាអេក្រង់របស់អ្នក</translation>
 <translation id="7730683939467795481">ទំព័រនេះត្រូវបានផ្លាស់ប្ដូរដោយកម្មវិធីបន្ថែម "<ph name="EXTENSION_NAME" />"</translation>
+<translation id="773511996612364297">សញ្ញា​សម្គាល់​សំឡេង</translation>
 <translation id="7735165285389721951">ការដំឡើង Steam មួយទៀតកំពុងដំណើរការ។ សូមរង់ចាំឱ្យការដំឡើងនោះចប់សិន មុនពេលព្យាយាមម្ដងទៀត</translation>
 <translation id="7737115349420013392">កំពុងផ្គូផ្គងជាមួយ "<ph name="DEVICE_NAME" />" ...</translation>
 <translation id="7737203573077018777">បាន​ទទួល​កា​រណែនាំ <ph name="PROOF_OF_POSSESSION_INSTRUCTION_NAME" /></translation>
@@ -7704,6 +7715,7 @@
 <translation id="7792388396321542707">ឈប់ចែករំលែក</translation>
 <translation id="779308894558717334">បៃតងខ្ចី</translation>
 <translation id="7793098747275782155">ខៀវចាស់</translation>
+<translation id="7796453472368605346">សញ្ញា​ប្ដូរ​សំឡេង</translation>
 <translation id="7797571222998226653">បិទ</translation>
 <translation id="7798504574384119986">មើល​ការ​អនុញ្ញាត​បណ្ដាញ</translation>
 <translation id="7798844538707273832">បាន​ទប់ស្កាត់ <ph name="PERMISSION" /> ដោយ​ស្វ័យប្រវត្តិ</translation>
@@ -7788,6 +7800,7 @@
 <translation id="7876027585589532670">មិនអាចកែ​ផ្លូវកាត់​បានទេ</translation>
 <translation id="7877451762676714207">កំហុសឆ្គងម៉ាស៊ីនមេមិនស្គាល់។ សូូមព្យាយាមម្តងទៀត ឬទំនាក់ទំនងអ្នកគ្រប់គ្រងម៉ាស៊ីនមេ។</translation>
 <translation id="7878945852730162014">គ្រប់គ្រងឯកសារនៅពេលទាញយក រួចបើកឯកសារទាំងនោះនៅពេលរួចរាល់</translation>
+<translation id="7879172417209159252">មិន​អាច​ប្រើ​កម្មវិធីបន្ថែម​​បាន​ទេ</translation>
 <translation id="7879478708475862060">ធ្វើតាមរបៀបធាតុបញ្ចូល</translation>
 <translation id="7879631849810108578">បានកំណត់​ផ្លូវកាត់​៖ <ph name="IDS_SHORT_SET_COMMAND" /></translation>
 <translation id="7880823633812189969">ទិន្នន័យ​មូលដ្ឋាន​នឹងលុប នៅពេលអ្នក​ចាប់ផ្ដើម​ឡើងវិញ</translation>

chrome/app/resources/generated_resources_kn.xtb

diff --git a/chrome/app/resources/generated_resources_kn.xtb b/chrome/app/resources/generated_resources_kn.xtb
index 67ab76602..0137fb8 100644
--- a/chrome/app/resources/generated_resources_kn.xtb
+++ b/chrome/app/resources/generated_resources_kn.xtb
@@ -701,6 +701,7 @@
 <translation id="1593594475886691512">ಸ್ವರೂಪಣೆ ಮಾಡಲಾಗುತ್ತಿದೆ...</translation>
 <translation id="159359590073980872">ಚಿತ್ರದ ಕ್ಯಾಷ್</translation>
 <translation id="1593926297800505364">ಪಾವತಿ ವಿಧಾನವನ್ನು ಉಳಿಸಿ</translation>
+<translation id="1594703455918849716">ಪರಿಶೀಲನೆ ಪುಟಕ್ಕೆ ಹೋಗಿ</translation>
 <translation id="1595492813686795610">Linux ಅಪ್‌ಗ್ರೇಡ್ ಆಗುತ್ತಿದೆ</translation>
 <translation id="1596286373007273895">ಲಭ್ಯ</translation>
 <translation id="1596709061955594992">ಬ್ಲೂಟೂತ್ ಆಫ್ ಆಗಿದೆ. ಲಭ್ಯವಿರುವ ಸಾಧನಗಳನ್ನು ನೋಡಲು, ಬ್ಲೂಟೂತ್ ಅನ್ನು ಆನ್ ಮಾಡಿ.</translation>
@@ -1687,6 +1688,7 @@
 <translation id="2399699884460174994">ಅಧಿಸೂಚನೆಗಳನ್ನು ಆನ್ ಮಾಡಲಾಗಿದೆ</translation>
 <translation id="2399939490305346086">ಭದ್ರತೆ ಕೀ ಸೈನ್-ಇನ್ ಡೇಟಾ</translation>
 <translation id="2400664245143453337">ಕೂಡಲೇ ಅಪ್‌ಡೇಟ್ ಮಾಡಬೇಕಿದೆ</translation>
+<translation id="2402226831639195063">ಟೋನ್‌ಗಳು</translation>
 <translation id="2406153734066939945">ಈ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಇದರ ಡೇಟಾವನ್ನು ಅಳಿಸಬೇಕೇ?</translation>
 <translation id="2408018932941436077">ಕಾರ್ಡ್ ಅನ್ನು ಉಳಿಸಲಾಗುತ್ತಿದೆ</translation>
 <translation id="2408955596600435184">ನಿಮ್ಮ ಪಿನ್ ನಮೂದಿಸಿ</translation>
@@ -1698,6 +1700,7 @@
 <translation id="241082044617551207">ಅಪರಿಚಿತ ಪ್ಲಗ್-ಇನ್</translation>
 <translation id="2410940059315936967">ನೀವು ಭೇಟಿ ನೀಡುವ ಸೈಟ್ ಇತರ ಸೈಟ್‌ಗಳಿಂದ ವಿಷಯವನ್ನು ಎಂಬೆಡ್ ಮಾಡಬಹುದು, ಉದಾಹರಣೆಗೆ ಚಿತ್ರಗಳು, ಜಾಹೀರಾತುಗಳು ಮತ್ತು ಪಠ್ಯ. ಈ ಇತರ ಸೈಟ್‌ಗಳಿಂದ ಸೆಟ್ ಮಾಡಲಾದ ಕುಕೀಗಳನ್ನು ಥರ್ಡ್-ಪಾರ್ಟಿ ಕುಕಿಗಳು ಎಂದು ಕರೆಯಲಾಗುತ್ತದೆ.</translation>
 <translation id="2411666601450687801">ಈ ಸಾಧನದಲ್ಲಿ ಯಾವುದೇ ವರ್ಚುವಲ್ ಮಷಿನ್‌ಗಳನ್ನು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ</translation>
+<translation id="2412015533711271895">ನೀವು ಈ ವಿಸ್ತರಣೆಯನ್ನು ಬಳಸುವುದಕ್ಕೆ ತಮ್ಮ ಒಪ್ಪಿಗೆಯಿದೆ ಎಂದು ನಿಮ್ಮ ಪೋಷಕರು ಅಥವಾ ಪಾಲಕರು ಸೂಚಿಸಬೇಕು</translation>
 <translation id="2412753904894530585">Kerberos</translation>
 <translation id="2414886740292270097">ಗಾಢ</translation>
 <translation id="2416435988630956212">ಕೀಬೋರ್ಡ್ ಫಂಕ್ಷನ್ ಕೀಗಳು</translation>
@@ -3023,6 +3026,7 @@
 <translation id="3609277884604412258">ತ್ವರಿತ ಹುಡುಕಾಟ</translation>
 <translation id="3610241585790874201">ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಡೇಟಾವನ್ನು ಉಳಿಸಲು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ</translation>
 <translation id="3610369246614755442">ಡಾಕ್ ಫ್ಯಾನ್‌ಗೆ ದುರಸ್ತಿಯ ಅಗತ್ಯವಿದೆ</translation>
+<translation id="3610961622607302617"><ph name="WEBSITE" /> ಗೆ ಸಂಬಂಧಿಸಿದ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಬದಲಾಯಿಸಿ</translation>
 <translation id="361106536627977100">ಫ್ಲ್ಯಾಶ್ ಡೇಟಾ</translation>
 <translation id="3611655097742243705">ಇನ್ನಷ್ಟು ಆ್ಯಪ್‌ಗಳನ್ನು ಹುಡುಕಲು Play Store ಗೆ ಭೇಟಿ ನೀಡಿ</translation>
 <translation id="3611658447322220736">ಇತ್ತೀಚೆಗೆ ಮುಚ್ಚಲಾದ ಸೈಟ್‌ಗಳು ಡೇಟಾ ಕಳುಹಿಸುವ ಮತ್ತು ಸ್ವೀಕರಿಸುವ ಪ್ರಕ್ರಿಯೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಬಹುದು</translation>
@@ -3079,6 +3083,7 @@
 <translation id="3651488188562686558">ವೈ-ಫೈ ನಿಂದ ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಿ</translation>
 <translation id="3652817283076144888">ಆರಂಭಿಸಲಾಗುತ್ತಿದೆ</translation>
 <translation id="3653160965917900914">ನೆಟ್‌ವರ್ಕ್‌ ಫೈಲ್‌ ಹಂಚಿಕೆಗಳು</translation>
+<translation id="3653887973853407813">ಈ ವಿಸ್ತರಣೆಯನ್ನು ಬಳಸಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ನಿಮ್ಮ ಪೋಷಕರು ಅಥವಾ ಪಾಲಕರು, Chrome ಗೆ ಸಂಬಂಧಿಸಿದಂತೆ "ಸೈಟ್‌ಗಳು, ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ವಿಸ್ತರಣೆಗಳಿಗೆ ಸಂಬಂಧಿಸಿದ ಅನುಮತಿಗಳನ್ನು" ಆಫ್ ಮಾಡಿದ್ದಾರೆ.</translation>
 <translation id="3653999333232393305">ನಿಮ್ಮ ಮೈಕ್ರೋಫೋನ್ ಪ್ರವೇಶಿಸಲು <ph name="HOST" /> ಗೆ ಅನುಮತಿಸುವುದನ್ನು ಮುಂದುವರೆಸಿ</translation>
 <translation id="3654045516529121250">ನಿಮ್ಮ ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಓದಿಕೊಳ್ಳಿ</translation>
 <translation id="3655712721956801464">{NUM_FILES,plural, =1{ಇದು ಒಂದು ಫೈಲ್‌ಗೆ ಶಾಶ್ವತ ಪ್ರವೇಶವನ್ನು ಹೊಂದಿದೆ.}one{ಇದು # ಫೈಲ್‌ಗಳಿಗೆ ಶಾಶ್ವತ ಪ್ರವೇಶವನ್ನು ಹೊಂದಿದೆ.}other{ಇದು # ಫೈಲ್‌ಗಳಿಗೆ ಶಾಶ್ವತ ಪ್ರವೇಶವನ್ನು ಹೊಂದಿದೆ.}}</translation>
@@ -5152,6 +5157,7 @@
 <translation id="5517304475148761050">ಈ ಆ್ಯಪ್‌ಗೆ Play Store ಗೆ ಪ್ರವೇಶದ ಅಗತ್ಯವಿದೆ</translation>
 <translation id="5517412723934627386"><ph name="NETWORK_TYPE" /> - <ph name="NETWORK_DISPLAY_NAME" /></translation>
 <translation id="5518219166343146486">ನೀವು ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ನಕಲಿಸಿರುವ ಪಠ್ಯ ಮತ್ತು ಚಿತ್ರಗಳನ್ನು ಒಂದು ಸೈಟ್ ನೋಡಲು ಬಯಸುವಾಗ ಅನುಮತಿ ಕೇಳಿ</translation>
+<translation id="5518949581554491184">Android ಫೋನ್ ಬಳಸಿಕೊಂಡು ಸೆಟಪ್ ಮಾಡಿ</translation>
 <translation id="5519195206574732858">LTE</translation>
 <translation id="5521078259930077036">ಇದು ನೀವು ನಿರೀಕ್ಷಿಸುತ್ತಿದ್ದ ಹೋಮ್ ಆಗಿದೆಯಾ?</translation>
 <translation id="5522156646677899028">ಈ ವಿಸ್ತರಣೆಯು ಗಂಭೀರ ಭದ್ರತಾ ಅಪಾಯ ಸಾಧ್ಯತೆಯನ್ನು ಒಳಗೊಂಡಿದೆ.</translation>
@@ -6041,6 +6047,7 @@
 <translation id="6318125393809743217">ಕಾರ್ಯನೀತಿ ಕಾನ್ಫಿಗರೇಷನ್‌ಗಳನ್ನು ಹೊಂದಿರುವ policies.json ಫೈಲ್ ಅನ್ನು ಸೇರಿಸಿ.</translation>
 <translation id="6318407754858604988">ಡೌನ್‌ಲೋಡ್ ಪ್ರಾರಂಭಿಸಲಾಗಿದೆ</translation>
 <translation id="6318944945640833942">ಪ್ರಿಂಟರ್ ಅನ್ನು ಪತ್ತೆಹಚ್ಚಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ಪ್ರಿಂಟರ್ ವಿಳಾಸವನ್ನು ಪುನಃ ನಮೂದಿಸಿ.</translation>
+<translation id="6320808462673705899">ನಿಮ್ಮ ಹುಡುಕಾಟಕ್ಕೆ ಹೊಂದಾಣಿಕೆಯಾಗುವ ಯಾವುದೇ ಬುಕ್‌ಮಾರ್ಕ್‌ಗಳಿಲ್ಲ.</translation>
 <translation id="6322370287306604163">ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಮೂಲಕ ವೇಗವಾಗಿ ಅನ್‌ಲಾಕ್ ಮಾಡಿ</translation>
 <translation id="6322559670748154781">ಈ ಫೈಲ್ ಅನ್ನು ಸಾಮಾನ್ಯವಾಗಿ ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾಗುವುದಿಲ್ಲ ಮತ್ತು ಸುಧಾರಿತ ರಕ್ಷಣೆಯಿಂದ ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ</translation>
 <translation id="6324916366299863871">ಶಾರ್ಟ್‌ಕಟ್ ಎಡಿಟ್ ಮಾಡಿ</translation>
@@ -6487,6 +6494,7 @@
 <translation id="6725206449694821596">ಇಂಟರ್ನೆಟ್ ಮುದ್ರಿಸುವಿಕೆಯ ಪ್ರೊಟೊಕಾಲ್ (IPP)</translation>
 <translation id="6725970970008349185">ಪ್ರತಿ ಪುಟವನ್ನು ಪ್ರದರ್ಶಿಸಲು ಅಭ್ಯರ್ಥಿಗಳ ಸಂಖ್ಯೆ</translation>
 <translation id="672609503628871915">ಹೊಸದೇನಿದೆ ನೋಡಿ</translation>
+<translation id="6726800386221816228">ವಿಶೇಷ ಅಕ್ಷರಗಳು</translation>
 <translation id="67269783048918309">ಬಳಕೆ ಮತ್ತು ಡಯಾಗ್ನಾಸ್ಟಿಕ್ ಡೇಟಾವನ್ನು ಕಳುಹಿಸಿ. ಪ್ರಸ್ತುತ ಈ ಸಾಧನವು ಡಯಾಗ್ನಾಸ್ಟಿಕ್, ಸಾಧನ, ಮತ್ತು ಆ್ಯಪ್ ಬಳಕೆಯ ಡೇಟಾವನ್ನು Google ಗೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಕಳುಹಿಸುತ್ತಿದೆ. ಈ ಡೇಟಾವನ್ನು ನಿಮ್ಮ ಮಗುವನ್ನು ಗುರುತಿಸುವುದಕ್ಕೆ ಬಳಸುವುದಿಲ್ಲ, ಹಾಗೂ ಇದು ಸಿಸ್ಟಮ್ ಮತ್ತು ಆ್ಯಪ್ ಸ್ಥಿರತೆಗೆ, ಹಾಗೂ ಇತರ ಸುಧಾರಣೆಗಳಿಗೆ ಸಹಾಯ ಮಾಡುತ್ತದೆ. ಕೆಲವು ಒಟ್ಟುಗೂಡಿಸಿದ ಡೇಟಾವು, Google ಆ್ಯಪ್‌ಗಳಿಗೆ ಮತ್ತು ಪಾಲುದಾರರಿಗೂ ಸಹ ಸಹಾಯ ಮಾಡುತ್ತದೆ. ಉದಾಹರಣೆಗೆ, Android ಡೆವಲಪರ್‌ಗಳು. ಈ <ph name="BEGIN_LINK1" />ಸೆಟ್ಟಿಂಗ್<ph name="END_LINK1" />ಅನ್ನು ಮಾಲೀಕರೇ ಜಾರಿಗೊಳಿಸುತ್ತಾರೆ. ನಿಮ್ಮ ಮಗುವಿಗಾಗಿ ಹೆಚ್ಚುವರಿ ವೆಬ್‌ ಮತ್ತು ಆ್ಯಪ್ ಚಟುವಟಿಕೆ ಸೆಟ್ಟಿಂಗ್ ಅನ್ನು ಆನ್‌ ಮಾಡಿದ್ದಲ್ಲಿ, ಈ ಡೇಟಾವು ಅವರ Google ಖಾತೆಯಲ್ಲಿ ಉಳಿಸಲ್ಪಡಬಹುದು. <ph name="BEGIN_LINK2" />ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ<ph name="END_LINK2" /></translation>
 <translation id="6728528977475057549"><ph name="LAST_FOUR_DIGITS" /> ನೊಂದಿಗೆ ಕೊನೆಗೊಳ್ಳುವ IBAN</translation>
 <translation id="6729192290958770680">ನಿಮ್ಮ ಬಳಕೆದಾರರ ಹೆಸರನ್ನು ನಮೂದಿಸಿ</translation>
@@ -6890,6 +6898,7 @@
 <translation id="7063129466199351735">ಶಾರ್ಟ್‌ಕಟ್‌ಗಳನ್ನು ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲಾಗುತ್ತಿದೆ...</translation>
 <translation id="7063311912041006059">ಪ್ರಶ್ನಾವಳಿ ಬದಲಾಗಿ <ph name="SPECIAL_SYMBOL" /> ಹೊಂದಿರುವ URL</translation>
 <translation id="706342288220489463">ಸಹಾಯಕ್ಕಾಗಿ, ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಮೇಲಿರುವ ಮಾಹಿತಿಯನ್ನು ಬಳಸಲು ನಿಮ್ಮ Assistant ಗೆ ಅನುಮತಿಸಿ</translation>
+<translation id="70641621694466590">ಪಾಸ್‌ವರ್ಡ್‌ಗಳ ಪುಟಕ್ಕೆ ಹೋಗಿ</translation>
 <translation id="7064734931812204395">Linux ಕಂಟೇನರ್ ಅನ್ನು ಕಾನ್ಫಿಗರ್ ಮಾಡಲಾಗುತ್ತಿದೆ. ಇದು 30 ನಿಮಿಷಗಳವರೆಗೆ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು.</translation>
 <translation id="7065223852455347715">ಈ ಸಾಧನವನ್ನು ಎಂಟರ್‌ರ್ಪ್ರೈಸ್ ನೋಂದಣಿಯನ್ನು ತಡೆಯುವ ಮೋಡ್‌ನಲ್ಲಿ ಲಾಕ್ ಮಾಡಲಾಗಿದೆ. ನೀವು ಸಾಧನವನ್ನು ನೋಂದಣಿ ಮಾಡಲು ಬಯಸಿದರೆ ನೀವು ಮೊದಲಿಗೆ ಸಾಧನ ಮರುಪ್ರಾಪ್ತಿಯನ್ನು ಮಾಡಬೇಕಾದ ಅಗತ್ಯವಿರುತ್ತದೆ.</translation>
 <translation id="7065534935986314333">ಸಿಸ್ಟಂ ಬಗ್ಗೆ</translation>
@@ -7390,6 +7399,7 @@
 <translation id="7541773865713908457"><ph name="APP_NAME" /> ಆ್ಯಪ್ ಬಳಸಿಕೊಂಡು <ph name="ACTION_NAME" /></translation>
 <translation id="754207240458482646">ನಿಮ್ಮ ಖಾತೆಯಲ್ಲಿ ಇತರ ಸಾಧನಗಳ ಜೊತೆಗೆ ಸಿಂಕ್ ಮಾಡಲಾಗಿದೆ. <ph name="LINK_BEGIN" />ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ<ph name="LINK_END" /></translation>
 <translation id="7543104066686362383">ಈ <ph name="IDS_SHORT_PRODUCT_NAME" /> ಸಾಧನದಲ್ಲಿ ಡೀಬಗ್ ಮಾಡುವಿಕೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ</translation>
+<translation id="7544977292347272434">ವಿಸ್ತರಣೆಯನ್ನು ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡುವುದಕ್ಕೆ ಅನುಮತಿ ನೀಡಲು ನಿಮ್ಮ ಪೋಷಕರನ್ನು ಕೇಳಿ</translation>
 <translation id="7545466883021407599">ಸರ್ವರ್‌ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ನಿಮ್ಮ ನೆಟ್‌ವರ್ಕ್ ಕನೆಕ್ಷನ್ ಅನ್ನು ಪರಿಶೀಲಿಸಿ ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. ನಿಮಗೆ ಈಗಲೂ ಸಮಸ್ಯೆ ಎದುರಾಗುತ್ತಿದ್ದರೆ, ನಿಮ್ಮ Chromebook ಅನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ ನೋಡಿ. ದೋಷ ಕೋಡ್: <ph name="ERROR_CODE" />.</translation>
 <translation id="7547317915858803630">ಎಚ್ಚರಿಕೆ: ನಿಮ್ಮ <ph name="PRODUCT_NAME" /> ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ನೆಟ್‌ವರ್ಕ್ ಡ್ರೈವ್‌ನಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿದೆ. ಇದರಿಂದಾಗಿ ನಿಧಾನವಾಗುವುದು, ಕ್ರ್ಯಾಶ್‌ಗಳಲ್ಲಿ ಅಥವಾ ಡೇಟಾ ನಷ್ಟವಾಗುವುದರಲ್ಲಿಯೂ ಇದು ಕೊನೆಗೊಳ್ಳಬಹುದು.</translation>
 <translation id="7548856833046333824">ಲೆಮನಾಡ್</translation>
@@ -7618,6 +7628,7 @@
 <translation id="7728668285692163452">ಚಾನಲ್ ಬದಲಾವಣೆಯನ್ನು ನಂತರ ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ</translation>
 <translation id="7730449930968088409">ನಿಮ್ಮ ಪರದೆಯ ವಿಷಯವನ್ನು ಸೆರೆಹಿಡಿಯಿರಿ</translation>
 <translation id="7730683939467795481">ಈ ಪುಟವನ್ನು "<ph name="EXTENSION_NAME" />" ವಿಸ್ತರಣೆ ಬಳಸಿ ಬದಲಾಯಿಸಲಾಗಿದೆ</translation>
+<translation id="773511996612364297">ಉಚ್ಚಾರಣಾ ಗುರುತುಗಳು</translation>
 <translation id="7735165285389721951">ಮತ್ತೊಂದು Steam ಸೆಟಪ್ ರನ್ ಆಗುತ್ತಿದೆ. ಮತ್ತೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸುವ ಮೊದಲು, ಅದು ಪೂರ್ಣವಾಗುವವರೆಗೆ ನಿರೀಕ್ಷಿಸಿ</translation>
 <translation id="7737115349420013392">"<ph name="DEVICE_NAME" />" ಜೊತೆ ಜೋಡಿಸಲಾಗುತ್ತಿದೆ...</translation>
 <translation id="7737203573077018777"><ph name="PROOF_OF_POSSESSION_INSTRUCTION_NAME" /> ಸೂಚನೆಯನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ</translation>
@@ -7699,6 +7710,7 @@
 <translation id="7792388396321542707">ಹಂಚಿಕೆಯನ್ನು ನಿಲ್ಲಿಸಿ</translation>
 <translation id="779308894558717334">ತಿಳಿ ಹಸಿರು</translation>
 <translation id="7793098747275782155">ಗಾಢ ನೀಲಿ</translation>
+<translation id="7796453472368605346">ಉಚ್ಚಾರಣಾ ರೂಪಗಳು</translation>
 <translation id="7797571222998226653">ಆಫ್</translation>
 <translation id="7798504574384119986">ವೆಬ್ ಅನುಮತಿಗಳನ್ನು ವೀಕ್ಷಿಸಿ</translation>
 <translation id="7798844538707273832"><ph name="PERMISSION" /> ಸ್ವಯಂಚಾಲಿತವಾಗಿ ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ</translation>
@@ -7783,6 +7795,7 @@
 <translation id="7876027585589532670">ಶಾರ್ಟ್‌ಕಟ್ ಅನ್ನು‌ ಎಡಿಟ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ</translation>
 <translation id="7877451762676714207">ಅಪರಿಚಿತ ಸರ್ವರ್ ದೋಷ. ದಯವಿಟ್ಟು ಪುನಃ ಪ್ರಯತ್ನಿಸಿ, ಅಥವಾ ಸರ್ವರ್ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ.</translation>
 <translation id="7878945852730162014">ಫೈಲ್‌ಗಳನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದಂತೆ ಅವುಗಳನ್ನು ನಿರ್ವಹಿಸಿ ಮತ್ತು ಅವುಗಳು ಮುಗಿದ ನಂತರ ತೆರೆಯಿರಿ</translation>
+<translation id="7879172417209159252">ವಿಸ್ತರಣೆಯನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ</translation>
 <translation id="7879478708475862060">ಇನ್‌ಪುಟ್ ಮೋಡ್ ಅನುಸರಿಸಿ</translation>
 <translation id="7879631849810108578">ಶಾರ್ಟ್‌ಕಟ್ ಸೆಟ್ ಮಾಡಲಾಗಿದೆ: <ph name="IDS_SHORT_SET_COMMAND" /></translation>
 <translation id="7880823633812189969">ನೀವು ಮರುಪ್ರಾರಂಭಿಸಿದಾಗ ಸ್ಥಳೀಯ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ</translation>

chrome/app/resources/generated_resources_lo.xtb

diff --git a/chrome/app/resources/generated_resources_lo.xtb b/chrome/app/resources/generated_resources_lo.xtb
index f652adb..3d590ba9 100644
--- a/chrome/app/resources/generated_resources_lo.xtb
+++ b/chrome/app/resources/generated_resources_lo.xtb
@@ -697,6 +697,7 @@
 <translation id="1593594475886691512">ກໍາລັງຟໍແມັດ...</translation>
 <translation id="159359590073980872">ແຄຊ໌ຮູບ</translation>
 <translation id="1593926297800505364">ບັນທຶກວິທີການຈ່າຍເງິນ</translation>
+<translation id="1594703455918849716">ເຂົ້າໄປໜ້າການກວດສອບ</translation>
 <translation id="1595492813686795610">Linux ກຳລັງອັບເກຣດ</translation>
 <translation id="1596286373007273895">ສາມາດໃຊ້ໄດ້</translation>
 <translation id="1596709061955594992">Bluetooth ຖືກປິດໄວ້ຢູ່. ເພື່ອເບິ່ງອຸປະກອນທີ່ສາມາດໃຊ້ໄດ້, ກະລຸນາເປີດ Bluetooth ກ່ອນ.</translation>
@@ -1693,6 +1694,7 @@
 <translation id="2399699884460174994">ເປິດການແຈ້ງເຕືອນແລ້ວ</translation>
 <translation id="2399939490305346086">ຂໍ້ມູນການເຂົ້າສູ່ລະບົບໃນກະແຈຄວາມປອດໄພ</translation>
 <translation id="2400664245143453337">ຈໍາເປັນຕ້ອງອັບເດດໃນທັນທີ</translation>
+<translation id="2402226831639195063">ໂທນສຽງ</translation>
 <translation id="2406153734066939945">ລຶບໂປຣໄຟລ໌ນີ້ ແລະ ຂໍ້ມູນຂອງມັນບໍ?</translation>
 <translation id="2408018932941436077">ກຳລັງບັນທຶກບັດ</translation>
 <translation id="2408955596600435184">​ປ້ອນ​ລະ​ຫັດ PIN ຂອງ​ທ່ານ</translation>
@@ -1704,6 +1706,7 @@
 <translation id="241082044617551207">ປລັກອິນທີ່ບໍ່ຮູ້ຈັກ</translation>
 <translation id="2410940059315936967">ເວັບໄຊທີ່ທ່ານເຂົ້າເບິ່ງສາມາດຝັງເນື້ອຫາຈາກເວັບໄຊອື່ນໆໄດ້, ຕົວຢ່າງ: ຮູບ, ໂຄສະນາ ແລະ ຂໍ້ຄວາມ. ຄຸກກີ້ທີ່ເວັບໄຊອື່ນໆເຫຼົ່ານີ້ຕັ້ງຄ່າໄວ້ແມ່ນເອີ້ນວ່າຄຸກກີ້ພາກສ່ວນທີສາມ.</translation>
 <translation id="2411666601450687801">ບໍ່ອະນຸຍາດໃຫ້ໃຊ້ເຄື່ອງຈັກສະເໝືອນຢູ່ອຸປະກອນນີ້</translation>
+<translation id="2412015533711271895">ພໍ່ແມ່ ຫຼື ຜູ້ປົກຄອງຂອງທ່ານຕ້ອງຕອບຕົກລົງກ່ອນ ທ່ານຈຶ່ງຈະສາມາດໃຊ້ສ່ວນຂະຫຍາຍນີ້ໄດ້</translation>
 <translation id="2412753904894530585">Kerberos</translation>
 <translation id="2414886740292270097">ມືດ</translation>
 <translation id="2416435988630956212">ປຸ່ມຟັງຊັນໃນແປ້ນພິມ</translation>
@@ -3086,6 +3089,7 @@
 <translation id="3651488188562686558">ຕັດການເຊື່ອມຕໍ່ຈາກ Wi-Fi</translation>
 <translation id="3652817283076144888">ກຳລັງເລີ່ມຕົ້ນ</translation>
 <translation id="3653160965917900914">ການແບ່ງປັນໄຟລ໌ຜ່ານເຄືອຂ່າຍ</translation>
+<translation id="3653887973853407813">ທ່ານບໍ່ສາມາດໃຊ້ສ່ວນຂະຫຍາຍນີ້ໄດ້. ພໍ່ແມ່ ຫຼື ຜູ້ປົກຄອງຂອງທ່ານຕ້ອງໄດ້ປິດ “ການອະນຸຍາດສຳລັບເວັບໄຊ, ແອັບ ແລະ ສ່ວນຂະຫຍາຍ” ໃນ Chrome.</translation>
 <translation id="3653999333232393305">ສືບ​ຕໍ່​ອະນຸຍາດໃຫ້ <ph name="HOST" /> ເຂົ້າຫາໄມໂຄຣໂຟນຂອງ​ທ່ານ</translation>
 <translation id="3654045516529121250">ອ່ານການຕັ້ງຄ່າຄວາມສາມາດເຂົ້າຫາ</translation>
 <translation id="3655712721956801464">{NUM_FILES,plural, =1{ມັນມີການເຂົ້າຫາໜຶ່ງ​ໄຟ​ລ໌ຖາວອນ.}other{ມັນມີການເຂົ້າຫາ # ໄຟ​ລ໌ຖາວອນ.}}</translation>
@@ -5157,6 +5161,7 @@
 <translation id="5517304475148761050">ແອັບນີ້ຈໍາເປັນຕ້ອງເຂົ້າເຖິງ Play Store</translation>
 <translation id="5517412723934627386"><ph name="NETWORK_TYPE" /> - <ph name="NETWORK_DISPLAY_NAME" /></translation>
 <translation id="5518219166343146486">ຖາມເມື່ອເວັບໄຊຕ້ອງການເຫັນຂໍ້ຄວາມ ແລະ ຮູບພາບທີ່ສຳເນົາໄວ້ໃນຄລິບບອດ</translation>
+<translation id="5518949581554491184">ຕັ້ງຄ່າດ້ວຍໂທລະສັບ Android</translation>
 <translation id="5519195206574732858">LTE</translation>
 <translation id="5521078259930077036">ນີ້ແມ່ນໜ້າຫຼັກທີ່ທ່ານຄາດໄວ້ບໍ?</translation>
 <translation id="5522156646677899028">ສ່ວນ​ຂະ​ຫຍາຍ​ນີ້​ມີ​ຄວາມອ່ອນໄຫວເລື່ອງຄວາມ​ປອດ​ໄພ​ຮ້າຍ​ແຮງ​.</translation>
@@ -6490,6 +6495,7 @@
 <translation id="6725206449694821596">ໂປຣໂຕຄໍການພິມຜ່ານອິນເຕີເນັດ (IPP)</translation>
 <translation id="6725970970008349185">ຈໍາ​ນວນ​ຜູ້ສະໝັກທີ່​ຈະ​ສະ​ແດງຂຶ້ນ​ຕໍ່​ຫນ້າ</translation>
 <translation id="672609503628871915">ເບິ່ງ​ມີອັນໃດໃຫມ່</translation>
+<translation id="6726800386221816228">ຕົວອັກສອນພິເສດ</translation>
 <translation id="67269783048918309">ສົ່ງຂໍ້ມູນການນຳໃຊ້ ແລະ ການວິເຄາະ. ອຸປະກອນນີ້ກຳລັງສົ່ງຂໍ້ມູນການວິເຄາະ, ຂໍ້ມູນອຸປະກອນ ແລະ ການໃຊ້ແອັບໃຫ້ Google ໂດຍອັດຕະໂນມັດໃນຂະນະນີ້. ຂໍ້ມູນນີ້ຈະບໍ່ຖືກໃຊ້ເພື່ອລະບຸຕົວລູກຂອງທ່ານ ແລະ ຈະຊ່ວຍປັບປຸງຄວາມສະຖຽນຂອງລະບົບ ແລະ ແອັບ ແລະ ການປັບປຸງອື່ນໆ. ບາງຂໍ້ມູນແບບຮວມກັນຍັງຈະຊ່ວຍແອັບ ແລະ ຮຸ້ນສ່ວນຂອງ Google ນຳອີກ ເຊັ່ນ: ຜູ້ພັດທະນາ Android. ເຈົ້າຂອງບັງຄັບໃຊ້ <ph name="BEGIN_LINK1" />ການຕັ້ງຄ່າ<ph name="END_LINK1" /> ນີ້. ຖ້າເປີດການຕັ້ງຄ່າການເຄື່ອນໄຫວເວັບ ແລະ ແອັບເພີ່ມເຕີມສໍາລັບລູກຂອງທ່ານ, ລະບົບອາດຈະບັນທຶກຂໍ້ມູນນີ້ໄວ້ໃນບັນຊີ Google ຂອງເຂົາເຈົ້າ. <ph name="BEGIN_LINK2" />ສຶກສາ​ເພີ່ມ​ເຕີມ<ph name="END_LINK2" /></translation>
 <translation id="6728528977475057549">IBAN ທີ່ລົງທ້າຍໃນ <ph name="LAST_FOUR_DIGITS" /></translation>
 <translation id="6729192290958770680">ລະບຸຊື່ຜູ້ໃຊ້ຂອງທ່ານ</translation>
@@ -6892,6 +6898,7 @@
 <translation id="7063129466199351735">ກໍາລັງປະມວນຜົນທາງລັດ...</translation>
 <translation id="7063311912041006059">URL ທີ່ມີ <ph name="SPECIAL_SYMBOL" /> ແທນຄຳຊອກຫາ</translation>
 <translation id="706342288220489463">ອະນຸຍາດໃຫ້ຜູ້ຊ່ວຍຂອງທ່ານໃຊ້ຂໍ້ມູນຢູ່ໜ້າຈໍຂອງທ່ານເພື່ອຊ່ວຍເຫຼືອໄດ້</translation>
+<translation id="70641621694466590">ເຂົ້າໄປໜ້າລະຫັດຜ່ານ</translation>
 <translation id="7064734931812204395">ກຳລັງຕັ້ງຄ່າກ່ອງບັນຈຸ Linux ຢູ່. ນີ້ອາດຈະໃຊ້ເວລາບໍ່ເກີນ 30 ນາທີ.</translation>
 <translation id="7065223852455347715">ອຸ​ປະ​ກອນ​ນີ້​ຖືກ​ລັອກ​ຢູ່​ໃນ​ໂໝດ​ທີ່​ປ້ອງ​ກັນ​ການ​ຈົດ​ທະ​ບຽນ​ວິ​ສາ​ຫະ​ກິດ. ຖ້າ​ທ່ານ​ຕ້ອງ​ການ​ຈົດ​ທະ​ບຽນ​ອຸ​ປະ​ກອນ ທ່ານ​ຈຳ​ເປັນ​ຕ້ອງ​ໄປ​ຜ່ານ​ການ​ກູ້​ຄືນ​ອຸ​ປະ​ກອນ​ກ່ອນ.</translation>
 <translation id="7065534935986314333">ກ່ຽວກັບລະບົບ</translation>
@@ -7392,6 +7399,7 @@
 <translation id="7541773865713908457"><ph name="ACTION_NAME" /> ດ້ວຍແອັບ <ph name="APP_NAME" /></translation>
 <translation id="754207240458482646">ຊິ້ງຂໍ້ມູນກັບອຸປະກອນອື່ນໃນບັນຊີຂອງທ່ານແລ້ວ. <ph name="LINK_BEGIN" />ສຶກສາເພີ່ມເຕີມ<ph name="LINK_END" /></translation>
 <translation id="7543104066686362383">ເປີດ​ໃຊ້​ງານ​ຄຸນສົມບັດ​ການ​ແກ້​ໄຂ​ບັນ​ຫາ​ຢູ່​ເທິງ​ອຸ​ປະ​ກອນ <ph name="IDS_SHORT_PRODUCT_NAME" /> ນີ້</translation>
+<translation id="7544977292347272434">ຂໍໃຫ້ຜູ້ປົກຄອງຂອງທ່ານອະນຸຍາດໃຫ້ຕິດຕັ້ງສ່ວນຂະຫຍາຍ</translation>
 <translation id="7545466883021407599">ບໍ່ສາມາດເຊື່ອມຕໍ່ກັບເຊີບເວີໄດ້. ກະລຸນາກວດສອບການເຊື່ອມຕໍ່ເຄືອຂ່າຍຂອງທ່ານແລ້ວລອງໃໝ່. ຫາກທ່ານຍັງຄົງພົບບັນຫາຢູ່, ໃຫ້ລອງຣີສະຕາດ Chromebook ຂອງທ່ານ. ລະຫັດຂໍ້ຜິດພາດ: <ph name="ERROR_CODE" />.</translation>
 <translation id="7547317915858803630">ຄໍາເຕືອນ: ການຕັ້ງຄ່າ <ph name="PRODUCT_NAME" /> ຂອງທ່ານຖືກເກັບໄວ້ຢູ່ໃນດຣາຍເຄືອຂ່າຍ. ອັນນີ້ອາດຈະສົ່ງຜົນໃຫ້ມີການຊ້າລົງ, ເກີດການຂັດຂ້ອງ, ຫຼືແມ້ແຕ່ການສູນເສຍຂໍ້ມູນ.</translation>
 <translation id="7548856833046333824">ນໍ້າໝາກນາວ</translation>
@@ -7620,6 +7628,7 @@
 <translation id="7728668285692163452">ການປ່ຽນຊ່ອງຈະຖືກນຳໃຊ້ໃນພາຍຫຼັງ</translation>
 <translation id="7730449930968088409">ແຄັບເຈີເນື້ອໃນຂອງໜ້າຈໍຂອງທ່ານ</translation>
 <translation id="7730683939467795481">ໜ້ານີ້ຖືກປ່ຽນໂດຍສ່ວນຂະຫຍາຍ "<ph name="EXTENSION_NAME" />"</translation>
+<translation id="773511996612364297">ເຄື່ອງໝາຍສຳນຽງ</translation>
 <translation id="7735165285389721951">ກຳລັງມີການເອີ້ນໃຊ້ການຕັ້ງຄ່າ Steam ອື່ນຢູ່. ກະລຸນາລໍຖ້າໃຫ້ມັນສຳເລັດກ່ອນການລອງໃໝ່</translation>
 <translation id="7737115349420013392">ກຳລັງຈັບຄູ່ກັບ "<ph name="DEVICE_NAME" />" ...</translation>
 <translation id="7737203573077018777">ໄດ້ຮັບຄຳສັ່ງ <ph name="PROOF_OF_POSSESSION_INSTRUCTION_NAME" /> ລາຍການແລ້ວ</translation>
@@ -7701,6 +7710,7 @@
 <translation id="7792388396321542707">ຢຸດການແຊຣ໌</translation>
 <translation id="779308894558717334">ສີຂຽວອ່ອນ</translation>
 <translation id="7793098747275782155">ສີຟ້າເຂັ້ມ</translation>
+<translation id="7796453472368605346">ເຄື່ອງໝາຍການອອກສຽງ</translation>
 <translation id="7797571222998226653">ປິດ</translation>
 <translation id="7798504574384119986">ເບິ່ງການອະນຸຍາດເວັບ</translation>
 <translation id="7798844538707273832">ບລັອກ <ph name="PERMISSION" /> ອັດຕະໂນມັດແລ້ວ</translation>
@@ -7785,6 +7795,7 @@
 <translation id="7876027585589532670">ບໍ່ສາມາດແກ້ໄຂທາງລັດໄດ້</translation>
 <translation id="7877451762676714207">ການຜິດພາດຂອງເຊີບເວີທີ່ບໍ່ຮູ້ຈັກ. ກະລຸນາລອງໃໝ່ອີກ, ຫຼືຕິດຕໍ່ຫາຜູ້ຄວບຄຸມເຊີບເວີ.</translation>
 <translation id="7878945852730162014">ຈັດການໄຟລ໌ເມື່ອດາວໂຫຼດ ແລະ ເປີດໄຟລ໌ເຫຼົ່ານັ້ນເມື່ອສຳເລັດ.</translation>
+<translation id="7879172417209159252">ບໍ່ສາມາດໃຊ້ສ່ວນຂະຫຍາຍໄດ້</translation>
 <translation id="7879478708475862060">ປະຕິບັດຕາມໂໝດປ້ອນເຂົ້າ</translation>
 <translation id="7879631849810108578">ທາງລັດທີ່ຕັ້ງຄ່າ: <ph name="IDS_SHORT_SET_COMMAND" /></translation>
 <translation id="7880823633812189969">ຂໍ້ມູນພາຍໃນເຄື່ອງຈະຖືກລຶບເມື່ອທ່ານປິດເປີດຄືນໃໝ່</translation>

chrome/app/resources/generated_resources_lv.xtb

diff --git a/chrome/app/resources/generated_resources_lv.xtb b/chrome/app/resources/generated_resources_lv.xtb
index 8523cf5e..9ed15e5d 100644
--- a/chrome/app/resources/generated_resources_lv.xtb
+++ b/chrome/app/resources/generated_resources_lv.xtb
@@ -6501,7 +6501,7 @@
 <translation id="6748980958975836188">Es izlasīju <ph name="BEGIN_LINK1" />Google pakalpojumu sniegšanas noteikumus<ph name="END_LINK1" />, kā arī <ph name="BEGIN_LINK2" />Chrome un Chrome OS pakalpojumu sniegšanas papildu noteikumus<ph name="END_LINK2" /> un piekrītu tiem.</translation>
 <translation id="6750757184909117990">Mobilā tīkla atspējošana</translation>
 <translation id="6751344591405861699"><ph name="WINDOW_TITLE" /> (Inkognito režīms)</translation>
-<translation id="6756157672127672536">Izmantojot lietotni Faili, varat ērti piekļūt failiem, kas saglabāti Google diskā, ārējā atmiņā vai Chrome OS ierīcē.</translation>
+<translation id="6756157672127672536">Izmantojot lietotni Faili, varat ērti piekļūt failiem, kas saglabāti Google diskā, ārējā krātuvē vai Chrome OS ierīcē.</translation>
 <translation id="6756643207511618722">Runas programmas</translation>
 <translation id="6757431299485455321">Varat palīdzēt citām ierīcēm atrast šo tīklāju.</translation>
 <translation id="6758056191028427665">Sniedziet atsauksmes par pakalpojuma darbību.</translation>

chrome/app/resources/generated_resources_ml.xtb

diff --git a/chrome/app/resources/generated_resources_ml.xtb b/chrome/app/resources/generated_resources_ml.xtb
index 93365d4..5ab516f 100644
--- a/chrome/app/resources/generated_resources_ml.xtb
+++ b/chrome/app/resources/generated_resources_ml.xtb
@@ -3014,6 +3014,7 @@
 <translation id="3609277884604412258">ദ്രുത തിരയൽ</translation>
 <translation id="3610241585790874201">നിങ്ങളുടെ ഉപകരണത്തിൽ ഡാറ്റ സംരക്ഷിക്കാൻ അനുവാദമില്ല</translation>
 <translation id="3610369246614755442">ഡോക്ക് ഫാൻ സർവീസ് ചെയ്യേണ്ടതുണ്ട്</translation>
+<translation id="3610961622607302617"><ph name="WEBSITE" /> എന്നതിന്റെ പാസ്‌വേഡ് മാറ്റുക</translation>
 <translation id="361106536627977100">ഫ്ലാഷ് ഡാറ്റ</translation>
 <translation id="3611655097742243705">കൂടുതൽ ആപ്പുകൾ കണ്ടെത്താൻ Play Store സന്ദർശിക്കുക</translation>
 <translation id="3611658447322220736">അടുത്തിടെ അടച്ച സൈറ്റുകൾക്ക് ഡാറ്റ അയയ്‌ക്കുന്നതും സ്വീകരിക്കുന്നതും പൂർത്തിയാക്കാം</translation>
@@ -6030,6 +6031,7 @@
 <translation id="6318125393809743217">നയ കോൺഫിഗറേഷനുകളുള്ള policies.json ഫയൽ ഉൾപ്പെടുത്തുക.</translation>
 <translation id="6318407754858604988">ഡൗൺലോഡ് ആരംഭിച്ചു</translation>
 <translation id="6318944945640833942">പ്രിന്റർ കണ്ടെത്താനായില്ല. പ്രിന്റർ വിലാസം വീണ്ടും നൽകുക.</translation>
+<translation id="6320808462673705899">നിങ്ങളുടെ തിരയലുമായി പൊരുത്തപ്പെടുന്ന ബുക്ക്‌മാർക്കുകൾ ഒന്നുമില്ല.</translation>
 <translation id="6322370287306604163">ഫിംഗർപ്രിന്റ് ഉപയോഗിച്ച് വേഗത്തിൽ അൺലോക്ക് ചെയ്യുക</translation>
 <translation id="6322559670748154781">ഈ ഫയൽ സാധാരണ ഡൗൺലോഡ് ചെയ്യാറില്ലാത്തതിനാൽ, വിപുലമായ പരിരക്ഷ അത് ബ്ലോക്ക് ചെയ്തിരിക്കുന്നു</translation>
 <translation id="6324916366299863871">കുറുക്കുവഴി എഡിറ്റ് ചെയ്യുക</translation>

chrome/app/resources/generated_resources_mr.xtb

diff --git a/chrome/app/resources/generated_resources_mr.xtb b/chrome/app/resources/generated_resources_mr.xtb
index 470115b..b4af30b 100644
--- a/chrome/app/resources/generated_resources_mr.xtb
+++ b/chrome/app/resources/generated_resources_mr.xtb
@@ -3029,6 +3029,7 @@
 <translation id="3609277884604412258">झटपट शोध</translation>
 <translation id="3610241585790874201">तुमच्या डिव्हाइसवर डेटा सेव्ह करण्याची अनुमती नाही</translation>
 <translation id="3610369246614755442">डॉक फॅनला सेवा हव्या आहेत</translation>
+<translation id="3610961622607302617"><ph name="WEBSITE" /> चा पासवर्ड बदला</translation>
 <translation id="361106536627977100">फ्लॅश डेटा</translation>
 <translation id="3611655097742243705">आणखी अ‍ॅप्स शोधण्यासाठी Play Store ला भेट द्या</translation>
 <translation id="3611658447322220736">नुकत्याच बंद केलेल्या साइट डेटा पाठवणे आणि मिळवणे पूर्ण करू शकतात</translation>
@@ -6044,6 +6045,7 @@
 <translation id="6318125393809743217">धोरण कॉन्फिगरेशनसोबत policies.json फाइलचा समावेश करा.</translation>
 <translation id="6318407754858604988">डाउनलोड सुरू झाले</translation>
 <translation id="6318944945640833942">प्रिंटर शोधू शकलो नाही. कृपया प्रिंटर ॲड्रेस पुन्हा एंटर करा.</translation>
+<translation id="6320808462673705899">तुमच्या शोधाशी जुळणारे कोणतेही बुकमार्क नाहीत.</translation>
 <translation id="6322370287306604163">फिंगरप्रिंट वापरून जलदरीत्या अनलॉक करा</translation>
 <translation id="6322559670748154781">ही फाइल सामान्यतः डाउनलोड केली जात नाही आणि प्रगत संरक्षण याद्वारे ब्लॉक केली गेली आहे</translation>
 <translation id="6324916366299863871">शॉर्टकट संपादित करा</translation>

chrome/app/resources/generated_resources_my.xtb

diff --git a/chrome/app/resources/generated_resources_my.xtb b/chrome/app/resources/generated_resources_my.xtb
index a09ccda..a674ac5 100644
--- a/chrome/app/resources/generated_resources_my.xtb
+++ b/chrome/app/resources/generated_resources_my.xtb
@@ -3028,6 +3028,7 @@
 <translation id="3609277884604412258">အမြန် ရှာဖွေရန်</translation>
 <translation id="3610241585790874201">သင့်စက်တွင် ဒေတာသိမ်းရန် ခွင့်ပြုမထားပါ</translation>
 <translation id="3610369246614755442">အထိုင်ပန်ကာကို စစ်ဆေးကြည့်ရှုရန် လိုပါသည်</translation>
+<translation id="3610961622607302617"><ph name="WEBSITE" /> အတွက် စကားဝှက်ပြောင်းရန်</translation>
 <translation id="361106536627977100">ဖလက်ရှ် ဒေတာ</translation>
 <translation id="3611655097742243705">နောက်ထပ်အက်ပ်များ ရှာရန် Play Store တွင် ဝင်ကြည့်ပါ</translation>
 <translation id="3611658447322220736">မကြာသေးမီကပိတ်လိုက်သော ဝဘ်ဆိုက်များက ဒေတာပို့ခြင်းနှင့် လက်ခံခြင်းတို့ကို အပြီးသတ်နိုင်သည်</translation>
@@ -6043,6 +6044,7 @@
 <translation id="6318125393809743217">မူဝါဒ စီစဉ်သတ်မှတ်မှုများနှင့် policies.json ဖိုင် ပါဝင်သည်။</translation>
 <translation id="6318407754858604988">ဒေါင်းလုဒ် စလုပ်နေပါပြီ</translation>
 <translation id="6318944945640833942">ပရင်တာကို မတွေ့ပါ။ ပရင်တာ၏ လိပ်စာကို ထပ်မံ၍ ထည့်သွင်းပါ။</translation>
+<translation id="6320808462673705899">သင့်ရှာဖွေမှုနှင့် ကိုက်ညီသော လိပ်စာများမရှိပါ။</translation>
 <translation id="6322370287306604163">လက်ဗွေဖြင့် ပိုမိုမြန်ဆန်စွာ ဖွင့်ပါ</translation>
 <translation id="6322559670748154781">ဤဖိုင်ကို အများအားဖြင့် ဒေါင်းလုဒ်လုပ်လေ့ မရှိပါ။ အဆင့်မြင့်ကာကွယ်ရေးက ပိတ်ထားပါသည်</translation>
 <translation id="6324916366299863871">ဖြတ်လမ်းလင့်ခ်ကို တည်းဖြတ်ခြင်း</translation>

chrome/app/resources/generated_resources_nl.xtb

diff --git a/chrome/app/resources/generated_resources_nl.xtb b/chrome/app/resources/generated_resources_nl.xtb
index ec65ab37..b83ea8d8 100644
--- a/chrome/app/resources/generated_resources_nl.xtb
+++ b/chrome/app/resources/generated_resources_nl.xtb
@@ -696,6 +696,7 @@
 <translation id="1593594475886691512">Formatteren...</translation>
 <translation id="159359590073980872">Cache met afbeeldingen</translation>
 <translation id="1593926297800505364">Betaalmethode opslaan</translation>
+<translation id="1594703455918849716">Naar de controlepagina</translation>
 <translation id="1595492813686795610">Linux wordt geüpgraded</translation>
 <translation id="1596286373007273895">Beschikbaar</translation>
 <translation id="1596709061955594992">Bluetooth staat uit. Zet bluetooth aan om beschikbare apparaten te zien.</translation>
@@ -1679,6 +1680,7 @@
 <translation id="2399699884460174994">Meldingen staan aan</translation>
 <translation id="2399939490305346086">Inloggegevens voor beveiligingssleutel</translation>
 <translation id="2400664245143453337">Onmiddellijke update vereist</translation>
+<translation id="2402226831639195063">Tonen</translation>
 <translation id="2406153734066939945">Dit profiel en de bijbehorende gegevens verwijderen?</translation>
 <translation id="2408018932941436077">Kaart opslaan</translation>
 <translation id="2408955596600435184">Je pincode opgeven</translation>
@@ -1690,6 +1692,7 @@
 <translation id="241082044617551207">Onbekende plug-in</translation>
 <translation id="2410940059315936967">Een site die je bezoekt, kan content van andere sites insluiten, zoals afbeeldingen, advertenties en tekst. Cookies die door deze andere sites worden ingesteld, worden cookies van derden genoemd.</translation>
 <translation id="2411666601450687801">Er zijn geen virtuele machines toegestaan op dit apparaat</translation>
+<translation id="2412015533711271895">Je ouder of voogd moet toestemming geven dat je deze extensie mag gebruiken</translation>
 <translation id="2412753904894530585">Kerberos</translation>
 <translation id="2414886740292270097">Donker</translation>
 <translation id="2416435988630956212">Functietoetsen toetsenbord</translation>
@@ -3015,6 +3018,7 @@
 <translation id="3609277884604412258">Snel zoeken</translation>
 <translation id="3610241585790874201">Geen toestemming om gegevens op je apparaat op te slaan</translation>
 <translation id="3610369246614755442">De ventilator van het dock heeft onderhoud nodig</translation>
+<translation id="3610961622607302617">Wachtwoord wijzigen voor <ph name="WEBSITE" /></translation>
 <translation id="361106536627977100">Flash-gegevens</translation>
 <translation id="3611655097742243705">Ga naar de Play Store om meer apps te vinden</translation>
 <translation id="3611658447322220736">Onlangs gesloten sites kunnen het sturen en ontvangen van gegevens afronden</translation>
@@ -3071,6 +3075,7 @@
 <translation id="3651488188562686558">Verbinding met wifi-netwerk verbreken</translation>
 <translation id="3652817283076144888">Initialiseren</translation>
 <translation id="3653160965917900914">Fileshares via netwerk</translation>
+<translation id="3653887973853407813">Je kunt deze extensie niet gebruiken. Je ouder of voogd heeft Rechten voor sites, apps en extensies uitgezet voor Chrome.</translation>
 <translation id="3653999333232393305"><ph name="HOST" /> toegang tot je microfoon blijven geven</translation>
 <translation id="3654045516529121250">Je toegankelijkheidsinstellingen lezen</translation>
 <translation id="3655712721956801464">{NUM_FILES,plural, =1{De app heeft permanent toegang tot één bestand.}other{De app heeft permanent toegang tot # bestanden.}}</translation>
@@ -5140,6 +5145,7 @@
 <translation id="5517304475148761050">Deze app heeft toegang tot de Play Store nodig</translation>
 <translation id="5517412723934627386"><ph name="NETWORK_TYPE" /> - <ph name="NETWORK_DISPLAY_NAME" /></translation>
 <translation id="5518219166343146486">Vragen wanneer een site tekst en afbeeldingen wil bekijken die naar het klembord zijn gekopieerd</translation>
+<translation id="5518949581554491184">Instellen met Android-telefoon</translation>
 <translation id="5519195206574732858">LTE</translation>
 <translation id="5521078259930077036">Is dit de homepage die je had verwacht?</translation>
 <translation id="5522156646677899028">Deze extensie bevat een groot beveiligingsprobleem.</translation>
@@ -6024,6 +6030,7 @@
 <translation id="6318125393809743217">Een bestand policies.json opnemen bij beleidsconfiguraties.</translation>
 <translation id="6318407754858604988">Download gestart</translation>
 <translation id="6318944945640833942">Kan geen printer detecteren. Voer het printeradres opnieuw in.</translation>
+<translation id="6320808462673705899">Er zijn geen bookmarks die overeenkomen met je zoekopdracht.</translation>
 <translation id="6322370287306604163">Sneller ontgrendelen met je vingerafdruk</translation>
 <translation id="6322559670748154781">Dit bestand wordt niet vaak gedownload en is geblokkeerd door Geavanceerde beveiliging</translation>
 <translation id="6324916366299863871">Snelkoppeling bewerken</translation>
@@ -6468,6 +6475,7 @@
 <translation id="6725206449694821596">Internetafdrukprotocol (IPP)</translation>
 <translation id="6725970970008349185">Aantal kandidaten dat per pagina wordt weergegeven</translation>
 <translation id="672609503628871915">Wat is er nieuw?</translation>
+<translation id="6726800386221816228">Speciale tekens</translation>
 <translation id="67269783048918309">Stuur gebruiks- en diagnostische gegevens. Dit apparaat stuurt momenteel automatisch diagnostische, apparaat- en app-gebruiksgegevens naar Google. Deze gegevens worden niet gebruikt om je kind te identificeren en kunnen helpen om de systeem- en app-stabiliteit te verbeteren en andere optimalisaties mogelijk te maken. Daarnaast zijn bepaalde verzamelde gegevens nuttig voor Google-apps en -partners, zoals Android-ontwikkelaars. Deze <ph name="BEGIN_LINK1" />instelling<ph name="END_LINK1" /> wordt afgedwongen door de eigenaar. Als je de instelling voor aanvullende Web- en app-activiteit hebt aangezet voor je kind, kunnen deze gegevens worden opgeslagen in het Google-account van je kind. <ph name="BEGIN_LINK2" />Meer informatie<ph name="END_LINK2" /></translation>
 <translation id="6728528977475057549">IBAN eindigend op <ph name="LAST_FOUR_DIGITS" /></translation>
 <translation id="6729192290958770680">Geef je gebruikersnaam op</translation>
@@ -6869,6 +6877,7 @@
 <translation id="7063129466199351735">Snelle links verwerken...</translation>
 <translation id="7063311912041006059">URL met <ph name="SPECIAL_SYMBOL" /> in plaats van zoekterm</translation>
 <translation id="706342288220489463">Toestaan dat de Assistent de informatie op je scherm gebruikt om te helpen</translation>
+<translation id="70641621694466590">Naar de pagina Wachtwoorden</translation>
 <translation id="7064734931812204395">De Linux-container wordt geconfigureerd. Dit kan tot dertig minuten duren.</translation>
 <translation id="7065223852455347715">Dit apparaat is vergrendeld in een modus waarin zakelijke aanmelding niet mogelijk is. Als je het apparaat wilt aanmelden, moet je eerst apparaatherstel uitvoeren.</translation>
 <translation id="7065534935986314333">Over dit systeem</translation>
@@ -7369,6 +7378,7 @@
 <translation id="7541773865713908457"><ph name="ACTION_NAME" /> met <ph name="APP_NAME" />-app</translation>
 <translation id="754207240458482646">Gesynchroniseerd met andere apparaten in je account. <ph name="LINK_BEGIN" />Meer informatie<ph name="LINK_END" /></translation>
 <translation id="7543104066686362383">Foutopsporingsfuncties voor dit <ph name="IDS_SHORT_PRODUCT_NAME" />-apparaat aanzetten</translation>
+<translation id="7544977292347272434">Vraag je ouder om een extensie toe te staan</translation>
 <translation id="7545466883021407599">Kan geen verbinding maken met de server. Check je netwerkverbinding en probeer het opnieuw. Als je nog steeds problemen ondervindt, start je de Chromebook opnieuw op. Foutcode: <ph name="ERROR_CODE" />.</translation>
 <translation id="7547317915858803630">Waarschuwing: je instellingen voor <ph name="PRODUCT_NAME" /> zijn opgeslagen op een netwerkschijf. Dit kan leiden tot vertragingen, crashes of zelfs gegevensverlies.</translation>
 <translation id="7548856833046333824">Cocktail</translation>
@@ -7597,6 +7607,7 @@
 <translation id="7728668285692163452">Wijziging van kanaal wordt later toegepast</translation>
 <translation id="7730449930968088409">De content van je scherm vastleggen</translation>
 <translation id="7730683939467795481">Deze pagina is gewijzigd door de extensie '<ph name="EXTENSION_NAME" />'</translation>
+<translation id="773511996612364297">Accenttekens</translation>
 <translation id="7735165285389721951">Er is al een instelproces voor Steam actief. Wacht tot dit is afgerond voordat je het opnieuw probeert.</translation>
 <translation id="7737115349420013392">Koppelen met '<ph name="DEVICE_NAME" />'…</translation>
 <translation id="7737203573077018777"><ph name="PROOF_OF_POSSESSION_INSTRUCTION_NAME" />-instructie ontvangen</translation>
@@ -7677,6 +7688,7 @@
 <translation id="7792388396321542707">Delen stoppen</translation>
 <translation id="779308894558717334">Lichtgroen</translation>
 <translation id="7793098747275782155">Donkerblauw</translation>
+<translation id="7796453472368605346">Diakritische tekens</translation>
 <translation id="7797571222998226653">Uit</translation>
 <translation id="7798504574384119986">Webrechten bekijken</translation>
 <translation id="7798844538707273832"><ph name="PERMISSION" /> automatisch geblokkeerd</translation>
@@ -7761,6 +7773,7 @@
 <translation id="7876027585589532670">Kan snelkoppeling niet bewerken</translation>
 <translation id="7877451762676714207">Onbekende serverfout. Probeer het opnieuw of neem contact op met de serverbeheerder.</translation>
 <translation id="7878945852730162014">Beheer bestanden terwijl ze worden gedownload en open ze als ze klaar zijn</translation>
+<translation id="7879172417209159252">Kan extensie niet gebruiken</translation>
 <translation id="7879478708475862060">Invoermodus volgen</translation>
 <translation id="7879631849810108578">Snelkoppeling ingesteld: <ph name="IDS_SHORT_SET_COMMAND" /></translation>
 <translation id="7880823633812189969">Lokale gegevens worden verwijderd wanneer je opnieuw opstart</translation>

chrome/app/resources/generated_resources_no.xtb

diff --git a/chrome/app/resources/generated_resources_no.xtb b/chrome/app/resources/generated_resources_no.xtb
index b01f4a4c..24f98561 100644
--- a/chrome/app/resources/generated_resources_no.xtb
+++ b/chrome/app/resources/generated_resources_no.xtb
@@ -3025,6 +3025,7 @@
 <translation id="3609277884604412258">Hurtigsøk</translation>
 <translation id="3610241585790874201">Nettsteder som ikke har lov til å lagre data på enheten din</translation>
 <translation id="3610369246614755442">Dokkviften må på service</translation>
+<translation id="3610961622607302617">Endre passordet for <ph name="WEBSITE" /></translation>
 <translation id="361106536627977100">Flash-data</translation>
 <translation id="3611655097742243705">Gå til Play-butikken for å finne flere apper</translation>
 <translation id="3611658447322220736">Nylig lukkede nettsteder kan fullføre sending og mottak av data</translation>
@@ -6037,6 +6038,7 @@
 <translation id="6318125393809743217">Inkluder en policies.json-fil med regelkonfigurasjoner.</translation>
 <translation id="6318407754858604988">Nedlastingen er startet</translation>
 <translation id="6318944945640833942">Fant ikke noen skriver. Skriv inn skriveradressen på nytt.</translation>
+<translation id="6320808462673705899">Ingen bokmerker samsvarer med søket ditt.</translation>
 <translation id="6322370287306604163">Lås opp raskere med fingeravtrykk</translation>
 <translation id="6322559670748154781">Denne filen lastes sjelden ned og er blokkert av Avansert beskyttelse</translation>
 <translation id="6324916366299863871">Endre snarvei</translation>

chrome/app/resources/generated_resources_pl.xtb

diff --git a/chrome/app/resources/generated_resources_pl.xtb b/chrome/app/resources/generated_resources_pl.xtb
index 9efed91..1b69d077 100644
--- a/chrome/app/resources/generated_resources_pl.xtb
+++ b/chrome/app/resources/generated_resources_pl.xtb
@@ -698,6 +698,7 @@
 <translation id="1593594475886691512">Formatuję...</translation>
 <translation id="159359590073980872">Pamięć podręczna grafiki</translation>
 <translation id="1593926297800505364">Zapisz formę płatności</translation>
+<translation id="1594703455918849716">Otwórz stronę Sprawdzanie</translation>
 <translation id="1595492813686795610">Linux jest uaktualniany</translation>
 <translation id="1596286373007273895">Dostępne</translation>
 <translation id="1596709061955594992">Bluetooth jest wyłączony. Włącz go, aby zobaczyć dostępne urządzenia.</translation>
@@ -1666,6 +1667,7 @@
 <translation id="2399699884460174994">Powiadomienia włączone</translation>
 <translation id="2399939490305346086">Dane logowania na kluczu bezpieczeństwa</translation>
 <translation id="2400664245143453337">Wymagana natychmiastowa aktualizacja</translation>
+<translation id="2402226831639195063">Tony</translation>
 <translation id="2406153734066939945">Usunąć ten profil i powiązane z nim dane?</translation>
 <translation id="2408018932941436077">Zapisuję kartę</translation>
 <translation id="2408955596600435184">Wpisz kod PIN</translation>
@@ -1677,6 +1679,7 @@
 <translation id="241082044617551207">Nieznana wtyczka</translation>
 <translation id="2410940059315936967">Witryna, którą odwiedzasz, może wykorzystywać treści z innych witryn, np. obrazy, reklamy i tekst. Pliki cookie tworzone przez inne witryny są nazywane plikami cookie innych firm.</translation>
 <translation id="2411666601450687801">Na tym urządzeniu nie są dozwolone żadne maszyny wirtualne</translation>
+<translation id="2412015533711271895">Na to rozszerzenie musi wyrazić zgodę Twój rodzic lub opiekun</translation>
 <translation id="2412753904894530585">Kerberos</translation>
 <translation id="2414886740292270097">Ciemny</translation>
 <translation id="2416435988630956212">Klawisze funkcyjne na klawiaturze</translation>
@@ -3002,6 +3005,7 @@
 <translation id="3609277884604412258">Szybkie wyszukiwanie</translation>
 <translation id="3610241585790874201">Nie zezwolono na zapisywanie danych na urządzeniu</translation>
 <translation id="3610369246614755442">Wentylator stacji dokującej wymaga naprawy</translation>
+<translation id="3610961622607302617">Zmień hasło do strony <ph name="WEBSITE" />.</translation>
 <translation id="361106536627977100">Dane Flash</translation>
 <translation id="3611655097742243705">Aby znaleźć więcej aplikacji, odwiedź Sklep Play</translation>
 <translation id="3611658447322220736">Niedawno zamknięte strony mogą dokończyć wysyłanie i odbieranie danych</translation>
@@ -3058,6 +3062,7 @@
 <translation id="3651488188562686558">rozłączy się z siecią Wi-Fi</translation>
 <translation id="3652817283076144888">Inicjuję</translation>
 <translation id="3653160965917900914">Sieciowe udziały plików</translation>
+<translation id="3653887973853407813">Nie możesz używać tego rozszerzenia. Rodzic lub opiekun wyłączył w Chrome „Uprawnienia stron, aplikacji i rozszerzeń”.</translation>
 <translation id="3653999333232393305">Nadal zezwalaj witrynie <ph name="HOST" /> na dostęp do mikrofonu</translation>
 <translation id="3654045516529121250">Odczyt ustawień ułatwień dostępu</translation>
 <translation id="3655712721956801464">{NUM_FILES,plural, =1{Ma stały dostęp do jednego pliku.}few{Ma stały dostęp do # plików.}many{Ma stały dostęp do # plików.}other{Ma stały dostęp do # pliku.}}</translation>
@@ -5128,6 +5133,7 @@
 <translation id="5517304475148761050">Ta aplikacja wymaga dostępu do Sklepu Play</translation>
 <translation id="5517412723934627386"><ph name="NETWORK_TYPE" /> – <ph name="NETWORK_DISPLAY_NAME" /></translation>
 <translation id="5518219166343146486">Pytaj, gdy strona chce uzyskać dostęp do tekstu i obrazów skopiowanych do schowka</translation>
+<translation id="5518949581554491184">Skonfiguruj, używając telefonu z Androidem</translation>
 <translation id="5519195206574732858">LTE</translation>
 <translation id="5521078259930077036">Czy to oczekiwana strona główna?</translation>
 <translation id="5522156646677899028">To rozszerzenie zawiera poważną lukę w zabezpieczeniach.</translation>
@@ -6016,6 +6022,7 @@
 <translation id="6318125393809743217">Uwzględnij plik policies.json w konfiguracji zasad.</translation>
 <translation id="6318407754858604988">Rozpoczęto pobieranie</translation>
 <translation id="6318944945640833942">Nie udało się wykryć drukarki. Wpisz jej adres ponownie.</translation>
+<translation id="6320808462673705899">Brak zakładek pasujących do wyszukiwania.</translation>
 <translation id="6322370287306604163">Szybsze odblokowywanie odciskiem palca</translation>
 <translation id="6322559670748154781">Ten plik jest rzadko pobierany, dlatego zablokowała go Ochrona zaawansowana</translation>
 <translation id="6324916366299863871">Edytuj skrót</translation>
@@ -6464,6 +6471,7 @@
 <translation id="6725206449694821596">Internet Printing Protocol (IPP)</translation>
 <translation id="6725970970008349185">Liczba propozycji wyświetlanych na stronie</translation>
 <translation id="672609503628871915">Zobacz, co nowego</translation>
+<translation id="6726800386221816228">Znaki specjalne</translation>
 <translation id="67269783048918309">Wysyłaj dane diagnostyczne oraz informacje o użytkowaniu. To urządzenie automatycznie wysyła do Google dane diagnostyczne oraz informacje o używaniu urządzenia i aplikacji. Nie zostaną one użyte do zidentyfikowania Twojego dziecka. Wykorzystamy je, by 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 <ph name="BEGIN_LINK1" />ustawienie<ph name="END_LINK1" /> jest wymuszone przez właściciela. Jeśli na koncie Google dziecka włączysz ustawienie Dodatkowa aktywność w internecie i aplikacjach, te dane mogą być zapisywane na tym koncie. <ph name="BEGIN_LINK2" />Więcej informacji<ph name="END_LINK2" /></translation>
 <translation id="6728528977475057549">Numer IBAN kończący się cyframi <ph name="LAST_FOUR_DIGITS" /></translation>
 <translation id="6729192290958770680">Wpisz swoją nazwę użytkownika</translation>
@@ -6864,6 +6872,7 @@
 <translation id="7063129466199351735">Przetwarzam skróty...</translation>
 <translation id="7063311912041006059">Adres URL z parametrem <ph name="SPECIAL_SYMBOL" /> zamiast zapytania</translation>
 <translation id="706342288220489463">Zezwól Asystentowi na korzystanie z informacji na ekranie, aby mógł Ci pomagać</translation>
+<translation id="70641621694466590">Otwórz stronę Hasła</translation>
 <translation id="7064734931812204395">Konfiguruję kontener Linuksa. Może to potrwać do 30 minut.</translation>
 <translation id="7065223852455347715">To urządzenie jest zablokowane w trybie, który uniemożliwia rejestrację w firmie. Jeśli chcesz je zarejestrować, najpierw musisz je odzyskać.</translation>
 <translation id="7065534935986314333">Informacje o systemie</translation>
@@ -7364,6 +7373,7 @@
 <translation id="7541773865713908457"><ph name="ACTION_NAME" /> w aplikacji <ph name="APP_NAME" /></translation>
 <translation id="754207240458482646">Sieć jest zsynchronizowana ze wszystkimi urządzeniami na Twoim koncie. <ph name="LINK_BEGIN" />Więcej informacji<ph name="LINK_END" /></translation>
 <translation id="7543104066686362383">Włącz funkcje debugowania na urządzeniu <ph name="IDS_SHORT_PRODUCT_NAME" /></translation>
+<translation id="7544977292347272434">Poproś rodzica o zgodę na zainstalowanie rozszerzenia</translation>
 <translation id="7545466883021407599">Nie udało się połączyć z serwerem. Sprawdź połączenie internetowe i spróbuj jeszcze raz. Jeśli problem nadal występuje, uruchom ponownie Chromebooka. Kod błędu: <ph name="ERROR_CODE" />.</translation>
 <translation id="7547317915858803630">Ostrzeżenie: Twoje ustawienia <ph name="PRODUCT_NAME" /> są zapisywane na dysku sieciowym. Może to spowalniać działanie, powodować awarie, a nawet doprowadzić do utraty danych.</translation>
 <translation id="7548856833046333824">Lemoniada</translation>
@@ -7592,6 +7602,7 @@
 <translation id="7728668285692163452">Zmiana wersji nastąpi później</translation>
 <translation id="7730449930968088409">Przechwytywanie zawartości ekranu</translation>
 <translation id="7730683939467795481">Strona została zmieniona przez rozszerzenie „<ph name="EXTENSION_NAME" />”</translation>
+<translation id="773511996612364297">Znaki akcentowane</translation>
 <translation id="7735165285389721951">Aplikacja Steam jest teraz konfigurowana w innym procesie. Zanim spróbujesz ponownie, poczekaj, aż konfiguracja się zakończy</translation>
 <translation id="7737115349420013392">Paruję z urządzeniem „<ph name="DEVICE_NAME" />”…</translation>
 <translation id="7737203573077018777">Otrzymano instrukcję <ph name="PROOF_OF_POSSESSION_INSTRUCTION_NAME" /></translation>
@@ -7674,6 +7685,7 @@
 <translation id="7792388396321542707">Zatrzymaj udostępnianie</translation>
 <translation id="779308894558717334">Jasnozielony</translation>
 <translation id="7793098747275782155">Ciemnoniebieski</translation>
+<translation id="7796453472368605346">Znaki diakrytyczne</translation>
 <translation id="7797571222998226653">Wyłączono</translation>
 <translation id="7798504574384119986">Wyświetl uprawnienia dotyczące sieci</translation>
 <translation id="7798844538707273832">Automatycznie zablokowano uprawnienie: <ph name="PERMISSION" /></translation>
@@ -7758,6 +7770,7 @@
 <translation id="7876027585589532670">Nie można edytować skrótu</translation>
 <translation id="7877451762676714207">Nieznany błąd serwera. Spróbuj ponownie lub skontaktuj się z administratorem serwera.</translation>
 <translation id="7878945852730162014">Zarządzaj pobieranymi plikami i otwieraj je po zakończeniu</translation>
+<translation id="7879172417209159252">Nie można użyć rozszerzenia</translation>
 <translation id="7879478708475862060">Zgodnie z trybem wprowadzania</translation>
 <translation id="7879631849810108578">Ustawiono skrót: <ph name="IDS_SHORT_SET_COMMAND" /></translation>
 <translation id="7880823633812189969">Dane lokalne zostaną usunięte po ponownym uruchomieniu</translation>

chrome/app/resources/generated_resources_pt-BR.xtb

diff --git a/chrome/app/resources/generated_resources_pt-BR.xtb b/chrome/app/resources/generated_resources_pt-BR.xtb
index dfc52df..5b97f0a 100644
--- a/chrome/app/resources/generated_resources_pt-BR.xtb
+++ b/chrome/app/resources/generated_resources_pt-BR.xtb
@@ -700,6 +700,7 @@
 <translation id="1593594475886691512">Formatando...</translation>
 <translation id="159359590073980872">Cache de imagem</translation>
 <translation id="1593926297800505364">Salvar forma de pagamento</translation>
+<translation id="1594703455918849716">Acessar a página de verificação</translation>
 <translation id="1595492813686795610">O Linux está sendo atualizado</translation>
 <translation id="1596286373007273895">Disponível</translation>
 <translation id="1596709061955594992">O Bluetooth está desativado. Ative-o para ver os dispositivos disponíveis.</translation>
@@ -1695,6 +1696,7 @@
 <translation id="2399699884460174994">Notificações ativadas</translation>
 <translation id="2399939490305346086">Dados de login da chave de segurança</translation>
 <translation id="2400664245143453337">Atualização imediata necessária</translation>
+<translation id="2402226831639195063">Tons</translation>
 <translation id="2406153734066939945">Excluir este perfil e os dados dele?</translation>
 <translation id="2408018932941436077">Salvando cartão</translation>
 <translation id="2408955596600435184">Informe seu PIN</translation>
@@ -1706,6 +1708,7 @@
 <translation id="241082044617551207">Plug-in desconhecido</translation>
 <translation id="2410940059315936967">O site que você acessou pode incorporar conteúdo de outros, como imagens, anúncios e texto. Os cookies definidos por esses outros sites são chamados de cookies de terceiros.</translation>
 <translation id="2411666601450687801">Máquinas virtuais não são permitidas neste dispositivo</translation>
+<translation id="2412015533711271895">Você precisa da permissão de um familiar ou responsável para usar essa extensão</translation>
 <translation id="2412753904894530585">Kerberos</translation>
 <translation id="2414886740292270097">Escuro</translation>
 <translation id="2416435988630956212">Teclas de função do teclado</translation>
@@ -3088,6 +3091,7 @@
 <translation id="3651488188562686558">Desconectar do Wi-Fi</translation>
 <translation id="3652817283076144888">Inicializando</translation>
 <translation id="3653160965917900914">Compartilhamentos de arquivos de rede</translation>
+<translation id="3653887973853407813">Não é possível usar a extensão. Seu familiar ou responsável desativou a opção "Permissões para sites, apps e extensões" no Chrome.</translation>
 <translation id="3653999333232393305">Continuar permitindo que <ph name="HOST" /> acesse seu microfone</translation>
 <translation id="3654045516529121250">Ler suas configurações de acessibilidade</translation>
 <translation id="3655712721956801464">{NUM_FILES,plural, =1{Tem acesso permanente a um arquivo.}one{Tem acesso permanente a # arquivos.}other{Tem acesso permanente a # arquivos.}}</translation>
@@ -5160,6 +5164,7 @@
 <translation id="5517304475148761050">Este app precisa de acesso à Play Store</translation>
 <translation id="5517412723934627386"><ph name="NETWORK_TYPE" />: <ph name="NETWORK_DISPLAY_NAME" /></translation>
 <translation id="5518219166343146486">Perguntar quando um site quiser ver os textos e imagens copiados para a área de transferência</translation>
+<translation id="5518949581554491184">Configurar com um smartphone Android</translation>
 <translation id="5519195206574732858">LTE</translation>
 <translation id="5521078259930077036">Esta é a página inicial que você esperava?</translation>
 <translation id="5522156646677899028">Esta extensão contém uma grave vulnerabilidade de segurança.</translation>
@@ -6495,6 +6500,7 @@
 <translation id="6725206449694821596">Protocolo de impressão via Internet (IPP)</translation>
 <translation id="6725970970008349185">Número de candidatos a serem exibidos por página</translation>
 <translation id="672609503628871915">Veja o que há de novo</translation>
+<translation id="6726800386221816228">Caracteres especiais</translation>
 <translation id="67269783048918309">Envie dados de uso e diagnóstico. No momento, este dispositivo está enviando automaticamente ao Google dados de diagnóstico, de uso de apps e do dispositivo. Eles não serão usados para identificar seu filho e ajudarão a melhorar o sistema, a estabilidade de apps e muito mais. Alguns dados agregados também ajudarão os apps do Google e os nossos parceiros, como os desenvolvedores Android. Essa <ph name="BEGIN_LINK1" />configuração<ph name="END_LINK1" /> é aplicada pelo proprietário. Se a configuração "Atividade na Web e de apps adicional" estiver ativada para seu filho, esses dados poderão ser salvos na Conta do Google dele. <ph name="BEGIN_LINK2" />Saiba mais<ph name="END_LINK2" /></translation>
 <translation id="6728528977475057549">IBAN com final <ph name="LAST_FOUR_DIGITS" /></translation>
 <translation id="6729192290958770680">Digite seu nome de usuário</translation>
@@ -6897,6 +6903,7 @@
 <translation id="7063129466199351735">Processando atalhos...</translation>
 <translation id="7063311912041006059">URL com <ph name="SPECIAL_SYMBOL" /> no lugar da consulta</translation>
 <translation id="706342288220489463">Permita que o Google Assistente use as informações exibidas na tela para ajudar você</translation>
+<translation id="70641621694466590">Acessar a página "Senhas"</translation>
 <translation id="7064734931812204395">Configurando o contêiner Linux. Isso pode levar até 30 minutos.</translation>
 <translation id="7065223852455347715">Este dispositivo está bloqueado de tal modo que impede a inscrição de empresas. Se quiser inscrever o dispositivo, primeiro é necessário executar a recuperação dele.</translation>
 <translation id="7065534935986314333">Sobre o sistema</translation>
@@ -7398,6 +7405,7 @@
 <translation id="7541773865713908457"><ph name="ACTION_NAME" /> com o app <ph name="APP_NAME" /></translation>
 <translation id="754207240458482646">Sincronizada com outros dispositivos na sua conta. <ph name="LINK_BEGIN" />Saiba mais<ph name="LINK_END" /></translation>
 <translation id="7543104066686362383">Ativar os recursos de depuração neste dispositivo <ph name="IDS_SHORT_PRODUCT_NAME" /></translation>
+<translation id="7544977292347272434">Peça para um familiar responsável permitir uma extensão</translation>
 <translation id="7545466883021407599">Não foi possível se conectar ao servidor. Verifique sua conexão de rede e tente novamente. Se ainda assim tiver problemas, reinicie o Chromebook. Código do erro: <ph name="ERROR_CODE" />.</translation>
 <translation id="7547317915858803630">Aviso: as configurações do <ph name="PRODUCT_NAME" /> são armazenadas em um disco de rede. Isso pode acarretar lentidão, falhas ou até mesmo perda de dados.</translation>
 <translation id="7548856833046333824">Margarita</translation>
@@ -7626,6 +7634,7 @@
 <translation id="7728668285692163452">A mudança de canal será aplicada mais tarde</translation>
 <translation id="7730449930968088409">Capturar o conteúdo da sua tela</translation>
 <translation id="7730683939467795481">Esta página foi mudada pela extensão <ph name="EXTENSION_NAME" /></translation>
+<translation id="773511996612364297">Acentos</translation>
 <translation id="7735165285389721951">Outra configuração do Steam está em execução. Aguarde a conclusão para tentar novamente</translation>
 <translation id="7737115349420013392">Pareando com "<ph name="DEVICE_NAME" />"…</translation>
 <translation id="7737203573077018777">Instrução <ph name="PROOF_OF_POSSESSION_INSTRUCTION_NAME" /> recebida</translation>
@@ -7708,6 +7717,7 @@
 <translation id="7792388396321542707">Interromper compartilhamento</translation>
 <translation id="779308894558717334">Verde-claro</translation>
 <translation id="7793098747275782155">Azul-escuro</translation>
+<translation id="7796453472368605346">Diacríticos</translation>
 <translation id="7797571222998226653">Desativado</translation>
 <translation id="7798504574384119986">Conferir permissões da Web</translation>
 <translation id="7798844538707273832"><ph name="PERMISSION" /> bloqueada automaticamente</translation>
@@ -7792,6 +7802,7 @@
 <translation id="7876027585589532670">Não é possível editar o atalho</translation>
 <translation id="7877451762676714207">Erro de servidor desconhecido. Tente novamente ou entre em contato com o administrador do servidor.</translation>
 <translation id="7878945852730162014">Gerencie os arquivos durante o download e abra-os quando terminar</translation>
+<translation id="7879172417209159252">Não é possível usar a extensão</translation>
 <translation id="7879478708475862060">Seguir modo de entrada</translation>
 <translation id="7879631849810108578">Atalho definido: <ph name="IDS_SHORT_SET_COMMAND" /></translation>
 <translation id="7880823633812189969">Os dados locais serão excluídos quando você reiniciar</translation>

chrome/app/resources/generated_resources_ru.xtb

diff --git a/chrome/app/resources/generated_resources_ru.xtb b/chrome/app/resources/generated_resources_ru.xtb
index ec648b5..8d74434 100644
--- a/chrome/app/resources/generated_resources_ru.xtb
+++ b/chrome/app/resources/generated_resources_ru.xtb
@@ -698,6 +698,7 @@
 <translation id="1593594475886691512">Форматирование...</translation>
 <translation id="159359590073980872">Кеш изображений</translation>
 <translation id="1593926297800505364">Сохранить способ оплаты</translation>
+<translation id="1594703455918849716">Перейти на страницу проверки</translation>
 <translation id="1595492813686795610">Обновление Linux…</translation>
 <translation id="1596286373007273895">Доступно</translation>
 <translation id="1596709061955594992">Bluetooth выключен. Включите его, чтобы увидеть доступные устройства.</translation>
@@ -1681,6 +1682,7 @@
 <translation id="2399699884460174994">Уведомления включены</translation>
 <translation id="2399939490305346086">Учетные данные электронного ключа</translation>
 <translation id="2400664245143453337">Требуется немедленно обновить ОС</translation>
+<translation id="2402226831639195063">Тональные символы</translation>
 <translation id="2406153734066939945">Удалить профиль и все его данные?</translation>
 <translation id="2408018932941436077">Сохранение карты</translation>
 <translation id="2408955596600435184">Введите PIN-код</translation>
@@ -1692,6 +1694,7 @@
 <translation id="241082044617551207">Неизвестный плагин</translation>
 <translation id="2410940059315936967">На сайте, который вы просматриваете, может быть встроенный контент с других сайтов, например изображения, реклама и текст. Файлы cookie с таких сайтов называются сторонними файлами cookie.</translation>
 <translation id="2411666601450687801">На этом устройстве запрещено использовать виртуальные машины</translation>
+<translation id="2412015533711271895">Твой родитель или опекун должен одобрить использование этого расширения.</translation>
 <translation id="2412753904894530585">Kerberos</translation>
 <translation id="2414886740292270097">Темная</translation>
 <translation id="2416435988630956212">Функциональные клавиши клавиатуры</translation>
@@ -3073,6 +3076,7 @@
 <translation id="3651488188562686558">Отключится от сети Wi-Fi</translation>
 <translation id="3652817283076144888">Инициализация…</translation>
 <translation id="3653160965917900914">Общие сетевые папки</translation>
+<translation id="3653887973853407813">Ты не можешь использовать это расширение, так как твой родитель или опекун отключил параметр "Разрешения для сайтов, приложений и расширений" в Chrome.</translation>
 <translation id="3653999333232393305">Разрешить <ph name="HOST" /> доступ к микрофону</translation>
 <translation id="3654045516529121250">Чтение настроек специальных возможностей</translation>
 <translation id="3655712721956801464">{NUM_FILES,plural, =1{С постоянным доступом к 1 файлу.}one{С постоянным доступом к # файлу.}few{С постоянным доступом к # файлам.}many{С постоянным доступом к # файлам.}other{С постоянным доступом к # файла.}}</translation>
@@ -3935,7 +3939,7 @@
 <translation id="4411719918614785832">Эти ключи доступа хранятся в сервисе Windows Hello на этом компьютере. Они не сохраняются в вашем аккаунте Google.</translation>
 <translation id="4412632005703201014">Мы переходим к использованию современных веб-приложений вместо приложений Chrome. Это приложение было установлено в браузер вашей организацией. Чтобы открыть современное веб-приложение, попросите администратора удалить приложение Chrome. Пока вы можете открыть расширение "<ph name="EXTENSION_NAME" />" в браузере, перейдя по адресу <ph name="EXTENSION_LAUNCH_URL" />.</translation>
 <translation id="4412698727486357573">Справочный центр</translation>
-<translation id="4412992751769744546">Разрешить сторонним сайтам сохранять файлы cookie</translation>
+<translation id="4412992751769744546">Разрешить использование сторонних файлов cookie</translation>
 <translation id="44141919652824029">Разрешить приложению "<ph name="APP_NAME" />" доступ к списку подключенных USB-устройств?</translation>
 <translation id="4414232939543644979">Новое окно в режиме инкогнито</translation>
 <translation id="4414648713167199100">Используется мобильный интернет устройства Chromebook. Оператор связи может взимать дополнительную плату. Также может увеличиться расход заряда батареи. <ph name="BEGIN_LINK_LEARN_MORE" />Подробнее…<ph name="END_LINK_LEARN_MORE" /></translation>
@@ -5144,6 +5148,7 @@
 <translation id="5517304475148761050">Этому приложению необходим доступ к Play Маркету</translation>
 <translation id="5517412723934627386"><ph name="NETWORK_TYPE" /> – <ph name="NETWORK_DISPLAY_NAME" /></translation>
 <translation id="5518219166343146486">Запрашивать мое разрешение на доступ сайтов к тексту и изображениям, скопированным в буфер обмена</translation>
+<translation id="5518949581554491184">Настроить с помощью телефона Android</translation>
 <translation id="5519195206574732858">LTE</translation>
 <translation id="5521078259930077036">Другая главная страница?</translation>
 <translation id="5522156646677899028">В этом расширении обнаружена серьезная уязвимость, угрожающая безопасности.</translation>
@@ -6482,6 +6487,7 @@
 <translation id="6725206449694821596">Internet Printing Protocol (IPP)</translation>
 <translation id="6725970970008349185">Количество вариантов, отображаемых на одной странице</translation>
 <translation id="672609503628871915">Узнать, что нового</translation>
+<translation id="6726800386221816228">Специальные символы</translation>
 <translation id="67269783048918309">Отправка данных о работе устройства. Сейчас это устройство автоматически отправляет в Google диагностическую информацию, сведения об использовании приложений и самого устройства. Установить личность ребенка по этим данным нельзя. Они нужны нам, чтобы в будущем повысить стабильность приложений и внести другие улучшения. Некоторые данные в обобщенном виде пригодятся партнерам Google, например разработчикам Android. Эта <ph name="BEGIN_LINK1" />настройка<ph name="END_LINK1" /> принудительно применяется владельцем. Если запись дополнительной истории приложений и веб-поиска включена, эта информация может сохраняться в аккаунте ребенка. <ph name="BEGIN_LINK2" />Подробнее…<ph name="END_LINK2" /></translation>
 <translation id="6728528977475057549">Код IBAN заканчивается на <ph name="LAST_FOUR_DIGITS" /></translation>
 <translation id="6729192290958770680">Введите имя пользователя.</translation>
@@ -6884,6 +6890,7 @@
 <translation id="7063129466199351735">Обработка ярлыков…</translation>
 <translation id="7063311912041006059">URL с параметром <ph name="SPECIAL_SYMBOL" /> вместо запроса</translation>
 <translation id="706342288220489463">Разрешите Ассистенту использовать информацию на экране</translation>
+<translation id="70641621694466590">Открыть страницу паролей</translation>
 <translation id="7064734931812204395">Идет настройка контейнера Linux. Это может занять до 30 минут.</translation>
 <translation id="7065223852455347715">Устройство работает в режиме, запрещающем регистрацию в корпоративном домене. Чтобы зарегистрировать устройство, сначала восстановите его настройки.</translation>
 <translation id="7065534935986314333">О системе</translation>
@@ -7384,6 +7391,7 @@
 <translation id="7541773865713908457"><ph name="ACTION_NAME" /> в приложении "<ph name="APP_NAME" />"</translation>
 <translation id="754207240458482646">Синхронизировано с другими устройствами в вашем аккаунте. <ph name="LINK_BEGIN" />Подробнее…<ph name="LINK_END" /></translation>
 <translation id="7543104066686362383">Включите функции отладки на устройстве <ph name="IDS_SHORT_PRODUCT_NAME" /></translation>
+<translation id="7544977292347272434">Попроси родителя разрешить использовать расширения</translation>
 <translation id="7545466883021407599">Не удалось установить связь с сервером. Проверьте подключение к сети и повторите попытку. Если решить проблему не удалось, перезапустите Chromebook. Код ошибки: <ph name="ERROR_CODE" />.</translation>
 <translation id="7547317915858803630">Внимание! Настройки <ph name="PRODUCT_NAME" /> хранятся на сетевом диске. Это может привести к замедлению работы, сбоям или даже потере данных.</translation>
 <translation id="7548856833046333824">Лимонад</translation>
@@ -7486,7 +7494,7 @@
 <translation id="7634280112532283638">Противодействие спаму и мошенничеству</translation>
 <translation id="7634566076839829401">Произошла ошибка. Повторите попытку.</translation>
 <translation id="7635048370253485243">Закреплено администратором</translation>
-<translation id="7635711411613274199">Персонализация объявлений зависит от этого параметра, <ph name="BEGIN_LINK1" />тем рекламы<ph name="LINK_END1" />, <ph name="BEGIN_LINK2" />настроек файлов cookie<ph name="LINK_END2" />, а также от параметров сайта, который вы просматриваете.</translation>
+<translation id="7635711411613274199">Персонализация рекламы зависит от этого параметра, <ph name="BEGIN_LINK1" />тем<ph name="LINK_END1" />, <ph name="BEGIN_LINK2" />настроек файлов cookie<ph name="LINK_END2" />, а также от параметров сайта, который вы просматриваете.</translation>
 <translation id="7636919061354591437">Установить на этом устройстве</translation>
 <translation id="7637253234491814483">Приложите палец к сканеру отпечатков рядом с кнопкой питания в правом верхнем углу клавиатуры. Данные отпечатков пальцев хранятся только на устройстве <ph name="DEVICE_TYPE" />.</translation>
 <translation id="7637272932128132922">Пока эта вкладка была неактивна, режим экономии памяти высвободил ресурсы на выполнение других задач. Чтобы изменить его параметры, перейдите в <ph name="SETTINGS_LINK" />.</translation>
@@ -7612,6 +7620,7 @@
 <translation id="7728668285692163452">Изменение вступит в силу позже</translation>
 <translation id="7730449930968088409">Снимок содержания экрана</translation>
 <translation id="7730683939467795481">Эта страница была изменена расширением "<ph name="EXTENSION_NAME" />".</translation>
+<translation id="773511996612364297">Знаки ударения</translation>
 <translation id="7735165285389721951">Установка Steam уже запущена. Дождитесь ее завершения и повторите попытку.</translation>
 <translation id="7737115349420013392">Подключение к устройству "<ph name="DEVICE_NAME" />"...</translation>
 <translation id="7737203573077018777">Получена инструкция: <ph name="PROOF_OF_POSSESSION_INSTRUCTION_NAME" /></translation>
@@ -7694,6 +7703,7 @@
 <translation id="7792388396321542707">Закрыть доступ</translation>
 <translation id="779308894558717334">Светло-зеленый</translation>
 <translation id="7793098747275782155">Темно-синий</translation>
+<translation id="7796453472368605346">Диакритические знаки</translation>
 <translation id="7797571222998226653">ВЫКЛ</translation>
 <translation id="7798504574384119986">Посмотреть интернет-разрешения</translation>
 <translation id="7798844538707273832">Автоматически отключено разрешение "<ph name="PERMISSION" />"</translation>
@@ -7778,6 +7788,7 @@
 <translation id="7876027585589532670">Не удалось изменить ярлык.</translation>
 <translation id="7877451762676714207">Обнаружена неизвестная ошибка сервера. Повторите попытку или свяжитесь с его администратором.</translation>
 <translation id="7878945852730162014">Управляйте файлами по мере их скачивания и открывайте их, когда все будет готово.</translation>
+<translation id="7879172417209159252">Расширение нельзя использовать</translation>
 <translation id="7879478708475862060">Использовать выбранный режим ввода</translation>
 <translation id="7879631849810108578">Добавлено сочетание клавиш: <ph name="IDS_SHORT_SET_COMMAND" /></translation>
 <translation id="7880823633812189969">Локальные данные будут удалены после перезапуска</translation>
@@ -8551,7 +8562,7 @@
 <translation id="8557180006508471423">Включите Google Chrome в службах геолокации на устройстве Mac</translation>
 <translation id="8557856025359704738">Следующее скачивание запланировано <ph name="NEXT_DATE_DOWNLOAD" />.</translation>
 <translation id="8559858985063901027">Ключи доступа</translation>
-<translation id="8559961053328923750">Для оценки эффективности рекламы Chrome ограничивает общий объем данных отправляемых сайтами через браузер.</translation>
+<translation id="8559961053328923750">Для оценки эффективности рекламы Chrome ограничивает общий объем данных, отправляемых сайтами через браузер.</translation>
 <translation id="8560327176991673955">{COUNT,plural, =0{Открыть все URL в &amp;новом окне}=1{Открыть URL в &amp;новом окне}one{Открыть все URL ({COUNT}) в &amp;новом окне}few{Открыть все URL ({COUNT}) в &amp;новом окне}many{Открыть все URL ({COUNT}) в &amp;новом окне}other{Открыть все URL ({COUNT}) в &amp;новом окне}}</translation>
 <translation id="8561206103590473338">Слон</translation>
 <translation id="8561565784790166472">Будьте осторожны!</translation>

chrome/app/resources/generated_resources_sq.xtb

diff --git a/chrome/app/resources/generated_resources_sq.xtb b/chrome/app/resources/generated_resources_sq.xtb
index 96d10ee40..7d51396 100644
--- a/chrome/app/resources/generated_resources_sq.xtb
+++ b/chrome/app/resources/generated_resources_sq.xtb
@@ -1233,7 +1233,7 @@
 <translation id="2048554637254265991">Gabim gjatë nisjes së menaxherit të kontejnerit. Provo përsëri.</translation>
 <translation id="2048653237708779538">Veprimi nuk ofrohet</translation>
 <translation id="204914487372604757">Krijo shkurtore</translation>
-<translation id="2050339315714019657">Portret (vertikal</translation>
+<translation id="2050339315714019657">Portret (vertikal)</translation>
 <translation id="2051555741181591333">Çaktivizo automatikisht zonën e qasjes për internet</translation>
 <translation id="2052572566310583903">Instaluar në pajisje të tjera</translation>
 <translation id="2053105195397337973">Po eksplorojmë mënyra për të kufizuar gjurmimin ndërkohë që bëjmë të mundur që sajtet të ndalojnë reklamat e bezdisshme dhe mashtrimet.</translation>

chrome/app/resources/generated_resources_sr-Latn.xtb

diff --git a/chrome/app/resources/generated_resources_sr-Latn.xtb b/chrome/app/resources/generated_resources_sr-Latn.xtb
index 675520dd..e233faeb 100644
--- a/chrome/app/resources/generated_resources_sr-Latn.xtb
+++ b/chrome/app/resources/generated_resources_sr-Latn.xtb
@@ -3014,6 +3014,7 @@
 <translation id="3609277884604412258">Brza pretraga</translation>
 <translation id="3610241585790874201">Čuvanje podataka na uređaju nije dozvoljeno</translation>
 <translation id="3610369246614755442">Ventilatoru bazne stanice je potreban servis</translation>
+<translation id="3610961622607302617">Promenite lozinku za <ph name="WEBSITE" /></translation>
 <translation id="361106536627977100">Podaci Flash-a</translation>
 <translation id="3611655097742243705">Idite u Play prodavnicu da biste pronašli još aplikacija</translation>
 <translation id="3611658447322220736">Nedavno zatvoreni sajtovi mogu da završe slanje i prijem podataka</translation>
@@ -6029,6 +6030,7 @@
 <translation id="6318125393809743217">Uvrsti datoteku policies.json uz konfiguracije smernica.</translation>
 <translation id="6318407754858604988">Preuzimanje je započeto</translation>
 <translation id="6318944945640833942">Štampač nije otkriven. Ponovo unesite adresu štampača.</translation>
+<translation id="6320808462673705899">Nema obeleživača koji se podudaraju sa pretragom.</translation>
 <translation id="6322370287306604163">Otključavajte brže pomoću otiska prsta</translation>
 <translation id="6322559670748154781">Ovaj fajl se ne preuzima često i blokirala ga je Napredna zaštita</translation>
 <translation id="6324916366299863871">Izmeni prečicu</translation>

chrome/app/resources/generated_resources_sr.xtb

diff --git a/chrome/app/resources/generated_resources_sr.xtb b/chrome/app/resources/generated_resources_sr.xtb
index c0394eb..0078cd8 100644
--- a/chrome/app/resources/generated_resources_sr.xtb
+++ b/chrome/app/resources/generated_resources_sr.xtb
@@ -3014,6 +3014,7 @@
 <translation id="3609277884604412258">Брза претрага</translation>
 <translation id="3610241585790874201">Чување података на уређају није дозвољено</translation>
 <translation id="3610369246614755442">Вентилатору базне станице је потребан сервис</translation>
+<translation id="3610961622607302617">Промените лозинку за <ph name="WEBSITE" /></translation>
 <translation id="361106536627977100">Подаци Flash-а</translation>
 <translation id="3611655097742243705">Идите у Play продавницу да бисте пронашли још апликација</translation>
 <translation id="3611658447322220736">Недавно затворени сајтови могу да заврше слање и пријем података</translation>
@@ -6029,6 +6030,7 @@
 <translation id="6318125393809743217">Уврсти датотеку policies.json уз конфигурације смерница.</translation>
 <translation id="6318407754858604988">Преузимање је започето</translation>
 <translation id="6318944945640833942">Штампач није откривен. Поново унесите адресу штампача.</translation>
+<translation id="6320808462673705899">Нема обележивача који се подударају са претрагом.</translation>
 <translation id="6322370287306604163">Откључавајте брже помоћу отиска прста</translation>
 <translation id="6322559670748154781">Овај фајл се не преузима често и блокирала га је Напредна заштита</translation>
 <translation id="6324916366299863871">Измени пречицу</translation>

chrome/app/resources/generated_resources_th.xtb

diff --git a/chrome/app/resources/generated_resources_th.xtb b/chrome/app/resources/generated_resources_th.xtb
index 977a4f2..8a65d466 100644
--- a/chrome/app/resources/generated_resources_th.xtb
+++ b/chrome/app/resources/generated_resources_th.xtb
@@ -285,7 +285,7 @@
 <translation id="1235924639474699896">{COUNT,plural, =1{ข้อความ}other{# ข้อความ}}</translation>
 <translation id="1236009322878349843">แก้ไขโทรศัพท์</translation>
 <translation id="1239594683407221485">สำรวจเนื้อหาของอุปกรณ์ในแอป Files</translation>
-<translation id="1240903469550363138">หากต้องการดำเนินการต่อ <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" /> จะแชร์ชื่อ อีเมล และรูปโปรไฟล์ของคุณกับเว็บไซต์นี้ อ่าน<ph name="BEGIN_LINK1" />นโยบายความเป็นส่วนตัว<ph name="END_LINK1" />และ<ph name="BEGIN_LINK2" />ข้อกำหนดในการให้บริการ<ph name="END_LINK2" />ของเว็บไซต์</translation>
+<translation id="1240903469550363138">หากต้องการดำเนินการต่อ <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" /> จะแชร์ชื่อ อีเมล และรูปโปรไฟล์ของคุณกับเว็บไซต์นี้ โปรดอ่าน<ph name="BEGIN_LINK1" />นโยบายความเป็นส่วนตัว<ph name="END_LINK1" />และ<ph name="BEGIN_LINK2" />ข้อกำหนดในการให้บริการ<ph name="END_LINK2" />ของเว็บไซต์</translation>
 <translation id="1241066500170667906">เลือกสถานะการทดสอบสำหรับ<ph name="EXPERIMENT_NAME" /></translation>
 <translation id="124116460088058876">ภาษาเพิ่มเติม</translation>
 <translation id="1242633766021457174"><ph name="THIRD_PARTY_TOOL_NAME" /> ต้องการรีเซ็ตการตั้งค่าของคุณ</translation>
@@ -696,6 +696,7 @@
 <translation id="1593594475886691512">กำลังจัดรูปแบบ...</translation>
 <translation id="159359590073980872">แคชของภาพ</translation>
 <translation id="1593926297800505364">บันทึกวิธีการชำระเงิน</translation>
+<translation id="1594703455918849716">ไปที่หน้าการตรวจสอบ</translation>
 <translation id="1595492813686795610">Linux กำลังอัปเกรด</translation>
 <translation id="1596286373007273895">ใช้งานได้</translation>
 <translation id="1596709061955594992">บลูทูธปิดอยู่ หากต้องการดูอุปกรณ์ที่ใช้ได้ ให้เปิดบลูทูธ</translation>
@@ -1679,6 +1680,7 @@
 <translation id="2399699884460174994">เปิดการแจ้งเตือนแล้ว</translation>
 <translation id="2399939490305346086">ข้อมูลการลงชื่อเข้าใช้ในคีย์ความปลอดภัย</translation>
 <translation id="2400664245143453337">ต้องอัปเดตทันที</translation>
+<translation id="2402226831639195063">ระดับเสียงสูงต่ำ</translation>
 <translation id="2406153734066939945">ลบโปรไฟล์นี้และข้อมูลในโปรไฟล์ใช่ไหม</translation>
 <translation id="2408018932941436077">กำลังบันทึกบัตร</translation>
 <translation id="2408955596600435184">ป้อน PIN ของคุณ</translation>
@@ -1690,6 +1692,7 @@
 <translation id="241082044617551207">ปลั๊กอินที่ไม่รู้จัก</translation>
 <translation id="2410940059315936967">เว็บไซต์ที่คุณเข้าชมสามารถฝังเนื้อหาจากเว็บไซต์อื่นๆ เช่น รูปภาพ โฆษณา และข้อความ เราเรียกคุกกี้ที่เว็บไซต์อื่นๆ ตั้งค่าไว้ว่าคุกกี้ของบุคคลที่สาม</translation>
 <translation id="2411666601450687801">ไม่อนุญาตให้ใช้เครื่องเสมือนในอุปกรณ์นี้</translation>
+<translation id="2412015533711271895">พ่อแม่หรือผู้ปกครองต้องตอบตกลงก่อน คุณจึงจะใช้ส่วนขยายนี้ได้</translation>
 <translation id="2412753904894530585">Kerberos</translation>
 <translation id="2414886740292270097">มืด</translation>
 <translation id="2416435988630956212">แป้นฟังก์ชันของแป้นพิมพ์</translation>
@@ -1907,7 +1910,7 @@
 <translation id="2605668923777146443">ไปที่<ph name="LINK_BEGIN" />การตั้งค่า<ph name="LINK_END" />เพื่อดูตัวเลือกสำหรับ Better Together</translation>
 <translation id="2606246518223360146">ลิงก์ข้อมูล</translation>
 <translation id="2606454609872547359">ไม่ ดำเนินการต่อโดยไม่ใช้ ChromeVox</translation>
-<translation id="2606568927909309675">สร้างคำบรรยายสำหรับเสียงและวิดีโอภาษาอังกฤษโดยอัตโนมัติ ระบบจะไม่ส่งเสียงและคำบรรยายออกไปจากอุปกรณ์</translation>
+<translation id="2606568927909309675">สร้างคำบรรยายแทนเสียงสำหรับเสียงและวิดีโอภาษาอังกฤษโดยอัตโนมัติ ระบบจะไม่ส่งเสียงและคำบรรยายแทนเสียงออกไปจากอุปกรณ์</translation>
 <translation id="2607101320794533334">ข้อมูลหัวเรื่องคีย์สาธารณะ</translation>
 <translation id="2609896558069604090">สร้างทางลัด...</translation>
 <translation id="2609980095400624569">เริ่มการเชื่อมต่อไม่ได้</translation>
@@ -2179,7 +2182,7 @@
 <translation id="2832124733806557606">บุตรหลานจะใช้ PIN เพื่อลงชื่อเข้าใช้หรือปลดล็อกอุปกรณ์ได้</translation>
 <translation id="2835177225987815960">ระบบจะรีเซ็ตการตั้งค่าการสแกนในปัจจุบัน ซึ่งรวมถึงสวิตช์ที่กำหนดไว้และค่ากำหนดความเร็วในการสแกนอัตโนมัติ</translation>
 <translation id="2835547721736623118">บริการการรู้จำคำพูด</translation>
-<translation id="2836232638504556905">หากต้องการดำเนินการต่อ <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" /> จะแชร์ชื่อ อีเมล และรูปโปรไฟล์ของคุณกับเว็บไซต์นี้ ดู<ph name="BEGIN_LINK" />นโยบายความเป็นส่วนตัว<ph name="END_LINK" />ของเว็บไซต์</translation>
+<translation id="2836232638504556905">หากต้องการดำเนินการต่อ <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" /> จะแชร์ชื่อ อีเมล และรูปโปรไฟล์ของคุณกับเว็บไซต์นี้ โปรดอ่าน<ph name="BEGIN_LINK" />นโยบายความเป็นส่วนตัว<ph name="END_LINK" />ของเว็บไซต์</translation>
 <translation id="2836269494620652131">ขัดข้อง</translation>
 <translation id="283669119850230892">หากต้องการใช้เครือข่าย <ph name="NETWORK_ID" /> ก่อนอื่น ให้เชื่อมต่ออินเทอร์เน็ตตามด้านล่างนี้</translation>
 <translation id="2838379631617906747">การติดตั้ง</translation>
@@ -2202,7 +2205,7 @@
 <translation id="2850541429955027218">เพิ่มธีม</translation>
 <translation id="2850672011315104382">รูปแบบเครื่องหมายวรรคตอน</translation>
 <translation id="2852385257476173980">รายการเว็บไซต์ที่คุณเข้าชมอาจปรากฏที่นี่เมื่อคุณท่องเว็บ</translation>
-<translation id="285241945869362924">สร้างคำบรรยายสำหรับเสียงและวิดีโอโดยอัตโนมัติ ระบบจะไม่ส่งเสียงและคำบรรยายออกไปจากอุปกรณ์</translation>
+<translation id="285241945869362924">สร้างคำบรรยายแทนเสียงสำหรับเสียงและวิดีโอโดยอัตโนมัติ ระบบจะไม่ส่งเสียงและคำบรรยายแทนเสียงออกไปจากอุปกรณ์</translation>
 <translation id="2856776373509145513">สร้างคอนเทนเนอร์ใหม่</translation>
 <translation id="2861301611394761800">การอัปเดตระบบเสร็จสมบูรณ์ โปรดรีสตาร์ทระบบ</translation>
 <translation id="2861941300086904918">ตัวจัดการความปลอดภัยไคลเอ็นต์ในระบบ</translation>
@@ -2413,7 +2416,7 @@
 <translation id="3030967311408872958">พระอาทิตย์ตกถึงพระอาทิตย์ขึ้น</translation>
 <translation id="3031417829280473749">เอเจนต์เอ็กซ์</translation>
 <translation id="3031557471081358569">เลือกรายการที่จะนำเข้าต่อไปนี้:</translation>
-<translation id="3032204772252313646">คําบรรยายอัตโนมัติ</translation>
+<translation id="3032204772252313646">คําบรรยายแทนเสียงอัตโนมัติ</translation>
 <translation id="3033348223765101500">ควบคุมข้อมูลของคุณ</translation>
 <translation id="3036327949511794916">เลยกำหนดเวลาส่งคืน <ph name="DEVICE_TYPE" /> เครื่องนี้แล้ว</translation>
 <translation id="3036546437875325427">เปิดใช้ Flash</translation>
@@ -3071,6 +3074,7 @@
 <translation id="3651488188562686558">ยกเลิกการเชื่อมต่อ Wi-Fi</translation>
 <translation id="3652817283076144888">กำลังเริ่มต้น</translation>
 <translation id="3653160965917900914">พื้นที่แชร์ไฟล์ของเครือข่าย</translation>
+<translation id="3653887973853407813">คุณใช้ส่วนขยายนี้ไม่ได้ พ่อแม่หรือผู้ปกครองได้ปิดใช้ "สิทธิ์สำหรับเว็บไซต์ แอป และส่วนขยาย" ใน Chrome</translation>
 <translation id="3653999333232393305">อนุญาตให้ <ph name="HOST" /> เข้าถึงไมโครโฟนของคุณต่อไป</translation>
 <translation id="3654045516529121250">อ่านการตั้งค่าการเข้าถึง</translation>
 <translation id="3655712721956801464">{NUM_FILES,plural, =1{แอปมีการเข้าถึงอย่างถาวรไปยัง 1 ไฟล์}other{แอปมีการเข้าถึงอย่างถาวรไปยัง # ไฟล์}}</translation>
@@ -3924,7 +3928,7 @@
 <translation id="4405117686468554883">*.jpeg, *.jpg, *.png</translation>
 <translation id="4405224443901389797">ย้ายไปที่…</translation>
 <translation id="4406883609789734330">คำบรรยายสด</translation>
-<translation id="4407039574263172582">หากต้องการดำเนินการต่อ <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" /> จะแชร์ชื่อ อีเมล และรูปโปรไฟล์ของคุณกับเว็บไซต์นี้ ดู<ph name="BEGIN_LINK" />ข้อกำหนดในการให้บริการ<ph name="END_LINK" />ของเว็บไซต์นี้</translation>
+<translation id="4407039574263172582">หากต้องการดำเนินการต่อ <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" /> จะแชร์ชื่อ อีเมล และรูปโปรไฟล์ของคุณกับเว็บไซต์นี้ โปรดอ่าน<ph name="BEGIN_LINK" />ข้อกำหนดในการให้บริการ<ph name="END_LINK" />ของเว็บไซต์</translation>
 <translation id="4408599188496843485">ความ&amp;ช่วยเหลือ</translation>
 <translation id="4409271659088619928">เครื่องมือค้นหาของคุณคือ <ph name="DSE" /> ดูวิธีลบประวัติการค้นหา (หากมี) ของเครื่องมือค้นหาที่คุณใช้</translation>
 <translation id="4409697491990005945">ระยะขอบ</translation>
@@ -4888,7 +4892,7 @@
 <translation id="5288678174502918605">เ&amp;ปิดแท็บที่ถูกปิดขึ้นใหม่</translation>
 <translation id="52895863590846877">หน้านี้ไม่ใช่ภาษา<ph name="LANGUAGE" /></translation>
 <translation id="52912272896845572">ไฟล์กุญแจส่วนตัวไม่ถูกต้อง</translation>
-<translation id="5291739252352359682">สร้างคำบรรยายสำหรับสื่อในเบราว์เซอร์ Chrome โดยอัตโนมัติ (ปัจจุบันพร้อมให้บริการเป็นภาษาอังกฤษ) เสียงและคำบรรยายจะประมวลผลในอุปกรณ์และจะไม่มีการส่งออกไปจากอุปกรณ์</translation>
+<translation id="5291739252352359682">สร้างคำบรรยายแทนเสียงสำหรับสื่อในเบราว์เซอร์ Chrome โดยอัตโนมัติ (ปัจจุบันพร้อมให้บริการเป็นภาษาอังกฤษ) เสียงและคำบรรยายแทนเสียงจะประมวลผลในอุปกรณ์และจะไม่มีการส่งออกไปจากอุปกรณ์</translation>
 <translation id="529175790091471945">ฟอร์แมตอุปกรณ์นี้</translation>
 <translation id="529296195492126134">ไม่รองรับโหมดชั่วคราว โปรดติดต่อผู้ดูแลระบบ</translation>
 <translation id="5293170712604732402">คืนค่าการตั้งค่าเป็นค่าเริ่มต้นเดิม</translation>
@@ -5142,6 +5146,7 @@
 <translation id="5517304475148761050">แอปนี้ต้องการสิทธิ์เข้าถึง Play Store</translation>
 <translation id="5517412723934627386"><ph name="NETWORK_TYPE" /> - <ph name="NETWORK_DISPLAY_NAME" /></translation>
 <translation id="5518219166343146486">ถามเมื่อเว็บไซต์ต้องการดูข้อความและรูปภาพที่คัดลอกไปยังคลิปบอร์ด</translation>
+<translation id="5518949581554491184">ตั้งค่าด้วยโทรศัพท์ Android</translation>
 <translation id="5519195206574732858">LTE</translation>
 <translation id="5521078259930077036">นี่คือ "หน้าแรก" ที่คุณต้องการใช่ไหม</translation>
 <translation id="5522156646677899028">ส่วนขยายนี้มีช่องโหว่ด้านความปลอดภัยอย่างร้ายแรง</translation>
@@ -5685,7 +5690,7 @@
 <translation id="6011193465932186973">ลายนิ้วมือ</translation>
 <translation id="6011308810877101166">ปรับปรุงการแนะนำการค้นหา</translation>
 <translation id="6011908034087870826">กำลังส่งลิงก์ไปยัง <ph name="DEVICE_NAME" /></translation>
-<translation id="6013027779243312217">รับคำบรรยายสำหรับเสียงและวิดีโอของคุณ</translation>
+<translation id="6013027779243312217">รับคำบรรยายแทนเสียงสำหรับเสียงและวิดีโอของคุณ</translation>
 <translation id="6014293228235665243">ยังไม่อ่าน</translation>
 <translation id="6015796118275082299">ปี</translation>
 <translation id="6016178549409952427">ไปที่เนื้อหาเพิ่มเติม <ph name="CURRENT_ELEMENT" /> จาก <ph name="TOTAL_ELEMENTS" /> รายการ</translation>
@@ -6471,6 +6476,7 @@
 <translation id="6725206449694821596">โปรโตคอลการพิมพ์ผ่านอินเทอร์เน็ต (IPP)</translation>
 <translation id="6725970970008349185">จำนวนตัวเลือกที่จะแสดงต่อหนึ่งหน้า</translation>
 <translation id="672609503628871915">ดูว่ามีอะไรใหม่</translation>
+<translation id="6726800386221816228">สัญลักษณ์พิเศษ</translation>
 <translation id="67269783048918309">ส่งข้อมูลการใช้งานและการวินิจฉัย ปัจจุบันอุปกรณ์นี้ส่งข้อมูลการวินิจฉัย อุปกรณ์ และการใช้งานแอปไปยัง Google โดยอัตโนมัติ โดยจะไม่มีการใช้ข้อมูลนี้ในการระบุชื่อบุตรหลานของคุณ และจะช่วยให้แอปและระบบมีความเสถียร พร้อมทั้งปรับปรุงด้านอื่นๆ ข้อมูลที่รวบรวมมาบางส่วนจะมีประโยชน์ต่อแอปและพาร์ทเนอร์ของ Google ด้วย เช่น นักพัฒนาแอป Android เจ้าของเป็นผู้บังคับใช้<ph name="BEGIN_LINK1" />การตั้งค่า<ph name="END_LINK1" />นี้ หากเปิดการตั้งค่ากิจกรรมเพิ่มเติมบนเว็บและแอปสำหรับบุตรหลาน ระบบอาจบันทึกข้อมูลนี้ไว้ในบัญชี Google ของบุตรหลาน <ph name="BEGIN_LINK2" />ดูข้อมูลเพิ่มเติม<ph name="END_LINK2" /></translation>
 <translation id="6728528977475057549">IBAN ที่ลงท้ายด้วย <ph name="LAST_FOUR_DIGITS" /></translation>
 <translation id="6729192290958770680">ป้อนชื่อผู้ใช้</translation>
@@ -6486,7 +6492,7 @@
 <translation id="6740234557573873150">หยุด <ph name="FILE_NAME" /> ชั่วคราว</translation>
 <translation id="6741063444351041466"><ph name="BEGIN_LINK" />ผู้ดูแลระบบของคุณ<ph name="END_LINK" />ปิด Google Safe Browsing</translation>
 <translation id="6742339027238151589">การเข้าถึงสคริปต์</translation>
-<translation id="6742629250739345159">สร้างคำบรรยายสำหรับสื่อในเบราว์เซอร์ Chrome โดยอัตโนมัติ เสียงและคำบรรยายจะประมวลผลในอุปกรณ์และจะไม่มีการส่งออกไปจากอุปกรณ์</translation>
+<translation id="6742629250739345159">สร้างคำบรรยายแทนเสียงสำหรับสื่อในเบราว์เซอร์ Chrome โดยอัตโนมัติ เสียงและคำบรรยายแทนเสียงจะประมวลผลในอุปกรณ์และจะไม่มีการส่งออกไปจากอุปกรณ์</translation>
 <translation id="6743841972744298686">การตั้งค่าการซิงค์</translation>
 <translation id="6745592621698551453">อัปเดตเลย</translation>
 <translation id="6746124502594467657">เลื่อนลง</translation>
@@ -6873,6 +6879,7 @@
 <translation id="7063129466199351735">กำลังประมวลผลทางลัด...</translation>
 <translation id="7063311912041006059">URL ที่มี <ph name="SPECIAL_SYMBOL" /> ในตำแหน่งคำค้นหา</translation>
 <translation id="706342288220489463">อนุญาตให้ Assistant ใช้ข้อมูลบนหน้าจอเพื่อช่วยเหลือ</translation>
+<translation id="70641621694466590">ไปที่หน้ารหัสผ่าน</translation>
 <translation id="7064734931812204395">กำลังกำหนดค่าคอนเทนเนอร์ Linux ซึ่งอาจใช้เวลาถึง 30 นาที</translation>
 <translation id="7065223852455347715">มีการล็อกอุปกรณ์นี้ในโหมดที่ป้องกันการลงทะเบียนขององค์กร หากคุณต้องการลงทะเบียนอุปกรณ์ คุณจะต้องดำเนินการกู้คืนอุปกรณ์ก่อน</translation>
 <translation id="7065534935986314333">เกี่ยวกับระบบ</translation>
@@ -7373,6 +7380,7 @@
 <translation id="7541773865713908457"><ph name="ACTION_NAME" />ด้วยแอป <ph name="APP_NAME" /></translation>
 <translation id="754207240458482646">ซิงค์กับอุปกรณ์อื่นในบัญชีของคุณแล้ว <ph name="LINK_BEGIN" />ดูข้อมูลเพิ่มเติม<ph name="LINK_END" /></translation>
 <translation id="7543104066686362383">เปิดใช้ฟีเจอร์การแก้ไขข้อบกพร่องบนอุปกรณ์ <ph name="IDS_SHORT_PRODUCT_NAME" /> นี้</translation>
+<translation id="7544977292347272434">ขอให้ผู้ปกครองอนุญาตการใช้ส่วนขยาย</translation>
 <translation id="7545466883021407599">เชื่อมต่อกับเซิร์ฟเวอร์ไม่สำเร็จ ตรวจสอบการเชื่อมต่อเครือข่ายแล้วลองอีกครั้ง หากยังประสบปัญหาอยู่ ให้ลองรีสตาร์ท Chromebook รหัสข้อผิดพลาด: <ph name="ERROR_CODE" /></translation>
 <translation id="7547317915858803630">คำเตือน: การตั้งค่า <ph name="PRODUCT_NAME" /> ของคุณได้รับการจัดเก็บไว้ที่ไดรฟ์เครือข่าย ซึ่งอาจส่งผลให้การทำงานล่าช้า เกิดข้อขัดข้อง หรือแม้แต่ข้อมูลสูญหาย</translation>
 <translation id="7548856833046333824">เลมอนเนด</translation>
@@ -7601,6 +7609,7 @@
 <translation id="7728668285692163452">ระบบจะนำการเปลี่ยนช่องไปใช้ในภายหลัง</translation>
 <translation id="7730449930968088409">จับภาพเนื้อหาบนหน้าจอ</translation>
 <translation id="7730683939467795481">หน้านี้มีการเปลี่ยนแปลงจากส่วนขยาย "<ph name="EXTENSION_NAME" />"</translation>
+<translation id="773511996612364297">เครื่องหมายการลงน้ำหนักเสียง</translation>
 <translation id="7735165285389721951">กำลังตั้งค่า Steam อีกรายการ โปรดรอให้ตั้งค่าเสร็จก่อนแล้วลองอีกครั้ง</translation>
 <translation id="7737115349420013392">กำลังจับคู่กับ "<ph name="DEVICE_NAME" />" ...</translation>
 <translation id="7737203573077018777">ได้รับคำสั่ง <ph name="PROOF_OF_POSSESSION_INSTRUCTION_NAME" /> รายการแล้ว</translation>
@@ -7683,6 +7692,7 @@
 <translation id="7792388396321542707">หยุดการแชร์</translation>
 <translation id="779308894558717334">สีเขียวอ่อน</translation>
 <translation id="7793098747275782155">สีน้ำเงินเข้ม</translation>
+<translation id="7796453472368605346">เครื่องหมายเสริมสัทอักษร</translation>
 <translation id="7797571222998226653">ปิด</translation>
 <translation id="7798504574384119986">ดูสิทธิ์ของเว็บ</translation>
 <translation id="7798844538707273832">บล็อก<ph name="PERMISSION" />โดยอัตโนมัติ</translation>
@@ -7767,6 +7777,7 @@
 <translation id="7876027585589532670">แก้ไขทางลัดไม่ได้</translation>
 <translation id="7877451762676714207">ข้อผิดพลาดของเซิร์ฟเวอร์ที่ไม่รู้จัก โปรดลองอีกครั้งหรือติดต่อผู้ดูแลระบบเซิร์ฟเวอร์</translation>
 <translation id="7878945852730162014">จัดการไฟล์ขณะที่ดาวน์โหลด และเปิดไฟล์เมื่อดาวน์โหลดเสร็จ</translation>
+<translation id="7879172417209159252">ใช้ส่วนขยายไม่ได้</translation>
 <translation id="7879478708475862060">ใช้ตามโหมดป้อนข้อมูล</translation>
 <translation id="7879631849810108578">แป้นพิมพ์ลัดที่ตั้งค่า: <ph name="IDS_SHORT_SET_COMMAND" /></translation>
 <translation id="7880823633812189969">เมื่อคุณรีสตาร์ท ระบบจะลบข้อมูลในเครื่อง</translation>
@@ -8102,7 +8113,7 @@
 <translation id="8158117992543756526">อุปกรณ์นี้จะไม่ได้รับการอัปเดตซอฟต์แวร์และความปลอดภัยอัตโนมัตินับตั้งแต่เดือน<ph name="MONTH_AND_YEAR" /> เป็นต้นไป <ph name="LINK_BEGIN" />ดูข้อมูลเพิ่มเติม<ph name="LINK_END" /></translation>
 <translation id="8159652640256729753">รับการสั่นยืนยันสำหรับการดำเนินการอย่างเช่นการแบ่งหน้าจอและการสลับเดสก์ <ph name="LINK_BEGIN" />ดูข้อมูลเพิ่มเติม<ph name="LINK_END" /></translation>
 <translation id="816055135686411707">ข้อผิดพลาดในการตั้งค่าความเชื่อถือใบรับรอง</translation>
-<translation id="8160775796528709999">รับคำบรรยายสำหรับเสียงและวิดีโอของคุณโดยเปิดใช้คำบรรยายสดในการตั้งค่า</translation>
+<translation id="8160775796528709999">รับคำบรรยายแทนเสียงสำหรับเสียงและวิดีโอของคุณโดยเปิดใช้คำบรรยายแทนเสียงแบบสดในการตั้งค่า</translation>
 <translation id="816095449251911490"><ph name="SPEED" /> - <ph name="RECEIVED_AMOUNT" />, <ph name="TIME_REMAINING" /></translation>
 <translation id="8161293209665121583">โหมดผู้อ่านสำหรับหน้าเว็บ</translation>
 <translation id="8161604891089629425">แบบอักษรเส้นกรอบ</translation>
@@ -8145,7 +8156,7 @@
 <translation id="8195027750202970175">ขนาดบนดิสก์</translation>
 <translation id="8195191503358432289">เพิ่มรหัสผ่าน</translation>
 <translation id="8195265224453131880">ความเข้ม</translation>
-<translation id="8195737548602430447">แปลคำบรรยายเป็นภาษาเป้าหมายโดยอัตโนมัติ</translation>
+<translation id="8195737548602430447">แปลคำบรรยายแทนเสียงเป็นภาษาเป้าหมายโดยอัตโนมัติ</translation>
 <translation id="8197673340773315084">เพิ่มชื่อหรือป้ายกํากับ เช่น "งาน" หรือ "ส่วนตัว"</translation>
 <translation id="8198456017687137612">กำลังแคสต์แท็บ</translation>
 <translation id="8199300056570174101">เครือข่าย (บริการ) และคุณสมบัติอุปกรณ์</translation>
@@ -8250,7 +8261,7 @@
 <translation id="8281721647184388851">เปิดการซิงค์เบราว์เซอร์ Chrome ใช่ไหม</translation>
 <translation id="8281886186245836920">ข้าม</translation>
 <translation id="8284279544186306258">ไซต์ <ph name="WEBSITE_1" /> ทั้งหมด</translation>
-<translation id="8284326494547611709">คำบรรยาย</translation>
+<translation id="8284326494547611709">คำบรรยายแทนเสียง</translation>
 <translation id="8286036467436129157">ลงชื่อเข้าใช้</translation>
 <translation id="8286227656784970313">ใช้พจนานุกรมของระบบ</translation>
 <translation id="828642162569365647">รหัสผ่านหรือ PIN นี้ช่วยปกป้องข้อมูลใน <ph name="DEVICE_TYPE" /> เครื่องนี้และข้อมูลที่คุณเข้าถึงจากโทรศัพท์ คุณจะต้องปลดล็อกทุกครั้งที่ <ph name="DEVICE_TYPE" /> ออกจากโหมดสลีป</translation>

chrome/app/resources/generated_resources_uz.xtb

diff --git a/chrome/app/resources/generated_resources_uz.xtb b/chrome/app/resources/generated_resources_uz.xtb
index 81b18473..23306f4 100644
--- a/chrome/app/resources/generated_resources_uz.xtb
+++ b/chrome/app/resources/generated_resources_uz.xtb
@@ -694,6 +694,7 @@
 <translation id="1593594475886691512">Formatlanmoqda...</translation>
 <translation id="159359590073980872">Tasvirlar keshi</translation>
 <translation id="1593926297800505364">To‘lov usulini saqlash</translation>
+<translation id="1594703455918849716">Tekshiruv sahifasiga kirish</translation>
 <translation id="1595492813686795610">Linux yangilanmoqda</translation>
 <translation id="1596286373007273895">Mavjud</translation>
 <translation id="1596709061955594992">Bluetooth oʻchiq. Mavjud qurilmalarni koʻrish uchun Bluetoothni yoqing.</translation>
@@ -1235,7 +1236,7 @@
 <translation id="2048554637254265991">Konteynerlar menejeri ishga tushmadi. Qayta urining.</translation>
 <translation id="2048653237708779538">Bu amal ishlamaydi</translation>
 <translation id="204914487372604757">Yorliq yaratish</translation>
-<translation id="2050339315714019657">Bo‘yiga</translation>
+<translation id="2050339315714019657">Tik</translation>
 <translation id="2051555741181591333">Hotpost avtomatik oʻchirilsin</translation>
 <translation id="2052572566310583903">Boshqa qurilmalaringizda oʻrnatilgan</translation>
 <translation id="2053105195397337973">Biz saytlarda spam va firibgarlik reklamalaridan himoyani yoqish orqali kuzatuv mexanizmlarini taqiqlash yoʻllarini oʻrganib chiqmoqdamiz.</translation>
@@ -1681,6 +1682,7 @@
 <translation id="2399699884460174994">Bildirishnomalar yoqildi</translation>
 <translation id="2399939490305346086">Elektron kalitdagi kirish maʼlumotlari</translation>
 <translation id="2400664245143453337">Hoziroq yangilanishi zarur</translation>
+<translation id="2402226831639195063">Ohanglar</translation>
 <translation id="2406153734066939945">Bu profil va undagi axborotlar oʻchirilsinmi?</translation>
 <translation id="2408018932941436077">Karta saqlanmoqda</translation>
 <translation id="2408955596600435184">PIN kodni kiriting</translation>
@@ -1692,6 +1694,7 @@
 <translation id="241082044617551207">Noma’lum plagin</translation>
 <translation id="2410940059315936967">Siz kirgan sayt boshqa saytlardagi kontentni, masalan, rasmlar, reklamalar va matnlarni joylashtirishi mumkin. Ushbu boshqa saytlar belgilaydigan cookie fayllar tashqi cookie fayllar hisoblanadi.</translation>
 <translation id="2411666601450687801">Bu qurilmada hech qanday virtual mashinalarga ruxsat berilmagan</translation>
+<translation id="2412015533711271895">Ota-ona yoki vasiy bu kengaytmani ishlatishga ruxsat berishi kerak</translation>
 <translation id="2412753904894530585">Kerberos</translation>
 <translation id="2414886740292270097">Qorong‘i</translation>
 <translation id="2416435988630956212">Klaviaturaning funksiya tugmalari</translation>
@@ -3073,6 +3076,7 @@
 <translation id="3651488188562686558">Wi-Fi tarmoqdan uzish</translation>
 <translation id="3652817283076144888">Ishga tushirilmoqda</translation>
 <translation id="3653160965917900914">Fayllarni tarmoqda ulashish</translation>
+<translation id="3653887973853407813">Bu kengaytmani ishlata olmaysiz. Ota-ona yoki vasiy Chrome uchun “Saytlar, ilovalar va kengaytmalar uchun ruxsatlar” funksiyasini faolsizlantirgan.</translation>
 <translation id="3653999333232393305"><ph name="HOST" /> saytiga mikrofondan foydalanishiga ruxsat berilaversin</translation>
 <translation id="3654045516529121250">Qulayliklar sozlamalarini o‘qish</translation>
 <translation id="3655712721956801464">{NUM_FILES,plural, =1{1 ta faylga doimiy ruxsati bor.}other{# ta faylga doimiy ruxsati bor.}}</translation>
@@ -5145,6 +5149,7 @@
 <translation id="5517304475148761050">Bu ilova Play Marketga kirishni talab etadi</translation>
 <translation id="5517412723934627386"><ph name="NETWORK_TYPE" /> - <ph name="NETWORK_DISPLAY_NAME" /></translation>
 <translation id="5518219166343146486">Saytlar klipbordga nusxalangan matn va rasmlarni ko‘rmoqchi bo‘lganda xabar berilsin</translation>
+<translation id="5518949581554491184">Android telefoni bilan sozlash</translation>
 <translation id="5519195206574732858">LTE</translation>
 <translation id="5521078259930077036">Bu boshqa bosh sahifami?</translation>
 <translation id="5522156646677899028">Bu kengaytmada havfsizlikka ta’sir qiladigan jiddiy zaiflik aniqlandi.</translation>
@@ -6477,6 +6482,7 @@
 <translation id="6725206449694821596">Internet orqali chop etish protokoli (IPP)</translation>
 <translation id="6725970970008349185">Har sahifada ko‘rsatiladigan nomzodlar soni</translation>
 <translation id="672609503628871915">Nimalar yangiligini ko‘ring</translation>
+<translation id="6726800386221816228">Maxsus belgilar</translation>
 <translation id="67269783048918309">Foydalanish va diagnostika axborotini yuborish. Bu qurilma hozirda qurilma va ilovalardan foydalanish haqidagi hamda diagnostika axborotini avtomatik tarzda Google kompaniyasiga yubormoqda. Ushbu axborotdan farzandingiz shaxsini aniqlash uchun foydalanilmaydi. Ular tizim va ilovalar barqarorligi kabilarni yaxshilash uchun ishlatiladi. Ayrim toʻplangan maʼlumotlar Android dasturchilar kabi hamkorlarimizga ham oʻz ilovalari va mahsulotlarini yanada yaxshilashga yordam beradi. Bu <ph name="BEGIN_LINK1" />parametr<ph name="END_LINK1" /> qurilma egasi tomonidan oʻrnatilgan. Agar farzandingiz uchun Kengaytirilgan veb-qidiruv va ilovalar tarixi yoqilgan boʻlsa, bu maʼlumotlar uning Google hisobiga saqlanadi. <ph name="BEGIN_LINK2" />Batafsil<ph name="END_LINK2" /></translation>
 <translation id="6728528977475057549">IBAN (<ph name="LAST_FOUR_DIGITS" />)</translation>
 <translation id="6729192290958770680">Foydalanuvchi nomini kiriting</translation>
@@ -6879,6 +6885,7 @@
 <translation id="7063129466199351735">Yorliqlarga ishlov berilmoqda...</translation>
 <translation id="7063311912041006059">Soʻrovdagi <ph name="SPECIAL_SYMBOL" /> parametrli havola</translation>
 <translation id="706342288220489463">Assistent yordam berish uchun ekrandagi axborotdan foydalanishiga ruxsat bering</translation>
+<translation id="70641621694466590">Parollar sahifasiga kirish</translation>
 <translation id="7064734931812204395">Linux konteyneri sozlanmoqda. Bu 30 daqiqagacha vaqt olishi mumkin.</translation>
 <translation id="7065223852455347715">Ushbu qurilma korporativ domenda ro‘yxatdan o‘tishni taqiqlovchi rejimda ishlamoqda. Qurilmani ro‘yxatdan o‘tkazish uchun avval uning sozlamalarini qayta tiklang.</translation>
 <translation id="7065534935986314333">Tizim haqida</translation>
@@ -7380,6 +7387,7 @@
 <translation id="7541773865713908457"><ph name="APP_NAME" /> ilovasida <ph name="ACTION_NAME" /></translation>
 <translation id="754207240458482646">Hisobingizdagi boshqa qurilmalarga sinxronlandi. <ph name="LINK_BEGIN" />Batafsil<ph name="LINK_END" /></translation>
 <translation id="7543104066686362383"><ph name="IDS_SHORT_PRODUCT_NAME" /> qurilmasida tuzatish funksiyalarini yoqish.</translation>
+<translation id="7544977292347272434">Ota-onangizdan kengaytmaga ruxsat berishini soʻrang</translation>
 <translation id="7545466883021407599">Serverga ulana olmadi. Internetga ulanishni tekshiring va qayta urining. Muammo qaytarilaversa, Chromebook qurilmangizni qayta ishga tushiring. Xatolik kodi: <ph name="ERROR_CODE" />.</translation>
 <translation id="7547317915858803630">Diqqat! <ph name="PRODUCT_NAME" /> sozlamalari tarmoq diskiga saqlanmoqda. Bu ish faoliyatini sekinlashtirishi, ishdan chiqarishi yoki ma’lumotlarning o‘chib ketishiga olib kelishi mumkin.</translation>
 <translation id="7548856833046333824">Limonad</translation>
@@ -7608,6 +7616,7 @@
 <translation id="7728668285692163452">Kanal o‘zgarishi keyinroq tatbiq qilinadi</translation>
 <translation id="7730449930968088409">Ekran skrinshoti</translation>
 <translation id="7730683939467795481">Sahifa “<ph name="EXTENSION_NAME" />” kengaytmasi tomonidan oʻzgartirildi</translation>
+<translation id="773511996612364297">Urgʻu belgilari</translation>
 <translation id="7735165285389721951">Boshqa Steam oʻrnatish jarayoni ishga tushgan. Kutib turing va yakunidan keyin qayta urining</translation>
 <translation id="7737115349420013392">“<ph name="DEVICE_NAME" />” bilan ulanmoqda...</translation>
 <translation id="7737203573077018777"><ph name="PROOF_OF_POSSESSION_INSTRUCTION_NAME" /> koʻrsatmasi qabul qilindi</translation>
@@ -7689,6 +7698,7 @@
 <translation id="7792388396321542707">Ruxsatni bekor qilish</translation>
 <translation id="779308894558717334">Och yashil</translation>
 <translation id="7793098747275782155">Toʻq koʻk</translation>
+<translation id="7796453472368605346">Diakritika</translation>
 <translation id="7797571222998226653">Oʻchiq</translation>
 <translation id="7798504574384119986">Veb ruxsatlarini koʻrish</translation>
 <translation id="7798844538707273832"><ph name="PERMISSION" /> ruxsati avtomatik bloklandi.</translation>
@@ -7773,6 +7783,7 @@
 <translation id="7876027585589532670">Yorliq tahrirlanmadi</translation>
 <translation id="7877451762676714207">Serverda noma’lum xato. Qayta urinib ko‘ring yoki administrator bilan bog‘laning.</translation>
 <translation id="7878945852730162014">Fayllar yuklab olinishini boshqarish va ularni darhol ochish</translation>
+<translation id="7879172417209159252">Kengaytmani ishlatish imkonsiz</translation>
 <translation id="7879478708475862060">Tanlangan kiritish rejimidan foydalanish</translation>
 <translation id="7879631849810108578">Tugmalar birikmasi kiritildi: <ph name="IDS_SHORT_SET_COMMAND" /></translation>
 <translation id="7880823633812189969">Keyingi oʻchirib-yoqilganda mahalliy maʼlumotlar tozalanadi</translation>

chrome/app/resources/generated_resources_vi.xtb

diff --git a/chrome/app/resources/generated_resources_vi.xtb b/chrome/app/resources/generated_resources_vi.xtb
index 2533927..3065acc 100644
--- a/chrome/app/resources/generated_resources_vi.xtb
+++ b/chrome/app/resources/generated_resources_vi.xtb
@@ -3030,6 +3030,7 @@
 <translation id="3609277884604412258">Tìm kiếm nhanh</translation>
 <translation id="3610241585790874201">Không được phép lưu dữ liệu trên thiết bị của bạn</translation>
 <translation id="3610369246614755442">Quạt của đế sạc cần được bảo dưỡng</translation>
+<translation id="3610961622607302617">Thay đổi mật khẩu cho <ph name="WEBSITE" /></translation>
 <translation id="361106536627977100">Dữ liệu Flash</translation>
 <translation id="3611655097742243705">Hãy truy cập vào Cửa hàng Play để tìm thêm các ứng dụng khác</translation>
 <translation id="3611658447322220736">Các trang web đã đóng gần đây có thể hoàn tất thao tác gửi và nhận dữ liệu</translation>
@@ -6046,6 +6047,7 @@
 <translation id="6318125393809743217">Thêm một tệp policies.json có chứa cấu hình chính sách.</translation>
 <translation id="6318407754858604988">Đã bắt đầu tải xuống</translation>
 <translation id="6318944945640833942">Không thể phát hiện máy in. Vui lòng nhập lại địa chỉ máy in.</translation>
+<translation id="6320808462673705899">Không có dấu trang nào khớp với nội dung bạn tìm.</translation>
 <translation id="6322370287306604163">Mở khóa nhanh hơn bằng vân tay</translation>
 <translation id="6322559670748154781">Tệp này không được tải xuống theo cách thông thường và đã bị tính năng Bảo vệ nâng cao chặn lại</translation>
 <translation id="6324916366299863871">Chỉnh sửa phím tắt</translation>

chrome/app/resources/generated_resources_zh-CN.xtb

diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb
index 39a69bd..ebff2903 100644
--- a/chrome/app/resources/generated_resources_zh-CN.xtb
+++ b/chrome/app/resources/generated_resources_zh-CN.xtb
@@ -691,6 +691,7 @@
 <translation id="1593594475886691512">正在格式化…</translation>
 <translation id="159359590073980872">图片缓存</translation>
 <translation id="1593926297800505364">保存付款方式</translation>
+<translation id="1594703455918849716">前往“检查”页面</translation>
 <translation id="1595492813686795610">Linux 正在升级</translation>
 <translation id="1596286373007273895">可用</translation>
 <translation id="1596709061955594992">蓝牙处于关闭状态。若要查看可用的设备，请开启蓝牙。</translation>
@@ -1672,6 +1673,7 @@
 <translation id="2399699884460174994">通知已开启</translation>
 <translation id="2399939490305346086">安全密钥登录数据</translation>
 <translation id="2400664245143453337">需要立即更新</translation>
+<translation id="2402226831639195063">提示音</translation>
 <translation id="2406153734066939945">删除这份个人资料及其数据？</translation>
 <translation id="2408018932941436077">正在保存信用卡信息</translation>
 <translation id="2408955596600435184">输入您的 PIN 码</translation>
@@ -1683,6 +1685,7 @@
 <translation id="241082044617551207">未知插件</translation>
 <translation id="2410940059315936967">您访问的网站可以嵌入其他网站的内容，例如图片、广告和文字。由这类其他网站设置的 Cookie 称为第三方 Cookie。</translation>
 <translation id="2411666601450687801">不允许在此设备上安装虚拟机</translation>
+<translation id="2412015533711271895">要使用此扩展程序，必须先征得家长或监护人同意</translation>
 <translation id="2412753904894530585">Kerberos</translation>
 <translation id="2414886740292270097">深色调</translation>
 <translation id="2416435988630956212">键盘功能键</translation>
@@ -3007,6 +3010,7 @@
 <translation id="3609277884604412258">快速搜索</translation>
 <translation id="3610241585790874201">不得将数据保存在设备上</translation>
 <translation id="3610369246614755442">基座风扇需要维修</translation>
+<translation id="3610961622607302617">更改 <ph name="WEBSITE" /> 的密码</translation>
 <translation id="361106536627977100">闪存数据</translation>
 <translation id="3611655097742243705">如需查找更多应用，请前往 Play 商店</translation>
 <translation id="3611658447322220736">最近关闭的网站可以完成数据收发操作</translation>
@@ -3063,6 +3067,7 @@
 <translation id="3651488188562686558">断开 Wi-Fi 连接</translation>
 <translation id="3652817283076144888">正在初始化</translation>
 <translation id="3653160965917900914">网络文件共享</translation>
+<translation id="3653887973853407813">无法使用此扩展程序。你的家长或监护人已在 Chrome 中关闭“网站、应用和扩展程序的权限”。</translation>
 <translation id="3653999333232393305">继续允许 <ph name="HOST" /> 使用您的麦克风</translation>
 <translation id="3654045516529121250">读取您的无障碍设置</translation>
 <translation id="3655712721956801464">{NUM_FILES,plural, =1{此应用对 1 个文件拥有永久访问权限。}other{此应用对 # 个文件拥有永久访问权限。}}</translation>
@@ -5131,6 +5136,7 @@
 <translation id="5517304475148761050">此应用需要获得对 Play 商店的访问权限</translation>
 <translation id="5517412723934627386"><ph name="NETWORK_TYPE" /> - <ph name="NETWORK_DISPLAY_NAME" /></translation>
 <translation id="5518219166343146486">当网站想查看复制到剪贴板的文字和图片时询问您</translation>
+<translation id="5518949581554491184">使用 Android 手机进行设置</translation>
 <translation id="5519195206574732858">LTE</translation>
 <translation id="5521078259930077036">这是您想要的主页吗？</translation>
 <translation id="5522156646677899028">该扩展程序存在严重的安全漏洞。</translation>
@@ -6016,6 +6022,7 @@
 <translation id="6318125393809743217">添加一个包含政策配置的 policies.json 文件。</translation>
 <translation id="6318407754858604988">已开始下载</translation>
 <translation id="6318944945640833942">无法检测到打印机。请重新输入打印机地址。</translation>
+<translation id="6320808462673705899">没有与您的搜索条件相符的书签。</translation>
 <translation id="6322370287306604163">指纹解锁更快捷</translation>
 <translation id="6322559670748154781">此文件属于不常下载的内容，已被“高级保护”机制屏蔽</translation>
 <translation id="6324916366299863871">修改快捷方式</translation>
@@ -6460,6 +6467,7 @@
 <translation id="6725206449694821596">互联网打印协议 (IPP)</translation>
 <translation id="6725970970008349185">每页显示的候选字词数</translation>
 <translation id="672609503628871915">了解一下新变化</translation>
+<translation id="6726800386221816228">特殊字符</translation>
 <translation id="67269783048918309">发送使用情况数据和诊断数据。目前，此设备会自动向 Google 发送诊断数据、设备数据和应用使用情况数据。这些数据不会被用来辨识您孩子的身份，而是会被用来帮助提高系统和应用的稳定性以及实现其他方面的改进。部分汇总数据也会对 Google 应用和合作伙伴（例如 Android 开发者）有所帮助。这项<ph name="BEGIN_LINK1" />设置<ph name="END_LINK1" />是由此设备的所有者强制指定的。如果您已为孩子开启“其他网络与应用活动记录”设置，这些数据可能会被保存到其 Google 帐号中。<ph name="BEGIN_LINK2" />了解详情<ph name="END_LINK2" /></translation>
 <translation id="6728528977475057549">尾号为 <ph name="LAST_FOUR_DIGITS" /> 的 IBAN</translation>
 <translation id="6729192290958770680">请输入用户名</translation>
@@ -6862,6 +6870,7 @@
 <translation id="7063129466199351735">处理快捷方式…</translation>
 <translation id="7063311912041006059">网址格式（用“<ph name="SPECIAL_SYMBOL" />”代替搜索字词）</translation>
 <translation id="706342288220489463">允许 Google 助理使用屏幕中的信息为您提供帮助</translation>
+<translation id="70641621694466590">前往“密码”页面</translation>
 <translation id="7064734931812204395">正在配置 Linux 容器。此过程最多可能需要 30 分钟的时间。</translation>
 <translation id="7065223852455347715">此设备已锁定为禁止注册到企业的模式。如果您要注册此设备，必须先完成设备恢复过程。</translation>
 <translation id="7065534935986314333">关于系统</translation>
@@ -7363,6 +7372,7 @@
 <translation id="7541773865713908457">使用“<ph name="APP_NAME" />”应用来<ph name="ACTION_NAME" /></translation>
 <translation id="754207240458482646">已与您帐号中的其他设备同步。<ph name="LINK_BEGIN" />了解详情<ph name="LINK_END" /></translation>
 <translation id="7543104066686362383">在此<ph name="IDS_SHORT_PRODUCT_NAME" />设备上启用调试功能</translation>
+<translation id="7544977292347272434">请让你的家长批准此扩展程序</translation>
 <translation id="7545466883021407599">无法连接到服务器。请检查您的网络连接状况，然后重试。如果问题仍然存在，请尝试重启 Chromebook。错误代码：<ph name="ERROR_CODE" />。</translation>
 <translation id="7547317915858803630">警告：您的 <ph name="PRODUCT_NAME" />设置存储在网络驱动器上。这可能会导致速度变慢、崩溃，甚至数据丢失。</translation>
 <translation id="7548856833046333824">酒杯</translation>
@@ -7591,6 +7601,7 @@
 <translation id="7728668285692163452">系统将在稍后应用版本更改</translation>
 <translation id="7730449930968088409">截取您屏幕上的内容</translation>
 <translation id="7730683939467795481">此网页被扩展程序“<ph name="EXTENSION_NAME" />”更改了</translation>
+<translation id="773511996612364297">重音符号</translation>
 <translation id="7735165285389721951">已有一项 Steam 安装正在运行。请等待其完成，然后重试</translation>
 <translation id="7737115349420013392">正在与“<ph name="DEVICE_NAME" />”配对…</translation>
 <translation id="7737203573077018777">已收到<ph name="PROOF_OF_POSSESSION_INSTRUCTION_NAME" />说明</translation>
@@ -7673,6 +7684,7 @@
 <translation id="7792388396321542707">停止共享</translation>
 <translation id="779308894558717334">浅绿色</translation>
 <translation id="7793098747275782155">深蓝色</translation>
+<translation id="7796453472368605346">变音符号</translation>
 <translation id="7797571222998226653">已关闭</translation>
 <translation id="7798504574384119986">查看网站权限</translation>
 <translation id="7798844538707273832">已自动禁用<ph name="PERMISSION" /></translation>
@@ -7757,6 +7769,7 @@
 <translation id="7876027585589532670">无法修改快捷方式</translation>
 <translation id="7877451762676714207">未知服务器错误。请重试或与服务器管理员联系。</translation>
 <translation id="7878945852730162014">管理下载中的文件，并在下载完成后打开</translation>
+<translation id="7879172417209159252">扩展程序无法使用</translation>
 <translation id="7879478708475862060">按输入法</translation>
 <translation id="7879631849810108578">已成功设置快捷键：<ph name="IDS_SHORT_SET_COMMAND" /></translation>
 <translation id="7880823633812189969">系统会在您重启设备时删除本地数据</translation>

chrome/app/resources/google_chrome_strings_ja.xtb

diff --git a/chrome/app/resources/google_chrome_strings_ja.xtb b/chrome/app/resources/google_chrome_strings_ja.xtb
index 9d8c724..d5afdd0 100644
--- a/chrome/app/resources/google_chrome_strings_ja.xtb
+++ b/chrome/app/resources/google_chrome_strings_ja.xtb
@@ -110,7 +110,7 @@
 <translation id="2929907241665500097">エラーが発生したため、Chrome が更新されませんでした。<ph name="BEGIN_LINK" />Chrome の更新に関する問題を解決してください。<ph name="END_LINK" /></translation>
 <translation id="2969728957078202736"><ph name="PAGE_TITLE" /> - ネットワークにログイン - Chrome</translation>
 <translation id="3019382870990049182">再起動して ChromeOS Flex を更新(&amp;C)</translation>
-<translation id="303514781271618814">Chrome では、使用されるユーザーデータの量を抑えつつ、同じようにサイトをブラウジングできる新機能をテストしています</translation>
+<translation id="303514781271618814">Chrome では、使用するユーザー情報量を減らしながら、これまでと同様にブラウジングできる新機能をテストしています</translation>
 <translation id="3037838751736561277">Google Chrome はバックグラウンド モードです。</translation>
 <translation id="3038232873781883849">インストールの待機中...</translation>
 <translation id="3059710691562604940">セーフ ブラウジングがオフになっています。Chrome はオンにすることをおすすめしています。</translation>
@@ -163,7 +163,7 @@
 <translation id="4035053306113201399">更新を適用するには、Chrome OS を再起動する必要があります。</translation>
 <translation id="4050175100176540509">最新バージョンに更新すると、重要なセキュリティ更新と新機能が適用されます。</translation>
 <translation id="4053720452172726777">Google Chrome の設定</translation>
-<translation id="4106587138345390261">Chrome では、使用されるユーザーの情報の量を抑えつつ、同じようにサイトをブラウジングできる新機能をテストしています</translation>
+<translation id="4106587138345390261">Chrome では、使用するユーザー情報量を減らしながら、これまでと同様にブラウジングできる新機能をテストしています</translation>
 <translation id="4110895483821904099">新しい Chrome プロファイルの設定</translation>
 <translation id="4147555960264124640">現在、管理対象アカウントでログインしており、あなたの Google Chrome プロファイルを管理者が制御できる状態になっています。あなたの Chrome データ（アプリ、ブックマーク、履歴、パスワードなどの設定）は永続的に <ph name="USER_NAME" /> に関連付けられます。このデータは Google アカウントのダッシュボードを介して削除できますが、このデータを別のアカウントに関連付けることはできなくなります。<ph name="LEARN_MORE" /></translation>
 <translation id="4148957013307229264">インストール中...</translation>

chrome/browser/accessibility/live_caption/live_caption_unavailability_notifier_browsertest.cc

diff --git a/chrome/browser/accessibility/live_caption/live_caption_unavailability_notifier_browsertest.cc b/chrome/browser/accessibility/live_caption/live_caption_unavailability_notifier_browsertest.cc
index 72ffb2db..42e2a5a4 100644
--- a/chrome/browser/accessibility/live_caption/live_caption_unavailability_notifier_browsertest.cc
+++ b/chrome/browser/accessibility/live_caption/live_caption_unavailability_notifier_browsertest.cc
@@ -84,6 +84,10 @@
 
 IN_PROC_BROWSER_TEST_F(LiveCaptionUnavailabilityNotifierTest,
                        CaptionBubbleDestroyed) {
+#if BUILDFLAG(IS_WIN) && defined(ARCH_CPU_ARM64)
+  // TODO(https://crbug.com/1425041): Remove when live captioning is supported.
+  GTEST_SKIP() << "Live captioning not supported on Win Arm64";
+#else
   content::RenderFrameHost* frame_host = browser()
                                              ->tab_strip_model()
                                              ->GetActiveWebContents()
@@ -101,6 +105,7 @@
   DestroyNotifiers();
   base::RunLoop().RunUntilIdle();
   ExpectIsWidgetVisible(false);
+#endif  // BUILDFLAG(IS_WIN) && defined(ARCH_CPU_ARM64)
 }
 
 }  // namespace captions

chrome/browser/ash/BUILD.gn

diff --git a/chrome/browser/ash/BUILD.gn b/chrome/browser/ash/BUILD.gn
index a12f8c3..03819d68 100644
--- a/chrome/browser/ash/BUILD.gn
+++ b/chrome/browser/ash/BUILD.gn
@@ -2020,6 +2020,8 @@
     "nearby/nearby_process_manager_factory.h",
     "nearby/nearby_process_manager_impl.cc",
     "nearby/nearby_process_manager_impl.h",
+    "nearby/presence/nearby_presence_service_factory.cc",
+    "nearby/presence/nearby_presence_service_factory.h",
     "nearby/quick_start_connectivity_service.cc",
     "nearby/quick_start_connectivity_service.h",
     "nearby/quick_start_connectivity_service_factory.cc",
@@ -3486,6 +3488,7 @@
     "//chromeos/ash/components/metrics",
     "//chromeos/ash/components/mojo_service_manager/mojom",
     "//chromeos/ash/components/multidevice",
+    "//chromeos/ash/components/nearby/presence",
     "//chromeos/ash/components/network",
     "//chromeos/ash/components/network/portal_detector",
     "//chromeos/ash/components/osauth/impl",
@@ -4782,6 +4785,7 @@
     "app_list/search/chrome_search_result_unittest.cc",
     "app_list/search/common/keyword_util_unittest.cc",
     "app_list/search/common/string_util_unittest.cc",
+    "app_list/search/desks_admin_template_zero_state_provider_unittest.cc",
     "app_list/search/federated_metrics_manager_unittest.cc",
     "app_list/search/files/file_result_unittest.cc",
     "app_list/search/files/file_search_provider_unittest.cc",

chrome/browser/ash/app_list/app_list_client_impl.cc

diff --git a/chrome/browser/ash/app_list/app_list_client_impl.cc b/chrome/browser/ash/app_list/app_list_client_impl.cc
index 9a3013009..42f8e76 100644
--- a/chrome/browser/ash/app_list/app_list_client_impl.cc
+++ b/chrome/browser/ash/app_list/app_list_client_impl.cc
@@ -138,6 +138,10 @@
 
   ~ScopedIphSessionImpl() override { tracker_->Dismissed(iph_feature_); }
 
+  void NotifyEvent(const std::string& event) override {
+    tracker_->NotifyEvent(event);
+  }
+
  private:
   raw_ptr<feature_engagement::Tracker> tracker_;
   const base::Feature& iph_feature_;
@@ -559,7 +563,7 @@
 
   SetUpSearchUI();
   OnTemplateURLServiceChanged();
-  QueryWouldTriggerLauncherSearchIph();
+  RecalculateWouldTriggerLauncherSearchIph();
 }
 
 void AppListClientImpl::SetUpSearchUI() {
@@ -701,7 +705,7 @@
   return app_list_notifier_.get();
 }
 
-void AppListClientImpl::QueryWouldTriggerLauncherSearchIph() {
+void AppListClientImpl::RecalculateWouldTriggerLauncherSearchIph() {
   // This can be called before a `Profile` is set to `AppListClientImpl`. If a
   // `Profile` is not set yet, return here. `AppListClientImpl::SetProfile` will
   // call this method once a `Profile` is set.
@@ -709,7 +713,7 @@
     return;
   }
 
-  current_model_updater_->QueryWouldTriggerLauncherSearchIph();
+  current_model_updater_->RecalculateWouldTriggerLauncherSearchIph();
 }
 
 std::unique_ptr<ash::ScopedIphSession>

chrome/browser/ash/app_list/app_list_client_impl.h

diff --git a/chrome/browser/ash/app_list/app_list_client_impl.h b/chrome/browser/ash/app_list/app_list_client_impl.h
index 6e5ccff4..1fc4bd1 100644
--- a/chrome/browser/ash/app_list/app_list_client_impl.h
+++ b/chrome/browser/ash/app_list/app_list_client_impl.h
@@ -105,7 +105,7 @@
       const std::string& setting_name,
       const std::map<std::string, int>& values) override;
   ash::AppListNotifier* GetNotifier() override;
-  void QueryWouldTriggerLauncherSearchIph() override;
+  void RecalculateWouldTriggerLauncherSearchIph() override;
   std::unique_ptr<ash::ScopedIphSession> CreateLauncherSearchIphSession()
       override;
   void OpenSearchBoxIphUrl() override;

chrome/browser/ash/app_list/app_list_model_updater.h

diff --git a/chrome/browser/ash/app_list/app_list_model_updater.h b/chrome/browser/ash/app_list/app_list_model_updater.h
index d0e50a0..2389f2d 100644
--- a/chrome/browser/ash/app_list/app_list_model_updater.h
+++ b/chrome/browser/ash/app_list/app_list_model_updater.h
@@ -120,7 +120,7 @@
   virtual size_t BadgedItemCount() = 0;
   // For SearchModel:
   virtual bool SearchEngineIsGoogle() = 0;
-  virtual void QueryWouldTriggerLauncherSearchIph() = 0;
+  virtual void RecalculateWouldTriggerLauncherSearchIph() = 0;
 
   // Notifies when the app list gets hidden.
   virtual void OnAppListHidden() = 0;

chrome/browser/ash/app_list/chrome_app_list_model_updater.cc

diff --git a/chrome/browser/ash/app_list/chrome_app_list_model_updater.cc b/chrome/browser/ash/app_list/chrome_app_list_model_updater.cc
index 09aa688a..315ed4fe 100644
--- a/chrome/browser/ash/app_list/chrome_app_list_model_updater.cc
+++ b/chrome/browser/ash/app_list/chrome_app_list_model_updater.cc
@@ -290,7 +290,7 @@
   search_model_.SetSearchEngineIsGoogle(is_google);
 }
 
-void ChromeAppListModelUpdater::QueryWouldTriggerLauncherSearchIph() {
+void ChromeAppListModelUpdater::RecalculateWouldTriggerLauncherSearchIph() {
   raw_ptr<feature_engagement::Tracker> tracker =
       feature_engagement::TrackerFactory::GetForBrowserContext(profile_);
   if (!tracker) {

chrome/browser/ash/app_list/chrome_app_list_model_updater.h

diff --git a/chrome/browser/ash/app_list/chrome_app_list_model_updater.h b/chrome/browser/ash/app_list/chrome_app_list_model_updater.h
index 38cb761..812c1e4 100644
--- a/chrome/browser/ash/app_list/chrome_app_list_model_updater.h
+++ b/chrome/browser/ash/app_list/chrome_app_list_model_updater.h
@@ -53,7 +53,7 @@
   void RemoveItem(const std::string& id, bool is_uninstall) override;
   void SetStatus(ash::AppListModelStatus status) override;
   void SetSearchEngineIsGoogle(bool is_google) override;
-  void QueryWouldTriggerLauncherSearchIph() override;
+  void RecalculateWouldTriggerLauncherSearchIph() override;
   void PublishSearchResults(
       const std::vector<ChromeSearchResult*>& results,
       const std::vector<ash::AppListSearchResultCategory>& categories) override;

chrome/browser/ash/app_list/launcher_search_iph_browsertest.cc

diff --git a/chrome/browser/ash/app_list/launcher_search_iph_browsertest.cc b/chrome/browser/ash/app_list/launcher_search_iph_browsertest.cc
index 83f81a6..845c0c6 100644
--- a/chrome/browser/ash/app_list/launcher_search_iph_browsertest.cc
+++ b/chrome/browser/ash/app_list/launcher_search_iph_browsertest.cc
@@ -24,9 +24,12 @@
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
+#include "base/metrics/field_trial_params.h"
 #include "base/run_loop.h"
 #include "base/scoped_observation.h"
+#include "base/strings/stringprintf.h"
 #include "base/test/gtest_tags.h"
+#include "base/test/metrics/user_action_tester.h"
 #include "base/test/scoped_feature_list.h"
 #include "chrome/browser/ash/app_list/app_list_client_impl.h"
 #include "chrome/browser/ash/app_list/search/search_controller.h"
@@ -50,6 +53,17 @@
 constexpr char kScreenPlayTagValue[] =
     "screenplay-3adcce6b-a470-48b0-9246-f6570c5cef34";
 
+constexpr char kNotifyUsedEventUserActionName[] =
+    "InProductHelp.NotifyUsedEvent.IPH_LauncherSearchHelpUi";
+constexpr char kNotifyEventUserActionName[] =
+    "InProductHelp.NotifyEvent.IPH_LauncherSearchHelpUi";
+
+constexpr char kIphConfigParamNameEventUsed[] = "event_used";
+constexpr char kIphConfigParamNameEventTrigger[] = "event_trigger";
+constexpr char kIphConfigParamNameEvent1[] = "event_1";
+constexpr char kIphConfigParamNameAvailability[] = "availability";
+constexpr char kIphConfigParamNameSessionRate[] = "session_rate";
+
 class ViewWaiter : public views::ViewObserver {
  public:
   ViewWaiter(raw_ptr<views::View> observed_view, int view_id)
@@ -265,13 +279,29 @@
   raw_ptr<AppListClientImpl> app_list_client_impl_ = nullptr;
 };
 
-class AppListIphBrowserTestWithDemoMode : public AppListIphBrowserTest {
+class AppListIphBrowserTestWithTestConfig : public AppListIphBrowserTest {
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override {
+    base::FieldTrialParams params;
+    params[kIphConfigParamNameAvailability] = "any";
+    params[kIphConfigParamNameSessionRate] = "any";
+    params[kIphConfigParamNameEventUsed] =
+        base::StringPrintf("name:%s;comparator:any;window:365;storage:365",
+                           ash::LauncherSearchIphView::kIphEventNameChipClick);
+    // Trigger event is not used for this test config. Note that a trigger event
+    // gets incremented every time an IPH is shown.
+    params[kIphConfigParamNameEventTrigger] =
+        "name:IPH_LauncherSearchHelpUi_trigger;comparator:any;window:365;"
+        "storage:365";
+    params[kIphConfigParamNameEvent1] = base::StringPrintf(
+        "name:%s;comparator:==0;window:365;storage:365",
+        ash::LauncherSearchIphView::kIphEventNameAssistantClick);
+
     scoped_iph_feature_list_ =
         std::make_unique<feature_engagement::test::ScopedIphFeatureList>();
-    scoped_iph_feature_list_->InitForDemo(
-        feature_engagement::kIPHLauncherSearchHelpUiFeature);
+    scoped_iph_feature_list_->InitAndEnableFeaturesWithParameters(
+        {base::test::FeatureRefAndParams(
+            feature_engagement::kIPHLauncherSearchHelpUiFeature, params)});
 
     MixinBasedInProcessBrowserTest::SetUpCommandLine(command_line);
   }
@@ -287,7 +317,7 @@
   EXPECT_FALSE(IsLauncherSearchIphViewVisible());
 }
 
-IN_PROC_BROWSER_TEST_P(AppListIphBrowserTestWithDemoMode, LauncherSearchIph) {
+IN_PROC_BROWSER_TEST_P(AppListIphBrowserTestWithTestConfig, LauncherSearchIph) {
   OpenAppListAndWaitForIphView();
 
   EXPECT_TRUE(IsLauncherSearchIphViewVisible());
@@ -295,20 +325,14 @@
     EXPECT_TRUE(search_box_view()->assistant_button()->GetBackground());
   }
 
-  // Dismiss the app list and show it again. IPH won't be shown this time. Note
-  // that this is IPH demo mode behavior.
+  // IPH should be kept being shown as long as the trigger condition in the test
+  // config matches.
   DismissAppList();
-  OpenAppListForSearch();
-  EXPECT_FALSE(IsLauncherSearchIphViewVisible());
-
-  if (IsClamshellModeTest()) {
-    // Launcher search iph installs a background to an assistant button in the
-    // search box. It should be removed if the iph gets dismissed.
-    EXPECT_FALSE(search_box_view()->assistant_button()->GetBackground());
-  }
+  OpenAppListAndWaitForIphView();
+  EXPECT_TRUE(IsLauncherSearchIphViewVisible());
 }
 
-IN_PROC_BROWSER_TEST_P(AppListIphBrowserTestWithDemoMode,
+IN_PROC_BROWSER_TEST_P(AppListIphBrowserTestWithTestConfig,
                        LauncherSearchIphSearch) {
   OpenAppListAndWaitForIphView();
   EXPECT_TRUE(IsLauncherSearchIphViewVisible());
@@ -318,10 +342,10 @@
   EXPECT_FALSE(IsLauncherSearchIphViewVisible());
 }
 
-using AppListIphBrowserTestWithDemoModeClamshell =
-    AppListIphBrowserTestWithDemoMode;
+using AppListIphBrowserTestWithTestConfigClamshell =
+    AppListIphBrowserTestWithTestConfig;
 
-IN_PROC_BROWSER_TEST_P(AppListIphBrowserTestWithDemoModeClamshell,
+IN_PROC_BROWSER_TEST_P(AppListIphBrowserTestWithTestConfigClamshell,
                        LauncherSearchIphAssistantButtonInSearchBox) {
   OpenAppListAndWaitForIphView();
 
@@ -335,13 +359,17 @@
   EXPECT_FALSE(IsLauncherSearchIphViewVisible());
 }
 
-IN_PROC_BROWSER_TEST_P(AppListIphBrowserTestWithDemoMode, ClickChip) {
+IN_PROC_BROWSER_TEST_P(AppListIphBrowserTestWithTestConfig, ClickChip) {
   OpenAppListAndWaitForIphView();
 
+  // Chip click is specified as EventUsed in the test config.
+  base::UserActionTester user_action_tester;
   raw_ptr<views::View> chip = search_box_view()->GetViewByID(
       ash::LauncherSearchIphView::ViewId::kChipStart);
   ASSERT_TRUE(chip);
   Click(chip);
+  EXPECT_EQ(1,
+            user_action_tester.GetActionCount(kNotifyUsedEventUserActionName));
 
   EXPECT_EQ(u"Weather",
             app_list_client_impl()->search_controller()->get_query());
@@ -349,19 +377,43 @@
   EXPECT_FALSE(IsLauncherSearchIphViewVisible());
 }
 
-IN_PROC_BROWSER_TEST_P(AppListIphBrowserTestWithDemoMode, ClickAssistant) {
+IN_PROC_BROWSER_TEST_P(AppListIphBrowserTestWithTestConfig, ClickAssistant) {
   OpenAppListAndWaitForIphView();
 
+  EXPECT_TRUE(IsLauncherSearchIphViewVisible());
+  if (IsClamshellModeTest()) {
+    // Confirm that a background is installed as we check that this gets removed
+    // if IPH is not shown below.
+    EXPECT_TRUE(search_box_view()->assistant_button()->GetBackground());
+  }
+
+  // Confirm that assistant event is recorded. Make sure that the initial count
+  // is 0 to distinguish this from other events.
+  base::UserActionTester user_action_tester;
+  ASSERT_EQ(0, user_action_tester.GetActionCount(kNotifyEventUserActionName));
   raw_ptr<views::View> assistant_button = search_box_view()->GetViewByID(
       ash::LauncherSearchIphView::ViewId::kAssistant);
   ASSERT_TRUE(assistant_button);
   Click(assistant_button);
+  EXPECT_EQ(1, user_action_tester.GetActionCount(kNotifyEventUserActionName));
 
   EXPECT_TRUE(IsAssistantPageActive());
   EXPECT_FALSE(IsLauncherSearchIphViewVisible());
+
+  // Dismiss the app list and show it again. IPH won't be shown this time. Note
+  // that this behavior is coming from the IPH test config.
+  DismissAppList();
+  OpenAppListForSearch();
+  EXPECT_FALSE(IsLauncherSearchIphViewVisible());
+
+  if (IsClamshellModeTest()) {
+    // Launcher search iph installs a background to an assistant button in the
+    // search box. It should be removed if the iph gets dismissed.
+    EXPECT_FALSE(search_box_view()->assistant_button()->GetBackground());
+  }
 }
 
-IN_PROC_BROWSER_TEST_P(AppListIphBrowserTestWithDemoMode,
+IN_PROC_BROWSER_TEST_P(AppListIphBrowserTestWithTestConfig,
                        NoIphWithoutAssistant) {
   // `AssistantTestApiImpl::SetAssistantEnabled` asserts that the value has
   // taken effect, i.e. we are sure that Assistant gets disabled after this
@@ -379,7 +431,7 @@
   EXPECT_FALSE(search_box_view()->assistant_button()->GetBackground());
 }
 
-IN_PROC_BROWSER_TEST_P(AppListIphBrowserTestWithDemoMode, ClickLink) {
+IN_PROC_BROWSER_TEST_P(AppListIphBrowserTestWithTestConfig, ClickLink) {
   OpenAppListAndWaitForIphView();
   raw_ptr<views::StyledLabel> description_label =
       static_cast<views::StyledLabel*>(search_box_view()->GetViewByID(
@@ -458,12 +510,12 @@
                          &GenerateTestSuffix);
 
 INSTANTIATE_TEST_SUITE_P(LauncherSearchIph,
-                         AppListIphBrowserTestWithDemoMode,
+                         AppListIphBrowserTestWithTestConfig,
                          /*is_tablet=*/testing::Bool(),
                          &GenerateTestSuffix);
 
 INSTANTIATE_TEST_SUITE_P(LauncherSearchIph,
-                         AppListIphBrowserTestWithDemoModeClamshell,
+                         AppListIphBrowserTestWithTestConfigClamshell,
                          /*is_tablet=*/testing::Values(false),
                          &GenerateTestSuffix);
 

chrome/browser/ash/app_list/search/common/types_util.cc

diff --git a/chrome/browser/ash/app_list/search/common/types_util.cc b/chrome/browser/ash/app_list/search/common/types_util.cc
index d149314f..280b8c0 100644
--- a/chrome/browser/ash/app_list/search/common/types_util.cc
+++ b/chrome/browser/ash/app_list/search/common/types_util.cc
@@ -63,6 +63,8 @@
       return "Image search";
     case ash::AppListSearchResultType::kSystemInfo:
       return "System info";
+    case ash::AppListSearchResultType::kZeroStateDesksAdminTemplate:
+      return "Desks Admin template";
   }
   NOTREACHED();
 }
@@ -179,6 +181,8 @@
       return "SYSTEM_INFO";
     case ash::SearchResultType::IMAGE_SEARCH:
       return "IMAGE_SEARCH";
+    case ash::SearchResultType::ZERO_STATE_DESKS_ADMIN_TEMPLATE:
+      return "ZERO_STATE_DESKS_ADMIN_TEMPLATE";
   }
   NOTREACHED();
 }

chrome/browser/ash/app_list/search/desks_admin_template_zero_state_provider.cc

diff --git a/chrome/browser/ash/app_list/search/desks_admin_template_zero_state_provider.cc b/chrome/browser/ash/app_list/search/desks_admin_template_zero_state_provider.cc
new file mode 100644
index 0000000..8e807b0
--- /dev/null
+++ b/chrome/browser/ash/app_list/search/desks_admin_template_zero_state_provider.cc
@@ -0,0 +1,93 @@
+// 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 "chrome/browser/ash/app_list/search/desks_admin_template_zero_state_provider.h"
+
+#include <memory>
+
+#include "ash/public/cpp/app_list/vector_icons/vector_icons.h"
+#include "ash/public/cpp/style/color_provider.h"
+#include "ash/shell.h"
+#include "ash/wm/desks/templates/saved_desk_controller.h"
+#include "chrome/browser/ash/app_list/search/common/icon_constants.h"
+#include "chrome/browser/ash/app_list/search/types.h"
+#include "chrome/browser/profiles/profile.h"
+#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/paint_vector_icon.h"
+
+namespace app_list {
+namespace {
+
+// A hardcode id for each admin template.
+constexpr char kAdminTemplateResultPrefix[] = "admin-template://";
+
+}  // namespace
+
+DesksAdminTemplateZeroStateResult::DesksAdminTemplateZeroStateResult(
+    Profile* profile,
+    const base ::GUID& template_uuid,
+    const std::u16string& title,
+    const gfx::ImageSkia& icon)
+    : profile_(profile), template_uuid_(template_uuid) {
+  DCHECK(profile_);
+  set_id(kAdminTemplateResultPrefix + template_uuid.AsLowercaseString());
+  SetCategory(Category::kUnknown);
+  SetTitle(title);
+  SetDetails(u"Managed by administrator");
+  SetResultType(ResultType::kZeroStateDesksAdminTemplate);
+  SetDisplayType(DisplayType::kContinue);
+  SetMetricsType(ash::ZERO_STATE_DESKS_ADMIN_TEMPLATE);
+  SetChipIcon(icon);
+}
+
+DesksAdminTemplateZeroStateResult::~DesksAdminTemplateZeroStateResult() =
+    default;
+
+void DesksAdminTemplateZeroStateResult::Open(int event_flags) {
+  ash::SavedDeskController::Get()->LaunchAdminTemplate(template_uuid_);
+}
+
+DesksAdminTemplateZeroStateProvider::DesksAdminTemplateZeroStateProvider(
+    Profile* profile)
+    : profile_(profile) {
+  DCHECK(profile_);
+}
+
+DesksAdminTemplateZeroStateProvider::~DesksAdminTemplateZeroStateProvider() =
+    default;
+
+void DesksAdminTemplateZeroStateProvider::StartZeroState() {
+  SearchProvider::Results search_results;
+
+  auto* controller = ash::SavedDeskController::Get();
+
+  auto* color_provider = ash::ColorProvider::Get();
+  // NOTE: Color provider may not be set in unit tests.
+  SkColor icon_color =
+      color_provider
+          ? color_provider->GetContentLayerColor(
+                ash::ColorProvider::ContentLayerType::kButtonIconColorPrimary)
+          : gfx::kGoogleGrey900;
+  // TODO(b/273799604): We will replace the default icon with our admin
+  // templates icon.
+  gfx::ImageSkia icon = gfx::CreateVectorIcon(
+      ash::kReleaseNotesChipIcon, app_list::kSystemIconDimension, icon_color);
+
+  for (const auto& metadata : controller->GetAdminTemplateMetadata()) {
+    // With productivity launcher enabled, release notes are shown in continue
+    // section.
+    search_results.emplace_back(
+        std::make_unique<DesksAdminTemplateZeroStateResult>(
+            profile_, metadata.uuid, metadata.name, icon));
+  }
+
+  SwapResults(&search_results);
+}
+
+ash::AppListSearchResultType DesksAdminTemplateZeroStateProvider::ResultType()
+    const {
+  return ash::AppListSearchResultType::kZeroStateDesksAdminTemplate;
+}
+
+}  // namespace app_list

chrome/browser/ash/app_list/search/desks_admin_template_zero_state_provider.h

diff --git a/chrome/browser/ash/app_list/search/desks_admin_template_zero_state_provider.h b/chrome/browser/ash/app_list/search/desks_admin_template_zero_state_provider.h
new file mode 100644
index 0000000..eaa8c8b
--- /dev/null
+++ b/chrome/browser/ash/app_list/search/desks_admin_template_zero_state_provider.h
@@ -0,0 +1,70 @@
+// 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.
+
+#ifndef CHROME_BROWSER_ASH_APP_LIST_SEARCH_DESKS_ADMIN_TEMPLATE_ZERO_STATE_PROVIDER_H_
+#define CHROME_BROWSER_ASH_APP_LIST_SEARCH_DESKS_ADMIN_TEMPLATE_ZERO_STATE_PROVIDER_H_
+
+#include <string>
+#include <vector>
+
+#include "base/guid.h"
+#include "base/memory/weak_ptr.h"
+#include "chrome/browser/ash/app_list/search/chrome_search_result.h"
+#include "chrome/browser/ash/app_list/search/search_provider.h"
+
+class Profile;
+
+namespace gfx {
+class ImageSkia;
+}  // namespace gfx
+
+namespace app_list {
+
+// Search results for admin templates.
+class DesksAdminTemplateZeroStateResult : public ChromeSearchResult {
+ public:
+  DesksAdminTemplateZeroStateResult(Profile* profile,
+                                    const base::GUID& template_uuid,
+                                    const std::u16string& title,
+                                    const gfx::ImageSkia& icon);
+
+  ~DesksAdminTemplateZeroStateResult() override;
+
+  DesksAdminTemplateZeroStateResult(const DesksAdminTemplateZeroStateResult&) =
+      delete;
+  DesksAdminTemplateZeroStateResult& operator=(
+      const DesksAdminTemplateZeroStateResult&) = delete;
+
+  // ChromeSearchResult overrides:
+  void Open(int event_flags) override;
+
+ private:
+  Profile* const profile_;
+  base::GUID template_uuid_;
+};
+
+// Provides zero-state results from the admin templates. The admin template is a
+// new “type” of desk templates that users will launch from the app launcher.
+// The admin templates will appear in the continue section view.
+class DesksAdminTemplateZeroStateProvider : public SearchProvider {
+ public:
+  explicit DesksAdminTemplateZeroStateProvider(Profile* profile);
+  ~DesksAdminTemplateZeroStateProvider() override;
+
+  DesksAdminTemplateZeroStateProvider(
+      const DesksAdminTemplateZeroStateProvider&) = delete;
+  DesksAdminTemplateZeroStateProvider& operator=(
+      const DesksAdminTemplateZeroStateProvider&) = delete;
+
+  // SearchProvider:
+  void StartZeroState() override;
+  ash::AppListSearchResultType ResultType() const override;
+
+ private:
+  Profile* const profile_;
+};
+
+}  // namespace app_list
+
+#endif  // CHROME_BROWSER_ASH_APP_LIST_SEARCH_DESKS_ADMIN_TEMPLATE_ZERO_STATE_PROVIDER_H_

chrome/browser/ash/app_list/search/desks_admin_template_zero_state_provider_unittest.cc

diff --git a/chrome/browser/ash/app_list/search/desks_admin_template_zero_state_provider_unittest.cc b/chrome/browser/ash/app_list/search/desks_admin_template_zero_state_provider_unittest.cc
new file mode 100644
index 0000000..0b984fe
--- /dev/null
+++ b/chrome/browser/ash/app_list/search/desks_admin_template_zero_state_provider_unittest.cc
@@ -0,0 +1,127 @@
+// 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 "chrome/browser/ash/app_list/search/desks_admin_template_zero_state_provider.h"
+#include <vector>
+
+#include "ash/wm/desks/templates/saved_desk_controller.h"
+#include "chrome/browser/ash/app_list/search/test/test_search_controller.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/test/base/testing_browser_process.h"
+#include "chrome/test/base/testing_profile_manager.h"
+#include "content/public/test/browser_task_environment.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace app_list::test {
+
+namespace {
+
+using testing::_;
+using testing::Return;
+
+class MockSavedDeskController : public ash::SavedDeskController {
+ public:
+  MockSavedDeskController() = default;
+
+  MockSavedDeskController(const MockSavedDeskController&) = delete;
+  MockSavedDeskController& operator=(const MockSavedDeskController&) = delete;
+
+  ~MockSavedDeskController() override = default;
+
+  MOCK_METHOD(std::vector<ash::AdminTemplateMetadata>,
+              GetAdminTemplateMetadata,
+              (),
+              (const, override));
+  MOCK_METHOD(bool,
+              LaunchAdminTemplate,
+              (const base::GUID& template_uuid),
+              (override));
+};
+
+}  // namespace
+
+class DesksAdminTemplateZeroStateProviderTest : public testing::Test {
+ public:
+  DesksAdminTemplateZeroStateProviderTest() = default;
+  ~DesksAdminTemplateZeroStateProviderTest() override = default;
+
+  void SetUp() override {
+    search_controller_ = std::make_unique<TestSearchController>();
+    profile_manager_ = std::make_unique<TestingProfileManager>(
+        TestingBrowserProcess::GetGlobal());
+    ASSERT_TRUE(profile_manager_->SetUp());
+    profile_ = profile_manager_->CreateTestingProfile("name");
+
+    auto provider =
+        std::make_unique<DesksAdminTemplateZeroStateProvider>(profile_);
+    provider_ = provider.get();
+    search_controller_->AddProvider(std::move(provider));
+
+    Wait();
+  }
+
+  void TearDown() override {
+    search_controller_.reset();
+    profile_ = nullptr;
+    profile_manager_->DeleteTestingProfile("name");
+  }
+
+  void StartZeroStateSearch() {
+    search_controller_->StartZeroState(base::DoNothing(), base::TimeDelta());
+  }
+
+  const SearchProvider::Results& LastResults() {
+    return search_controller_->last_results();
+  }
+
+  void Wait() { task_environment_.RunUntilIdle(); }
+
+ protected:
+  content::BrowserTaskEnvironment task_environment_;
+  std::unique_ptr<TestSearchController> search_controller_;
+
+ private:
+  std::unique_ptr<TestingProfileManager> profile_manager_;
+  TestingProfile* profile_;
+  DesksAdminTemplateZeroStateProvider* provider_ = nullptr;
+};
+
+// Tests that when there isn't a admin template, the results will be empty.
+TEST_F(DesksAdminTemplateZeroStateProviderTest, NoResultsWhenNoAdminTemplates) {
+  MockSavedDeskController mock;
+  std::vector<ash::AdminTemplateMetadata> empty_result = {};
+
+  EXPECT_CALL(mock, GetAdminTemplateMetadata()).WillOnce(Return(empty_result));
+
+  StartZeroStateSearch();
+  Wait();
+
+  EXPECT_TRUE(LastResults().empty());
+}
+
+// Tests that when there is a admin template, it will showing up on the bubble
+// launcher in zero state. Also, when opening it, it will call the
+// `LaunchAdminTemplate` function.
+TEST_F(DesksAdminTemplateZeroStateProviderTest, Basic) {
+  MockSavedDeskController mock;
+
+  std::vector<ash::AdminTemplateMetadata> results = {ash::AdminTemplateMetadata{
+      .uuid = base::GUID::GenerateRandomV4(), .name = u"test admin template"}};
+
+  EXPECT_CALL(mock, GetAdminTemplateMetadata()).WillOnce(Return(results));
+  EXPECT_CALL(mock, LaunchAdminTemplate(results[0].uuid))
+      .WillOnce(Return(true));
+
+  StartZeroStateSearch();
+  Wait();
+
+  ASSERT_EQ(1u, LastResults().size());
+
+  ChromeSearchResult* result = LastResults().at(0).get();
+  EXPECT_EQ(result->title(), u"test admin template");
+  result->Open(/*event_flags=*/0);
+}
+
+}  // namespace app_list::test

chrome/browser/ash/app_list/search/ranking/best_match_ranker.cc

diff --git a/chrome/browser/ash/app_list/search/ranking/best_match_ranker.cc b/chrome/browser/ash/app_list/search/ranking/best_match_ranker.cc
index 7a27a2c..a8513050 100644
--- a/chrome/browser/ash/app_list/search/ranking/best_match_ranker.cc
+++ b/chrome/browser/ash/app_list/search/ranking/best_match_ranker.cc
@@ -51,6 +51,7 @@
     case ProviderType::kOpenTab:
     case ProviderType::kOsSettings:
     case ProviderType::kSystemInfo:
+    case ProviderType::kZeroStateDesksAdminTemplate:
       return false;
   }
 }

chrome/browser/ash/app_list/search/search_controller_factory.cc

diff --git a/chrome/browser/ash/app_list/search/search_controller_factory.cc b/chrome/browser/ash/app_list/search/search_controller_factory.cc
index 9384f4f..951e67f 100644
--- a/chrome/browser/ash/app_list/search/search_controller_factory.cc
+++ b/chrome/browser/ash/app_list/search/search_controller_factory.cc
@@ -18,6 +18,7 @@
 #include "chrome/browser/ash/app_list/search/arc/arc_app_shortcuts_search_provider.h"
 #include "chrome/browser/ash/app_list/search/arc/arc_playstore_search_provider.h"
 #include "chrome/browser/ash/app_list/search/assistant_text_search_provider.h"
+#include "chrome/browser/ash/app_list/search/desks_admin_template_zero_state_provider.h"
 #include "chrome/browser/ash/app_list/search/files/drive_search_provider.h"
 #include "chrome/browser/ash/app_list/search/files/file_search_provider.h"
 #include "chrome/browser/ash/app_list/search/files/zero_state_drive_provider.h"
@@ -135,6 +136,11 @@
   controller->AddProvider(
       std::make_unique<HelpAppZeroStateProvider>(profile, notifier));
 
+  if (base::FeatureList::IsEnabled(ash::features::kAppLaunchAutomation)) {
+    controller->AddProvider(
+        std::make_unique<DesksAdminTemplateZeroStateProvider>(profile));
+  }
+
   if (search_features::IsLauncherGameSearchEnabled()) {
     controller->AddProvider(
         std::make_unique<GameProvider>(profile, list_controller));

chrome/browser/ash/app_list/search/search_metrics_manager.cc

diff --git a/chrome/browser/ash/app_list/search/search_metrics_manager.cc b/chrome/browser/ash/app_list/search/search_metrics_manager.cc
index b6bb3a9..33b1997 100644
--- a/chrome/browser/ash/app_list/search/search_metrics_manager.cc
+++ b/chrome/browser/ash/app_list/search/search_metrics_manager.cc
@@ -101,6 +101,8 @@
       case ash::SearchResultType::HELP_APP_UPDATES:
         ++help_app_count;
         break;
+      case ash::SearchResultType::ZERO_STATE_DESKS_ADMIN_TEMPLATE:
+        break;
       default:
         NOTREACHED() << static_cast<int>(result.type);
     }

chrome/browser/ash/app_list/test/fake_app_list_model_updater.cc

diff --git a/chrome/browser/ash/app_list/test/fake_app_list_model_updater.cc b/chrome/browser/ash/app_list/test/fake_app_list_model_updater.cc
index a26d8d7..fc0da82 100644
--- a/chrome/browser/ash/app_list/test/fake_app_list_model_updater.cc
+++ b/chrome/browser/ash/app_list/test/fake_app_list_model_updater.cc
@@ -189,7 +189,7 @@
   return search_engine_is_google_;
 }
 
-void FakeAppListModelUpdater::QueryWouldTriggerLauncherSearchIph() {}
+void FakeAppListModelUpdater::RecalculateWouldTriggerLauncherSearchIph() {}
 
 void FakeAppListModelUpdater::PublishSearchResults(
     const std::vector<ChromeSearchResult*>& results,

chrome/browser/ash/app_list/test/fake_app_list_model_updater.h

diff --git a/chrome/browser/ash/app_list/test/fake_app_list_model_updater.h b/chrome/browser/ash/app_list/test/fake_app_list_model_updater.h
index d7baa125..635face 100644
--- a/chrome/browser/ash/app_list/test/fake_app_list_model_updater.h
+++ b/chrome/browser/ash/app_list/test/fake_app_list_model_updater.h
@@ -70,7 +70,7 @@
 
   // For SearchModel:
   bool SearchEngineIsGoogle() override;
-  void QueryWouldTriggerLauncherSearchIph() override;
+  void RecalculateWouldTriggerLauncherSearchIph() override;
   const std::vector<ChromeSearchResult*>& search_results() const {
     return search_results_;
   }

chrome/browser/ash/browser_context_keyed_service_factories.cc

diff --git a/chrome/browser/ash/browser_context_keyed_service_factories.cc b/chrome/browser/ash/browser_context_keyed_service_factories.cc
index 3b148ac..5463719 100644
--- a/chrome/browser/ash/browser_context_keyed_service_factories.cc
+++ b/chrome/browser/ash/browser_context_keyed_service_factories.cc
@@ -73,6 +73,7 @@
 #include "chrome/browser/ash/nearby/nearby_dependencies_provider.h"
 #include "chrome/browser/ash/nearby/nearby_dependencies_provider_factory.h"
 #include "chrome/browser/ash/nearby/nearby_process_manager_factory.h"
+#include "chrome/browser/ash/nearby/presence/nearby_presence_service_factory.h"
 #include "chrome/browser/ash/nearby/quick_start_connectivity_service_factory.h"
 #include "chrome/browser/ash/ownership/owner_settings_service_ash_factory.h"
 #include "chrome/browser/ash/phonehub/phone_hub_manager_factory.h"
@@ -203,6 +204,7 @@
   nearby::NearbyDependenciesProvider::EnsureFactoryBuilt();
   nearby::NearbyDependenciesProviderFactory::GetInstance();
   nearby::NearbyProcessManagerFactory::GetInstance();
+  ash::nearby::presence::NearbyPresenceServiceFactory::GetInstance();
   OwnerSettingsServiceAshFactory::GetInstance();
   phonehub::PhoneHubManagerFactory::GetInstance();
   platform_keys::KeyPermissionsServiceFactory::GetInstance();

chrome/browser/ash/extensions/users_private/users_private_api.cc

diff --git a/chrome/browser/ash/extensions/users_private/users_private_api.cc b/chrome/browser/ash/extensions/users_private/users_private_api.cc
index 0c47d66..27a5bd93 100644
--- a/chrome/browser/ash/extensions/users_private/users_private_api.cc
+++ b/chrome/browser/ash/extensions/users_private/users_private_api.cc
@@ -243,8 +243,7 @@
                                                        canonical_email);
   user_manager::UserManager::Get()->RemoveUser(
       AccountId::FromUserEmail(parameters->email),
-      user_manager::UserRemovalReason::LOCAL_USER_INITIATED,
-      /*delegate=*/nullptr);
+      user_manager::UserRemovalReason::LOCAL_USER_INITIATED);
   return RespondNow(WithArguments(removed));
 }
 

chrome/browser/ash/login/screens/update_required_screen.cc

diff --git a/chrome/browser/ash/login/screens/update_required_screen.cc b/chrome/browser/ash/login/screens/update_required_screen.cc
index a2a0ec9..fa2f2ef 100644
--- a/chrome/browser/ash/login/screens/update_required_screen.cc
+++ b/chrome/browser/ash/login/screens/update_required_screen.cc
@@ -432,8 +432,7 @@
   for (user_manager::User* user : user_list) {
     user_manager->RemoveUser(user->GetAccountId(),
                              user_manager::UserRemovalReason::
-                                 LOCAL_USER_INITIATED_ON_REQUIRED_UPDATE,
-                             /*delegate=*/nullptr);
+                                 LOCAL_USER_INITIATED_ON_REQUIRED_UPDATE);
   }
 
   // TODO(b/277159583): Here we check the user list, but the exact

chrome/browser/ash/login/users/chrome_user_manager_impl.cc

diff --git a/chrome/browser/ash/login/users/chrome_user_manager_impl.cc b/chrome/browser/ash/login/users/chrome_user_manager_impl.cc
index dde1d64..ae7384d 100644
--- a/chrome/browser/ash/login/users/chrome_user_manager_impl.cc
+++ b/chrome/browser/ash/login/users/chrome_user_manager_impl.cc
@@ -101,7 +101,6 @@
 #include "components/proxy_config/proxy_prefs.h"
 #include "components/session_manager/core/session_manager.h"
 #include "components/user_manager/known_user.h"
-#include "components/user_manager/remove_user_delegate.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_image/user_image.h"
 #include "components/user_manager/user_manager.h"
@@ -563,13 +562,12 @@
 
 void ChromeUserManagerImpl::RemoveUserInternal(
     const AccountId& account_id,
-    user_manager::UserRemovalReason reason,
-    user_manager::RemoveUserDelegate* delegate) {
+    user_manager::UserRemovalReason reason) {
   CrosSettings* cros_settings = CrosSettings::Get();
 
   auto callback =
       base::BindOnce(&ChromeUserManagerImpl::RemoveUserInternal,
-                     weak_factory_.GetWeakPtr(), account_id, reason, delegate);
+                     weak_factory_.GetWeakPtr(), account_id, reason);
 
   // Ensure the value of owner email has been fetched.
   if (CrosSettingsProvider::TRUSTED !=
@@ -590,7 +588,7 @@
   if (!user_added_removed_reporter_intialized_) {
     CacheRemovedUser(account_id.GetUserEmail(), reason);
   }
-  RemoveNonOwnerUserInternal(account_id, reason, delegate);
+  RemoveNonOwnerUserInternal(account_id, reason);
 }
 
 void ChromeUserManagerImpl::CacheRemovedUser(

chrome/browser/ash/login/users/chrome_user_manager_impl.h

diff --git a/chrome/browser/ash/login/users/chrome_user_manager_impl.h b/chrome/browser/ash/login/users/chrome_user_manager_impl.h
index d3ab3a8..b43cee91 100644
--- a/chrome/browser/ash/login/users/chrome_user_manager_impl.h
+++ b/chrome/browser/ash/login/users/chrome_user_manager_impl.h
@@ -40,10 +40,6 @@
 class ImageSkia;
 }
 
-namespace user_manager {
-class RemoveUserDelegate;
-}
-
 namespace policy {
 class CloudExternalDataPolicyHandler;
 }  // namespace policy
@@ -161,8 +157,7 @@
   void PerformPostUserLoggedInActions(bool browser_restart) override;
   void RemoveNonCryptohomeData(const AccountId& account_id) override;
   void RemoveUserInternal(const AccountId& account_id,
-                          user_manager::UserRemovalReason reason,
-                          user_manager::RemoveUserDelegate* delegate) override;
+                          user_manager::UserRemovalReason reason) override;
   bool IsDeviceLocalAccountMarkedForRemoval(
       const AccountId& account_id) const override;
   void GuestUserLoggedIn() override;

chrome/browser/ash/login/users/fake_chrome_user_manager.cc

diff --git a/chrome/browser/ash/login/users/fake_chrome_user_manager.cc b/chrome/browser/ash/login/users/fake_chrome_user_manager.cc
index 5c2c341..8726e16 100644
--- a/chrome/browser/ash/login/users/fake_chrome_user_manager.cc
+++ b/chrome/browser/ash/login/users/fake_chrome_user_manager.cc
@@ -285,10 +285,9 @@
 
 void FakeChromeUserManager::OnSessionStarted() {}
 
-void FakeChromeUserManager::RemoveUser(
-    const AccountId& account_id,
-    user_manager::UserRemovalReason reason,
-    user_manager::RemoveUserDelegate* delegate) {}
+void FakeChromeUserManager::RemoveUser(const AccountId& account_id,
+                                       user_manager::UserRemovalReason reason) {
+}
 
 void FakeChromeUserManager::RemoveUserFromList(const AccountId& account_id) {
   WallpaperControllerClientImpl* const wallpaper_client =

chrome/browser/ash/login/users/fake_chrome_user_manager.h

diff --git a/chrome/browser/ash/login/users/fake_chrome_user_manager.h b/chrome/browser/ash/login/users/fake_chrome_user_manager.h
index fa3a5be..ddd7b03 100644
--- a/chrome/browser/ash/login/users/fake_chrome_user_manager.h
+++ b/chrome/browser/ash/login/users/fake_chrome_user_manager.h
@@ -92,8 +92,7 @@
   void SwitchToLastActiveUser() override;
   void OnSessionStarted() override;
   void RemoveUser(const AccountId& account_id,
-                  user_manager::UserRemovalReason reason,
-                  user_manager::RemoveUserDelegate* delegate) override;
+                  user_manager::UserRemovalReason reason) override;
   void RemoveUserFromList(const AccountId& account_id) override;
   bool IsKnownUser(const AccountId& account_id) const override;
   const user_manager::User* FindUser(

chrome/browser/ash/login/users/user_manager_unittest.cc

diff --git a/chrome/browser/ash/login/users/user_manager_unittest.cc b/chrome/browser/ash/login/users/user_manager_unittest.cc
index 75595685..8ec57889 100644
--- a/chrome/browser/ash/login/users/user_manager_unittest.cc
+++ b/chrome/browser/ash/login/users/user_manager_unittest.cc
@@ -38,7 +38,6 @@
 #include "components/account_id/account_id.h"
 #include "components/prefs/pref_service.h"
 #include "components/user_manager/known_user.h"
-#include "components/user_manager/remove_user_delegate.h"
 #include "components/user_manager/scoped_user_manager.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
@@ -64,31 +63,6 @@
 
 static constexpr char kEmail[] = "user@example.com";
 
-class UnittestRemoveUserDelegate : public user_manager::RemoveUserDelegate {
- public:
-  explicit UnittestRemoveUserDelegate(const AccountId& expected_account_id)
-      : expected_account_id_(expected_account_id) {}
-
-  bool HasBeforeUserRemoved() const { return has_before_user_removed_; }
-
-  bool HasUserRemoved() const { return has_user_removed_; }
-
-  void OnBeforeUserRemoved(const AccountId& account_id) override {
-    has_before_user_removed_ = true;
-    EXPECT_EQ(expected_account_id_, account_id);
-  }
-
-  void OnUserRemoved(const AccountId& account_id) override {
-    has_user_removed_ = true;
-    EXPECT_EQ(expected_account_id_, account_id);
-  }
-
- private:
-  const AccountId expected_account_id_;
-  bool has_before_user_removed_;
-  bool has_user_removed_;
-};
-
 class UserManagerObserverTest : public user_manager::UserManager::Observer {
  public:
   UserManagerObserverTest() = default;
@@ -420,8 +394,7 @@
 
   // Removing logged-in account is unacceptable.
   user_manager->RemoveUser(account_id0_at_invalid_domain_,
-                           user_manager::UserRemovalReason::UNKNOWN,
-                           /*delegate=*/nullptr);
+                           user_manager::UserRemovalReason::UNKNOWN);
   EXPECT_EQ(2U, user_manager->GetUsers().size());
 
   // Recreate the user manager to log out all accounts.
@@ -443,13 +416,10 @@
   }
   ASSERT_TRUE(user_to_remove);
   ASSERT_EQ(account_id0_at_invalid_domain_, user_to_remove->GetAccountId());
-  UnittestRemoveUserDelegate delegate(account_id0_at_invalid_domain_);
   // Pass the account id of the user to be removed from the user list to verify
   // that a reference to the account id will not be used after user removal.
   user_manager->RemoveUser(user_to_remove->GetAccountId(),
-                           user_manager::UserRemovalReason::UNKNOWN, &delegate);
-  EXPECT_TRUE(delegate.HasBeforeUserRemoved());
-  EXPECT_TRUE(delegate.HasUserRemoved());
+                           user_manager::UserRemovalReason::UNKNOWN);
   EXPECT_EQ(1, observer_test.OnUserToBeRemovedCallCount());
   EXPECT_EQ(1, observer_test.OnUserRemovedCallCount());
   EXPECT_EQ(1U, user_manager->GetUsers().size());
@@ -457,8 +427,7 @@
   // Removing owner account is unacceptable.
   observer_test.ResetCallCounts();
   user_manager->RemoveUser(owner_account_id_at_invalid_domain_,
-                           user_manager::UserRemovalReason::UNKNOWN,
-                           /*delegate=*/nullptr);
+                           user_manager::UserRemovalReason::UNKNOWN);
   EXPECT_EQ(0, observer_test.OnUserToBeRemovedCallCount());
   EXPECT_EQ(0, observer_test.OnUserRemovedCallCount());
   EXPECT_EQ(1U, user_manager->GetUsers().size());

chrome/browser/ash/nearby/presence/nearby_presence_service_factory.cc

diff --git a/chrome/browser/ash/nearby/presence/nearby_presence_service_factory.cc b/chrome/browser/ash/nearby/presence/nearby_presence_service_factory.cc
new file mode 100644
index 0000000..8830c68
--- /dev/null
+++ b/chrome/browser/ash/nearby/presence/nearby_presence_service_factory.cc
@@ -0,0 +1,83 @@
+// 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 "chrome/browser/ash/nearby/presence/nearby_presence_service_factory.h"
+
+#include <memory>
+
+#include "base/memory/singleton.h"
+#include "build/build_config.h"
+#include "chrome/browser/ash/nearby/nearby_process_manager_factory.h"
+#include "chrome/browser/ash/profiles/profile_helper.h"
+#include "chrome/browser/browser_features.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chromeos/ash/components/nearby/presence/nearby_presence_service_impl.h"
+#include "components/keyed_service/content/browser_context_dependency_manager.h"
+#include "components/prefs/pref_service.h"
+#include "components/user_manager/user_manager.h"
+#include "content/public/browser/browser_context.h"
+
+namespace {
+
+constexpr char kServiceName[] = "NearbyPresenceService";
+
+}  // namespace
+
+namespace ash::nearby::presence {
+
+// static
+NearbyPresenceServiceFactory* NearbyPresenceServiceFactory::GetInstance() {
+  return base::Singleton<NearbyPresenceServiceFactory>::get();
+}
+
+// static
+NearbyPresenceService* NearbyPresenceServiceFactory::GetForBrowserContext(
+    content::BrowserContext* context) {
+  return static_cast<NearbyPresenceServiceImpl*>(
+      GetInstance()->GetServiceForBrowserContext(context, /*create=*/true));
+}
+
+NearbyPresenceServiceFactory::NearbyPresenceServiceFactory()
+    : ProfileKeyedServiceFactory(kServiceName) {
+  DependsOn(ash::nearby::NearbyProcessManagerFactory::GetInstance());
+}
+
+NearbyPresenceServiceFactory::~NearbyPresenceServiceFactory() = default;
+
+KeyedService* NearbyPresenceServiceFactory::BuildServiceInstanceFor(
+    content::BrowserContext* context) const {
+  if (!context) {
+    return nullptr;
+  }
+
+  Profile* profile = Profile::FromBrowserContext(context);
+  if (!profile) {
+    return nullptr;
+  }
+
+  // Nearby Presence is not supported for secondary profiles.
+  if (!ProfileHelper::IsPrimaryProfile(profile)) {
+    return nullptr;
+  }
+
+  // Guest/incognito profiles cannot use Nearby Presence.
+  if (profile->IsOffTheRecord()) {
+    return nullptr;
+  }
+
+  // Likewise, kiosk users are ineligible.
+  if (user_manager::UserManager::Get()->IsLoggedInAsAnyKioskApp()) {
+    return nullptr;
+  }
+
+  // TODO(b/276344576): add the NearbyPresence feature flag.
+
+  VLOG(1) << __func__ << ": creating NearbyPresenceService.";
+  return new NearbyPresenceServiceImpl();
+}
+
+void NearbyPresenceServiceFactory::RegisterProfilePrefs(
+    user_prefs::PrefRegistrySyncable* registry) {}
+
+}  // namespace ash::nearby::presence

chrome/browser/ash/nearby/presence/nearby_presence_service_factory.h

diff --git a/chrome/browser/ash/nearby/presence/nearby_presence_service_factory.h b/chrome/browser/ash/nearby/presence/nearby_presence_service_factory.h
new file mode 100644
index 0000000..ddf16e40
--- /dev/null
+++ b/chrome/browser/ash/nearby/presence/nearby_presence_service_factory.h
@@ -0,0 +1,49 @@
+// 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.
+
+#ifndef CHROME_BROWSER_ASH_NEARBY_PRESENCE_NEARBY_PRESENCE_SERVICE_FACTORY_H_
+#define CHROME_BROWSER_ASH_NEARBY_PRESENCE_NEARBY_PRESENCE_SERVICE_FACTORY_H_
+
+#include "chrome/browser/profiles/profile_keyed_service_factory.h"
+
+namespace base {
+template <typename T>
+struct DefaultSingletonTraits;
+}  // namespace base
+
+namespace content {
+class BrowserContext;
+}  // namespace content
+
+namespace ash::nearby::presence {
+
+class NearbyPresenceService;
+
+class NearbyPresenceServiceFactory : public ProfileKeyedServiceFactory {
+ public:
+  NearbyPresenceServiceFactory(const NearbyPresenceServiceFactory&) = delete;
+  NearbyPresenceServiceFactory& operator=(const NearbyPresenceServiceFactory&) =
+      delete;
+
+  static NearbyPresenceServiceFactory* GetInstance();
+
+  static NearbyPresenceService* GetForBrowserContext(
+      content::BrowserContext* context);
+
+ private:
+  friend struct base::DefaultSingletonTraits<NearbyPresenceServiceFactory>;
+
+  NearbyPresenceServiceFactory();
+  ~NearbyPresenceServiceFactory() override;
+
+  // BrowserContextKeyedServiceFactory:
+  KeyedService* BuildServiceInstanceFor(
+      content::BrowserContext* context) const override;
+  void RegisterProfilePrefs(
+      user_prefs::PrefRegistrySyncable* registry) override;
+};
+
+}  // namespace ash::nearby::presence
+
+#endif  // CHROME_BROWSER_ASH_NEARBY_PRESENCE_NEARBY_PRESENCE_SERVICE_FACTORY_H_

chrome/browser/ash/system/user_removal_manager.cc

diff --git a/chrome/browser/ash/system/user_removal_manager.cc b/chrome/browser/ash/system/user_removal_manager.cc
index 883ef8d..2fecc55 100644
--- a/chrome/browser/ash/system/user_removal_manager.cc
+++ b/chrome/browser/ash/system/user_removal_manager.cc
@@ -64,11 +64,11 @@
   // change underneath us if we used a reference).
   const user_manager::UserList user_list = user_manager->GetUsers();
 
-  for (user_manager::User* user : user_list)
+  for (user_manager::User* user : user_list) {
     user_manager->RemoveUser(
         user->GetAccountId(),
-        user_manager::UserRemovalReason::REMOTE_ADMIN_INITIATED,
-        /*delegate=*/nullptr);
+        user_manager::UserRemovalReason::REMOTE_ADMIN_INITIATED);
+  }
 
   // Revert to default value after removal is done.
   local_state->ClearPref(prefs::kRemoveUsersRemoteCommand);

chrome/browser/ash/system/user_removal_manager_unittest.cc

diff --git a/chrome/browser/ash/system/user_removal_manager_unittest.cc b/chrome/browser/ash/system/user_removal_manager_unittest.cc
index 6732047..5d73bea 100644
--- a/chrome/browser/ash/system/user_removal_manager_unittest.cc
+++ b/chrome/browser/ash/system/user_removal_manager_unittest.cc
@@ -32,8 +32,7 @@
       delete;
 
   void RemoveUser(const AccountId& account_id,
-                  user_manager::UserRemovalReason reason,
-                  user_manager::RemoveUserDelegate* delegate) override {
+                  user_manager::UserRemovalReason reason) override {
     RemoveUserFromList(account_id);
   }
 };

chrome/browser/cart/cart_service.cc

diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_service.cc
index 0682baa..68ebf76d 100644
--- a/chrome/browser/cart/cart_service.cc
+++ b/chrome/browser/cart/cart_service.cc
@@ -117,6 +117,22 @@
   }
   return false;
 }
+
+// Check if products in existing_proto are the same as the new_proto.
+bool HaveSameProducts(cart_db::ChromeCartContentProto existing_proto,
+                      cart_db::ChromeCartContentProto new_proto) {
+  if (existing_proto.product_image_urls_size() !=
+      new_proto.product_image_urls_size()) {
+    return false;
+  }
+  for (int i = 0; i < existing_proto.product_image_urls_size(); i++) {
+    if (existing_proto.product_image_urls()[i] !=
+        new_proto.product_image_urls()[i]) {
+      return false;
+    }
+  }
+  return true;
+}
 }  // namespace
 
 CartService::CartService(Profile* profile)
@@ -213,14 +229,8 @@
 }
 
 void CartService::DeleteCart(const GURL& url, bool ignore_remove_status) {
-  // Postpone coupon deletion to avoid ephemeral cart deletions.
-  content::GetUIThreadTaskRunner({base::TaskPriority::BEST_EFFORT})
-      ->PostDelayedTask(
-          FROM_HERE,
-          base::BindOnce(&CartService::CheckCartExistenceAfterDeletion,
-                         weak_ptr_factory_.GetWeakPtr(), url),
-          commerce::kCodeBasedRuleDiscountCouponDeletionTime.Get());
   if (ignore_remove_status) {
+    coupon_service_->DeleteFreeListingCouponsForUrl(url);
     cart_db_->DeleteCart(eTLDPlusOne(url),
                          base::BindOnce(&CartService::OnOperationFinished,
                                         weak_ptr_factory_.GetWeakPtr()));
@@ -454,14 +464,11 @@
   std::move(callback).Run(!IsCartExpired(proto_pairs[0].second));
 }
 
-void CartService::CheckCartExistenceAfterDeletion(GURL url) {
-  HasActiveCartForURL(url, base::BindOnce(&CartService::MaybeDeleteCoupons,
-                                          weak_ptr_factory_.GetWeakPtr(), url));
-}
-
-void CartService::MaybeDeleteCoupons(GURL url, bool has_cart) {
-  if (!has_cart) {
+void CartService::MaybeCommitDeletion(GURL url) {
+  std::string domain = eTLDPlusOne(url);
+  if (pending_deletion_map_.contains(domain)) {
     coupon_service_->DeleteFreeListingCouponsForUrl(url);
+    pending_deletion_map_.erase(domain);
   }
 }
 
@@ -954,9 +961,24 @@
   if (!success) {
     return;
   }
+  std::string domain = eTLDPlusOne(navigation_url);
+
   // Restore module visibility anytime a cart-related action happens.
   RestoreHidden();
-  std::string domain = eTLDPlusOne(navigation_url);
+
+  // Cancel pending closure if the cart being closed has the same content as the
+  // cart being added.
+  if (pending_deletion_map_.contains(domain) &&
+      pending_deletion_map_[domain].merchant_cart_url() ==
+          proto.merchant_cart_url() &&
+      HaveSameProducts(pending_deletion_map_[domain], proto)) {
+    cart_db_->AddCart(domain, pending_deletion_map_[domain],
+                      base::BindOnce(&CartService::OnOperationFinished,
+                                     weak_ptr_factory_.GetWeakPtr()));
+    pending_deletion_map_.erase(domain);
+    return;
+  }
+
   absl::optional<std::string> merchant_name_from_component =
       commerce_heuristics::CommerceHeuristicsData::GetInstance()
           .GetMerchantName(domain);
@@ -1149,7 +1171,7 @@
       profile_->GetDefaultStoragePartition()
           ->GetURLLoaderFactoryForBrowserProcess(),
       std::make_unique<CartDiscountFetcherFactory>(),
-      std::make_unique<CartServiceDelegate>(this),
+      std::make_unique<CartDiscountServiceDelegate>(this),
       IdentityManagerFactory::GetForProfile(profile_),
       profile_->GetVariationsClient());
 
@@ -1210,6 +1232,15 @@
                                std::vector<CartDB::KeyAndValue> proto_pairs) {
   if (proto_pairs.size() != 1 || proto_pairs[0].second.is_removed())
     return;
+  // Postpone cart deletion commit to avoid ephemeral cart deletions.
+  content::GetUIThreadTaskRunner({base::TaskPriority::BEST_EFFORT})
+      ->PostDelayedTask(
+          FROM_HERE,
+          base::BindOnce(&CartService::MaybeCommitDeletion,
+                         weak_ptr_factory_.GetWeakPtr(),
+                         GURL(proto_pairs[0].second.merchant_cart_url())),
+          commerce::kCodeBasedRuleDiscountCouponDeletionTime.Get());
+  pending_deletion_map_[proto_pairs[0].first] = proto_pairs[0].second;
   cart_db_->DeleteCart(proto_pairs[0].first,
                        base::BindOnce(&CartService::OnOperationFinished,
                                       weak_ptr_factory_.GetWeakPtr()));

chrome/browser/cart/cart_service.h

diff --git a/chrome/browser/cart/cart_service.h b/chrome/browser/cart/cart_service.h
index e168d71..5e17699 100644
--- a/chrome/browser/cart/cart_service.h
+++ b/chrome/browser/cart/cart_service.h
@@ -4,6 +4,7 @@
 #ifndef CHROME_BROWSER_CART_CART_SERVICE_H_
 #define CHROME_BROWSER_CART_CART_SERVICE_H_
 
+#include "base/containers/flat_map.h"
 #include "base/functional/callback_helpers.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/raw_ptr.h"
@@ -255,8 +256,7 @@
       base::OnceCallback<void(bool)> callback,
       bool success,
       std::vector<CartDB::KeyAndValue> proto_pairs);
-  void CheckCartExistenceAfterDeletion(GURL url);
-  void MaybeDeleteCoupons(GURL url, bool has_cart);
+  void MaybeCommitDeletion(GURL url);
 
   raw_ptr<Profile> profile_;
   std::unique_ptr<CartDB> cart_db_;
@@ -274,6 +274,8 @@
   raw_ptr<CouponService> coupon_service_;
   PrefChangeRegistrar pref_change_registrar_;
   raw_ptr<commerce::ShoppingService, DanglingUntriaged> shopping_service_;
+  base::flat_map<std::string, cart_db::ChromeCartContentProto>
+      pending_deletion_map_;
   base::WeakPtrFactory<CartService> weak_ptr_factory_{this};
 };
 

chrome/browser/cart/cart_service_unittest.cc

diff --git a/chrome/browser/cart/cart_service_unittest.cc b/chrome/browser/cart/cart_service_unittest.cc
index dffaa81..fbdc504c 100644
--- a/chrome/browser/cart/cart_service_unittest.cc
+++ b/chrome/browser/cart/cart_service_unittest.cc
@@ -374,6 +374,11 @@
     service_->CleanUpDiscounts(proto);
   }
 
+  base::flat_map<std::string, cart_db::ChromeCartContentProto>
+  GetPendingDeletionMap() {
+    return service_->pending_deletion_map_;
+  }
+
   void TearDown() override {
     // Clean up the used discounts dictionary prefs.
     profile_->GetPrefs()->ClearPref(prefs::kCartUsedDiscounts);
@@ -733,6 +738,162 @@
   run_loop[3].Run();
 }
 
+TEST_F(CartServiceTest, TestDeleteCart_NoPendingWhenRemoval) {
+  CartDB* cart_db_ = service_->GetDB();
+  base::RunLoop run_loop[2];
+  cart_db::ChromeCartContentProto merchant_proto =
+      BuildProto(kMockMerchantA, kMockMerchantURLA);
+  merchant_proto.set_is_removed(true);
+  cart_db_->AddCart(
+      kMockMerchantA, merchant_proto,
+      base::BindOnce(&CartServiceTest::OperationEvaluation,
+                     base::Unretained(this), run_loop[0].QuitClosure(), true));
+  run_loop[0].Run();
+
+  // The cart deletion will not be tracked as pending when ignoring removal
+  // status.
+  service_->DeleteCart(GURL(kMockMerchantURLA), true);
+  task_environment_.RunUntilIdle();
+
+  cart_db_->LoadAllCarts(
+      base::BindOnce(&CartServiceTest::GetEvaluationURL, base::Unretained(this),
+                     run_loop[1].QuitClosure(), kEmptyExpected));
+  run_loop[1].Run();
+  EXPECT_FALSE(GetPendingDeletionMap().contains(kMockMerchantA));
+}
+
+TEST_F(CartServiceTest, TestDeleteCart_PendingDeletion) {
+  CartDB* cart_db_ = service_->GetDB();
+  base::RunLoop run_loop[3];
+  const std::string discount_text = "15% off";
+  // Build two protos who have the same products but the only difference is
+  // discount info.
+  cart_db::ChromeCartContentProto proto_with_discount =
+      BuildProtoWithProducts(kMockMerchantA, kMockMerchantURLA, {kProductURL});
+  proto_with_discount.mutable_discount_info()->set_discount_text(discount_text);
+  cart_db::ChromeCartContentProto proto_without_discount =
+      BuildProtoWithProducts(kMockMerchantA, kMockMerchantURLA, {kProductURL});
+
+  cart_db_->AddCart(
+      kMockMerchantA, proto_with_discount,
+      base::BindOnce(&CartServiceTest::OperationEvaluation,
+                     base::Unretained(this), run_loop[0].QuitClosure(), true));
+  run_loop[0].Run();
+
+  service_->DeleteCart(GURL(kMockMerchantURLA), false);
+  task_environment_.RunUntilIdle();
+
+  // The cart is deleted right away, but the deletion is cached in the pending
+  // deletion map until the deletion is committed.
+  cart_db_->LoadAllCarts(
+      base::BindOnce(&CartServiceTest::GetEvaluationURL, base::Unretained(this),
+                     run_loop[1].QuitClosure(), kEmptyExpected));
+  run_loop[1].Run();
+  task_environment_.FastForwardBy(
+      commerce::kCodeBasedRuleDiscountCouponDeletionTime.Get() -
+      base::Seconds(2));
+  EXPECT_TRUE(GetPendingDeletionMap().contains(kMockMerchantA));
+
+  // When deletion is pending, try to reuse the deleted cart proto.
+  service_->AddCart(mock_merchant_url_A_, absl::nullopt,
+                    proto_without_discount);
+  task_environment_.RunUntilIdle();
+  const ShoppingCarts expected = {{kMockMerchantA, proto_with_discount}};
+  cart_db_->LoadAllCarts(base::BindOnce(&CartServiceTest::GetEvaluationURL,
+                                        base::Unretained(this),
+                                        run_loop[2].QuitClosure(), expected));
+  run_loop[2].Run();
+  EXPECT_FALSE(GetPendingDeletionMap().contains(kMockMerchantA));
+}
+
+TEST_F(CartServiceTest, TestDeleteCart_CommitPendingDeletion) {
+  CartDB* cart_db_ = service_->GetDB();
+  base::RunLoop run_loop[3];
+  const std::string discount_text = "15% off";
+  // Build two protos who have the same products but the only difference is
+  // discount info.
+  cart_db::ChromeCartContentProto proto_with_discount =
+      BuildProtoWithProducts(kMockMerchantA, kMockMerchantURLA, {kProductURL});
+  proto_with_discount.mutable_discount_info()->set_discount_text(discount_text);
+  cart_db::ChromeCartContentProto proto_without_discount =
+      BuildProtoWithProducts(kMockMerchantA, kMockMerchantURLA, {kProductURL});
+
+  cart_db_->AddCart(
+      kMockMerchantA, proto_with_discount,
+      base::BindOnce(&CartServiceTest::OperationEvaluation,
+                     base::Unretained(this), run_loop[0].QuitClosure(), true));
+  run_loop[0].Run();
+
+  service_->DeleteCart(GURL(kMockMerchantURLA), false);
+  task_environment_.RunUntilIdle();
+
+  // The cart is deleted right away, and the deletion is committed after
+  // predefined period of time.
+  cart_db_->LoadAllCarts(
+      base::BindOnce(&CartServiceTest::GetEvaluationURL, base::Unretained(this),
+                     run_loop[1].QuitClosure(), kEmptyExpected));
+  run_loop[1].Run();
+  task_environment_.FastForwardBy(
+      commerce::kCodeBasedRuleDiscountCouponDeletionTime.Get());
+  EXPECT_FALSE(GetPendingDeletionMap().contains(kMockMerchantA));
+
+  // Deleted cart proto cannot be reused after deletion is committed.
+  service_->AddCart(mock_merchant_url_A_, absl::nullopt,
+                    proto_without_discount);
+  task_environment_.RunUntilIdle();
+  const ShoppingCarts expected = {{kMockMerchantA, proto_without_discount}};
+  cart_db_->LoadAllCarts(base::BindOnce(&CartServiceTest::GetEvaluationURL,
+                                        base::Unretained(this),
+                                        run_loop[2].QuitClosure(), expected));
+  run_loop[2].Run();
+  EXPECT_FALSE(GetPendingDeletionMap().contains(kMockMerchantA));
+}
+
+TEST_F(CartServiceTest,
+       TestDeleteCart_NotReusePendingDeletionForDifferentCart) {
+  CartDB* cart_db_ = service_->GetDB();
+  base::RunLoop run_loop[3];
+  const std::string discount_text = "15% off";
+  // Build two protos who have different products.
+  cart_db::ChromeCartContentProto proto_with_productA = BuildProtoWithProducts(
+      kMockMerchantA, kMockMerchantURLA, {"https://productA.com"});
+  cart_db::ChromeCartContentProto proto_with_productB = BuildProtoWithProducts(
+      kMockMerchantA, kMockMerchantURLA, {"https://productB.com"});
+
+  cart_db_->AddCart(
+      kMockMerchantA, proto_with_productA,
+      base::BindOnce(&CartServiceTest::OperationEvaluation,
+                     base::Unretained(this), run_loop[0].QuitClosure(), true));
+  run_loop[0].Run();
+
+  service_->DeleteCart(GURL(kMockMerchantURLA), false);
+  task_environment_.RunUntilIdle();
+
+  cart_db_->LoadAllCarts(
+      base::BindOnce(&CartServiceTest::GetEvaluationURL, base::Unretained(this),
+                     run_loop[1].QuitClosure(), kEmptyExpected));
+  run_loop[1].Run();
+  task_environment_.FastForwardBy(
+      commerce::kCodeBasedRuleDiscountCouponDeletionTime.Get() -
+      base::Seconds(2));
+  EXPECT_TRUE(GetPendingDeletionMap().contains(kMockMerchantA));
+
+  // Deleted cart proto cannot be reused if the new proto is different from the
+  // deleted proto.
+  service_->AddCart(mock_merchant_url_A_, absl::nullopt, proto_with_productB);
+  task_environment_.RunUntilIdle();
+  const ShoppingCarts expected = {{kMockMerchantA, proto_with_productB}};
+  cart_db_->LoadAllCarts(base::BindOnce(&CartServiceTest::GetEvaluationURL,
+                                        base::Unretained(this),
+                                        run_loop[2].QuitClosure(), expected));
+  run_loop[2].Run();
+  EXPECT_TRUE(GetPendingDeletionMap().contains(kMockMerchantA));
+
+  // Deletion is committed after delay.
+  task_environment_.FastForwardBy(base::Seconds(2));
+  EXPECT_FALSE(GetPendingDeletionMap().contains(kMockMerchantA));
+}
+
 // Tests loading one cart from the service.
 TEST_F(CartServiceTest, TestLoadCart) {
   CartDB* cart_db_ = service_->GetDB();
@@ -2272,12 +2433,13 @@
       scoped_refptr<network::SharedURLLoaderFactory>
           browserProcessURLLoaderFactory,
       std::unique_ptr<CartDiscountFetcherFactory> fetcher_factory,
-      std::unique_ptr<CartServiceDelegate> cart_service_delegate,
+      std::unique_ptr<CartDiscountServiceDelegate>
+          cart_discount_service_delegate,
       signin::IdentityManager* const identity_manager,
       variations::VariationsClient* const chrome_variations_client)
       : FetchDiscountWorker(browserProcessURLLoaderFactory,
                             std::move(fetcher_factory),
-                            std::move(cart_service_delegate),
+                            std::move(cart_discount_service_delegate),
                             identity_manager,
                             chrome_variations_client) {}
 
@@ -2292,7 +2454,7 @@
   }
 
  private:
-  void FakeFetch() { cart_service_delegate_->RecordFetchTimestamp(); }
+  void FakeFetch() { cart_discount_service_delegate_->RecordFetchTimestamp(); }
 
   base::WeakPtrFactory<FakeFetchDiscountWorker> weak_ptr_factory_{this};
 };
@@ -2313,8 +2475,9 @@
     profile_->GetPrefs()->SetBoolean(prefs::kCartDiscountEnabled, true);
     // Only initialize CartServiceDelegate which is relevant to this test.
     fetch_discount_worker_ = std::make_unique<FakeFetchDiscountWorker>(
-        nullptr, nullptr, std::make_unique<CartServiceDelegate>(service_),
-        nullptr, nullptr);
+        nullptr, nullptr,
+        std::make_unique<CartDiscountServiceDelegate>(service_), nullptr,
+        nullptr);
     service_->SetFetchDiscountWorkerForTesting(
         std::move(fetch_discount_worker_));
   }
@@ -2396,12 +2559,24 @@
   MockCouponService coupon_service_;
 };
 
+TEST_F(CartServiceCouponTest, TestDeleteCartWithCoupon_DeleteImmediately) {
+  const GURL& url = GURL(kMockMerchantURLA);
+  EXPECT_CALL(coupon_service_, DeleteFreeListingCouponsForUrl(url)).Times(1);
+  // Coupons are deleted immediately when the cart is deleted in a way that
+  // ignores removal status. In this case, the cart is also deleted immediately
+  // and doesn't go through deletion pending.
+  service_->DeleteCart(url, true);
+}
+
 TEST_F(CartServiceCouponTest,
        TestDeleteCartWithCoupon_NotDeleteCouponImmediately) {
+  service_->AddCart(mock_merchant_url_A_, absl::nullopt, kMockProtoA);
+  task_environment_.RunUntilIdle();
+
   const GURL& url = GURL(kMockMerchantURLA);
   EXPECT_CALL(coupon_service_, DeleteFreeListingCouponsForUrl(url)).Times(0);
   // Coupons are not deleted until deletion time is reached.
-  service_->DeleteCart(url, true);
+  service_->DeleteCart(url, false);
   task_environment_.FastForwardBy(
       commerce::kCodeBasedRuleDiscountCouponDeletionTime.Get() -
       base::Seconds(2));
@@ -2410,10 +2585,13 @@
 
 TEST_F(CartServiceCouponTest,
        TestDeleteCartWithCoupon_DeleteCouponForActualDeletion) {
+  service_->AddCart(mock_merchant_url_A_, absl::nullopt, kMockProtoA);
+  task_environment_.RunUntilIdle();
+
   const GURL& url = GURL(kMockMerchantURLA);
   EXPECT_CALL(coupon_service_, DeleteFreeListingCouponsForUrl(url)).Times(1);
   // Coupons are deleted when the cart is actually deleted.
-  service_->DeleteCart(url, true);
+  service_->DeleteCart(url, false);
   task_environment_.FastForwardBy(
       commerce::kCodeBasedRuleDiscountCouponDeletionTime.Get());
   task_environment_.RunUntilIdle();
@@ -2421,10 +2599,13 @@
 
 TEST_F(CartServiceCouponTest,
        TestDeleteCartWithCoupon_NotDeleteCouponForCanceledDeletion) {
+  service_->AddCart(mock_merchant_url_A_, absl::nullopt, kMockProtoA);
+  task_environment_.RunUntilIdle();
+
   const GURL& url = GURL(kMockMerchantURLA);
   EXPECT_CALL(coupon_service_, DeleteFreeListingCouponsForUrl(url)).Times(0);
   // Coupons are never deleted when the cart is not actually deleted.
-  service_->DeleteCart(url, true);
+  service_->DeleteCart(url, false);
   service_->AddCart(url, absl::nullopt, kMockProtoA);
   task_environment_.FastForwardBy(
       commerce::kCodeBasedRuleDiscountCouponDeletionTime.Get());

chrome/browser/cart/fetch_discount_worker.cc

diff --git a/chrome/browser/cart/fetch_discount_worker.cc b/chrome/browser/cart/fetch_discount_worker.cc
index 2283217..da67cc35b 100644
--- a/chrome/browser/cart/fetch_discount_worker.cc
+++ b/chrome/browser/cart/fetch_discount_worker.cc
@@ -30,16 +30,17 @@
 const char kEmptyToken[] = "";
 }  // namespace
 
-CartServiceDelegate::CartServiceDelegate(CartService* cart_service)
+CartDiscountServiceDelegate::CartDiscountServiceDelegate(
+    CartService* cart_service)
     : cart_service_(cart_service) {}
 
-CartServiceDelegate::~CartServiceDelegate() = default;
+CartDiscountServiceDelegate::~CartDiscountServiceDelegate() = default;
 
-void CartServiceDelegate::LoadAllCarts(CartDB::LoadCallback callback) {
+void CartDiscountServiceDelegate::LoadAllCarts(CartDB::LoadCallback callback) {
   cart_service_->LoadAllActiveCarts(std::move(callback));
 }
 
-void CartServiceDelegate::UpdateCart(
+void CartDiscountServiceDelegate::UpdateCart(
     const std::string& cart_url,
     const cart_db::ChromeCartContentProto new_proto,
     const bool is_tester) {
@@ -47,11 +48,11 @@
                                  is_tester);
 }
 
-void CartServiceDelegate::RecordFetchTimestamp() {
+void CartDiscountServiceDelegate::RecordFetchTimestamp() {
   cart_service_->RecordFetchTimestamp();
 }
 
-void CartServiceDelegate::UpdateFreeListingCoupons(
+void CartDiscountServiceDelegate::UpdateFreeListingCoupons(
     const CouponService::CouponsMap& map) {
   cart_service_->UpdateFreeListingCoupons(map);
 }
@@ -60,12 +61,13 @@
     scoped_refptr<network::SharedURLLoaderFactory>
         browserProcessURLLoaderFactory,
     std::unique_ptr<CartDiscountFetcherFactory> fetcher_factory,
-    std::unique_ptr<CartServiceDelegate> cart_service_delegate,
+    std::unique_ptr<CartDiscountServiceDelegate> cart_discount_service_delegate,
     signin::IdentityManager* const identity_manager,
     variations::VariationsClient* const chrome_variations_client)
     : browserProcessURLLoaderFactory_(browserProcessURLLoaderFactory),
       fetcher_factory_(std::move(fetcher_factory)),
-      cart_service_delegate_(std::move(cart_service_delegate)),
+      cart_discount_service_delegate_(
+          std::move(cart_discount_service_delegate)),
       identity_manager_(identity_manager),
       chrome_variations_client_(chrome_variations_client) {
   backend_task_runner_ = base::ThreadPool::CreateSequencedTaskRunner(
@@ -127,7 +129,8 @@
   auto cart_loaded_callback = base::BindOnce(
       &FetchDiscountWorker::ReadyToFetch, weak_ptr_factory_.GetWeakPtr(),
       is_oauth_fetch, std::move(access_token_str));
-  cart_service_delegate_->LoadAllCarts(std::move(cart_loaded_callback));
+  cart_discount_service_delegate_->LoadAllCarts(
+      std::move(cart_loaded_callback));
 }
 
 void FetchDiscountWorker::ReadyToFetch(
@@ -143,7 +146,7 @@
       base::BindOnce(&FetchDiscountWorker::AfterDiscountFetched,
                      weak_ptr_factory_.GetWeakPtr());
 
-  cart_service_delegate_->RecordFetchTimestamp();
+  cart_discount_service_delegate_->RecordFetchTimestamp();
   // If there is no eligible merchant cart, don't fetch immediately; instead,
   // post another delayed fetch.
   bool has_partner_merchant = false;
@@ -234,7 +237,8 @@
   auto update_discount_callback = base::BindOnce(
       &FetchDiscountWorker::OnUpdatingDiscounts, weak_ptr_factory_.GetWeakPtr(),
       std::move(discounts), is_tester);
-  cart_service_delegate_->LoadAllCarts(std::move(update_discount_callback));
+  cart_discount_service_delegate_->LoadAllCarts(
+      std::move(update_discount_callback));
 }
 
 void FetchDiscountWorker::OnUpdatingDiscounts(
@@ -266,8 +270,8 @@
       cart_discount_proto->clear_discount_text();
       cart_discount_proto->clear_rule_discount_info();
       cart_discount_proto->clear_has_coupons();
-      cart_service_delegate_->UpdateCart(cart_url_str, std::move(cart_proto),
-                                         is_tester);
+      cart_discount_service_delegate_->UpdateCart(
+          cart_url_str, std::move(cart_proto), is_tester);
       continue;
     }
 
@@ -284,8 +288,8 @@
         discount_infos.begin(), discount_infos.end()};
     cart_discount_proto->set_has_coupons(merchant_discounts.has_coupons);
 
-    cart_service_delegate_->UpdateCart(cart_url_str, std::move(cart_proto),
-                                       is_tester);
+    cart_discount_service_delegate_->UpdateCart(
+        cart_url_str, std::move(cart_proto), is_tester);
 
     if (commerce::IsCouponWithCodeEnabled()) {
       for (const coupon_db::FreeListingCouponInfoProto& coupon_info :
@@ -309,7 +313,7 @@
   }
 
   if (commerce::IsCouponWithCodeEnabled()) {
-    cart_service_delegate_->UpdateFreeListingCoupons(coupon_map);
+    cart_discount_service_delegate_->UpdateFreeListingCoupons(coupon_map);
   }
 
   if (commerce::IsCartDiscountFeatureEnabled()) {

chrome/browser/cart/fetch_discount_worker.h

diff --git a/chrome/browser/cart/fetch_discount_worker.h b/chrome/browser/cart/fetch_discount_worker.h
index cef36d39..15d5ecc2 100644
--- a/chrome/browser/cart/fetch_discount_worker.h
+++ b/chrome/browser/cart/fetch_discount_worker.h
@@ -28,12 +28,12 @@
 class VariationsClient;
 }  // namespace Variations
 
-// Delegate class that enables FetchDiscountWorker to use relevant
+// Delegate class that enables FetchDiscountWorker to use discount-related
 // functionalities from CartService.
-class CartServiceDelegate {
+class CartDiscountServiceDelegate {
  public:
-  explicit CartServiceDelegate(CartService* cart_service);
-  virtual ~CartServiceDelegate();
+  explicit CartDiscountServiceDelegate(CartService* cart_service);
+  virtual ~CartDiscountServiceDelegate();
   virtual void LoadAllCarts(CartDB::LoadCallback callback);
   virtual void UpdateCart(const std::string& cart_url,
                           const cart_db::ChromeCartContentProto new_proto,
@@ -68,7 +68,8 @@
       scoped_refptr<network::SharedURLLoaderFactory>
           browserProcessURLLoaderFactory,
       std::unique_ptr<CartDiscountFetcherFactory> fetcher_factory,
-      std::unique_ptr<CartServiceDelegate> cart_service_delegate,
+      std::unique_ptr<CartDiscountServiceDelegate>
+          cart_discount_service_delegate,
       signin::IdentityManager* const identity_manager,
       variations::VariationsClient* const chrome_variations_client);
   virtual ~FetchDiscountWorker();
@@ -87,9 +88,9 @@
   scoped_refptr<base::SequencedTaskRunner> backend_task_runner_;
   // This is used to create a CartDiscountFetcher to fetch discounts.
   std::unique_ptr<CartDiscountFetcherFactory> fetcher_factory_;
-  // This is used to access CartService functionalities such as loading all
-  // active carts, updating given cart discount, etc.
-  std::unique_ptr<CartServiceDelegate> cart_service_delegate_;
+  // This is used to access CartService discount-related functionalities such as
+  // loading all active carts, updating given cart discount, etc.
+  std::unique_ptr<CartDiscountServiceDelegate> cart_discount_service_delegate_;
   // This is used to identify whether user is a sync user.
   const raw_ptr<signin::IdentityManager, DanglingUntriaged> identity_manager_;
   // This is used to fetch the oauth token.

chrome/browser/cart/fetch_discount_worker_unittest.cc

diff --git a/chrome/browser/cart/fetch_discount_worker_unittest.cc b/chrome/browser/cart/fetch_discount_worker_unittest.cc
index a5f51ba..9c346f30 100644
--- a/chrome/browser/cart/fetch_discount_worker_unittest.cc
+++ b/chrome/browser/cart/fetch_discount_worker_unittest.cc
@@ -252,10 +252,10 @@
   bool is_tester_{false};
 };
 
-class FakeCartServiceDelegate : public CartServiceDelegate {
+class FakeCartDiscountServiceDelegate : public CartDiscountServiceDelegate {
  public:
-  explicit FakeCartServiceDelegate(CartService* cart_service)
-      : CartServiceDelegate(cart_service), expected_tester_(false) {}
+  explicit FakeCartDiscountServiceDelegate(CartService* cart_service)
+      : CartDiscountServiceDelegate(cart_service), expected_tester_(false) {}
 
   MOCK_METHOD(void,
               UpdateFreeListingCoupons,
@@ -383,8 +383,9 @@
         HistoryServiceFactory::GetInstance(),
         HistoryServiceFactory::GetDefaultFactory());
     profile_ = profile_builder.Build();
-    fake_cart_service_delegate_ = std::make_unique<FakeCartServiceDelegate>(
-        CartServiceFactory::GetForProfile(profile_.get()));
+    fake_cart_service_delegate_ =
+        std::make_unique<FakeCartDiscountServiceDelegate>(
+            CartServiceFactory::GetForProfile(profile_.get()));
 
     fake_variations_client_ = std::make_unique<FakeVariationsClient>();
   }
@@ -447,7 +448,7 @@
 
   std::unique_ptr<MockCartDiscountFetcher> mock_fetcher_;
 
-  std::unique_ptr<FakeCartServiceDelegate> fake_cart_service_delegate_;
+  std::unique_ptr<FakeCartDiscountServiceDelegate> fake_cart_service_delegate_;
 
   std::unique_ptr<FakeVariationsClient> fake_variations_client_;
 

chrome/browser/dips/dips_bounce_detector.cc

diff --git a/chrome/browser/dips/dips_bounce_detector.cc b/chrome/browser/dips/dips_bounce_detector.cc
index 58ef6a9..bb9bba4 100644
--- a/chrome/browser/dips/dips_bounce_detector.cc
+++ b/chrome/browser/dips/dips_bounce_detector.cc
@@ -16,6 +16,7 @@
 #include "chrome/browser/dips/cookie_access_filter.h"
 #include "chrome/browser/dips/dips_redirect_info.h"
 #include "chrome/browser/dips/dips_service.h"
+#include "chrome/browser/dips/dips_storage.h"
 #include "chrome/browser/dips/dips_utils.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/cookie_access_details.h"
@@ -77,7 +78,10 @@
       dips_service_(dips_service),
       detector_(this,
                 base::DefaultTickClock::GetInstance(),
-                base::DefaultClock::GetInstance()) {}
+                base::DefaultClock::GetInstance()) {
+  issue_callback_ = base::BindRepeating(&DIPSWebContentsObserver::EmitDIPSIssue,
+                                        weak_factory_.GetWeakPtr());
+}
 
 DIPSWebContentsObserver::~DIPSWebContentsObserver() = default;
 
@@ -215,6 +219,23 @@
   return false;
 }
 
+void DIPSWebContentsObserver::EmitDIPSIssue(
+    const std::set<std::string>& sites) {
+  // TODO (jdh@): Create a DIPSIssue type and report one from here.
+}
+
+void DIPSWebContentsObserver::ReportRedirectorsWithoutInteraction(
+    const std::set<std::string>& sites) {
+  if (sites.size() == 0) {
+    return;
+  }
+
+  dips_service_->storage()
+      ->AsyncCall(&DIPSStorage::FilterSitesWithoutInteraction)
+      .WithArgs(sites)
+      .Then(issue_callback_);
+}
+
 void DIPSWebContentsObserver::RecordEvent(DIPSRecordedEvent event,
                                           const GURL& url,
                                           const base::Time& time) {
@@ -460,6 +481,9 @@
         /*time=*/clock_->Now()));
   }
 
+  delegate_->ReportRedirectorsWithoutInteraction(
+      GetRedirectors(server_state->navigation_start, navigation_handle));
+
   if (navigation_handle->HasCommitted()) {
     redirect_context_.AppendCommitted(std::move(server_state->navigation_start),
                                       std::move(redirects));
@@ -476,6 +500,7 @@
     client_detection_state_->cookie_access_type = access_types.back();
   }
 }
+
 // TODO(kaklilu): Follow up on how this interacts with Fenced Frames.
 void DIPSWebContentsObserver::FrameReceivedUserActivation(
     content::RenderFrameHost* render_frame_host) {
@@ -517,6 +542,41 @@
           (now - last_time.value()) >= kTimestampUpdateInterval);
 }
 
+std::set<std::string> DIPSBounceDetector::GetRedirectors(
+    const DIPSNavigationStart& navigation_start,
+    DIPSNavigationHandle* navigation_handle) {
+  std::set<std::string> redirectors;
+  std::string initial_site;
+
+  absl::visit(  //
+      base::Overloaded{
+          [&](const DIPSRedirectInfoPtr& client_redirect) {
+            initial_site = GetSiteForDIPS(redirect_context_.GetInitialURL());
+            // If the navigation started with a client redirect,
+            // `navigation_start` will be a DIPSRedirectInfoPtr and
+            // we'll include that redirector as well.
+            redirectors.insert(GetSiteForDIPS(client_redirect->url));
+          },
+          [&](const GURL& client_url) {
+            initial_site = GetSiteForDIPS(client_url);
+          },
+      },
+      navigation_start);
+
+  const auto& redirect_chain = navigation_handle->GetRedirectChain();
+  // The last site in the chain is the destination page, so it is ignored here.
+  for (auto it = redirect_chain.begin(); it != (redirect_chain.end() - 1);
+       it++) {
+    redirectors.insert(GetSiteForDIPS(*it));
+  }
+
+  // Since redirectors that are the same as the start page won't be acted on,
+  // we don't report on them.
+  redirectors.erase(initial_site);
+
+  return redirectors;
+}
+
 void DIPSWebContentsObserver::WebContentsDestroyed() {
   detector_.BeforeDestruction();
 }

chrome/browser/dips/dips_bounce_detector.h

diff --git a/chrome/browser/dips/dips_bounce_detector.h b/chrome/browser/dips/dips_bounce_detector.h
index 13987bc..8be83a8 100644
--- a/chrome/browser/dips/dips_bounce_detector.h
+++ b/chrome/browser/dips/dips_bounce_detector.h
@@ -19,6 +19,7 @@
 #include "content/public/browser/cookie_access_details.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/navigation_handle_user_data.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "services/metrics/public/cpp/ukm_source_id.h"
@@ -78,6 +79,8 @@
 
   size_t size() const { return redirects_.size(); }
 
+  GURL GetInitialURL() { return initial_url_; }
+
   void SetRedirectChainHandlerForTesting(DIPSRedirectChainHandler handler) {
     handler_ = handler;
   }
@@ -94,6 +97,9 @@
   size_t update_offset_ = 0;
 };
 
+using DIPSIssueCallback =
+    base::RepeatingCallback<void(const std::set<std::string>& sites)>;
+
 // A simplified interface to WebContents and DIPSService that can be faked in
 // tests. Needed to allow unit testing DIPSBounceDetector.
 class DIPSBounceDetectorDelegate {
@@ -103,6 +109,8 @@
   virtual ukm::SourceId GetPageUkmSourceId() const = 0;
   virtual void HandleRedirectChain(std::vector<DIPSRedirectInfoPtr> redirects,
                                    DIPSRedirectChainInfoPtr chain) = 0;
+  virtual void ReportRedirectorsWithoutInteraction(
+      const std::set<std::string>& sites) = 0;
   virtual void RecordEvent(DIPSRecordedEvent event,
                            const GURL& url,
                            const base::Time& time) = 0;
@@ -197,6 +205,12 @@
   bool ShouldUpdateTimestamp(base::optional_ref<const base::Time> last_time,
                              base::Time now);
 
+  // Returns the set of sites in the current (server) redirect chain. If the
+  // navigation started with a client redirect, that site is also included.
+  std::set<std::string> GetRedirectors(
+      const DIPSNavigationStart& navigation_start,
+      DIPSNavigationHandle* navigation_handle);
+
   raw_ptr<const base::TickClock> tick_clock_;
   raw_ptr<const base::Clock> clock_;
   raw_ptr<DIPSBounceDetectorDelegate> delegate_;
@@ -218,6 +232,11 @@
     detector_.SetRedirectChainHandlerForTesting(handler);
   }
 
+  // Use the passed handler instead of DIPSWebContentsObserver::EmitDIPSIssue().
+  void SetIssueReportingCallbackForTesting(DIPSIssueCallback callback) {
+    issue_callback_ = callback;
+  }
+
   void SetClockForTesting(base::Clock* clock) {
     detector_.SetClockForTesting(clock);
     DCHECK(dips_service_);
@@ -232,11 +251,15 @@
   // So WebContentsUserData::CreateForWebContents() can call the constructor.
   friend class content::WebContentsUserData<DIPSWebContentsObserver>;
 
+  void EmitDIPSIssue(const std::set<std::string>& sites);
+
   // DIPSBounceDetectorDelegate overrides:
   const GURL& GetLastCommittedURL() const override;
   ukm::SourceId GetPageUkmSourceId() const override;
   void HandleRedirectChain(std::vector<DIPSRedirectInfoPtr> redirects,
                            DIPSRedirectChainInfoPtr chain) override;
+  void ReportRedirectorsWithoutInteraction(
+      const std::set<std::string>& sites) override;
   void RecordEvent(DIPSRecordedEvent event,
                    const GURL& url,
                    const base::Time& time) override;
@@ -259,6 +282,9 @@
   // DIPSWebContentsObserver is observing.
   raw_ptr<DIPSService> dips_service_;
   DIPSBounceDetector detector_;
+  DIPSIssueCallback issue_callback_;
+
+  base::WeakPtrFactory<DIPSWebContentsObserver> weak_factory_{this};
 
   WEB_CONTENTS_USER_DATA_KEY_DECL();
 };

chrome/browser/dips/dips_bounce_detector_browsertest.cc

diff --git a/chrome/browser/dips/dips_bounce_detector_browsertest.cc b/chrome/browser/dips/dips_bounce_detector_browsertest.cc
index ab6ba09..3d531d3 100644
--- a/chrome/browser/dips/dips_bounce_detector_browsertest.cc
+++ b/chrome/browser/dips/dips_bounce_detector_browsertest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/test/bind.h"
 #include "chrome/browser/dips/dips_bounce_detector.h"
 
 #include "base/files/file_path.h"
@@ -10,6 +11,8 @@
 #include "base/strings/strcat.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/scoped_feature_list.h"
+#include "chrome/browser/dips/dips_service.h"
+#include "chrome/browser/dips/dips_service_factory.h"
 #include "chrome/browser/dips/dips_test_utils.h"
 #include "chrome/browser/dips/dips_utils.h"
 #include "chrome/common/chrome_features.h"
@@ -18,6 +21,7 @@
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
+#include "content/public/test/hit_test_region_observer.h"
 #include "content/public/test/test_utils.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/http_request.h"
@@ -25,6 +29,7 @@
 #include "net/test/embedded_test_server/request_handler_util.h"
 #include "services/metrics/public/cpp/ukm_builders.h"
 #include "testing/gmock/include/gmock/gmock.h"
+#include "third_party/blink/public/common/switches.h"
 #include "third_party/metrics_proto/ukm/source.pb.h"
 
 #if BUILDFLAG(IS_ANDROID)
@@ -69,6 +74,12 @@
   }
 }
 
+void AppendSitesInReport(std::vector<std::string>* reports,
+                         const std::set<std::string>& sites) {
+  reports->push_back(base::JoinString(
+      std::vector<base::StringPiece>(sites.begin(), sites.end()), ", "));
+}
+
 }  // namespace
 
 // Keeps a log of DidStartNavigation, OnCookiesAccessed, and DidFinishNavigation
@@ -163,6 +174,11 @@
         });
   }
 
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    // Prevents flakiness by handling clicks even before content is drawn.
+    command_line->AppendSwitch(blink::switches::kAllowPreCommitInput);
+  }
+
   void SetUpOnMainThread() override {
     ASSERT_TRUE(embedded_test_server()->Start());
     host_resolver()->AddRule("a.test", "127.0.0.1");
@@ -186,6 +202,41 @@
         base::BindRepeating(&AppendRedirects, redirects));
   }
 
+  void StartAppendingReportsTo(std::vector<std::string>* reports) {
+    web_contents_observer_->SetIssueReportingCallbackForTesting(
+        base::BindRepeating(&AppendSitesInReport, reports));
+  }
+
+  void BlockUntilHelperProcessesPendingRequests() {
+    base::SequenceBound<DIPSStorage>* storage =
+        DIPSServiceFactory::GetForBrowserContext(
+            GetActiveWebContents()->GetBrowserContext())
+            ->storage();
+    storage->FlushPostedTasksForTesting();
+  }
+
+  void StateForURL(const GURL& url, StateForURLCallback callback) {
+    DIPSService* dips_service = DIPSServiceFactory::GetForBrowserContext(
+        GetActiveWebContents()->GetBrowserContext());
+    dips_service->storage()
+        ->AsyncCall(&DIPSStorage::Read)
+        .WithArgs(url)
+        .Then(std::move(callback));
+  }
+
+  absl::optional<StateValue> GetDIPSState(const GURL& url) {
+    absl::optional<StateValue> state;
+
+    StateForURL(url, base::BindLambdaForTesting([&](DIPSState loaded_state) {
+                  if (loaded_state.was_loaded()) {
+                    state = loaded_state.ToStateValue();
+                  }
+                }));
+    BlockUntilHelperProcessesPendingRequests();
+
+    return state;
+  }
+
   // Navigate to /set-cookie on `host` and wait for OnCookiesAccessed() to be
   // called.
   [[nodiscard]] bool NavigateToSetCookie(base::StringPiece host) {
@@ -377,6 +428,60 @@
   EXPECT_THAT(redirects, IsEmpty());
 }
 
+// This test verifies that sites in a redirect chain with previous user
+// interaction are not reported in the resulting issue when a navigation
+// finishes.
+IN_PROC_BROWSER_TEST_F(DIPSBounceDetectorBrowserTest,
+                       ReportRedirectorsInChain_OmitSitesWithInteraction) {
+  WebContents* web_contents = GetActiveWebContents();
+
+  std::vector<std::string> reports;
+  StartAppendingReportsTo(&reports);
+
+  // Record user activation on d.test.
+  GURL url = embedded_test_server()->GetURL("d.test", "/title1.html");
+
+  ASSERT_TRUE(content::NavigateToURL(web_contents, url));
+  UserActivationObserver observer(web_contents,
+                                  web_contents->GetPrimaryMainFrame());
+  content::WaitForHitTestData(web_contents->GetPrimaryMainFrame());
+  SimulateMouseClick(web_contents, 0, blink::WebMouseEvent::Button::kLeft);
+  observer.Wait();
+
+  // Verify interaction was recorded for d.test, before proceeding.
+  absl::optional<StateValue> state = GetDIPSState(url);
+  ASSERT_TRUE(state.has_value());
+  ASSERT_TRUE(state->user_interaction_times.has_value());
+
+  // Visit initial page on a.test.
+  ASSERT_TRUE(content::NavigateToURL(
+      web_contents, embedded_test_server()->GetURL("a.test", "/title1.html")));
+
+  // Navigate with a click (not a redirect) to b.test, which S-redirects to
+  // c.test.
+  ASSERT_TRUE(content::NavigateToURLFromRenderer(
+      web_contents,
+      embedded_test_server()->GetURL("b.test",
+                                     "/cross-site/c.test/title1.html"),
+      embedded_test_server()->GetURL("c.test", "/title1.html")));
+
+  // Navigate without a click (i.e. by C-redirecting) to d.test.
+  ASSERT_TRUE(content::NavigateToURLFromRendererWithoutUserGesture(
+      web_contents, embedded_test_server()->GetURL("d.test", "/title1.html")));
+
+  // Navigate without a click (i.e. by C-redirecting) to e.test, which
+  // S-redirects to f.test, which S-redirects to g.test.
+  ASSERT_TRUE(content::NavigateToURLFromRendererWithoutUserGesture(
+      web_contents,
+      embedded_test_server()->GetURL(
+          "e.test", "/cross-site/f.test/cross-site/g.test/title1.html"),
+      embedded_test_server()->GetURL("g.test", "/title1.html")));
+  EndRedirectChain();
+  BlockUntilHelperProcessesPendingRequests();
+
+  EXPECT_THAT(reports, ElementsAre(("b.test"), ("c.test"), ("e.test, f.test")));
+}
+
 // This test verifies that a third-party cookie access doesn't cause a client
 // bounce to be considered stateful.
 IN_PROC_BROWSER_TEST_F(

chrome/browser/dips/dips_bounce_detector_unittest.cc

diff --git a/chrome/browser/dips/dips_bounce_detector_unittest.cc b/chrome/browser/dips/dips_bounce_detector_unittest.cc
index 2aeebc5..cbbeeda 100644
--- a/chrome/browser/dips/dips_bounce_detector_unittest.cc
+++ b/chrome/browser/dips/dips_bounce_detector_unittest.cc
@@ -88,6 +88,21 @@
     }
   }
 
+  // The version of this method in the DIPSWebContentsObserver checks
+  // DIPSStorage for interactions and runs |callback| with the returned list of
+  // sites without interaction. However, for the purpose of testing here, this
+  // method just records the sites reported to it in |reported_sites_| without
+  // filtering.
+  void ReportRedirectorsWithoutInteraction(
+      const std::set<std::string>& sites) override {
+    if (sites.size() == 0) {
+      return;
+    }
+
+    reported_sites_.push_back(base::JoinString(
+        std::vector<base::StringPiece>(sites.begin(), sites.end()), ", "));
+  }
+
   void RecordEvent(DIPSRecordedEvent event,
                    const GURL& url,
                    const base::Time& time) override {
@@ -113,9 +128,17 @@
     url_by_source_id_[source_id_] = FormatURL(url);
   }
 
-  std::set<BounceTuple> GetRecordedBounces() const { return recorded_bounces_; }
+  const std::set<BounceTuple>& GetRecordedBounces() const {
+    return recorded_bounces_;
+  }
 
-  std::set<EventTuple> GetRecordedEvents() const { return recorded_events_; }
+  const std::set<EventTuple>& GetRecordedEvents() const {
+    return recorded_events_;
+  }
+
+  const std::vector<std::string>& GetReportedSites() const {
+    return reported_sites_;
+  }
 
   const std::vector<std::string>& redirects() const { return redirects_; }
 
@@ -131,6 +154,7 @@
   std::vector<std::string> redirects_;
   std::set<BounceTuple> recorded_bounces_;
   std::set<EventTuple> recorded_events_;
+  std::vector<std::string> reported_sites_;
 };
 
 // If you wait this long, even a navigation without user gesture is not
@@ -254,6 +278,10 @@
     return std::make_tuple(GURL(url), time, event);
   }
 
+  const std::vector<std::string>& GetReportedSites() const {
+    return delegate_.GetReportedSites();
+  }
+
   base::Time GetCurrentTime() { return test_clock_.Now(); }
 
   const std::vector<std::string>& redirects() const {
@@ -455,6 +483,80 @@
                                   /*stateful=*/false)));
 }
 
+TEST_F(DIPSBounceDetectorTest,
+       ReportRedirectorsInChain_OnEachFinishedNavigation) {
+  // Visit initial page on a.test
+  NavigateTo("http://a.test", kWithUserGesture);
+
+  // Navigate with a click (not a redirect) to b.test, which S-redirects to
+  // c.test
+  StartNavigation("http://b.test", kWithUserGesture)
+      .RedirectTo("http://c.test")
+      .Finish(true);
+
+  // Navigate without a click (i.e. by C-redirecting) to d.test
+  NavigateTo("http://d.test", kNoUserGesture);
+
+  // Navigate without a click (i.e. by C-redirecting) to e.test, which
+  // S-redirects to f.test
+  StartNavigation("http://e.test", kNoUserGesture)
+      .RedirectTo("http://f.test")
+      .Finish(true);
+
+  EXPECT_THAT(GetReportedSites(),
+              testing::ElementsAre("b.test", "c.test", "d.test, e.test"));
+}
+
+TEST_F(DIPSBounceDetectorTest,
+       ReportRedirectorsInChain_IncludingUncommittedNavigations) {
+  // Visit initial page on a.test
+  NavigateTo("http://a.test", kWithUserGesture);
+
+  // Start a redirect chain that doesn't commit.
+  StartNavigation("http://b.test", kWithUserGesture)
+      .RedirectTo("http://c.test")
+      .RedirectTo("http://d.test")
+      .Finish(false);
+
+  // Because the previous navigation didn't commit, the following chain still
+  // starts from http://a.test/.
+  StartNavigation("http://e.test", kWithUserGesture)
+      .RedirectTo("http://f.test")
+      .Finish(true);
+
+  EXPECT_THAT(GetReportedSites(),
+              testing::ElementsAre("b.test, c.test", "e.test"));
+}
+
+// This test verifies that sites in a redirect chain that are the same as the
+// starting site (i.e., last site before the redirect chain started) are not
+// reported.
+TEST_F(DIPSBounceDetectorTest,
+       ReportRedirectorsInChain_OmitSitesMatchingStartSite) {
+  // Visit initial page on a.test.
+  NavigateTo("http://a.test", kWithUserGesture);
+
+  // Navigate with a click (not a redirect) to b.test, which S-redirects to
+  // a.test, which S-redirects to c.test.
+  StartNavigation("http://b.test", kWithUserGesture)
+      .RedirectTo("http://a.test")
+      .RedirectTo("http://c.test")
+      .Finish(true);
+
+  // Navigate without a click (i.e. by C-redirecting) to a.test.
+  NavigateTo("http://a.test", kNoUserGesture);
+
+  // Navigate without a click (i.e. by C-redirecting) to d.test, which
+  // S-redirects to e.test, which S-redirects to f.test.
+  StartNavigation("http://d.test", kNoUserGesture)
+      .RedirectTo("http://e.test")
+      .RedirectTo("http://f.test")
+      .Finish(true);
+
+  EXPECT_THAT(GetReportedSites(),
+              testing::ElementsAre("b.test", "c.test", "d.test, e.test"));
+}
+
 TEST_F(DIPSBounceDetectorTest, InteractionRecording_Throttled) {
   base::Time first_time = GetCurrentTime();
   NavigateTo("http://a.test", kNoUserGesture);

chrome/browser/dips/dips_database.cc

diff --git a/chrome/browser/dips/dips_database.cc b/chrome/browser/dips/dips_database.cc
index 556de77..bba04e8 100644
--- a/chrome/browser/dips/dips_database.cc
+++ b/chrome/browser/dips/dips_database.cc
@@ -565,6 +565,36 @@
   return sites;
 }
 
+std::set<std::string> DIPSDatabase::FilterSitesWithInteraction(
+    const std::set<std::string>& sites) {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  if (!CheckDBInit()) {
+    return {};
+  }
+  ClearRowsWithExpiredInteractions();
+  sql::Statement s_interactions(db_->GetUniqueStatement(
+      base::StrCat({"SELECT site,last_user_interaction_time FROM bounces "
+                    "WHERE site IN(",
+                    base::JoinString(
+                        std::vector<base::StringPiece>(sites.size(), "?"), ","),
+                    ")"})
+          .c_str()));
+
+  int i = 0;
+  for (const auto& site : sites) {
+    s_interactions.BindString(i, site);
+    i++;
+  }
+
+  std::set<std::string> interacted_sites;
+  while (s_interactions.Step()) {
+    if (ColumnOptionalTime(&s_interactions, 1).has_value()) {
+      interacted_sites.insert(s_interactions.ColumnString(0));
+    }
+  }
+  return interacted_sites;
+}
+
 std::vector<std::string> DIPSDatabase::GetSitesThatBouncedWithState() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (!CheckDBInit()) {
@@ -658,11 +688,11 @@
   }
 
   sql::Statement s_remove_rows(db_->GetUniqueStatement(
-      base::StrCat(
-          {"DELETE FROM bounces "
-           "WHERE site IN(",
-           base::JoinString(std::vector<std::string>(sites.size(), "?"), ","),
-           ")"})
+      base::StrCat({"DELETE FROM bounces "
+                    "WHERE site IN(",
+                    base::JoinString(
+                        std::vector<base::StringPiece>(sites.size(), "?"), ","),
+                    ")"})
           .c_str()));
 
   for (size_t i = 0; i < sites.size(); i++) {
@@ -985,7 +1015,7 @@
     return true;
 
   std::string placeholders =
-      base::JoinString(std::vector<std::string>(sites.size(), "?"), ",");
+      base::JoinString(std::vector<base::StringPiece>(sites.size(), "?"), ",");
 
   if ((type & DIPSEventRemovalType::kStorage) ==
       DIPSEventRemovalType::kStorage) {

chrome/browser/dips/dips_database.h

diff --git a/chrome/browser/dips/dips_database.h b/chrome/browser/dips/dips_database.h
index cdf081df..adb1028 100644
--- a/chrome/browser/dips/dips_database.h
+++ b/chrome/browser/dips/dips_database.h
@@ -59,6 +59,10 @@
   // other database querying methods.
   std::vector<std::string> GetAllSitesForTesting();
 
+  // Returns the subset of sites in |sites| WITH user interaction recorded.
+  std::set<std::string> FilterSitesWithInteraction(
+      const std::set<std::string>& sites);
+
   // Returns all sites which bounced the user and aren't protected from DIPS.
   //
   // A site can be protected in several ways:

chrome/browser/dips/dips_storage.cc

diff --git a/chrome/browser/dips/dips_storage.cc b/chrome/browser/dips/dips_storage.cc
index 1cdbaca..5463cf8 100644
--- a/chrome/browser/dips/dips_storage.cc
+++ b/chrome/browser/dips/dips_storage.cc
@@ -144,6 +144,7 @@
 
 void DIPSStorage::RemoveRows(const std::vector<std::string>& sites) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  DCHECK(db_);
 
   db_->RemoveRows(sites);
 }
@@ -197,6 +198,23 @@
   }
 }
 
+std::set<std::string> DIPSStorage::FilterSitesWithoutInteraction(
+    std::set<std::string> sites) const {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  DCHECK(db_);
+
+  std::set<std::string> interacted_sites =
+      db_->FilterSitesWithInteraction(sites);
+
+  for (const auto& site : interacted_sites) {
+    if (sites.count(site)) {
+      sites.erase(site);
+    }
+  }
+
+  return sites;
+}
+
 std::vector<std::string> DIPSStorage::GetSitesThatBounced() const {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(db_);

chrome/browser/dips/dips_storage.h

diff --git a/chrome/browser/dips/dips_storage.h b/chrome/browser/dips/dips_storage.h
index 23fa380d..5ac8676 100644
--- a/chrome/browser/dips/dips_storage.h
+++ b/chrome/browser/dips/dips_storage.h
@@ -48,6 +48,11 @@
   void RecordBounce(const GURL& url, base::Time time, bool stateful);
 
   // Storage querying Methods --------------------------------------------------
+
+  // Returns the subset of sites in |sites| WITHOUT user interaction recorded.
+  std::set<std::string> FilterSitesWithoutInteraction(
+      std::set<std::string> sites) const;
+
   // Returns all sites that did a bounce that aren't protected from DIPS.
   std::vector<std::string> GetSitesThatBounced() const;
 

chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSliceViewTracker.java

diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSliceViewTracker.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSliceViewTracker.java
index b98b457..9fabdbc 100644
--- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSliceViewTracker.java
+++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSliceViewTracker.java
@@ -15,6 +15,8 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.recyclerview.widget.RecyclerView;
 
+import org.chromium.base.task.PostTask;
+import org.chromium.base.task.TaskTraits;
 import org.chromium.chrome.browser.xsurface.ListLayoutHelper;
 
 import java.util.ArrayList;
@@ -30,6 +32,7 @@
     private static final float DEFAULT_VIEW_LOG_THRESHOLD = .66f;
     private static final float GOOD_VISITS_EXPOSURE_THRESHOLD = 0.5f;
     private static final float GOOD_VISITS_COVERAGE_THRESHOLD = 0.25f;
+    private static final float VISIBLE_CHANGE_LOG_THRESHOLD = 0.05f;
 
     private class VisibilityObserver {
         final float mVisibilityThreshold;
@@ -49,6 +52,8 @@
     private ListLayoutHelper mLayoutHelper;
     // The set of content keys already reported as visible.
     private HashSet<String> mContentKeysVisible = new HashSet<String>();
+    // Map from content key to the runnable that is used to notify the completion of the rendering.
+    private HashMap<String, Runnable> mVisibleChangeMap = new HashMap<>();
     private boolean mFeedContentVisible;
     @Nullable
     private Observer mObserver;
@@ -69,6 +74,13 @@
         // Invoked when feed content is first visible. This can happens as soon as an xsurface view
         // is partially visible.
         void feedContentVisible();
+
+        // For reporting to feed user interaction reliability log.
+        //
+        // Called the first time a slice view is 5% visible.
+        void reportViewFirstVisible(View view);
+        // Called the first time a slice view is rendered.
+        void reportViewFirstRendered(View view);
     }
 
     public FeedSliceViewTracker(@NonNull RecyclerView rootView, @NonNull Activity activity,
@@ -114,6 +126,7 @@
         if (mWatchedSliceMap != null) {
             mWatchedSliceMap.clear();
         }
+        mVisibleChangeMap.clear();
     }
 
     /**
@@ -210,13 +223,24 @@
                     || isViewVisible(childView, GOOD_VISITS_EXPOSURE_THRESHOLD)
                     || isViewCoveringViewport(childView, GOOD_VISITS_COVERAGE_THRESHOLD);
 
-            if (mContentKeysVisible.contains(contentKey)
-                    || !isViewVisible(childView, DEFAULT_VIEW_LOG_THRESHOLD)) {
-                continue;
+            if (!mContentKeysVisible.contains(contentKey)
+                    && isViewVisible(childView, DEFAULT_VIEW_LOG_THRESHOLD)) {
+                mContentKeysVisible.add(contentKey);
+                mObserver.sliceVisible(contentKey);
             }
 
-            mContentKeysVisible.add(contentKey);
-            mObserver.sliceVisible(contentKey);
+            if (mVisibleChangeMap.get(contentKey) == null
+                    && isViewVisible(childView, VISIBLE_CHANGE_LOG_THRESHOLD)) {
+                mObserver.reportViewFirstVisible(childView);
+                // There is not a system way to measure the render latency. Here we mimic how
+                // Time To First Draw Done is measured, which is done by posting a runnable after
+                // onPreDraw.
+                Runnable renderedRunnable = () -> {
+                    mObserver.reportViewFirstRendered(childView);
+                };
+                PostTask.postTask(TaskTraits.UI_DEFAULT, renderedRunnable);
+                mVisibleChangeMap.put(contentKey, renderedRunnable);
+            }
         }
 
         reportTimeForGoodVisitsIfNeeded();

chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSliceViewTrackerTest.java

diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSliceViewTrackerTest.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSliceViewTrackerTest.java
index ebebdf0..4f023e00 100644
--- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSliceViewTrackerTest.java
+++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSliceViewTrackerTest.java
@@ -18,9 +18,11 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
 
 import android.app.Activity;
 import android.graphics.Rect;
+import android.os.Looper;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.view.Window;
@@ -514,6 +516,28 @@
         verify(mObserver, times(1)).reportContentSliceVisibleTime(eq(1L));
     }
 
+    @Test
+    @SmallTest
+    public void testReportViewFirstVisibleAndRendered() {
+        mContentManager.addContents(0,
+                Arrays.asList(new FeedListContentManager.FeedContent[] {
+                        new FeedListContentManager.NativeViewContent(0, "c/key1", mChildA),
+                }));
+        doReturn(0).when(mLayoutHelper).findFirstVisibleItemPosition();
+        doReturn(0).when(mLayoutHelper).findLastVisibleItemPosition();
+        doReturn(mChildA).when(mLayoutManager).findViewByPosition(eq(0));
+
+        // View only covers 5% of the viewport.
+        mockViewportRect(0, 0, 100, 100);
+        mockViewDimensions(mChildA, 100, 5);
+        mockGetChildVisibleRect(mChildA, 0, 0, 100, 5);
+
+        mTracker.onPreDraw();
+        verify(mObserver, times(1)).reportViewFirstVisible(any());
+        shadowOf(Looper.getMainLooper()).idle();
+        verify(mObserver, times(1)).reportViewFirstRendered(any());
+    }
+
     void mockViewDimensions(View view, int width, int height) {
         when(view.getWidth()).thenReturn(width);
         when(view.getHeight()).thenReturn(height);

chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedStream.java

diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedStream.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedStream.java
index 466e30b..9fb453a 100644
--- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedStream.java
+++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedStream.java
@@ -24,6 +24,7 @@
 import androidx.recyclerview.widget.RecyclerView.LayoutManager;
 
 import org.chromium.base.Callback;
+import org.chromium.base.FeatureList;
 import org.chromium.base.Log;
 import org.chromium.base.ObserverList;
 import org.chromium.base.ThreadUtils;
@@ -50,6 +51,7 @@
 import org.chromium.chrome.browser.xsurface.FeedActionsHandler;
 import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger;
 import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger.StreamType;
+import org.chromium.chrome.browser.xsurface.FeedUserInteractionReliabilityLogger;
 import org.chromium.chrome.browser.xsurface.HybridListRenderer;
 import org.chromium.chrome.browser.xsurface.ListLayoutHelper;
 import org.chromium.chrome.browser.xsurface.LoggingParameters;
@@ -596,6 +598,7 @@
     private RotationObserver mRotationObserver;
     private FeedReliabilityLoggingBridge mReliabilityLoggingBridge;
     private FeedLaunchReliabilityLogger mLaunchReliabilityLogger;
+    private FeedUserInteractionReliabilityLogger mFeedUserInteractionReliabilityLogger;
 
     // Things valid only when bound.
     private @Nullable RecyclerView mRecyclerView;
@@ -748,6 +751,13 @@
                 FeedStreamJni.get().getSurfaceId(mNativeFeedStream, FeedStream.this));
         launchReliabilityLogger.logFeedReloading(System.nanoTime());
         mReliabilityLoggingBridge.setLogger(launchReliabilityLogger);
+        if (FeatureList.isNativeInitialized()
+                && ChromeFeatureList.isEnabled(
+                        ChromeFeatureList.FEED_USER_INTERACTION_RELIABILITY_REPORT)
+                && surfaceScope != null) {
+            mFeedUserInteractionReliabilityLogger =
+                    surfaceScope.getFeedUserInteractionReliabilityLogger();
+        }
 
         mScrollStateToRestore = savedInstanceState;
         manager.setHandlers(mHandlersMap);
@@ -773,6 +783,10 @@
         }
 
         FeedStreamJni.get().surfaceOpened(mNativeFeedStream, FeedStream.this);
+
+        if (mFeedUserInteractionReliabilityLogger != null) {
+            mFeedUserInteractionReliabilityLogger.onStreamOpened(getXSurfaceStreamType());
+        }
     }
 
     @Override
@@ -1169,6 +1183,20 @@
         }
     }
 
+    // TODO(jianli): Consolidate 2 StreamType defined in different places.
+    private @org.chromium.chrome.browser.xsurface.StreamType int getXSurfaceStreamType() {
+        switch (mStreamKind) {
+            case StreamKind.FOR_YOU:
+                return org.chromium.chrome.browser.xsurface.StreamType.FOR_YOU;
+            case StreamKind.FOLLOWING:
+                return org.chromium.chrome.browser.xsurface.StreamType.WEB_FEED;
+            case StreamKind.SINGLE_WEB_FEED:
+                return org.chromium.chrome.browser.xsurface.StreamType.SINGLE_WEB_FEED;
+            default:
+                return org.chromium.chrome.browser.xsurface.StreamType.UNSPECIFIED;
+        }
+    }
+
     /**
      * Restores the scroll state serialized to |savedInstanceState|.
      * @return true if the scroll state was restored, or if the state could never be restored.
@@ -1303,6 +1331,18 @@
         public void feedContentVisible() {
             FeedStreamJni.get().reportFeedViewed(mNativeFeedStream, FeedStream.this);
         }
+        @Override
+        public void reportViewFirstVisible(View view) {
+            if (mFeedUserInteractionReliabilityLogger != null) {
+                mFeedUserInteractionReliabilityLogger.onViewFirstVisible(view);
+            }
+        }
+        @Override
+        public void reportViewFirstRendered(View view) {
+            if (mFeedUserInteractionReliabilityLogger != null) {
+                mFeedUserInteractionReliabilityLogger.onViewFirstRendered(view);
+            }
+        }
     }
 
     /**

chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/signinbottomsheet/SigninBottomSheetCoordinator.java

diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/signinbottomsheet/SigninBottomSheetCoordinator.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/signinbottomsheet/SigninBottomSheetCoordinator.java
index b98b4b1..78f4c371 100644
--- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/signinbottomsheet/SigninBottomSheetCoordinator.java
+++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/signinbottomsheet/SigninBottomSheetCoordinator.java
@@ -135,8 +135,8 @@
 
         /** Returns the cancel button string for the bottom sheet dialog. */
         @Override
-        public @StringRes int getCancelButton() {
-            return R.string.cancel;
+        public @StringRes int getDismissButton() {
+            return R.string.close;
         }
     }
 }

chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
index 56a1084..0905bff7 100644
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -316,7 +316,7 @@
     public static final String FEED_SHOW_SIGN_IN_COMMAND = "FeedShowSignInCommand";
     public static final String FEED_BOC_SIGN_IN_INTERSTITIAL = "FeedBoCSigninInterstitial";
     public static final String FEED_USER_INTERACTION_RELIABILITY_REPORT =
-            "kFeedUserInteractionReliabilityReport";
+            "FeedUserInteractionReliabilityReport";
     public static final String FILLING_PASSWORDS_FROM_ANY_ORIGIN = "FillingPasswordsFromAnyOrigin";
     public static final String FOCUS_OMNIBOX_IN_INCOGNITO_TAB_INTENTS =
             "FocusOmniboxInIncognitoTabIntents";

chrome/browser/page_load_metrics/observers/third_party_metrics_observer.cc

diff --git a/chrome/browser/page_load_metrics/observers/third_party_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/third_party_metrics_observer.cc
index 852f62f2..a5cedf5 100644
--- a/chrome/browser/page_load_metrics/observers/third_party_metrics_observer.cc
+++ b/chrome/browser/page_load_metrics/observers/third_party_metrics_observer.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/page_load_metrics/observers/third_party_metrics_observer.h"
 
+#include "base/containers/enum_set.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/strcat.h"
 #include "components/page_load_metrics/browser/metrics_web_contents_observer.h"
@@ -230,17 +231,15 @@
 void ThirdPartyMetricsObserver::OnTimingUpdate(
     content::RenderFrameHost* subframe_rfh,
     const page_load_metrics::mojom::PageLoadTiming& timing) {
-  if (!timing.paint_timing->first_contentful_paint)
-    return;
-
   // Filter out top-frames
-  if (!subframe_rfh)
+  if (!subframe_rfh) {
     return;
+  }
 
-  // Filter out navigations that we've already recorded, or if we've reached our
-  // frame limit.
-  const auto it = recorded_frames_.find(subframe_rfh);
-  if (it != recorded_frames_.end() ||
+  // If we've reached the frame limit and haven't recorded any metrics for this
+  // RFH before, then don't continue on.
+  auto recorded_frame_events = recorded_frames_.find(subframe_rfh);
+  if (recorded_frame_events == recorded_frames_.end() &&
       recorded_frames_.size() >= kMaxRecordedFrames) {
     return;
   }
@@ -248,20 +247,75 @@
   // Filter out first-party frames.
   content::RenderFrameHost* top_frame =
       GetDelegate().GetWebContents()->GetPrimaryMainFrame();
-  if (!top_frame)
+  if (!top_frame) {
     return;
+  }
 
   const url::Origin& top_frame_origin = top_frame->GetLastCommittedOrigin();
   const url::Origin& subframe_origin = subframe_rfh->GetLastCommittedOrigin();
-  if (IsSameSite(top_frame_origin, subframe_origin))
+  if (IsSameSite(top_frame_origin, subframe_origin)) {
     return;
+  }
 
-  if (page_load_metrics::WasStartedInForegroundOptionalEventInForeground(
+  bool should_record_opaque_subframe_time =
+      !top_frame_origin.opaque() && subframe_origin.opaque();
+
+  TimingEventTypeEnumSet newly_recorded_event_types;
+
+  if (timing.paint_timing->first_contentful_paint &&
+      page_load_metrics::WasStartedInForegroundOptionalEventInForeground(
           timing.paint_timing->first_contentful_paint, GetDelegate())) {
-    PAGE_LOAD_HISTOGRAM(
-        "PageLoad.Clients.ThirdParty.Frames.NavigationToFirstContentfulPaint3",
-        timing.paint_timing->first_contentful_paint.value());
-    recorded_frames_.insert(subframe_rfh);
+    // Filter out navigations that we've already recorded.
+    if (recorded_frame_events == recorded_frames_.end() ||
+        !recorded_frame_events->second.Has(
+            TimingEventType::kFirstContentfulPaint)) {
+      PAGE_LOAD_HISTOGRAM(
+          "PageLoad.Clients.ThirdParty.Frames."
+          "NavigationToFirstContentfulPaint3",
+          timing.paint_timing->first_contentful_paint.value());
+      if (should_record_opaque_subframe_time) {
+        PAGE_LOAD_HISTOGRAM(
+            "PageLoad.Clients.ThirdParty.Frames.Opaque."
+            "NavigationToFirstContentfulPaint",
+            timing.paint_timing->first_contentful_paint.value());
+      }
+      newly_recorded_event_types.Put(TimingEventType::kFirstContentfulPaint);
+    }
+  }
+
+  const page_load_metrics::ContentfulPaintTimingInfo&
+      cross_site_sub_frame_largest_contentful_paint =
+          GetDelegate()
+              .GetLargestContentfulPaintHandler()
+              .CrossSiteSubframesLargestContentfulPaint();
+  if (cross_site_sub_frame_largest_contentful_paint.ContainsValidTime() &&
+      page_load_metrics::WasStartedInForegroundOptionalEventInForeground(
+          cross_site_sub_frame_largest_contentful_paint.Time(),
+          GetDelegate())) {
+    // Filter out navigations that we've already recorded.
+    if (recorded_frame_events == recorded_frames_.end() ||
+        !recorded_frame_events->second.Has(
+            TimingEventType::kLargestContentfulPaint)) {
+      if (should_record_opaque_subframe_time) {
+        PAGE_LOAD_HISTOGRAM(
+            "PageLoad.Clients.ThirdParty.Frames.Opaque."
+            "NavigationToLargestContentfulPaint",
+            cross_site_sub_frame_largest_contentful_paint.Time().value());
+      }
+      // Note: We may not have actually recorded a histogram value at this
+      // point, but indicate that we did so that the LCP metric here has values
+      // that correspond to the FCP metric recorded above.
+      newly_recorded_event_types.Put(TimingEventType::kLargestContentfulPaint);
+    }
+  }
+
+  if (!newly_recorded_event_types.Empty()) {
+    if (recorded_frame_events == recorded_frames_.end()) {
+      recorded_frames_[subframe_rfh] = newly_recorded_event_types;
+    } else {
+      recorded_frames_[subframe_rfh] = base::Union(
+          recorded_frame_events->second, newly_recorded_event_types);
+    }
   }
 }
 

chrome/browser/page_load_metrics/observers/third_party_metrics_observer.h

diff --git a/chrome/browser/page_load_metrics/observers/third_party_metrics_observer.h b/chrome/browser/page_load_metrics/observers/third_party_metrics_observer.h
index e56dd38d4..59b5ce5 100644
--- a/chrome/browser/page_load_metrics/observers/third_party_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/third_party_metrics_observer.h
@@ -7,6 +7,7 @@
 
 #include <map>
 
+#include "base/containers/enum_set.h"
 #include "components/page_load_metrics/browser/page_load_metrics_observer.h"
 #include "url/gurl.h"
 #include "url/origin.h"
@@ -115,9 +116,25 @@
   // instead.
   std::map<GURL, ThirdPartyInfo> all_third_party_info_;
 
+  // Timing event types used to track which ones we've already recorded timing
+  // data for.
+  enum class TimingEventType : uint8_t {
+    kFirstContentfulPaint = 0,
+    kLargestContentfulPaint = 1,
+
+    kMaxValue = kLargestContentfulPaint,
+  };
+  using TimingEventTypeEnumSet =
+      base::EnumSet<TimingEventType,
+                    TimingEventType::kFirstContentfulPaint,
+                    TimingEventType::kMaxValue>;
+
   // A set of RenderFrameHosts that we've recorded timing data for. The
   // RenderFrameHosts are later removed when they navigate again or are deleted.
-  std::set<content::RenderFrameHost*> recorded_frames_;
+  // Note that we use `base::flat_map` here because at most `kMaxRecordedFrames`
+  // entries will be contained in the map.
+  base::flat_map<content::RenderFrameHost*, TimingEventTypeEnumSet>
+      recorded_frames_;
 
   // If the page has any blocked_by_policy cookie or DOM storage access (e.g.,
   // block third-party cookies is enabled) then we don't want to record any

chrome/browser/page_load_metrics/observers/third_party_metrics_observer_browsertest.cc

diff --git a/chrome/browser/page_load_metrics/observers/third_party_metrics_observer_browsertest.cc b/chrome/browser/page_load_metrics/observers/third_party_metrics_observer_browsertest.cc
index 1fbf2f1..3fb29e06 100644
--- a/chrome/browser/page_load_metrics/observers/third_party_metrics_observer_browsertest.cc
+++ b/chrome/browser/page_load_metrics/observers/third_party_metrics_observer_browsertest.cc
@@ -28,6 +28,12 @@
     "PageLoad.Clients.ThirdParty.Origins.SessionStorageAccess2";
 const char kSubframeFCPHistogram[] =
     "PageLoad.Clients.ThirdParty.Frames.NavigationToFirstContentfulPaint3";
+const char kOpaqueSubframeFCPHistogram[] =
+    "PageLoad.Clients.ThirdParty.Frames.Opaque."
+    "NavigationToFirstContentfulPaint";
+const char kOpaqueSubframeLCPHistogram[] =
+    "PageLoad.Clients.ThirdParty.Frames.Opaque."
+    "NavigationToLargestContentfulPaint";
 
 void InvokeStorageAccessOnFrame(content::RenderFrameHost* frame,
                                 blink::mojom::WebFeature storage_feature) {
@@ -137,11 +143,18 @@
       const std::string& host,
       const std::string& path,
       page_load_metrics::PageLoadMetricsTestWaiter* waiter) {
+    GURL page = https_server()->GetURL(host, path);
+    NavigateFrameAndWaitForFCP(page, waiter);
+  }
+
+  void NavigateFrameAndWaitForFCP(
+      const GURL& url,
+      page_load_metrics::PageLoadMetricsTestWaiter* waiter) {
     // Waiting for the frame to navigate ensures that any previous RFHs for this
     // frame have been deleted and therefore won't pollute any future frame
     // expectations (such as FCP).
     waiter->AddSubframeNavigationExpectation();
-    NavigateFrameTo(host, path);
+    NavigateFrameToUrl(url);
     waiter->Wait();
 
     waiter->AddSubFrameExpectation(
@@ -225,6 +238,29 @@
   histogram_tester.ExpectTotalCount(kSubframeFCPHistogram, 3);
 }
 
+IN_PROC_BROWSER_TEST_F(ThirdPartyMetricsObserverBrowserTest,
+                       OpaqueOriginSubframe) {
+  base::HistogramTester histogram_tester;
+
+  page_load_metrics::PageLoadMetricsTestWaiter waiter(
+      browser()->tab_strip_model()->GetActiveWebContents());
+  NavigateToPageWithFrameAndWaitForFrame("a.com", &waiter);
+
+  // Navigate the frame to a third-party page.
+  NavigateFrameAndWaitForFCP("b.com", "/select.html", &waiter);
+
+  // Navigate the frame to an opaque origin URL.
+  NavigateFrameAndWaitForFCP(GURL("data:,hello"), &waiter);
+
+  content::RenderFrameHost* subframe_rfh =
+      ChildFrameAt(web_contents()->GetPrimaryMainFrame(), /*index=*/0);
+  ASSERT_TRUE(subframe_rfh->GetLastCommittedOrigin().opaque());
+
+  histogram_tester.ExpectTotalCount(kSubframeFCPHistogram, 2);
+  histogram_tester.ExpectTotalCount(kOpaqueSubframeFCPHistogram, 1);
+  histogram_tester.ExpectTotalCount(kOpaqueSubframeLCPHistogram, 1);
+}
+
 IN_PROC_BROWSER_TEST_F(ThirdPartyMetricsObserverBrowserTest, NoStorageEvent) {
   base::HistogramTester histogram_tester;
   NavigateToPageWithFrame("a.com");

chrome/browser/resources/chromeos/.eslintrc.js

diff --git a/chrome/browser/resources/chromeos/.eslintrc.js b/chrome/browser/resources/chromeos/.eslintrc.js
index faccaf49..c634e9c 100644
--- a/chrome/browser/resources/chromeos/.eslintrc.js
+++ b/chrome/browser/resources/chromeos/.eslintrc.js
@@ -5,6 +5,5 @@
 module.exports = {
   'rules' : {
     'eqeqeq' : 'off',
-    'no-var' : 'off',
   },
 };

chrome/browser/resources/chromeos/accessibility/.eslintrc.js

diff --git a/chrome/browser/resources/chromeos/accessibility/.eslintrc.js b/chrome/browser/resources/chromeos/accessibility/.eslintrc.js
index 171a775..35f64c87 100644
--- a/chrome/browser/resources/chromeos/accessibility/.eslintrc.js
+++ b/chrome/browser/resources/chromeos/accessibility/.eslintrc.js
@@ -11,6 +11,7 @@
     'no-confusing-arrow' : ['error'],
     'no-console' : 'off',
     'no-throw-literal' : 'off',
+    'no-var' : 'off',
     'object-shorthand' : ['error', 'always'],
     'prefer-const' : ['error', {'destructuring' : 'all'}],
   },

chrome/browser/resources/chromeos/internet_detail_dialog/.eslintrc.js

diff --git a/chrome/browser/resources/chromeos/internet_detail_dialog/.eslintrc.js b/chrome/browser/resources/chromeos/internet_detail_dialog/.eslintrc.js
deleted file mode 100644
index b04d2fce..0000000
--- a/chrome/browser/resources/chromeos/internet_detail_dialog/.eslintrc.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2017 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module.exports = {
-  'rules': {
-    // Revert overrides in parent directory.
-    'brace-style': ['error', '1tbs'],
-    'curly': ['error', 'multi-line', 'consistent'],
-    // Match style in chrome/browser/resources/.
-    'no-var': 'error',
-    'prefer-const': 'error',
-  },
-};

chrome/browser/resources/chromeos/login/.eslintrc.js

diff --git a/chrome/browser/resources/chromeos/login/.eslintrc.js b/chrome/browser/resources/chromeos/login/.eslintrc.js
new file mode 100644
index 0000000..7481f707
--- /dev/null
+++ b/chrome/browser/resources/chromeos/login/.eslintrc.js
@@ -0,0 +1,9 @@
+// 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.
+
+module.exports = {
+  'rules' : {
+    'no-var' : 'off',
+  },
+};

chrome/browser/resources/chromeos/network_ui/.eslintrc.js

diff --git a/chrome/browser/resources/chromeos/network_ui/.eslintrc.js b/chrome/browser/resources/chromeos/network_ui/.eslintrc.js
deleted file mode 100644
index bdf8a8f2..0000000
--- a/chrome/browser/resources/chromeos/network_ui/.eslintrc.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2019 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module.exports = {
-  'rules': {
-    'no-var': 'error',
-    'prefer-const': 'error',
-  },
-};

chrome/browser/resources/extensions/activity_log/activity_log.html

diff --git a/chrome/browser/resources/extensions/activity_log/activity_log.html b/chrome/browser/resources/extensions/activity_log/activity_log.html
index 7dfb735..e1b095b 100644
--- a/chrome/browser/resources/extensions/activity_log/activity_log.html
+++ b/chrome/browser/resources/extensions/activity_log/activity_log.html
@@ -42,7 +42,7 @@
   <div class="page-content">
     <div class="page-header">
       <cr-icon-button class="icon-arrow-back no-overlap" id="closeButton"
-          aria-label="$i18n{back}" on-click="onCloseButtonTap_">
+          aria-label="$i18n{back}" on-click="onCloseButtonClick_">
       </cr-icon-button>
       <template is="dom-if" if="[[!extensionInfo.isPlaceholder]]">
         <img id="icon" src="[[extensionInfo.iconUrl]]" alt="">

chrome/browser/resources/extensions/activity_log/activity_log.ts

diff --git a/chrome/browser/resources/extensions/activity_log/activity_log.ts b/chrome/browser/resources/extensions/activity_log/activity_log.ts
index d72c453..c40b8b81 100644
--- a/chrome/browser/resources/extensions/activity_log/activity_log.ts
+++ b/chrome/browser/resources/extensions/activity_log/activity_log.ts
@@ -161,7 +161,7 @@
     }
   }
 
-  private onCloseButtonTap_() {
+  private onCloseButtonClick_() {
     if ((this.extensionInfo as ActivityLogExtensionPlaceholder).isPlaceholder) {
       navigation.navigateTo({page: Page.LIST});
     } else {

chrome/browser/resources/extensions/activity_log/activity_log_history_item.html

diff --git a/chrome/browser/resources/extensions/activity_log/activity_log_history_item.html b/chrome/browser/resources/extensions/activity_log/activity_log_history_item.html
index 7a75019..acad38be 100644
--- a/chrome/browser/resources/extensions/activity_log/activity_log_history_item.html
+++ b/chrome/browser/resources/extensions/activity_log/activity_log_history_item.html
@@ -74,7 +74,7 @@
 </style>
 <div actionable$="[[isExpandable_]]"
     id="activity-item-main-row"
-    on-click="onExpandTap_">
+    on-click="onExpandClick_">
   <div id="activity-call-and-count">
     <span id="activity-type">[[data.activityType]]</span>
     <span id="activity-key" title="[[data.key]]">[[data.key]]</span>
@@ -86,7 +86,7 @@
   <div class="separator" hidden$="[[!isExpandable_]]"></div>
   <cr-icon-button id="activity-delete" class="icon-delete-gray"
       aria-describedby="api-call" aria-label="$i18n{clearEntry}"
-      on-click="onDeleteTap_"></cr-icon-button>
+      on-click="onDeleteClick_"></cr-icon-button>
 </div>
 <div id="page-url-list" hidden$="[[!data.expanded]]">
   <template is="dom-repeat" items="[[getPageUrls_(data)]]">

chrome/browser/resources/extensions/activity_log/activity_log_history_item.ts

diff --git a/chrome/browser/resources/extensions/activity_log/activity_log_history_item.ts b/chrome/browser/resources/extensions/activity_log/activity_log_history_item.ts
index 9118dd9..86010bb 100644
--- a/chrome/browser/resources/extensions/activity_log/activity_log_history_item.ts
+++ b/chrome/browser/resources/extensions/activity_log/activity_log_history_item.ts
@@ -78,7 +78,7 @@
         });
   }
 
-  private onDeleteTap_(e: Event) {
+  private onDeleteClick_(e: Event) {
     e.stopPropagation();
     this.dispatchEvent(new CustomEvent('delete-activity-log-item', {
       bubbles: true,
@@ -87,7 +87,7 @@
     }));
   }
 
-  private onExpandTap_() {
+  private onExpandClick_() {
     if (this.isExpandable_) {
       this.set('data.expanded', !this.data.expanded);
     }

chrome/browser/resources/extensions/detail_view.html

diff --git a/chrome/browser/resources/extensions/detail_view.html b/chrome/browser/resources/extensions/detail_view.html
index 4410e67c..1f4309a 100644
--- a/chrome/browser/resources/extensions/detail_view.html
+++ b/chrome/browser/resources/extensions/detail_view.html
@@ -154,7 +154,7 @@
           aria-label$="[[getBackButtonAriaLabel_(data.name)]]"
           aria-roledescription$="[[
               getBackButtonAriaRoleDescription_(data.name)]]"
-          on-click="onCloseButtonTap_">
+          on-click="onCloseButtonClick_">
       </cr-icon-button>
       <img id="icon" src="[[data.iconUrl]]" alt="">
       <span id="name" class="cr-title-text" role="heading" aria-level="1">
@@ -174,7 +174,7 @@
         </cr-tooltip-icon>
         <template is="dom-if" if="[[showReloadButton_(data.state)]]">
           <cr-button id="terminated-reload-button" class="action-button"
-              on-click="onReloadTap_">
+              on-click="onReloadClick_">
             $i18n{itemReload}
           </cr-button>
         </template>
@@ -208,7 +208,7 @@
         </span>
         <template is="dom-if" if="[[!showReloadButton_(data.state)]]">
           <cr-button id="warnings-reload-button" class="action-button"
-              on-click="onReloadTap_">
+              on-click="onReloadClick_">
             $i18n{itemReload}
           </cr-button>
         </template>
@@ -230,7 +230,7 @@
         <iron-icon class="warning-icon" icon="cr:warning"></iron-icon>
         <span>$i18n{itemCorruptInstall}</span>
         <cr-button id="repair-button" class="action-button"
-            on-click="onRepairTap_">
+            on-click="onRepairClick_">
           $i18n{itemRepair}
         </cr-button>
       </div>
@@ -301,7 +301,7 @@
             <template is="dom-repeat" items="[[sortedViews_]]">
               <li>
                 <a is="action-link" class="inspectable-view"
-                    on-click="onInspectTap_">
+                    on-click="onInspectClick_">
                   [[computeInspectLabel_(item)]]
                 </a>
               </li>
@@ -444,21 +444,21 @@
         disabled="[[!isEnabled_(data.state)]]"
         hidden="[[!shouldShowOptionsLink_(data.*)]]"
         button-aria-description="$i18n{opensInNewTab}"
-        label="$i18n{itemOptions}" on-click="onExtensionOptionsTap_"
+        label="$i18n{itemOptions}" on-click="onExtensionOptionsClick_"
         external></cr-link-row>
     <cr-link-row class="hr"
         id="extensionsActivityLogLink" hidden$="[[!showActivityLog]]"
-        label="$i18n{viewActivityLog}" on-click="onActivityLogTap_"
+        label="$i18n{viewActivityLog}" on-click="onActivityLogClick_"
         role-description="$i18n{subpageArrowRoleDescription}">
     </cr-link-row>
     <cr-link-row class="hr" hidden="[[!data.manifestHomePageUrl.length]]"
         id="extensionWebsite" label="$i18n{extensionWebsite}"
         button-aria-description="$i18n{opensInNewTab}"
-        on-click="onExtensionWebSiteTap_" external></cr-link-row>
+        on-click="onExtensionWebSiteClick_" external></cr-link-row>
     <cr-link-row class="hr" hidden="[[!data.webStoreUrl.length]]"
         id="viewInStore" label="$i18n{viewInStore}"
         button-aria-description="$i18n{opensInNewTab}"
-        on-click="onViewInStoreTap_" external></cr-link-row>
+        on-click="onViewInStoreClick_" external></cr-link-row>
     <div class="section hr">
       <div class="section-title" role="heading" aria-level="2">
         $i18n{itemSource}
@@ -469,14 +469,14 @@
       <div id="load-path" class="section-content"
           hidden$="[[!data.prettifiedPath]]">
         <span>$i18n{itemExtensionPath}</span>
-        <a is="action-link" on-click="onLoadPathTap_">
+        <a is="action-link" on-click="onLoadPathClick_">
           [[data.prettifiedPath]]
         </a>
       </div>
     </div>
     <cr-link-row class="hr" id="remove-extension"
         hidden="[[data.mustRemainInstalled]]"
-        label="$i18n{itemRemoveExtension}" on-click="onRemoveTap_">
+        label="$i18n{itemRemoveExtension}" on-click="onRemoveClick_">
     </cr-link-row>
   </div>
 </div>

chrome/browser/resources/extensions/detail_view.ts

diff --git a/chrome/browser/resources/extensions/detail_view.ts b/chrome/browser/resources/extensions/detail_view.ts
index c2acfcb..bcd393c4 100644
--- a/chrome/browser/resources/extensions/detail_view.ts
+++ b/chrome/browser/resources/extensions/detail_view.ts
@@ -148,7 +148,7 @@
     });
   }
 
-  private onActivityLogTap_() {
+  private onActivityLogClick_() {
     navigation.navigateTo({page: Page.ACTIVITY_LOG, extensionId: this.data.id});
   }
 
@@ -166,7 +166,7 @@
         'itemDetailsBackButtonRoleDescription', this.data.name);
   }
 
-  private onCloseButtonTap_() {
+  private onCloseButtonClick_() {
     navigation.navigateTo({page: Page.LIST});
   }
 
@@ -227,31 +227,31 @@
     this.$.enableToggle.checked = this.isEnabled_();
   }
 
-  private onInspectTap_(
+  private onInspectClick_(
       e: DomRepeatEvent<chrome.developerPrivate.ExtensionView>) {
     this.delegate.inspectItemView(this.data.id, e.model.item);
   }
 
-  private onExtensionOptionsTap_() {
+  private onExtensionOptionsClick_() {
     this.delegate.showItemOptionsPage(this.data);
   }
 
-  private onReloadTap_() {
+  private onReloadClick_() {
     this.delegate.reloadItem(this.data.id).catch(loadError => {
       this.dispatchEvent(new CustomEvent(
           'load-error', {bubbles: true, composed: true, detail: loadError}));
     });
   }
 
-  private onRemoveTap_() {
+  private onRemoveClick_() {
     this.delegate.deleteItem(this.data.id);
   }
 
-  private onRepairTap_() {
+  private onRepairClick_() {
     this.delegate.repairItem(this.data.id);
   }
 
-  private onLoadPathTap_() {
+  private onLoadPathClick_() {
     this.delegate.showInFolder(this.data.id);
   }
 
@@ -279,7 +279,7 @@
                 '#collect-errors')!.checked);
   }
 
-  private onExtensionWebSiteTap_() {
+  private onExtensionWebSiteClick_() {
     this.delegate.openUrl(this.data.manifestHomePageUrl);
   }
 
@@ -289,7 +289,7 @@
             this.data.id}`);
   }
 
-  private onViewInStoreTap_() {
+  private onViewInStoreClick_() {
     this.delegate.openUrl(this.data.webStoreUrl);
   }
 

chrome/browser/resources/extensions/error_page.html

diff --git a/chrome/browser/resources/extensions/error_page.html b/chrome/browser/resources/extensions/error_page.html
index 022c85a9..4876d33 100644
--- a/chrome/browser/resources/extensions/error_page.html
+++ b/chrome/browser/resources/extensions/error_page.html
@@ -116,10 +116,10 @@
   <div class="page-content">
     <div id="heading" class="cr-title-text">
       <cr-icon-button class="icon-arrow-back no-overlap" id="closeButton"
-          aria-label="$i18n{back}" on-click="onCloseButtonTap_">
+          aria-label="$i18n{back}" on-click="onCloseButtonClick_">
       </cr-icon-button>
       <span role="heading" aria-level="2">$i18n{errorsPageHeading}</span>
-      <cr-button on-click="onClearAllTap_" hidden="[[!entries_.length]]">
+      <cr-button on-click="onClearAllClick_" hidden="[[!entries_.length]]">
         $i18n{clearAll}
       </cr-button>
     </div>
@@ -167,7 +167,7 @@
                   <ul class="stack-trace-container"
                       on-keydown="onStackKeydown_">
                     <template is="dom-repeat" items="[[item.stackTrace]]">
-                      <li on-click="onStackFrameTap_"
+                      <li on-click="onStackFrameClick_"
                           tabindex$="[[getStackFrameTabIndex_(item,
                               selectedStackFrame_)]]"
                           hidden="[[!shouldDisplayFrame_(item.url)]]"

chrome/browser/resources/extensions/error_page.ts

diff --git a/chrome/browser/resources/extensions/error_page.ts b/chrome/browser/resources/extensions/error_page.ts
index ef92f6b..3b5bdf4 100644
--- a/chrome/browser/resources/extensions/error_page.ts
+++ b/chrome/browser/resources/extensions/error_page.ts
@@ -168,11 +168,11 @@
     }
   }
 
-  private onCloseButtonTap_() {
+  private onCloseButtonClick_() {
     navigation.navigateTo({page: Page.LIST});
   }
 
-  private onClearAllTap_() {
+  private onClearAllClick_() {
     const ids = this.entries_.map(entry => entry.id);
     this.delegate.deleteErrors(this.data.id, ids);
   }
@@ -198,7 +198,7 @@
     if (!this.inDevMode) {
       // Wait until next render cycle in case error page is loading.
       setTimeout(() => {
-        this.onCloseButtonTap_();
+        this.onCloseButtonClick_();
       }, 0);
     }
   }
@@ -307,7 +307,7 @@
         .then(code => this.code_ = code);
   }
 
-  private onStackFrameTap_(
+  private onStackFrameClick_(
       e: DomRepeatEvent<chrome.developerPrivate.StackFrame>) {
     const frame = e.model.item;
     this.updateSelected_(frame);

chrome/browser/resources/extensions/install_warnings_dialog.html

diff --git a/chrome/browser/resources/extensions/install_warnings_dialog.html b/chrome/browser/resources/extensions/install_warnings_dialog.html
index abd531cd..34c68870 100644
--- a/chrome/browser/resources/extensions/install_warnings_dialog.html
+++ b/chrome/browser/resources/extensions/install_warnings_dialog.html
@@ -25,7 +25,7 @@
     </ul>
   </div>
   <div slot="button-container">
-    <cr-button class="action-button" on-click="onOkTap_">
+    <cr-button class="action-button" on-click="onOkClick_">
       $i18n{ok}
     </cr-button>
   </div>

chrome/browser/resources/extensions/install_warnings_dialog.ts

diff --git a/chrome/browser/resources/extensions/install_warnings_dialog.ts b/chrome/browser/resources/extensions/install_warnings_dialog.ts
index db047f92e..7670d8d 100644
--- a/chrome/browser/resources/extensions/install_warnings_dialog.ts
+++ b/chrome/browser/resources/extensions/install_warnings_dialog.ts
@@ -41,7 +41,7 @@
     this.$.dialog.showModal();
   }
 
-  private onOkTap_() {
+  private onOkClick_() {
     this.$.dialog.close();
   }
 }

chrome/browser/resources/extensions/item.html

diff --git a/chrome/browser/resources/extensions/item.html b/chrome/browser/resources/extensions/item.html
index cc6c9a15..fae1fb3f 100644
--- a/chrome/browser/resources/extensions/item.html
+++ b/chrome/browser/resources/extensions/item.html
@@ -282,12 +282,12 @@
               </span>
               <a class="clippable-flex-text" is="action-link"
                   title="[[computeFirstInspectTitle_(firstInspectView_)]]"
-                  on-click="onInspectTap_">
+                  on-click="onInspectClick_">
                 [[computeFirstInspectLabel_(firstInspectView_)]]
               </a>
               <a is="action-link"
                   hidden$="[[computeExtraViewsHidden_(data.views)]]"
-                  on-click="onExtraInspectTap_">
+                  on-click="onExtraInspectClick_">
                 &nbsp;[[computeExtraInspectLabel_(data.views)]]
               </a>
             </div>
@@ -298,17 +298,17 @@
   </div>
   <div id="button-strip" class="layout horizontal center cr-secondary-text">
     <div class="layout flex horizontal center">
-      <cr-button id="detailsButton" on-click="onDetailsTap_"
+      <cr-button id="detailsButton" on-click="onDetailsClick_"
           aria-describedby="a11yAssociation">
         $i18n{itemDetails}
       </cr-button>
-      <cr-button id="removeButton" on-click="onRemoveTap_"
+      <cr-button id="removeButton" on-click="onRemoveClick_"
           aria-describedby="a11yAssociation"
           hidden="[[data.mustRemainInstalled]]">
         $i18n{remove}
       </cr-button>
       <template is="dom-if" if="[[shouldShowErrorsButton_(data.*)]]">
-        <cr-button id="errors-button" on-click="onErrorsTap_"
+        <cr-button id="errors-button" on-click="onErrorsClick_"
             aria-describedby="a11yAssociation">
           $i18n{itemErrors}
         </cr-button>
@@ -317,17 +317,17 @@
     <template is="dom-if" if="[[!computeDevReloadButtonHidden_(data.*)]]">
       <cr-icon-button id="dev-reload-button" class="icon-refresh no-overlap"
           aria-label="$i18n{itemReload}" aria-describedby="a11yAssociation"
-          on-click="onReloadTap_"></cr-icon-button>
+          on-click="onReloadClick_"></cr-icon-button>
     </template>
     <template is="dom-if"
         if="[[showRepairButton_(data.disableReasons.corruptInstall)]]">
       <cr-button id="repair-button" class="action-button"
-          aria-describedby="a11yAssociation" on-click="onRepairTap_">
+          aria-describedby="a11yAssociation" on-click="onRepairClick_">
         $i18n{itemRepair}
       </cr-button>
     </template>
     <template is="dom-if" if="[[showReloadButton_(data.state)]]">
-      <cr-button id="terminated-reload-button" on-click="onReloadTap_"
+      <cr-button id="terminated-reload-button" on-click="onReloadClick_"
           aria-describedby="a11yAssociation" class="action-button">
         $i18n{itemReload}
       </cr-button>

chrome/browser/resources/extensions/item.ts

diff --git a/chrome/browser/resources/extensions/item.ts b/chrome/browser/resources/extensions/item.ts
index 4ab6c10..d0923f2 100644
--- a/chrome/browser/resources/extensions/item.ts
+++ b/chrome/browser/resources/extensions/item.ts
@@ -158,7 +158,7 @@
         this.data.runtimeErrors.length > 0;
   }
 
-  private onRemoveTap_() {
+  private onRemoveClick_() {
     this.delegate.deleteItem(this.data.id);
   }
 
@@ -167,7 +167,7 @@
     this.$.enableToggle.checked = this.isEnabled_();
   }
 
-  private onErrorsTap_() {
+  private onErrorsClick_() {
     if (this.data.installWarnings && this.data.installWarnings.length > 0) {
       this.fire_('show-install-warnings', this.data.installWarnings);
       return;
@@ -176,7 +176,7 @@
     navigation.navigateTo({page: Page.ERRORS, extensionId: this.data.id});
   }
 
-  private onDetailsTap_() {
+  private onDetailsClick_() {
     navigation.navigateTo({page: Page.DETAILS, extensionId: this.data.id});
   }
 
@@ -184,15 +184,15 @@
     return sortViews(this.data.views)[0];
   }
 
-  private onInspectTap_() {
+  private onInspectClick_() {
     this.delegate.inspectItemView(this.data.id, this.firstInspectView_);
   }
 
-  private onExtraInspectTap_() {
+  private onExtraInspectClick_() {
     navigation.navigateTo({page: Page.DETAILS, extensionId: this.data.id});
   }
 
-  private onReloadTap_() {
+  private onReloadClick_() {
     // Don't reload if in the middle of an update.
     if (this.isReloading_) {
       return;
@@ -219,7 +219,7 @@
             });
   }
 
-  private onRepairTap_() {
+  private onRepairClick_() {
     this.delegate.repairItem(this.data.id);
   }
 

chrome/browser/resources/extensions/item_list.html

diff --git a/chrome/browser/resources/extensions/item_list.html b/chrome/browser/resources/extensions/item_list.html
index 8b74a37c..a36e49a 100644
--- a/chrome/browser/resources/extensions/item_list.html
+++ b/chrome/browser/resources/extensions/item_list.html
@@ -83,7 +83,7 @@
     <div id="no-items" class="empty-list-message"
         hidden$="[[!shouldShowEmptyItemsMessage_(
             apps.length, extensions.length)]]">
-      <span on-click="onNoExtensionsTap_">
+      <span on-click="onNoExtensionsClick_">
         $i18nRaw{noExtensionsOrApps}
       </span>
     </div>

chrome/browser/resources/extensions/item_list.ts

diff --git a/chrome/browser/resources/extensions/item_list.ts b/chrome/browser/resources/extensions/item_list.ts
index 7b813a3..ab09b94c 100644
--- a/chrome/browser/resources/extensions/item_list.ts
+++ b/chrome/browser/resources/extensions/item_list.ts
@@ -117,7 +117,7 @@
         this.shownExtensionsCount_ === 0;
   }
 
-  private onNoExtensionsTap_(e: Event) {
+  private onNoExtensionsClick_(e: Event) {
     if ((e.target as HTMLElement).tagName === 'A') {
       chrome.metricsPrivate.recordUserAction('Options_GetMoreExtensions');
     }

chrome/browser/resources/extensions/kiosk_dialog.html

diff --git a/chrome/browser/resources/extensions/kiosk_dialog.html b/chrome/browser/resources/extensions/kiosk_dialog.html
index 50818e20..0af1c9de 100644
--- a/chrome/browser/resources/extensions/kiosk_dialog.html
+++ b/chrome/browser/resources/extensions/kiosk_dialog.html
@@ -66,13 +66,13 @@
           </div>
           <div class="item-controls">
             <cr-button hidden="[[!canEditAutoLaunch_]]"
-                on-click="onAutoLaunchButtonTap_">
+                on-click="onAutoLaunchButtonClick_">
               [[getAutoLaunchButtonLabel_(item.autoLaunch,
                   '$i18nPolymer{kioskDisableAutoLaunch}',
                   '$i18nPolymer{kioskEnableAutoLaunch}')]]
             </cr-button>
             <cr-icon-button class="icon-delete-gray"
-                on-click="onDeleteAppTap_"></cr-icon-button>
+                on-click="onDeleteAppClick_"></cr-icon-button>
           </div>
         </div>
       </template>
@@ -83,7 +83,7 @@
           invalid="[[errorAppId_]]" on-keydown="clearInputInvalid_"
           error-message="[[getErrorMessage_(
               '$i18nPolymer{kioskInvalidApp}', errorAppId_)]]">
-        <cr-button id="addButton" on-click="onAddAppTap_"
+        <cr-button id="addButton" on-click="onAddAppClick_"
             disabled="[[!addAppInput_]]" slot="suffix">
           $i18n{add}
         </cr-button>
@@ -96,7 +96,7 @@
     </cr-checkbox>
   </div>
   <div slot="button-container">
-    <cr-button class="action-button" on-click="onDoneTap_">
+    <cr-button class="action-button" on-click="onDoneClick_">
       $i18n{done}
     </cr-button>
   </div>
@@ -106,10 +106,10 @@
   <div slot="title">$i18n{kioskDisableBailoutWarningTitle}</div>
   <div slot="body">$i18n{kioskDisableBailoutWarningBody}</div>
   <div slot="button-container">
-    <cr-button class="cancel-button" on-click="onBailoutDialogCancelTap_">
+    <cr-button class="cancel-button" on-click="onBailoutDialogCancelClick_">
       $i18n{cancel}
     </cr-button>
-    <cr-button class="action-button" on-click="onBailoutDialogConfirmTap_">
+    <cr-button class="action-button" on-click="onBailoutDialogConfirmClick_">
       $i18n{confirm}
     </cr-button>
   </div>

chrome/browser/resources/extensions/kiosk_dialog.ts

diff --git a/chrome/browser/resources/extensions/kiosk_dialog.ts b/chrome/browser/resources/extensions/kiosk_dialog.ts
index cc016426..9b9c7fa9 100644
--- a/chrome/browser/resources/extensions/kiosk_dialog.ts
+++ b/chrome/browser/resources/extensions/kiosk_dialog.ts
@@ -106,7 +106,7 @@
     return this.errorAppId_ + ' ' + errorMessage;
   }
 
-  private onAddAppTap_() {
+  private onAddAppClick_() {
     assert(this.addAppInput_);
     this.kioskBrowserProxy_.addKioskApp(this.addAppInput_);
     this.addAppInput_ = null;
@@ -116,7 +116,7 @@
     this.errorAppId_ = null;
   }
 
-  private onAutoLaunchButtonTap_(event: DomRepeatEvent<KioskApp>) {
+  private onAutoLaunchButtonClick_(event: DomRepeatEvent<KioskApp>) {
     const app = event.model.item;
     if (app.autoLaunch) {  // If the app is originally set to
                            // auto-launch.
@@ -136,21 +136,21 @@
     }
   }
 
-  private onBailoutDialogCancelTap_() {
+  private onBailoutDialogCancelClick_() {
     this.$.bailout.checked = false;
     this.$.confirmDialog.cancel();
   }
 
-  private onBailoutDialogConfirmTap_() {
+  private onBailoutDialogConfirmClick_() {
     this.kioskBrowserProxy_.setDisableBailoutShortcut(true);
     this.$.confirmDialog.close();
   }
 
-  private onDoneTap_() {
+  private onDoneClick_() {
     this.$.dialog.close();
   }
 
-  private onDeleteAppTap_(event: DomRepeatEvent<KioskApp>) {
+  private onDeleteAppClick_(event: DomRepeatEvent<KioskApp>) {
     this.kioskBrowserProxy_.removeKioskApp(event.model.item.id);
   }
 

chrome/browser/resources/extensions/load_error.html

diff --git a/chrome/browser/resources/extensions/load_error.html b/chrome/browser/resources/extensions/load_error.html
index 804fc40..d59e3ab 100644
--- a/chrome/browser/resources/extensions/load_error.html
+++ b/chrome/browser/resources/extensions/load_error.html
@@ -35,7 +35,7 @@
       $i18n{cancel}
     </cr-button>
     <cr-button class="action-button" disabled="[[retrying_]]"
-        on-click="onRetryTap_">
+        on-click="onRetryClick_">
       $i18n{loadErrorRetry}
     </cr-button>
   </div>

chrome/browser/resources/extensions/load_error.ts

diff --git a/chrome/browser/resources/extensions/load_error.ts b/chrome/browser/resources/extensions/load_error.ts
index e02f7d9..e5577b1e 100644
--- a/chrome/browser/resources/extensions/load_error.ts
+++ b/chrome/browser/resources/extensions/load_error.ts
@@ -65,7 +65,7 @@
     this.$.dialog.close();
   }
 
-  private onRetryTap_() {
+  private onRetryClick_() {
     this.retrying_ = true;
     this.delegate.retryLoadUnpacked(this.loadError.retryGuid)
         .then(

chrome/browser/resources/extensions/manager.html

diff --git a/chrome/browser/resources/extensions/manager.html b/chrome/browser/resources/extensions/manager.html
index 8945c4ae..ee189122 100644
--- a/chrome/browser/resources/extensions/manager.html
+++ b/chrome/browser/resources/extensions/manager.html
@@ -26,11 +26,11 @@
     can-load-unpacked="[[canLoadUnpacked]]"
     is-child-account="[[isChildAccount_]]"
     dev-mode-controlled-by-policy="[[devModeControlledByPolicy]]"
-    delegate="[[delegate]]" on-cr-toolbar-menu-tap="onMenuButtonTap_"
+    delegate="[[delegate]]" on-cr-toolbar-menu-tap="onMenuButtonClick_"
     on-search-changed="onFilterChanged_"
     extensions="[[extensions_]]"
 <if expr="chromeos_ash">
-    on-kiosk-tap="onKioskTap_"
+    on-kiosk-tap="onKioskClick_"
     kiosk-enabled="[[kioskEnabled_]]"
 </if>
     >

chrome/browser/resources/extensions/manager.ts

diff --git a/chrome/browser/resources/extensions/manager.ts b/chrome/browser/resources/extensions/manager.ts
index 81fe22a..6df555b9 100644
--- a/chrome/browser/resources/extensions/manager.ts
+++ b/chrome/browser/resources/extensions/manager.ts
@@ -390,7 +390,7 @@
     this.filter = event.detail;
   }
 
-  private onMenuButtonTap_() {
+  private onMenuButtonClick_() {
     this.showDrawer_ = true;
     setTimeout(() => {
       this.shadowRoot!.querySelector('cr-drawer')!.openDrawer();
@@ -691,7 +691,7 @@
   }
 
   // <if expr="chromeos_ash">
-  private onKioskTap_() {
+  private onKioskClick_() {
     this.showKioskDialog_ = true;
   }
 

chrome/browser/resources/extensions/pack_dialog.html

diff --git a/chrome/browser/resources/extensions/pack_dialog.html b/chrome/browser/resources/extensions/pack_dialog.html
index f61b394..77a1e50 100644
--- a/chrome/browser/resources/extensions/pack_dialog.html
+++ b/chrome/browser/resources/extensions/pack_dialog.html
@@ -33,10 +33,10 @@
     </cr-input>
   </div>
   <div slot="button-container">
-    <cr-button class="cancel-button" on-click="onCancelTap_">
+    <cr-button class="cancel-button" on-click="onCancelClick_">
       $i18n{cancel}
     </cr-button>
-    <cr-button class="action-button" on-click="onConfirmTap_"
+    <cr-button class="action-button" on-click="onConfirmClick_"
         disabled="[[!packDirectory_]]">
       $i18n{packDialogConfirm}
     </cr-button>

chrome/browser/resources/extensions/pack_dialog.ts

diff --git a/chrome/browser/resources/extensions/pack_dialog.ts b/chrome/browser/resources/extensions/pack_dialog.ts
index 5e7f35b..f5a83e13 100644
--- a/chrome/browser/resources/extensions/pack_dialog.ts
+++ b/chrome/browser/resources/extensions/pack_dialog.ts
@@ -93,11 +93,11 @@
     });
   }
 
-  private onCancelTap_() {
+  private onCancelClick_() {
     this.$.dialog.cancel();
   }
 
-  private onConfirmTap_() {
+  private onConfirmClick_() {
     this.delegate.packExtension(this.packDirectory_, this.keyFile_, 0)
         .then(response => this.onPackResponse_(response));
   }

chrome/browser/resources/extensions/pack_dialog_alert.html

diff --git a/chrome/browser/resources/extensions/pack_dialog_alert.html b/chrome/browser/resources/extensions/pack_dialog_alert.html
index 79fc2f7..d99408e 100644
--- a/chrome/browser/resources/extensions/pack_dialog_alert.html
+++ b/chrome/browser/resources/extensions/pack_dialog_alert.html
@@ -11,10 +11,10 @@
   <div class="body" slot="body">[[model.message]]</div>
   <div class="button-container" slot="button-container">
     <cr-button class$="[[getCancelButtonClass_(confirmLabel_)]]"
-        on-click="onCancelTap_" hidden="[[!cancelLabel_]]">
+        on-click="onCancelClick_" hidden="[[!cancelLabel_]]">
       [[cancelLabel_]]
     </cr-button>
-    <cr-button class="action-button" on-click="onConfirmTap_"
+    <cr-button class="action-button" on-click="onConfirmClick_"
         hidden="[[!confirmLabel_]]">
       [[confirmLabel_]]
     </cr-button>

chrome/browser/resources/extensions/pack_dialog_alert.ts

diff --git a/chrome/browser/resources/extensions/pack_dialog_alert.ts b/chrome/browser/resources/extensions/pack_dialog_alert.ts
index 5b23af5b..1b2f902 100644
--- a/chrome/browser/resources/extensions/pack_dialog_alert.ts
+++ b/chrome/browser/resources/extensions/pack_dialog_alert.ts
@@ -84,11 +84,11 @@
     return this.confirmLabel_ ? 'cancel-button' : 'action-button';
   }
 
-  private onCancelTap_() {
+  private onCancelClick_() {
     this.$.dialog.cancel();
   }
 
-  private onConfirmTap_() {
+  private onConfirmClick_() {
     // The confirm button should only be available in WARNING state.
     assert(this.model.status === chrome.developerPrivate.PackStatus.WARNING);
     this.$.dialog.close();

chrome/browser/resources/extensions/runtime_hosts_dialog.html

diff --git a/chrome/browser/resources/extensions/runtime_hosts_dialog.html b/chrome/browser/resources/extensions/runtime_hosts_dialog.html
index 973d484..1fdbe62 100644
--- a/chrome/browser/resources/extensions/runtime_hosts_dialog.html
+++ b/chrome/browser/resources/extensions/runtime_hosts_dialog.html
@@ -17,10 +17,10 @@
     </div>
   </div>
   <div slot="button-container">
-    <cr-button class="cancel-button" on-click="onCancelTap_">
+    <cr-button class="cancel-button" on-click="onCancelClick_">
       $i18n{cancel}
     </cr-button>
-    <cr-button class="action-button" id="submit" on-click="onSubmitTap_"
+    <cr-button class="action-button" id="submit" on-click="onSubmitClick_"
         disabled="[[computeSubmitButtonDisabled_(inputInvalid_, site_)]]">
       [[computeSubmitButtonLabel_(currentSite)]]
     </cr-button>

chrome/browser/resources/extensions/runtime_hosts_dialog.ts

diff --git a/chrome/browser/resources/extensions/runtime_hosts_dialog.ts b/chrome/browser/resources/extensions/runtime_hosts_dialog.ts
index b7afefd..8ffc28b 100644
--- a/chrome/browser/resources/extensions/runtime_hosts_dialog.ts
+++ b/chrome/browser/resources/extensions/runtime_hosts_dialog.ts
@@ -215,7 +215,7 @@
     return getMatchingUserSpecifiedSites(this.restrictedSites, this.site_);
   }
 
-  private onCancelTap_() {
+  private onCancelClick_() {
     this.$.dialog.cancel();
   }
 
@@ -223,7 +223,7 @@
    * The tap handler for the submit button (adds the pattern and closes
    * the dialog).
    */
-  private onSubmitTap_() {
+  private onSubmitClick_() {
     chrome.metricsPrivate.recordUserAction(
         'Extensions.Settings.Hosts.AddHostDialogSubmitted');
     if (this.currentSite !== null) {

chrome/browser/resources/extensions/sidebar.html

diff --git a/chrome/browser/resources/extensions/sidebar.html b/chrome/browser/resources/extensions/sidebar.html
index a7e4de0d..1fe5404d 100644
--- a/chrome/browser/resources/extensions/sidebar.html
+++ b/chrome/browser/resources/extensions/sidebar.html
@@ -59,19 +59,19 @@
 <iron-selector id="sectionMenu">
   <!-- Values for "data-path" attribute must match the "Page" enum. -->
   <a class="section-item" id="sectionsExtensions" href="/"
-      on-click="onLinkTap_" data-path="items-list">
+      on-click="onLinkClick_" data-path="items-list">
     $i18n{sidebarExtensions}
     <paper-ripple></paper-ripple>
   </a>
   <a class="section-item" id="sections-site-permissions"
       hidden="[[!enableEnhancedSiteControls]]"
-      href="/sitePermissions" on-click="onLinkTap_"
+      href="/sitePermissions" on-click="onLinkClick_"
       data-path="site-permissions">
     $i18n{sitePermissions}
     <paper-ripple></paper-ripple>
   </a>
   <a class="section-item" id="sectionsShortcuts" href="/shortcuts"
-      on-click="onLinkTap_" data-path="keyboard-shortcuts">
+      on-click="onLinkClick_" data-path="keyboard-shortcuts">
     $i18n{keyboardShortcuts}
     <paper-ripple></paper-ripple>
   </a>
@@ -79,7 +79,7 @@
 <div>
   <div class="separator"></div>
   <a class="section-item" id="more-extensions" target="_blank"
-      href="$i18n{getMoreExtensionsUrl}" on-click="onMoreExtensionsTap_">
+      href="$i18n{getMoreExtensionsUrl}" on-click="onMoreExtensionsClick_">
     <span>$i18n{openChromeWebStore}</span>
     <div class="cr-icon icon-external"></div>
     <paper-ripple></paper-ripple>

chrome/browser/resources/extensions/sidebar.ts

diff --git a/chrome/browser/resources/extensions/sidebar.ts b/chrome/browser/resources/extensions/sidebar.ts
index 84501e04..9096e709 100644
--- a/chrome/browser/resources/extensions/sidebar.ts
+++ b/chrome/browser/resources/extensions/sidebar.ts
@@ -57,7 +57,7 @@
     this.$.sectionMenu.select(selectIndex);
   }
 
-  private onLinkTap_(e: Event) {
+  private onLinkClick_(e: Event) {
     e.preventDefault();
     navigation.navigateTo(
         {page: ((e.target as HTMLElement).dataset['path'] as Page)});
@@ -65,7 +65,7 @@
         new CustomEvent('close-drawer', {bubbles: true, composed: true}));
   }
 
-  private onMoreExtensionsTap_() {
+  private onMoreExtensionsClick_() {
     chrome.metricsPrivate.recordUserAction('Options_GetMoreExtensions');
   }
 }

chrome/browser/resources/extensions/toggle_row.ts

diff --git a/chrome/browser/resources/extensions/toggle_row.ts b/chrome/browser/resources/extensions/toggle_row.ts
index fb5d34e..5276e6b 100644
--- a/chrome/browser/resources/extensions/toggle_row.ts
+++ b/chrome/browser/resources/extensions/toggle_row.ts
@@ -62,7 +62,7 @@
     // Even though the native checkbox is hidden and can't be actually
     // cilcked/tapped by the user, because it resides within the <label> the
     // browser emits an extraneous event when the label is clicked. Stop
-    // propagation so that it does not interfere with |onLabelTap_| listener.
+    // propagation so that it does not interfere with |onLabelClick_| listener.
     e.stopPropagation();
   }
 

chrome/browser/resources/extensions/toolbar.html

diff --git a/chrome/browser/resources/extensions/toolbar.html b/chrome/browser/resources/extensions/toolbar.html
index eac706a..f633b87 100644
--- a/chrome/browser/resources/extensions/toolbar.html
+++ b/chrome/browser/resources/extensions/toolbar.html
@@ -95,18 +95,18 @@
 <div id="devDrawer" expanded$="[[expanded_]]">
   <div id="buttonStrip">
     <cr-button hidden$="[[!canLoadUnpacked]]" id="loadUnpacked"
-        on-click="onLoadUnpackedTap_">
+        on-click="onLoadUnpackedClick_">
       $i18n{toolbarLoadUnpacked}
     </cr-button>
-    <cr-button id="packExtensions" on-click="onPackTap_">
+    <cr-button id="packExtensions" on-click="onPackClick_">
       $i18n{toolbarPack}
     </cr-button>
-    <cr-button id="updateNow" on-click="onUpdateNowTap_"
+    <cr-button id="updateNow" on-click="onUpdateNowClick_"
         title="$i18n{toolbarUpdateNowTooltip}">
       $i18n{toolbarUpdateNow}
     </cr-button>
 <if expr="chromeos_ash">
-    <cr-button id="kioskExtensions" on-click="onKioskTap_"
+    <cr-button id="kioskExtensions" on-click="onKioskClick_"
         hidden$="[[!kioskEnabled]]">
       $i18n{manageKioskApp}
     </cr-button>

chrome/browser/resources/extensions/toolbar.ts

diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/resources/extensions/toolbar.ts
index 69bbef6..d0c94f5 100644
--- a/chrome/browser/resources/extensions/toolbar.ts
+++ b/chrome/browser/resources/extensions/toolbar.ts
@@ -159,7 +159,7 @@
     this.expanded_ = !this.expanded_;
   }
 
-  private onLoadUnpackedTap_() {
+  private onLoadUnpackedClick_() {
     this.delegate.loadUnpacked()
         .then((success) => {
           if (success) {
@@ -174,7 +174,7 @@
     chrome.metricsPrivate.recordUserAction('Options_LoadUnpackedExtension');
   }
 
-  private onPackTap_() {
+  private onPackClick_() {
     chrome.metricsPrivate.recordUserAction('Options_PackExtension');
     this.showPackDialog_ = true;
   }
@@ -185,12 +185,12 @@
   }
 
   // <if expr="chromeos_ash">
-  private onKioskTap_() {
+  private onKioskClick_() {
     this.fire_('kiosk-tap');
   }
   // </if>
 
-  private onUpdateNowTap_() {
+  private onUpdateNowClick_() {
     // If already updating, do not initiate another update.
     if (this.isUpdating_) {
       return;

chrome/browser/resources/new_tab_page/modules/history_clusters/tile.ts

diff --git a/chrome/browser/resources/new_tab_page/modules/history_clusters/tile.ts b/chrome/browser/resources/new_tab_page/modules/history_clusters/tile.ts
index 953672bd..67c82ea 100644
--- a/chrome/browser/resources/new_tab_page/modules/history_clusters/tile.ts
+++ b/chrome/browser/resources/new_tab_page/modules/history_clusters/tile.ts
@@ -57,6 +57,7 @@
       smallFormat: {
         type: Boolean,
         value: false,
+        reflectToAttribute: true,
       },
     };
   }

chrome/browser/resources/new_tab_page/realbox/realbox.html

diff --git a/chrome/browser/resources/new_tab_page/realbox/realbox.html b/chrome/browser/resources/new_tab_page/realbox/realbox.html
index e73b1e2..a4cbc43 100644
--- a/chrome/browser/resources/new_tab_page/realbox/realbox.html
+++ b/chrome/browser/resources/new_tab_page/realbox/realbox.html
@@ -17,18 +17,18 @@
   }
 
   /**
-   * Maintain a larger width if at any point had secondary matches and they can
-   * currently be shown.
+   * Maintain a larger width if the secondary side can be shown and was at any
+   * point available to be shown.
    */
-  :host([can-show-secondary-matches][had-secondary-matches]) {
+  :host([can-show-secondary-side][had-secondary-side]) {
     --cr-realbox-width: calc(var(--cr-realbox-min-width) * 1.5);
   }
 
   /**
-   * Show the secondary side if currently having secondary matches and they can
-   * currently be shown.
+   * Show the secondary side if it can be shown and is currently available to be
+   * shown.
    */
-  :host([can-show-secondary-matches][has-secondary-matches]) {
+  :host([can-show-secondary-side][has-secondary-side]) {
     --cr-realbox-secondary-side-display: block;
   }
 
@@ -224,9 +224,9 @@
   </template>
   <cr-realbox-dropdown id="matches" role="listbox" result="[[result_]]"
       selected-match-index="{{selectedMatchIndex_}}"
-      can-show-secondary-matches="[[canShowSecondaryMatches]]"
-      had-secondary-matches="{{hadSecondaryMatches}}"
-      has-secondary-matches="{{hasSecondaryMatches}}"
+      can-show-secondary-side="[[canShowSecondarySide]]"
+      had-secondary-side="{{hadSecondarySide}}"
+      has-secondary-side="{{hasSecondarySide}}"
       on-result-repaint="onResultRepaint_" on-match-focusin="onMatchFocusin_"
       on-match-click="onMatchClick_" on-match-remove="onMatchRemove_"
       on-header-focusin="onHeaderFocusin_" hidden$="[[!matchesAreVisible]]">

chrome/browser/resources/new_tab_page/realbox/realbox.ts

diff --git a/chrome/browser/resources/new_tab_page/realbox/realbox.ts b/chrome/browser/resources/new_tab_page/realbox/realbox.ts
index 74abbf6..4a9b5dbe 100644
--- a/chrome/browser/resources/new_tab_page/realbox/realbox.ts
+++ b/chrome/browser/resources/new_tab_page/realbox/realbox.ts
@@ -20,8 +20,7 @@
 import {getTemplate} from './realbox.html.js';
 
 // 900px ~= 561px (max value for --ntp-search-box-width) * 1.5 + some margin.
-const showSecondaryMatchesMediaQueryList =
-    window.matchMedia('(min-width: 900px)');
+const showSecondarySideMediaQueryList = window.matchMedia('(min-width: 900px)');
 
 interface Input {
   text: string;
@@ -60,22 +59,29 @@
       // Public properties
       //========================================================================
 
-      /** Whether secondary matches can be shown. */
-      canShowSecondaryMatches: {
+      /**
+       * Whether the secondary side can be shown based on the feature state and
+       * the width available to the dropdown.
+       */
+      canShowSecondarySide: {
         type: Boolean,
-        value: () => showSecondaryMatchesMediaQueryList.matches &&
+        value: () => showSecondarySideMediaQueryList.matches &&
             loadTimeData.getBoolean('showSecondarySide'),
         reflectToAttribute: true,
       },
 
-      /** Whether secondary matches were at any point available to show. */
-      hadSecondaryMatches: {
+      /**
+       * Whether the secondary side was at any point available to be shown.
+       */
+      hadSecondarySide: {
         type: Boolean,
         reflectToAttribute: true,
       },
 
-      /** Whether secondary matches are currently available to show. */
-      hasSecondaryMatches: {
+      /*
+       * Whether the secondary side is currently available to be shown.
+       */
+      hasSecondarySide: {
         type: Boolean,
         reflectToAttribute: true,
       },
@@ -220,12 +226,13 @@
     };
   }
 
-  canShowSecondaryMatches: boolean;
+  canShowSecondarySide: boolean;
+  hadSecondarySide: boolean;
+  hasSecondarySide: boolean;
   isDark: boolean;
   matchesAreVisible: boolean;
   matchSearchbox: boolean;
   realboxLensSearchEnabled: boolean;
-  hadSecondaryMatches: boolean;
   singleColoredIcons: boolean;
   private charTypedTime_: number;
   private inputAriaLive_: string;
@@ -261,8 +268,8 @@
     this.autocompleteResultChangedListenerId_ =
         this.callbackRouter_.autocompleteResultChanged.addListener(
             this.onAutocompleteResultChanged_.bind(this));
-    showSecondaryMatchesMediaQueryList.addEventListener(
-        'change', this.onCanShowSecondaryMatchesChanged_.bind(this));
+    showSecondarySideMediaQueryList.addEventListener(
+        'change', this.onCanShowSecondarySideChanged_.bind(this));
   }
 
   override disconnectedCallback() {
@@ -270,8 +277,8 @@
     assert(this.autocompleteResultChangedListenerId_);
     this.callbackRouter_.removeListener(
         this.autocompleteResultChangedListenerId_);
-    showSecondaryMatchesMediaQueryList.removeEventListener(
-        'change', this.onCanShowSecondaryMatchesChanged_.bind(this));
+    showSecondarySideMediaQueryList.removeEventListener(
+        'change', this.onCanShowSecondarySideChanged_.bind(this));
   }
 
   override ready() {
@@ -333,8 +340,8 @@
   // Event handlers
   //============================================================================
 
-  private onCanShowSecondaryMatchesChanged_(e: MediaQueryListEvent) {
-    this.canShowSecondaryMatches =
+  private onCanShowSecondarySideChanged_(e: MediaQueryListEvent) {
+    this.canShowSecondarySide =
         e.matches && loadTimeData.getBoolean('showSecondarySide');
   }
 

chrome/browser/resources/omnibox_popup/app.html

diff --git a/chrome/browser/resources/omnibox_popup/app.html b/chrome/browser/resources/omnibox_popup/app.html
index 21d2e111..94133ea 100644
--- a/chrome/browser/resources/omnibox_popup/app.html
+++ b/chrome/browser/resources/omnibox_popup/app.html
@@ -5,12 +5,16 @@
     font-size: 14.6px; /* closely resembles the omnibox input font size. */
   }
 
-  :host([can-show-secondary-matches][has-secondary-matches]) {
+  /**
+   * Show the secondary side if it can be shown and is currently available to be
+   * shown.
+   */
+  :host([can-show-secondary-side][has-secondary-side]) {
     --cr-realbox-secondary-side-display: block;
   }
 </style>
 <cr-realbox-dropdown id="matches" result="[[result_]]"
-    has-secondary-matches="{{hasSecondaryMatches}}"
-    can-show-secondary-matches="[[canShowSecondaryMatches]]"
+    can-show-secondary-side="[[canShowSecondarySide]]"
+    has-secondary-side="{{hasSecondarySide}}"
     on-dom-change="onResultRepaint_">
 </cr-realbox-dropdown>

chrome/browser/resources/omnibox_popup/app.ts

diff --git a/chrome/browser/resources/omnibox_popup/app.ts b/chrome/browser/resources/omnibox_popup/app.ts
index 5e91c2b2..ca15224 100644
--- a/chrome/browser/resources/omnibox_popup/app.ts
+++ b/chrome/browser/resources/omnibox_popup/app.ts
@@ -17,8 +17,7 @@
 import {getTemplate} from './app.html.js';
 
 // 675px ~= 449px (--ntp-realbox-primary-side-min-width) * 1.5 + some margin.
-const showSecondaryMatchesMediaQueryList =
-    window.matchMedia('(min-width: 675px)');
+const showSecondarySideMediaQueryList = window.matchMedia('(min-width: 675px)');
 
 export interface OmniboxPopupAppElement {
   $: {
@@ -38,15 +37,21 @@
 
   static get properties() {
     return {
-      /** Whether secondary matches can be shown. */
-      canShowSecondaryMatches: {
+      /**
+       * Whether the secondary side can be shown based on the feature state and
+       * the width available to the dropdown.
+       */
+      canShowSecondarySide: {
         type: Boolean,
-        value: () => showSecondaryMatchesMediaQueryList.matches &&
+        value: () => showSecondarySideMediaQueryList.matches &&
             loadTimeData.getBoolean('showSecondarySide'),
         reflectToAttribute: true,
       },
 
-      hasSecondaryMatches: {
+      /*
+       * Whether the secondary side is currently available to be shown.
+       */
+      hasSecondarySide: {
         reflectToAttribute: true,
         type: Boolean,
       },
@@ -55,7 +60,8 @@
     };
   }
 
-  canShowSecondaryMatches: boolean;
+  canShowSecondarySide: boolean;
+  hasSecondarySide: boolean;
   private result_: AutocompleteResult;
 
   private callbackRouter_: PageCallbackRouter;
@@ -76,8 +82,8 @@
     this.selectMatchAtLineListenerId_ =
         this.callbackRouter_.selectMatchAtLine.addListener(
             this.onSelectMatchAtLine_.bind(this));
-    showSecondaryMatchesMediaQueryList.addEventListener(
-        'change', this.onCanShowSecondaryMatchesChanged_.bind(this));
+    showSecondarySideMediaQueryList.addEventListener(
+        'change', this.onCanShowSecondarySideChanged_.bind(this));
   }
 
   override disconnectedCallback() {
@@ -87,12 +93,12 @@
         this.omniboxAutocompleteResultChangedListenerId_);
     assert(this.selectMatchAtLineListenerId_);
     this.callbackRouter_.removeListener(this.selectMatchAtLineListenerId_);
-    showSecondaryMatchesMediaQueryList.removeEventListener(
-        'change', this.onCanShowSecondaryMatchesChanged_.bind(this));
+    showSecondarySideMediaQueryList.removeEventListener(
+        'change', this.onCanShowSecondarySideChanged_.bind(this));
   }
 
-  private onCanShowSecondaryMatchesChanged_(e: MediaQueryListEvent) {
-    this.canShowSecondaryMatches =
+  private onCanShowSecondarySideChanged_(e: MediaQueryListEvent) {
+    this.canShowSecondarySide =
         e.matches && loadTimeData.getBoolean('showSecondarySide');
   }
 

chrome/browser/resources/settings/chromeos/os_settings.gni

diff --git a/chrome/browser/resources/settings/chromeos/os_settings.gni b/chrome/browser/resources/settings/chromeos/os_settings.gni
index 34a31a95..e13dab8 100644
--- a/chrome/browser/resources/settings/chromeos/os_settings.gni
+++ b/chrome/browser/resources/settings/chromeos/os_settings.gni
@@ -416,7 +416,6 @@
   "focus_config.ts",
   "i18n_setup.ts",
   "lifetime_browser_proxy.ts",
-  "page_visibility.ts",
   "people_page/profile_info_browser_proxy.ts",
   "people_page/sync_browser_proxy.ts",
   "privacy_page/privacy_page_browser_proxy.ts",

chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java

diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java
index 1831c20..466220e3 100644
--- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java
+++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java
@@ -218,7 +218,7 @@
 
         /** Returns the cancel button string for the bottom sheet dialog. */
         @Override
-        public @StringRes int getCancelButton() {
+        public @StringRes int getDismissButton() {
             return R.string.cancel;
         }
     }

chrome/browser/signin/bound_session_credentials/registration_token_helper.h

diff --git a/chrome/browser/signin/bound_session_credentials/registration_token_helper.h b/chrome/browser/signin/bound_session_credentials/registration_token_helper.h
index 2269bdc..a827825 100644
--- a/chrome/browser/signin/bound_session_credentials/registration_token_helper.h
+++ b/chrome/browser/signin/bound_session_credentials/registration_token_helper.h
@@ -50,9 +50,10 @@
   RegistrationTokenHelper(const RegistrationTokenHelper&) = delete;
   RegistrationTokenHelper& operator=(const RegistrationTokenHelper&) = delete;
 
-  ~RegistrationTokenHelper();
+  virtual ~RegistrationTokenHelper();
 
-  void Start();
+  // virtual for testing.
+  virtual void Start();
 
  private:
   // Callback for `GenerateSigningKeySlowlyAsync()`.

chrome/browser/signin/chrome_signin_client_unittest.cc

diff --git a/chrome/browser/signin/chrome_signin_client_unittest.cc b/chrome/browser/signin/chrome_signin_client_unittest.cc
index 0722c94..ad69bf06 100644
--- a/chrome/browser/signin/chrome_signin_client_unittest.cc
+++ b/chrome/browser/signin/chrome_signin_client_unittest.cc
@@ -303,6 +303,7 @@
     case signin_metrics::ProfileSignout::kAccountReconcilorReconcile:
     case signin_metrics::ProfileSignout::kUserClickedSignoutProfileMenu:
     case signin_metrics::ProfileSignout::kAccountEmailUpdated:
+    case signin_metrics::ProfileSignout::kSigninManagerUpdateUPA:
       return false;
 
     case signin_metrics::ProfileSignout::kAccountRemovedFromDevice:
@@ -450,10 +451,11 @@
         kUserClickedSignoutFromClearBrowsingDataPage,
     signin_metrics::ProfileSignout::kGaiaCookieUpdated,
     signin_metrics::ProfileSignout::kAccountReconcilorReconcile,
+    signin_metrics::ProfileSignout::kSigninManagerUpdateUPA,
 };
 // kNumberOfObsoleteSignoutSources should be updated when a ProfileSignout
 // value is deprecated.
-const int kNumberOfObsoleteSignoutSources = 5;
+const int kNumberOfObsoleteSignoutSources = 6;
 static_assert(std::size(kSignoutSources) + kNumberOfObsoleteSignoutSources ==
                   static_cast<int>(signin_metrics::ProfileSignout::kMaxValue) +
                       1,

chrome/browser/signin/dice_browsertest.cc

diff --git a/chrome/browser/signin/dice_browsertest.cc b/chrome/browser/signin/dice_browsertest.cc
index c0525a5..7893d22 100644
--- a/chrome/browser/signin/dice_browsertest.cc
+++ b/chrome/browser/signin/dice_browsertest.cc
@@ -13,6 +13,7 @@
 #include "base/functional/bind.h"
 #include "base/functional/callback.h"
 #include "base/functional/callback_helpers.h"
+#include "base/json/json_writer.h"
 #include "base/location.h"
 #include "base/run_loop.h"
 #include "base/scoped_observation.h"
@@ -42,6 +43,7 @@
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/browser/ui/webui/signin/login_ui_test_utils.h"
+#include "chrome/common/buildflags.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
@@ -81,6 +83,10 @@
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "url/gurl.h"
 
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+#include "crypto/scoped_mock_unexportable_key_provider.h"
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+
 using net::test_server::BasicHttpResponse;
 using net::test_server::HttpRequest;
 using net::test_server::HttpResponse;
@@ -101,6 +107,7 @@
 };
 
 const char kAuthorizationCode[] = "authorization_code";
+const char kBoundTokenRegistrationJwt[] = "bound_token_registration_jwt";
 const char kDiceResponseHeader[] = "X-Chrome-ID-Consistency-Response";
 const char kChromeSyncEndpointURL[] = "/signin/chrome/sync";
 const char kEnableSyncURL[] = "/enable_sync";
@@ -284,14 +291,18 @@
   std::unique_ptr<BlockedHttpResponse> http_response =
       std::make_unique<BlockedHttpResponse>(callback);
 
-  std::string content =
-      "{"
-      "  \"access_token\":\"access_token\","
-      "  \"refresh_token\":\"new_refresh_token\","
-      "  \"expires_in\":9999"
-      "}";
+  base::Value::Dict response = base::Value::Dict()
+                                   .Set("access_token", "access_token")
+                                   .Set("refresh_token", "new_refresh_token")
+                                   .Set("expires_in", 9999);
 
-  http_response->set_content(content);
+  // If the request contains binding registration token, include successful
+  // binding result in the response.
+  if (request.content.find(kBoundTokenRegistrationJwt) != std::string::npos) {
+    response.Set("refresh_token_type", "bound_to_key");
+  }
+
+  http_response->set_content(*base::WriteJson(response));
   http_response->set_content_type("text/plain");
   http_response->AddCustomHeader("Cache-Control", "no-store");
   return std::move(http_response);
@@ -706,6 +717,23 @@
   EXPECT_EQ(1, reconcilor_started_count_);
 }
 
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+// Checks that signin on Gaia triggers the fetch for a refresh token.
+IN_PROC_BROWSER_TEST_F(DiceBrowserTest, SigninWithTokenBinding) {
+  crypto::ScopedMockUnexportableKeyProvider mock_key_provider_;
+
+  // Navigate to Gaia and sign in.
+  NavigateToURL(kSigninURL);
+
+  // Check that the bound token was requested and added to the token service.
+  SendRefreshTokenResponse();
+  EXPECT_TRUE(
+      GetIdentityManager()->HasAccountWithRefreshToken(GetMainAccountID()));
+  // TODO(http://b/274463812): verify that the refresh token is bound once the
+  // binding status is propagated to `IdentityManager`.
+}
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+
 // Checks that the account reconcilor is blocked when where was OAuth
 // outage in Dice, and unblocked after the timeout.
 IN_PROC_BROWSER_TEST_F(DiceBrowserTest, SupportOAuthOutageInDice) {

chrome/browser/signin/dice_response_handler.cc

diff --git a/chrome/browser/signin/dice_response_handler.cc b/chrome/browser/signin/dice_response_handler.cc
index e6e0863..3dc4736 100644
--- a/chrome/browser/signin/dice_response_handler.cc
+++ b/chrome/browser/signin/dice_response_handler.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/signin/dice_response_handler.h"
 
 #include "base/functional/bind.h"
+#include "base/functional/callback.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
@@ -19,6 +20,7 @@
 #include "chrome/browser/signin/account_reconcilor_factory.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/identity_manager_factory.h"
+#include "chrome/common/buildflags.h"
 #include "components/signin/core/browser/about_signin_internals.h"
 #include "components/signin/core/browser/signin_header_helper.h"
 #include "components/signin/public/base/consent_level.h"
@@ -30,6 +32,15 @@
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+#include "chrome/browser/signin/bound_session_credentials/registration_token_helper.h"  // nogncheck
+#include "chrome/browser/signin/bound_session_credentials/unexportable_key_service_factory.h"  // nogncheck
+#include "components/unexportable_keys/unexportable_key_id.h"       // nogncheck
+#include "components/unexportable_keys/unexportable_key_service.h"  // nogncheck
+#include "google_apis/gaia/gaia_urls.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+
 const int kDiceTokenFetchTimeoutSeconds = 10;
 // Timeout for locking the account reconcilor when
 // there was OAuth outage in Dice.
@@ -70,6 +81,32 @@
   kDiceTokenFetchResultCount
 };
 
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+std::unique_ptr<RegistrationTokenHelper> BuildRegistrationTokenHelper(
+    unexportable_keys::UnexportableKeyService& unexportable_key_service,
+    base::StringPiece client_id,
+    base::StringPiece auth_code,
+    const GURL& registration_url,
+    base::OnceCallback<void(absl::optional<RegistrationTokenHelper::Result>)>
+        callback) {
+  return std::make_unique<RegistrationTokenHelper>(
+      unexportable_key_service, client_id, auth_code, registration_url,
+      std::move(callback));
+}
+
+DiceResponseHandler::RegistrationTokenHelperFactory
+CreateRegistrationTokenHelperFactory(
+    unexportable_keys::UnexportableKeyService* unexportable_key_service) {
+  if (!unexportable_key_service) {
+    return {};
+  }
+
+  // The factory holds a non-owning reference to `unexportable_key_service`.
+  return base::BindRepeating(&BuildRegistrationTokenHelper,
+                             std::ref(*unexportable_key_service));
+}
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+
 class DiceResponseHandlerFactory : public ProfileKeyedServiceFactory {
  public:
   // Returns an instance of the factory singleton.
@@ -98,6 +135,9 @@
     DependsOn(AccountReconcilorFactory::GetInstance());
     DependsOn(ChromeSigninClientFactory::GetInstance());
     DependsOn(IdentityManagerFactory::GetInstance());
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+    DependsOn(UnexportableKeyServiceFactory::GetInstance());
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
   }
 
   ~DiceResponseHandlerFactory() override {}
@@ -106,12 +146,18 @@
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override {
     Profile* profile = static_cast<Profile*>(context);
+    DiceResponseHandler::RegistrationTokenHelperFactory
+        registration_token_helper_factory;
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+    registration_token_helper_factory = CreateRegistrationTokenHelperFactory(
+        UnexportableKeyServiceFactory::GetForProfile(profile));
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
     return new DiceResponseHandler(
         ChromeSigninClientFactory::GetForProfile(profile),
         IdentityManagerFactory::GetForProfile(profile),
         AccountReconcilorFactory::GetForProfile(profile),
         AboutSigninInternalsFactory::GetForProfile(profile),
-        profile->GetPath());
+        std::move(registration_token_helper_factory));
   }
 };
 
@@ -141,12 +187,14 @@
     SigninClient* signin_client,
     AccountReconcilor* account_reconcilor,
     std::unique_ptr<ProcessDiceHeaderDelegate> delegate,
+    const RegistrationTokenHelperFactory& registration_token_helper_factory,
     DiceResponseHandler* dice_response_handler)
     : gaia_id_(gaia_id),
       email_(email),
       authorization_code_(authorization_code),
       delegate_(std::move(delegate)),
       dice_response_handler_(dice_response_handler),
+      signin_client_(signin_client),
       timeout_closure_(
           base::BindOnce(&DiceResponseHandler::DiceTokenFetcher::OnTimeout,
                          base::Unretained(this))),
@@ -154,13 +202,14 @@
   DCHECK(dice_response_handler_);
   account_reconcilor_lock_ =
       std::make_unique<AccountReconcilor::Lock>(account_reconcilor);
-  gaia_auth_fetcher_ =
-      signin_client->CreateGaiaAuthFetcher(this, gaia::GaiaSource::kChrome);
-  VLOG(1) << "Start fetching token for account: " << email;
-  gaia_auth_fetcher_->StartAuthCodeForOAuth2TokenExchange(authorization_code_);
-  base::SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask(
-      FROM_HERE, timeout_closure_.callback(),
-      base::Seconds(kDiceTokenFetchTimeoutSeconds));
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+  if (!registration_token_helper_factory.is_null()) {
+    StartBindingKeyGeneration(registration_token_helper_factory);
+    // Wait until the binding key is generated before fetching a token.
+    return;
+  }
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+  StartTokenFetch();
 }
 
 DiceResponseHandler::DiceTokenFetcher::~DiceTokenFetcher() {}
@@ -179,8 +228,19 @@
   RecordDiceFetchTokenResult(kFetchSuccess);
   gaia_auth_fetcher_.reset();
   timeout_closure_.Cancel();
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+  absl::optional<unexportable_keys::UnexportableKeyId> binding_key_id;
+  if (result.is_bound_to_key) {
+    binding_key_id = binding_key_id_;
+  }
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
   dice_response_handler_->OnTokenExchangeSuccess(
-      this, result.refresh_token, result.is_under_advanced_protection);
+      this, result.refresh_token, result.is_under_advanced_protection
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+      ,
+      binding_key_id
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+  );
   // |this| may be deleted at this point.
 }
 
@@ -193,6 +253,47 @@
   // |this| may be deleted at this point.
 }
 
+void DiceResponseHandler::DiceTokenFetcher::StartTokenFetch() {
+  VLOG(1) << "Start fetching token for account: " << email_;
+  gaia_auth_fetcher_ =
+      signin_client_->CreateGaiaAuthFetcher(this, gaia::GaiaSource::kChrome);
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+  // `binding_registration_token_` is empty if the binding key was not
+  // generated.
+  gaia_auth_fetcher_->StartAuthCodeForOAuth2TokenExchange(
+      authorization_code_, binding_registration_token_);
+#else
+  gaia_auth_fetcher_->StartAuthCodeForOAuth2TokenExchange(authorization_code_);
+#endif
+  base::SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask(
+      FROM_HERE, timeout_closure_.callback(),
+      base::Seconds(kDiceTokenFetchTimeoutSeconds));
+}
+
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+void DiceResponseHandler::DiceTokenFetcher::StartBindingKeyGeneration(
+    const RegistrationTokenHelperFactory& registration_token_helper_factory) {
+  // `base::Unretained()` is safe because `this` owns
+  // `registration_token_helper_`.
+  registration_token_helper_ = registration_token_helper_factory.Run(
+      GaiaUrls::GetInstance()->oauth2_chrome_client_id(), authorization_code_,
+      GaiaUrls::GetInstance()->oauth2_token_url(),
+      base::BindOnce(&DiceTokenFetcher::OnRegistrationTokenGenerated,
+                     base::Unretained(this)));
+  registration_token_helper_->Start();
+}
+
+void DiceResponseHandler::DiceTokenFetcher::OnRegistrationTokenGenerated(
+    absl::optional<RegistrationTokenHelper::Result> result) {
+  if (result.has_value()) {
+    binding_key_id_ = result->binding_key_id;
+    binding_registration_token_ = std::move(result->registration_token);
+  }
+  registration_token_helper_.reset();
+  StartTokenFetch();
+}
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+
 ////////////////////////////////////////////////////////////////////////////////
 // DiceResponseHandler
 ////////////////////////////////////////////////////////////////////////////////
@@ -207,12 +308,13 @@
     signin::IdentityManager* identity_manager,
     AccountReconcilor* account_reconcilor,
     AboutSigninInternals* about_signin_internals,
-    const base::FilePath& profile_path)
+    RegistrationTokenHelperFactory registration_token_helper_factory)
     : signin_client_(signin_client),
       identity_manager_(identity_manager),
       account_reconcilor_(account_reconcilor),
       about_signin_internals_(about_signin_internals),
-      profile_path_(profile_path) {
+      registration_token_helper_factory_(
+          std::move(registration_token_helper_factory)) {
   DCHECK(signin_client_);
   DCHECK(identity_manager_);
   DCHECK(account_reconcilor_);
@@ -264,6 +366,13 @@
   task_runner_ = std::move(task_runner);
 }
 
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+void DiceResponseHandler::SetRegistrationTokenHelperFactoryForTesting(
+    RegistrationTokenHelperFactory factory) {
+  registration_token_helper_factory_ = std::move(factory);
+}
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+
 void DiceResponseHandler::ProcessDiceSigninHeader(
     const std::string& gaia_id,
     const std::string& email,
@@ -303,7 +412,7 @@
   }
   token_fetchers_.push_back(std::make_unique<DiceTokenFetcher>(
       gaia_id, email, authorization_code, signin_client_, account_reconcilor_,
-      std::move(delegate), this));
+      std::move(delegate), registration_token_helper_factory_, this));
 }
 
 void DiceResponseHandler::ProcessEnableSyncHeader(
@@ -391,7 +500,12 @@
 void DiceResponseHandler::OnTokenExchangeSuccess(
     DiceTokenFetcher* token_fetcher,
     const std::string& refresh_token,
-    bool is_under_advanced_protection) {
+    bool is_under_advanced_protection
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+    ,
+    absl::optional<unexportable_keys::UnexportableKeyId> binding_key_id
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+) {
   const std::string& email = token_fetcher->email();
   const std::string& gaia_id = token_fetcher->gaia_id();
   VLOG(1) << "[Dice] OAuth success for email " << email;
@@ -400,6 +514,7 @@
       identity_manager_->PickAccountIdForAccount(gaia_id, email);
   bool is_new_account =
       !identity_manager_->HasAccountWithRefreshToken(account_id);
+  // TODO(http://b/274463812): propagate binding key to `IdentityManager`.
   identity_manager_->GetAccountsMutator()->AddOrUpdateAccount(
       gaia_id, email, refresh_token, is_under_advanced_protection,
       signin_metrics::SourceForRefreshTokenOperation::

chrome/browser/signin/dice_response_handler.h

diff --git a/chrome/browser/signin/dice_response_handler.h b/chrome/browser/signin/dice_response_handler.h
index a2ee6a64..643b7df 100644
--- a/chrome/browser/signin/dice_response_handler.h
+++ b/chrome/browser/signin/dice_response_handler.h
@@ -11,16 +11,25 @@
 
 #include "base/cancelable_callback.h"
 #include "base/files/file_path.h"
+#include "base/functional/callback_forward.h"
 #include "base/memory/raw_ptr.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/task/sequenced_task_runner.h"
 #include "base/timer/timer.h"
+#include "chrome/common/buildflags.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/signin/core/browser/account_reconcilor.h"
 #include "components/signin/core/browser/signin_header_helper.h"
 #include "components/signin/public/base/account_consistency_method.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+#include "chrome/browser/signin/bound_session_credentials/registration_token_helper.h"  // nogncheck
+#include "components/unexportable_keys/unexportable_key_id.h"       // nogncheck
+#include "components/unexportable_keys/unexportable_key_service.h"  // nogncheck
+#include "third_party/abseil-cpp/absl/types/optional.h"
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+
 class AboutSigninInternals;
 class GaiaAuthFetcher;
 class GoogleServiceAuthError;
@@ -63,15 +72,31 @@
 // Processes the Dice responses from Gaia.
 class DiceResponseHandler : public KeyedService {
  public:
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+  using RegistrationTokenHelperFactory =
+      base::RepeatingCallback<std::unique_ptr<RegistrationTokenHelper>(
+          base::StringPiece client_id,
+          base::StringPiece auth_code,
+          const GURL& registration_url,
+          base::OnceCallback<void(
+              absl::optional<RegistrationTokenHelper::Result>)> callback)>;
+#else
+  // A fake factory type that is always used to pass a null callback.
+  using RegistrationTokenHelperFactory = base::RepeatingClosure;
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+
   // Returns the DiceResponseHandler associated with this profile.
   // May return nullptr if there is none (e.g. in incognito).
   static DiceResponseHandler* GetForProfile(Profile* profile);
 
-  DiceResponseHandler(SigninClient* signin_client,
-                      signin::IdentityManager* identity_manager,
-                      AccountReconcilor* account_reconcilor,
-                      AboutSigninInternals* about_signin_internals,
-                      const base::FilePath& profile_path_);
+  // `registration_token_helper_factory` might be null. If that's the case,
+  // Chrome won't make an attempt to bind a refresh token.
+  DiceResponseHandler(
+      SigninClient* signin_client,
+      signin::IdentityManager* identity_manager,
+      AccountReconcilor* account_reconcilor,
+      AboutSigninInternals* about_signin_internals,
+      RegistrationTokenHelperFactory registration_token_helper_factory);
 
   DiceResponseHandler(const DiceResponseHandler&) = delete;
   DiceResponseHandler& operator=(const DiceResponseHandler&) = delete;
@@ -88,19 +113,27 @@
   // Sets |task_runner_| for testing.
   void SetTaskRunner(scoped_refptr<base::SequencedTaskRunner> task_runner);
 
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+  // Sets a `registration_token_helper_factory_` factory callback for testing.
+  void SetRegistrationTokenHelperFactoryForTesting(
+      RegistrationTokenHelperFactory factory);
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+
   static void EnsureFactoryBuilt();
 
  private:
   // Helper class to fetch a refresh token from an authorization code.
   class DiceTokenFetcher : public GaiaAuthConsumer {
    public:
-    DiceTokenFetcher(const std::string& gaia_id,
-                     const std::string& email,
-                     const std::string& authorization_code,
-                     SigninClient* signin_client,
-                     AccountReconcilor* account_reconcilor,
-                     std::unique_ptr<ProcessDiceHeaderDelegate> delegate,
-                     DiceResponseHandler* dice_response_handler);
+    DiceTokenFetcher(
+        const std::string& gaia_id,
+        const std::string& email,
+        const std::string& authorization_code,
+        SigninClient* signin_client,
+        AccountReconcilor* account_reconcilor,
+        std::unique_ptr<ProcessDiceHeaderDelegate> delegate,
+        const RegistrationTokenHelperFactory& registration_token_helper_factory,
+        DiceResponseHandler* dice_response_handler);
 
     DiceTokenFetcher(const DiceTokenFetcher&) = delete;
     DiceTokenFetcher& operator=(const DiceTokenFetcher&) = delete;
@@ -127,17 +160,32 @@
         const GaiaAuthConsumer::ClientOAuthResult& result) override;
     void OnClientOAuthFailure(const GoogleServiceAuthError& error) override;
 
+    void StartTokenFetch();
+
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+    void StartBindingKeyGeneration(const RegistrationTokenHelperFactory&
+                                       registration_token_helper_factory);
+    void OnRegistrationTokenGenerated(
+        absl::optional<RegistrationTokenHelper::Result> result);
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+
     // Lock the account reconcilor while tokens are being fetched.
     std::unique_ptr<AccountReconcilor::Lock> account_reconcilor_lock_;
 
-    std::string gaia_id_;
-    std::string email_;
-    std::string authorization_code_;
-    std::unique_ptr<ProcessDiceHeaderDelegate> delegate_;
-    raw_ptr<DiceResponseHandler> dice_response_handler_;
+    const std::string gaia_id_;
+    const std::string email_;
+    const std::string authorization_code_;
+    const std::unique_ptr<ProcessDiceHeaderDelegate> delegate_;
+    const raw_ptr<DiceResponseHandler> dice_response_handler_;
+    const raw_ptr<SigninClient> signin_client_;
     base::CancelableOnceClosure timeout_closure_;
     bool should_enable_sync_;
     std::unique_ptr<GaiaAuthFetcher> gaia_auth_fetcher_;
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+    std::unique_ptr<RegistrationTokenHelper> registration_token_helper_;
+    absl::optional<unexportable_keys::UnexportableKeyId> binding_key_id_;
+    std::string binding_registration_token_;
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
   };
 
   // Deletes the token fetcher.
@@ -164,25 +212,32 @@
 
   // Called after exchanging an OAuth 2.0 authorization code for a refresh token
   // after DiceAction::SIGNIN.
-  void OnTokenExchangeSuccess(DiceTokenFetcher* token_fetcher,
-                              const std::string& refresh_token,
-                              bool is_under_advanced_protection);
+  void OnTokenExchangeSuccess(
+      DiceTokenFetcher* token_fetcher,
+      const std::string& refresh_token,
+      bool is_under_advanced_protection
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+      ,
+      absl::optional<unexportable_keys::UnexportableKeyId> binding_key_id
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+  );
   void OnTokenExchangeFailure(DiceTokenFetcher* token_fetcher,
                               const GoogleServiceAuthError& error);
   // Called to unlock the reconcilor after a SLO outage.
   void OnTimeoutUnlockReconcilor();
 
-  raw_ptr<SigninClient> signin_client_;
-  raw_ptr<signin::IdentityManager> identity_manager_;
-  raw_ptr<AccountReconcilor> account_reconcilor_;
-  raw_ptr<AboutSigninInternals> about_signin_internals_;
-  base::FilePath profile_path_;
+  const raw_ptr<SigninClient> signin_client_;
+  const raw_ptr<signin::IdentityManager> identity_manager_;
+  const raw_ptr<AccountReconcilor> account_reconcilor_;
+  const raw_ptr<AboutSigninInternals> about_signin_internals_;
   std::vector<std::unique_ptr<DiceTokenFetcher>> token_fetchers_;
   // Lock the account reconcilor for kLockAccountReconcilorTimeoutHours
   // when there was OAuth outage in Dice.
   std::unique_ptr<AccountReconcilor::Lock> lock_;
   std::unique_ptr<base::OneShotTimer> timer_;
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
+  // Always null unless the BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS) is set.
+  RegistrationTokenHelperFactory registration_token_helper_factory_;
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_DICE_RESPONSE_HANDLER_H_

chrome/browser/signin/dice_response_handler_unittest.cc

diff --git a/chrome/browser/signin/dice_response_handler_unittest.cc b/chrome/browser/signin/dice_response_handler_unittest.cc
index 21550ac..0efe38d 100644
--- a/chrome/browser/signin/dice_response_handler_unittest.cc
+++ b/chrome/browser/signin/dice_response_handler_unittest.cc
@@ -9,10 +9,13 @@
 
 #include "base/check.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/functional/callback.h"
 #include "base/memory/raw_ptr.h"
 #include "base/notreached.h"
+#include "base/test/mock_callback.h"
 #include "base/test/task_environment.h"
 #include "base/time/time.h"
+#include "chrome/common/buildflags.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/signin/core/browser/about_signin_internals.h"
 #include "components/signin/core/browser/account_reconcilor.h"
@@ -27,8 +30,20 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+#include "chrome/browser/signin/bound_session_credentials/registration_token_helper.h"
+#include "components/unexportable_keys/fake_unexportable_key_service.h"
+#include "components/unexportable_keys/unexportable_key_id.h"
+#include "components/unexportable_keys/unexportable_key_service.h"
+#include "components/unexportable_keys/unexportable_key_task_manager.h"
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+
 using signin::DiceAction;
 using signin::DiceResponseParams;
+using testing::_;
+using testing::Invoke;
+using testing::StrictMock;
+using testing::Unused;
 
 namespace {
 
@@ -83,6 +98,25 @@
   raw_ptr<GaiaAuthConsumer> consumer_;
 };
 
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+class FakeRegistrationTokenHelper : public RegistrationTokenHelper {
+ public:
+  FakeRegistrationTokenHelper()
+      : RegistrationTokenHelper(fake_unexportable_key_service_,
+                                "test_client_id",
+                                "test_auth_code",
+                                GURL("https://accounts.google.com/Register"),
+                                base::DoNothing()) {}
+
+  ~FakeRegistrationTokenHelper() override = default;
+
+  void Start() override {}
+
+ private:
+  unexportable_keys::FakeUnexportableKeyService fake_unexportable_key_service_;
+};
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+
 class DiceResponseHandlerTest : public testing::Test,
                                 public AccountReconcilor::Observer {
  public:
@@ -136,7 +170,8 @@
     dice_response_handler_ = std::make_unique<DiceResponseHandler>(
         &signin_client_, identity_test_env_.identity_manager(),
         account_reconcilor_.get(), about_signin_internals_.get(),
-        temp_dir_.GetPath());
+        /*registration_token_helper_factory=*/
+        DiceResponseHandler::RegistrationTokenHelperFactory());
   }
 
   ~DiceResponseHandlerTest() override {
@@ -175,6 +210,25 @@
     return dice_params;
   }
 
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+  void EnableRegistrationTokenHelper(base::StringPiece authorization_code) {
+    EXPECT_CALL(mock_registration_token_helper_factory_,
+                Run(_, authorization_code, _, _))
+        .WillOnce(Invoke([this](Unused, Unused, Unused, auto callback) {
+          binding_registration_callback_ = std::move(callback);
+          return std::make_unique<FakeRegistrationTokenHelper>();
+        }));
+    dice_response_handler_->SetRegistrationTokenHelperFactoryForTesting(
+        mock_registration_token_helper_factory_.Get());
+  }
+
+  void SimulateRegistrationTokenHelperResult(
+      absl::optional<RegistrationTokenHelper::Result> result) {
+    ASSERT_FALSE(binding_registration_callback_.is_null());
+    std::move(binding_registration_callback_).Run(std::move(result));
+  }
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+
   // AccountReconcilor::Observer:
   void OnBlockReconcile() override { ++reconcilor_blocked_count_; }
   void OnUnblockReconcile() override { ++reconcilor_unblocked_count_; }
@@ -199,6 +253,13 @@
   CoreAccountId enable_sync_account_id_;
   GoogleServiceAuthError auth_error_;
   std::string auth_error_email_;
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+  StrictMock<
+      base::MockCallback<DiceResponseHandler::RegistrationTokenHelperFactory>>
+      mock_registration_token_helper_factory_;
+  base::OnceCallback<void(absl::optional<RegistrationTokenHelper::Result>)>
+      binding_registration_callback_;
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
 };
 
 class TestProcessDiceHeaderDelegate : public ProcessDiceHeaderDelegate {
@@ -263,6 +324,69 @@
                   .is_under_advanced_protection);
 }
 
+#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+// Checks that a SIGNIN action triggers a token exchange request.
+TEST_F(DiceResponseHandlerTest, SigninWithBoundToken) {
+  DiceResponseParams dice_params = MakeDiceParams(DiceAction::SIGNIN);
+  const auto& account_info = dice_params.signin_info->account_info;
+  CoreAccountId account_id = identity_manager()->PickAccountIdForAccount(
+      account_info.gaia_id, account_info.email);
+  EXPECT_FALSE(identity_manager()->HasAccountWithRefreshToken(account_id));
+  EnableRegistrationTokenHelper(dice_params.signin_info->authorization_code);
+  dice_response_handler_->ProcessDiceHeader(
+      dice_params, std::make_unique<TestProcessDiceHeaderDelegate>(this));
+
+  // Token fetch should be blocked on the binding registration token generation.
+  ASSERT_THAT(signin_client_.GetAndClearConsumer(), testing::IsNull());
+  // Simulate successful token generation.
+  SimulateRegistrationTokenHelperResult(RegistrationTokenHelper::Result{
+      .binding_key_id = unexportable_keys::UnexportableKeyId(),
+      .registration_token = "test_registration_token"});
+
+  // Check that a GaiaAuthFetcher has been created.
+  GaiaAuthConsumer* consumer = signin_client_.GetAndClearConsumer();
+  ASSERT_THAT(consumer, testing::NotNull());
+  // Simulate GaiaAuthFetcher success.
+  consumer->OnClientOAuthSuccess(GaiaAuthConsumer::ClientOAuthResult(
+      "refresh_token", "access_token", 10, /*is_child_account=*/false,
+      /*is_under_advanced_protection=*/false, /*is_bound_to_key=*/true));
+  // Check that the token has been inserted in the token service.
+  EXPECT_TRUE(identity_manager()->HasAccountWithRefreshToken(account_id));
+  EXPECT_TRUE(auth_error_email_.empty());
+  EXPECT_EQ(GoogleServiceAuthError::NONE, auth_error_.state());
+  // TODO(b/274463812): check that the inserted token is bound.
+}
+
+TEST_F(DiceResponseHandlerTest, SigninWithFailedBoundTokenAttempt) {
+  DiceResponseParams dice_params = MakeDiceParams(DiceAction::SIGNIN);
+  const auto& account_info = dice_params.signin_info->account_info;
+  CoreAccountId account_id = identity_manager()->PickAccountIdForAccount(
+      account_info.gaia_id, account_info.email);
+  EXPECT_FALSE(identity_manager()->HasAccountWithRefreshToken(account_id));
+  EnableRegistrationTokenHelper(dice_params.signin_info->authorization_code);
+  dice_response_handler_->ProcessDiceHeader(
+      dice_params, std::make_unique<TestProcessDiceHeaderDelegate>(this));
+
+  // Token fetch should be blocked on the binding registration token generation.
+  ASSERT_THAT(signin_client_.GetAndClearConsumer(), testing::IsNull());
+  // Simulate failed token generation.
+  SimulateRegistrationTokenHelperResult(absl::nullopt);
+
+  // Check that a GaiaAuthFetcher has been created.
+  GaiaAuthConsumer* consumer = signin_client_.GetAndClearConsumer();
+  ASSERT_THAT(consumer, testing::NotNull());
+  // Simulate GaiaAuthFetcher success.
+  consumer->OnClientOAuthSuccess(GaiaAuthConsumer::ClientOAuthResult(
+      "refresh_token", "access_token", 10, /*is_child_account=*/false,
+      /*is_under_advanced_protection=*/false, /*is_bound_to_key=*/false));
+  // Check that the token has been inserted in the token service.
+  EXPECT_TRUE(identity_manager()->HasAccountWithRefreshToken(account_id));
+  EXPECT_TRUE(auth_error_email_.empty());
+  EXPECT_EQ(GoogleServiceAuthError::NONE, auth_error_.state());
+  // TODO(b/274463812): check that the inserted token is not bound.
+}
+#endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+
 // Checks that the account reconcilor is blocked when where was OAuth
 // outage in Dice, and unblocked after the timeout.
 TEST_F(DiceResponseHandlerTest, SupportOAuthOutageInDice) {

chrome/browser/signin/signin_manager.cc

diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc
index 0ff840c..60bab6d7 100644
--- a/chrome/browser/signin/signin_manager.cc
+++ b/chrome/browser/signin/signin_manager.cc
@@ -126,7 +126,7 @@
 #else
     DCHECK(!identity_manager_->HasPrimaryAccount(signin::ConsentLevel::kSync));
     signin_metrics::ProfileSignout source =
-        signin_metrics::ProfileSignout::kUserDeletedAccountCookies;
+        signin_metrics::ProfileSignout::kSigninManagerUpdateUPA;
 #endif
     identity_manager_->GetPrimaryAccountMutator()->ClearPrimaryAccount(
         source, signin_metrics::SignoutDelete::kIgnoreMetric);

chrome/browser/sync/test/integration/two_client_web_apps_integration_test_cros.cc

diff --git a/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_cros.cc b/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_cros.cc
index ac63873..2fd7aeb 100644
--- a/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_cros.cc
+++ b/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_cros.cc
@@ -18,23 +18,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_7Standalone_11Standalone_34Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.SwitchProfileClients(ProfileClient::kClient2);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_7Standalone_11Standalone_41_10Standalone_42_11Standalone_7Standalone) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -270,5 +253,22 @@
   helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
 }
 
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_7Standalone_11Standalone_34Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.SwitchProfileClients(ProfileClient::kClient2);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
 }  // namespace
 }  // namespace web_app::integration_tests

chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac_win_linux.cc

diff --git a/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac_win_linux.cc b/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac_win_linux.cc
index 592a4d4..1055687 100644
--- a/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac_win_linux.cc
+++ b/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac_win_linux.cc
@@ -117,37 +117,18 @@
   helper_.CheckLaunchIconNotShown();
 }
 
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_34Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.SwitchProfileClients(ProfileClient::kClient2);
-  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
-  helper_.InstallLocally(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
 // TODO(crbug.com/1427296): Mac LaunchFromPlatformShortcut behavior does not
 // match other platforms.
 #if BUILDFLAG(IS_MAC)
-#define MAYBE_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_1Standalone_22 \
-  DISABLED_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_1Standalone_22
+#define MAYBE_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_1Standalone_22One \
+  DISABLED_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_1Standalone_22One
 #else
-#define MAYBE_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_1Standalone_22 \
-  WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_1Standalone_22
+#define MAYBE_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_1Standalone_22One \
+  WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_1Standalone_22One
 #endif
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    MAYBE_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_1Standalone_22) {
+    MAYBE_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_1Standalone_22One) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
   // `docs/webapps/integration-testing-framework` for more info.
@@ -161,37 +142,21 @@
   helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
   helper_.CheckAppInListTabbed(Site::kStandalone);
   helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_34Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.SwitchProfileClients(ProfileClient::kClient2);
-  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated();
+  helper_.CheckTabCreated(Number::kOne);
 }
 
 // TODO(crbug.com/1427296): Mac LaunchFromPlatformShortcut behavior does not
 // match other platforms.
 #if BUILDFLAG(IS_MAC)
-#define MAYBE_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_1Standalone_22 \
-  DISABLED_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_1Standalone_22
+#define MAYBE_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_1Standalone_22One \
+  DISABLED_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_1Standalone_22One
 #else
-#define MAYBE_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_1Standalone_22 \
-  WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_1Standalone_22
+#define MAYBE_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_1Standalone_22One \
+  WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_1Standalone_22One
 #endif
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    MAYBE_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_1Standalone_22) {
+    MAYBE_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_1Standalone_22One) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
   // `docs/webapps/integration-testing-framework` for more info.
@@ -202,7 +167,7 @@
   helper_.SwitchProfileClients(ProfileClient::kClient2);
   helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
   helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
+  helper_.CheckTabCreated(Number::kOne);
 }
 
 IN_PROC_BROWSER_TEST_F(
@@ -501,37 +466,18 @@
   helper_.CheckWindowCreated();
 }
 
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_34Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SwitchProfileClients(ProfileClient::kClient2);
-  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
 // TODO(crbug.com/1427296): Mac LaunchFromPlatformShortcut behavior does not
 // match other platforms.
 #if BUILDFLAG(IS_MAC)
-#define MAYBE_WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22 \
-  DISABLED_WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22
+#define MAYBE_WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22One \
+  DISABLED_WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22One
 #else
-#define MAYBE_WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22 \
-  WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22
+#define MAYBE_WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22One \
+  WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22One
 #endif
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    MAYBE_WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22) {
+    MAYBE_WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22One) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
   // `docs/webapps/integration-testing-framework` for more info.
@@ -545,7 +491,7 @@
   helper_.SwitchProfileClients(ProfileClient::kClient2);
   helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
   helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
+  helper_.CheckTabCreated(Number::kOne);
 }
 
 IN_PROC_BROWSER_TEST_F(
@@ -826,37 +772,18 @@
   helper_.CheckWindowCreated();
 }
 
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_34Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SwitchProfileClients(ProfileClient::kClient2);
-  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
 // TODO(crbug.com/1427296): Mac LaunchFromPlatformShortcut behavior does not
 // match other platforms.
 #if BUILDFLAG(IS_MAC)
-#define MAYBE_WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22 \
-  DISABLED_WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22
+#define MAYBE_WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22One \
+  DISABLED_WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22One
 #else
-#define MAYBE_WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22 \
-  WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22
+#define MAYBE_WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22One \
+  WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22One
 #endif
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    MAYBE_WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22) {
+    MAYBE_WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22One) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
   // `docs/webapps/integration-testing-framework` for more info.
@@ -870,7 +797,7 @@
   helper_.SwitchProfileClients(ProfileClient::kClient2);
   helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
   helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
+  helper_.CheckTabCreated(Number::kOne);
 }
 
 IN_PROC_BROWSER_TEST_F(
@@ -1151,37 +1078,18 @@
   helper_.CheckWindowCreated();
 }
 
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_34Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallMenuOption(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SwitchProfileClients(ProfileClient::kClient2);
-  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
 // TODO(crbug.com/1427296): Mac LaunchFromPlatformShortcut behavior does not
 // match other platforms.
 #if BUILDFLAG(IS_MAC)
-#define MAYBE_WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22 \
-  DISABLED_WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22
+#define MAYBE_WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22One \
+  DISABLED_WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22One
 #else
-#define MAYBE_WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22 \
-  WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22
+#define MAYBE_WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22One \
+  WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22One
 #endif
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    MAYBE_WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22) {
+    MAYBE_WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_1Standalone_22One) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
   // `docs/webapps/integration-testing-framework` for more info.
@@ -1195,7 +1103,7 @@
   helper_.SwitchProfileClients(ProfileClient::kClient2);
   helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
   helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
+  helper_.CheckTabCreated(Number::kOne);
 }
 
 IN_PROC_BROWSER_TEST_F(
@@ -1281,5 +1189,97 @@
   helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
 }
 
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_34Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SwitchProfileClients(ProfileClient::kClient2);
+  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_34Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SwitchProfileClients(ProfileClient::kClient2);
+  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_34Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallMenuOption(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SwitchProfileClients(ProfileClient::kClient2);
+  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_34Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.SwitchProfileClients(ProfileClient::kClient2);
+  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
+  helper_.InstallLocally(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_34Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.SwitchProfileClients(ProfileClient::kClient2);
+  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
 }  // namespace
 }  // namespace web_app::integration_tests

chrome/browser/ui/BUILD.gn

diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 5057485..6d616f9 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -2117,6 +2117,8 @@
       "../ash/app_list/search/common/string_util.h",
       "../ash/app_list/search/common/types_util.cc",
       "../ash/app_list/search/common/types_util.h",
+      "../ash/app_list/search/desks_admin_template_zero_state_provider.cc",
+      "../ash/app_list/search/desks_admin_template_zero_state_provider.h",
       "../ash/app_list/search/federated_metrics_manager.cc",
       "../ash/app_list/search/federated_metrics_manager.h",
       "../ash/app_list/search/files/drive_search_provider.cc",
@@ -3351,6 +3353,7 @@
       "//chromeos/ash/components/login/session",
       "//chromeos/ash/components/multidevice",
       "//chromeos/ash/components/multidevice/logging",
+      "//chromeos/ash/components/nearby/presence",
       "//chromeos/ash/components/network",
       "//chromeos/ash/components/network/portal_detector",
       "//chromeos/ash/components/peripheral_notification",

chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/browser/ui/native_page/NativePage.java

diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/browser/ui/native_page/NativePage.java b/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/browser/ui/native_page/NativePage.java
index 6ae28d8..f0400a71 100644
--- a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/browser/ui/native_page/NativePage.java
+++ b/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/browser/ui/native_page/NativePage.java
@@ -127,13 +127,14 @@
      *         native pages.
      */
     @Deprecated // Use GURL-variant instead.
-    public static boolean isNativePageUrl(String url, boolean isIncognito) {
+    static boolean isNativePageUrl(String url, boolean isIncognito) {
         return nativePageType(url, null, isIncognito) != NativePageType.NONE;
     }
 
-    public static boolean isNativePageUrl(GURL url, boolean isIncognito) {
+    static boolean isNativePageUrl(GURL url, boolean isIncognito) {
         return url != null
-                && nativePageType(url.getSpec(), null, isIncognito) != NativePageType.NONE;
+                && nativePageType(url.getHost(), url.getScheme(), null, isIncognito)
+                != NativePageType.NONE;
     }
 
     /**
@@ -143,17 +144,26 @@
      * @return Type of the native page defined in {@link NativePageType}.
      */
     // TODO(crbug/783819) - Convert to using GURL.
-    public static @NativePageType int nativePageType(
+    static @NativePageType int nativePageType(
             String url, NativePage candidatePage, boolean isIncognito) {
         if (url == null) return NativePageType.NONE;
 
         Uri uri = Uri.parse(url);
-        if (!UrlConstants.CHROME_NATIVE_SCHEME.equals(uri.getScheme())
-                && !UrlConstants.CHROME_SCHEME.equals(uri.getScheme())) {
+        return nativePageType(uri.getHost(), uri.getScheme(), candidatePage, isIncognito);
+    }
+
+    /**
+     * @param candidatePage NativePage to return as result if the host is matched.
+     * @param isIncognito Whether the page will be displayed in incognito mode.
+     * @return Type of the native page defined in {@link NativePageType}.
+     */
+    private static @NativePageType int nativePageType(
+            String host, String scheme, NativePage candidatePage, boolean isIncognito) {
+        if (!UrlConstants.CHROME_NATIVE_SCHEME.equals(scheme)
+                && !UrlConstants.CHROME_SCHEME.equals(scheme)) {
             return NativePageType.NONE;
         }
 
-        String host = uri.getHost();
         if (candidatePage != null && candidatePage.getHost().equals(host)) {
             return NativePageType.CANDIDATE;
         }

chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/AccountPickerBottomSheetStrings.java

diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/AccountPickerBottomSheetStrings.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/AccountPickerBottomSheetStrings.java
index c984bcf7..c5f6ef0 100644
--- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/AccountPickerBottomSheetStrings.java
+++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/AccountPickerBottomSheetStrings.java
@@ -19,7 +19,7 @@
         return R.string.signin_account_picker_bottom_sheet_subtitle;
     }
     /** Returns the cancel button string for the bottom sheet dialog. */
-    default @StringRes int getCancelButton() {
+    default @StringRes int getDismissButton() {
         return R.string.signin_account_picker_dismiss_button;
     }
 }

chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/AccountPickerBottomSheetViewBinder.java

diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/AccountPickerBottomSheetViewBinder.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/AccountPickerBottomSheetViewBinder.java
index 26125679..25b884e 100644
--- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/AccountPickerBottomSheetViewBinder.java
+++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/AccountPickerBottomSheetViewBinder.java
@@ -38,7 +38,7 @@
             AccountPickerBottomSheetStrings bottomSheetStrings =
                     model.get(AccountPickerBottomSheetProperties.BOTTOM_SHEET_STRINGS);
             view.setBottomSheetStrings(bottomSheetStrings.getTitle(),
-                    bottomSheetStrings.getSubtitle(), bottomSheetStrings.getCancelButton());
+                    bottomSheetStrings.getSubtitle(), bottomSheetStrings.getDismissButton());
         }
     }
 

chrome/browser/ui/android/strings/android_chrome_strings.grd

diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
index f8e6d8b4..37f998ac 100644
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -3520,6 +3520,15 @@
       <message name="IDS_CUSTOM_TAB_AMP_PUBLISHER_URL" desc="Text shown in a Custom Tab toolbar for a web page that is hosted by the Google content delivery network but was originally published by someone else.">
         From <ph name="PUBLISHER_ORIGIN">&lt;pub&gt;%1$s&lt;/pub&gt;<ex>example.com</ex></ph> – <ph name="BEGIN_DEEMPHASIZED">&lt;bg&gt;</ph>delivered by Google<ph name="END_DEEMPHASIZED">&lt;/bg&gt;</ph>
       </message>
+      <message name="IDS_ACCESSIBILITY_CUSTOM_TAB_DRAG_HANDLE" desc="The accesibility text for drag handle in the toolbar of the partial custom tab.">
+        Drag handle
+      </message>
+      <message name="IDS_ACCESSIBILITY_CUSTOM_TAB_EXPANDED" desc="The accesibility text informing the custom tab is expanded.">
+        Tab is expanded
+      </message>
+      <message name="IDS_ACCESSIBILITY_CUSTOM_TAB_COLLAPSED" desc="The accesibility text informing the custom tab is collapsed back to initial height.">
+        Tab is back to initial height
+      </message>
       <message name="IDS_CUSTOM_TAB_SIDE_SHEET_MAXIMIZE" desc="The accesibility text for maximize button in side-sheet custom tab.">
         Expand to full screen
       </message>

chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_ACCESSIBILITY_CUSTOM_TAB_COLLAPSED.png.sha1

diff --git a/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_ACCESSIBILITY_CUSTOM_TAB_COLLAPSED.png.sha1 b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_ACCESSIBILITY_CUSTOM_TAB_COLLAPSED.png.sha1
new file mode 100644
index 0000000..c056986c
--- /dev/null
+++ b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_ACCESSIBILITY_CUSTOM_TAB_COLLAPSED.png.sha1
@@ -0,0 +1 @@
+df61801632caa37802949846725e597da705b4e3
\ No newline at end of file

chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_ACCESSIBILITY_CUSTOM_TAB_DRAG_HANDLE.png.sha1

diff --git a/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_ACCESSIBILITY_CUSTOM_TAB_DRAG_HANDLE.png.sha1 b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_ACCESSIBILITY_CUSTOM_TAB_DRAG_HANDLE.png.sha1
new file mode 100644
index 0000000..4ca3ccc
--- /dev/null
+++ b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_ACCESSIBILITY_CUSTOM_TAB_DRAG_HANDLE.png.sha1
@@ -0,0 +1 @@
+6a6b30bd35f2af2358dbb5566dc0c965d72fbc3f
\ No newline at end of file

chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_ACCESSIBILITY_CUSTOM_TAB_EXPANDED.png.sha1

diff --git a/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_ACCESSIBILITY_CUSTOM_TAB_EXPANDED.png.sha1 b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_ACCESSIBILITY_CUSTOM_TAB_EXPANDED.png.sha1
new file mode 100644
index 0000000..31cbc74
--- /dev/null
+++ b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_ACCESSIBILITY_CUSTOM_TAB_EXPANDED.png.sha1
@@ -0,0 +1 @@
+2d23cb83a278c3329848319dcf532de55bab28bc
\ No newline at end of file

chrome/browser/ui/android/strings/translations/android_chrome_strings_bs.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bs.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bs.xtb
index 848643c..354afea 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bs.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bs.xtb
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">Možete vidjeti i uklanjati teme koje vas zanimaju, a koje web lokacije koriste da vam prikazuju oglase. Chrome procjenjuje vaša interesovanja na osnovu vaše nedavne historije pregledanja.</translation>
 <translation id="4000212216660919741">Početna stranica van mreže</translation>
 <translation id="4016425174436051808">Nije moguće pratiti. Nešto nije uredu.</translation>
+<translation id="4024768890073681126">Roditelj upravlja tvojim preglednikom</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# h}one{# h}few{# h}other{# h}}</translation>
 <translation id="4035877632587724847">Nemoj dozvoliti</translation>
 <translation id="4036177530563778041">Jednostavno nastavite gdje ste stali</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_cy.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_cy.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_cy.xtb
index 56336c0d..cdf1821 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_cy.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_cy.xtb
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">Gallwch weld a dileu pynciau o ddiddordeb y mae gwefannau'n eu defnyddio i ddangos hysbysebion i chi. Mae Chrome yn amcangyfrif eich diddordebau yn seiliedig ar eich hanes pori diweddar.</translation>
 <translation id="4000212216660919741">Hafan All-lein</translation>
 <translation id="4016425174436051808">Methu â dilyn. Aeth rhywbeth o'i le.</translation>
+<translation id="4024768890073681126">Rheolir dy borwr gan dy riant</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# awr}zero{# awr}two{# awr}few{# awr}many{# awr}other{# awr}}</translation>
 <translation id="4035877632587724847">Peidio â chaniatáu</translation>
 <translation id="4036177530563778041">Parhau lle y gwnaethoch adael yn hawdd</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb
index 1e86039..9db203b 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">You can see and remove topics of interest that sites use to show you ads. Chrome estimates your interests based on your recent browsing history.</translation>
 <translation id="4000212216660919741">Offline Home</translation>
 <translation id="4016425174436051808">Can’t follow. Something went wrong.</translation>
+<translation id="4024768890073681126">Your browser is managed by your parent</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# hr}other{# hrs}}</translation>
 <translation id="4035877632587724847">Don't allow</translation>
 <translation id="4036177530563778041">Easily continue where you left off</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb
index 58ae6f1..f9f5959 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">Voit tarkistaa ja poistaa kiinnostuksen kohteita, joita sivustot käyttävät mainosten näyttämiseen. Chrome arvioi viimeaikaisen selaushistoriasi perusteella, mikä saattaisi kiinnostaa sinua.</translation>
 <translation id="4000212216660919741">Offline-etusivu</translation>
 <translation id="4016425174436051808">Ei voi seurata. Jotain meni pieleen.</translation>
+<translation id="4024768890073681126">Vanhempasi hallinnoi selainta</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# h}other{# h}}</translation>
 <translation id="4035877632587724847">Älä salli</translation>
 <translation id="4036177530563778041">Jatka helposti siitä, mihin jäit</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb
index 551fa1b..a4b51dab 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb
@@ -325,7 +325,7 @@
 <translation id="2860954141821109167">Assurez-vous qu'une application Téléphone est activée sur cet appareil</translation>
 <translation id="2861923151411510142">Certaines fonctionnalités de Chrome ne seront plus disponibles</translation>
 <translation id="2870560284913253234">Site</translation>
-<translation id="2871733351037274014">Précharger des pages</translation>
+<translation id="2871733351037274014">Précharger les pages</translation>
 <translation id="2876136027428473467"><ph name="CHILD_NAME" /> souhaite que vous approuviez ce site Web :</translation>
 <translation id="2886836735871983413">Une liste de sites s'affichera ici quand vous naviguerez sur le Web</translation>
 <translation id="2888126860611144412">À propos de Chrome</translation>
@@ -574,13 +574,13 @@
 <translation id="4162867837470729563">Liste des options de partage ouverte à pleine hauteur.</translation>
 <translation id="4170011742729630528">Service indisponible. Veuillez réessayer plus tard.</translation>
 <translation id="4177222230309051052">Récupérer tous vos favoris</translation>
-<translation id="4177501066905053472">Thèmes publicitaires</translation>
+<translation id="4177501066905053472">Thèmes des annonces</translation>
 <translation id="4181841719683918333">Langues</translation>
 <translation id="4188221736490993796">Trier de Z à A</translation>
 <translation id="4195643157523330669">Ouvrir dans un nouvel onglet</translation>
 <translation id="4196597275619698563">Créer une fiche</translation>
 <translation id="4198423547019359126">Aucun emplacement de téléchargements disponible</translation>
-<translation id="4202218894997543208">Thèmes bloqués</translation>
+<translation id="4202218894997543208">Thèmes que vous avez bloqués</translation>
 <translation id="4214315110991671325">Si vous autorisez les cookies, Chrome peut les utiliser pour le préchargement.</translation>
 <translation id="4225895483398857530">Raccourci de la barre d'outils</translation>
 <translation id="4242533952199664413">Ouvrir les paramètres</translation>
@@ -753,7 +753,7 @@
 <translation id="5091199029769593641">Vous verrez bientôt les stories de <ph name="SITE_NAME" /> quand vous ouvrirez un onglet. Les sites que vous suivez seront enregistrés dans votre compte Google. Vous pourrez les gérer dans les paramètres Discover.</translation>
 <translation id="5091249083535528968">Données d'utilisation avancées</translation>
 <translation id="509429900233858213">Une erreur s'est produite.</translation>
-<translation id="5097349930204431044">Les sites que vous consultez peuvent déterminer vos centres d'intérêt, puis vous suggérer des annonces durant votre navigation</translation>
+<translation id="5097349930204431044">Les sites que vous consultez peuvent déterminer ce que vous aimez, puis vous montrer des annonces alors que vous continuez de naviguer</translation>
 <translation id="5099845111805573968">Si vous sélectionnez la version pour ordinateur, ce paramètre sera appliqué chaque fois que vous accéderez à ce site.</translation>
 <translation id="5102401324271069229">Si un site tente de voler votre mot de passe ou si vous téléchargez un fichier dangereux, Chrome peut envoyer les URL concernées, y compris des extraits du contenu des pages, à la fonctionnalité de navigation sécurisée</translation>
 <translation id="510275257476243843">1 heure restante</translation>
@@ -930,7 +930,7 @@
 <translation id="6059830886158432458">Contrôlez vos articles et votre activité via ce menu</translation>
 <translation id="6070730414166672373">Nous contactons votre banque…</translation>
 <translation id="6085886413119427067">Détermine comment se connecter aux sites Web via une connexion sécurisée</translation>
-<translation id="6091413777268123602">Avec les essais Privacy Sandbox, les sites peuvent offrir la même expérience de navigation en utilisant moins de données personnelles. Cela signifie plus de confidentialité pour vous et moins de suivi intersites. Nous ajouterons des essais dès qu'ils seront prêts à être testés.</translation>
+<translation id="6091413777268123602">Avec les essais Privacy Sandbox, les sites peuvent offrir la même expérience de navigation en utilisant moins de vos données. Cela signifie plus de confidentialité pour vous et moins de suivi intersites. Nous ajouterons des essais dès qu'ils seront prêts à être testés.</translation>
 <translation id="60923314841986378"><ph name="HOURS" /> heures restantes</translation>
 <translation id="6095578583683628124">Si Google est aussi votre moteur de recherche par défaut, vous obtiendrez des suggestions plus pertinentes en fonction du contexte</translation>
 <translation id="6108923351542677676">Configuration en cours…</translation>
@@ -1106,7 +1106,7 @@
 <translation id="6900532703269623216">Protection renforcée</translation>
 <translation id="6903907808598579934">Activer la synchronisation</translation>
 <translation id="6908998565271542516">Option permettant d'approuver ou non un site Web ouverte à pleine hauteur</translation>
-<translation id="6909589135458168665">Précharger des pages</translation>
+<translation id="6909589135458168665">Précharger les pages</translation>
 <translation id="6942665639005891494">Modifier à tout moment l'emplacement de téléchargement par défaut à l'aide de l'option de menu "Paramètres"</translation>
 <translation id="694267552845942083">Vous personnalisez actuellement vos paramètres de synchronisation. Pour valider l'activation de la synchronisation, appuyez sur le bouton "Confirmer" en bas de l'écran. Revenir en haut de la page</translation>
 <translation id="6945221475159498467">Sélectionner</translation>
@@ -1450,7 +1450,7 @@
 <translation id="8662811608048051533">Vous déconnecte de la plupart des sites.</translation>
 <translation id="8664215986015753476">Utilisez Chrome comme vous le souhaitez</translation>
 <translation id="8664979001105139458">Nom de fichier déjà attribué</translation>
-<translation id="8666759526542103597">À propos de la personnalisation des annonces basée sur un navigateur</translation>
+<translation id="8666759526542103597">À propos de la personnalisation des annonces basée sur le navigateur</translation>
 <translation id="8676789164135894283">Validations de connexion</translation>
 <translation id="8683039184091909753">image</translation>
 <translation id="869891660844655955">Date d'expiration</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb
index ab83dae..5c156e0 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb
@@ -477,6 +477,7 @@
 <translation id="3587596251841506391">વેબ પર સુરક્ષા સુધારવા સહાય કરો</translation>
 <translation id="3597179440835065298">બહેતર સૂચનો મેળવો</translation>
 <translation id="3602290021589620013">પ્રીવ્યૂ કરો</translation>
+<translation id="360901359071773787">છેલ્લી 15 મિનિટનો ડેટા ડિલીટ કરીએ?</translation>
 <translation id="3616113530831147358">ઑડિઓ</translation>
 <translation id="3622349720008044802">વિન્ડો મેનેજ કરો</translation>
 <translation id="3631987586758005671"><ph name="DEVICE_NAME" /> પર શેર કરી રહ્યાં છે</translation>
@@ -827,6 +828,7 @@
 <translation id="5517095782334947753">તમારી પાસે <ph name="FROM_ACCOUNT" />ના બુકમાર્ક, ઇતિહાસ, પાસવર્ડ અને અન્ય સેટિંગ છે.</translation>
 <translation id="5524761631371622910">જ્યારે અજમાયશો ચાલુ હોય અને જો Chrome કોઈ સક્રિય અજમાયશમાં કોઈપણ ક્રમમાં તમારી ગોઠવણ કરી લે, તો તમારો બ્રાઉઝિંગ ઇતિહાસ તમને દેખાતી જાહેરાતો અને નીચે જણાવેલી અનુમાનિત રુચિઓને અસર કરે છે. તમારી પ્રાઇવસીની સુરક્ષા કરવા માટે Chrome નવા વિષયો આવતા જાય, તેના આધારે દર મહિને તમારી રુચિના વિષયોને ડિલીટ કરે છે.</translation>
 <translation id="5524843473235508879">રીડાયરેક્ટ કરવાનું અવરોધિત.</translation>
+<translation id="554297709083131118">નીચેનો છેલ્લી 15 મિનિટનો ડેટા ડિલીટ કરવામાં આવશે</translation>
 <translation id="5548606607480005320">સલામતી માટે તપાસ</translation>
 <translation id="5555525474779371165">તમારું Safe Browsing સંરક્ષણ પસંદ કરો</translation>
 <translation id="5556459405103347317">ફરીથી લોડ કરો</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb
index cc72d60..aa422fc 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">Možete vidjeti i ukloniti teme koje web-lokacije koriste da bi vam prikazivale oglase. Chrome procjenjuje vaše interese na temelju vaše nedavne povijesti pregledavanja.</translation>
 <translation id="4000212216660919741">Početna stranica offline</translation>
 <translation id="4016425174436051808">Praćenje nije uspjelo. Došlo je do pogreške.</translation>
+<translation id="4024768890073681126">Preglednikom upravlja tvoj roditelj</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# h}one{# h}few{# h}other{# h}}</translation>
 <translation id="4035877632587724847">Nemoj dopustiti</translation>
 <translation id="4036177530563778041">Lako nastavite tamo gdje ste stali</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_is.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_is.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_is.xtb
index eb42f9e..c00c2e5 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_is.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_is.xtb
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">Þú getur séð og fjarlægt áhugasvið sem vefsvæði nota til að birta þér auglýsingar. Chrome áætlar áhugasvið þín út frá nýlegum vafraferli þínum.</translation>
 <translation id="4000212216660919741">Ónettengt</translation>
 <translation id="4016425174436051808">Ekkki er hægt að fylgja. Eitthvað fór úrskeiðis.</translation>
+<translation id="4024768890073681126">Foreldri þitt stjórnar vafranum</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# klst.}one{# klst.}other{# klst.}}</translation>
 <translation id="4035877632587724847">Ekki leyfa</translation>
 <translation id="4036177530563778041">Auðvelt að halda áfram þar sem frá var horfið</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb
index a477143..85e7622 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb
@@ -49,7 +49,7 @@
 <translation id="1239792311949352652">Condividi rapidamente questa pagina. Per modificare questa scorciatoia, vai a Impostazioni.</translation>
 <translation id="1240190568154816272">Suggerimenti per Chrome</translation>
 <translation id="1240288207750131269">Caricamento della lingua <ph name="LANG" /> in corso…</translation>
-<translation id="1240903469550363138">Per continuare, <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" /> condividerà il tuo nome, il tuo indirizzo email e l'immagine del tuo profilo con questo sito. Leggi le <ph name="BEGIN_LINK1" />norme sulla privacy<ph name="END_LINK1" /> e i <ph name="BEGIN_LINK2" />Termini di servizio<ph name="END_LINK2" /> del sito.</translation>
+<translation id="1240903469550363138">Per continuare, <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" /> condividerà il tuo nome, il tuo indirizzo email e l'immagine del tuo profilo con questo sito. Leggi le <ph name="BEGIN_LINK1" />Norme sulla privacy<ph name="END_LINK1" /> e i <ph name="BEGIN_LINK2" />Termini di servizio<ph name="END_LINK2" /> del sito.</translation>
 <translation id="124116460088058876">Altre lingue</translation>
 <translation id="1242883863226959074">dispositivo</translation>
 <translation id="124678866338384709">Chiudi scheda corrente</translation>
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">Puoi visualizzare e rimuovere argomenti di interesse usati dai siti per mostrarti annunci. Chrome stima i tuoi interessi in base alla tua recente cronologia di navigazione.</translation>
 <translation id="4000212216660919741">Home page offline</translation>
 <translation id="4016425174436051808">Non è possibile seguire. Si è verificato un errore.</translation>
+<translation id="4024768890073681126">Il tuo browser è gestito da un genitore</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# ora}other{# ore}}</translation>
 <translation id="4035877632587724847">Non consentire</translation>
 <translation id="4036177530563778041">Continua facilmente da dove avevi interrotto</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb
index a8d4926..5d0e35b 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb
@@ -10,7 +10,7 @@
 <translation id="1049743911850919806">シークレット モード</translation>
 <translation id="1058669287135776095">オフラインです。インターネット接続を確認してから、もう一度お試しください。</translation>
 <translation id="10614374240317010">常に保存しない</translation>
-<translation id="1062628064301375934">ウェブにおけるプライバシーの強化にご協力ください</translation>
+<translation id="1062628064301375934">ウェブのプライバシー強化にご協力ください</translation>
 <translation id="107147699690128016">ファイル拡張子を変更すると、ファイルが別のアプリケーションで開かれる可能性があり、場合によってはデバイスに損害が生じます。</translation>
 <translation id="1089606299949659462">確認が終わりました</translation>
 <translation id="1095761715416917775">同期データに常にアクセスできるようにしてください</translation>
@@ -557,7 +557,7 @@
 <translation id="4096227151372679484">ブックマーク保存フローが画面の下半分に表示されています</translation>
 <translation id="4101475238162928417">同期すると、他のデバイスのパスワードやブックマークなどを使用できます。</translation>
 <translation id="410351446219883937">自動再生</translation>
-<translation id="4106587138345390261">Chrome では、使用されるユーザーの情報の量を抑えつつ、同じようにサイトをブラウジングできる新機能をテストしています</translation>
+<translation id="4106587138345390261">Chrome では、使用するユーザー情報量を減らしながら、これまでと同様にブラウジングできる新機能をテストしています</translation>
 <translation id="4108314971463891922">フォロー</translation>
 <translation id="4108998448622696017">危険なイベントの発生を検出して警告します。</translation>
 <translation id="4116038641877404294">ページをダウンロードするとオフラインで使用できるようになります</translation>
@@ -785,7 +785,7 @@
 <translation id="5271967389191913893">デバイスでダウンロード コンテンツを開くことができません。</translation>
 <translation id="5274286919938458946"><ph name="CARD_DETAIL" /> とリンクしました</translation>
 <translation id="5292796745632149097">送信先</translation>
-<translation id="5300426565656326054">ブラウザベースの広告のカスタマイズ</translation>
+<translation id="5300426565656326054">ブラウザベースの広告のパーソナライズ</translation>
 <translation id="5304593522240415983">この項目は必須です</translation>
 <translation id="5308380583665731573">接続</translation>
 <translation id="5317780077021120954">保存</translation>
@@ -930,7 +930,7 @@
 <translation id="6059830886158432458">ここで記事やアクティビティを管理します</translation>
 <translation id="6070730414166672373">カード発行会社に問い合わせています…</translation>
 <translation id="6085886413119427067">ウェブサイトに安全に接続する方法を決定します</translation>
-<translation id="6091413777268123602">プライバシー サンドボックスの試用版を使うと、使用されるユーザーデータの量を抑えつつ、同じようにサイトをブラウジングできる可能性があります。それにより、ユーザーのプライバシーが向上し、クロスサイト トラッキングが減少します。テストの準備が整い次第、他の新しい試用版も追加されます。</translation>
+<translation id="6091413777268123602">プライバシー サンドボックスの試用版を使うと、使用されるユーザーデータの量を抑えつつ、同じようにサイトをブラウジングできる可能性があります。それによってユーザーのプライバシー保護が強化され、クロスサイト トラッキングが制限されます。テストの準備が整い次第、他の新しい試用版も追加されます。</translation>
 <translation id="60923314841986378">残り <ph name="HOURS" /> 時間</translation>
 <translation id="6095578583683628124">既定の検索エンジンが Google の場合は、コンテンツとより関連性の高い候補が表示されます</translation>
 <translation id="6108923351542677676">設定しています...</translation>
@@ -1267,7 +1267,7 @@
 <translation id="7780645209293383778">ログイン時には、このデータを一時的に Google アカウントにリンクして、すべての Google アプリを安全に利用できるように保護します</translation>
 <translation id="7791543448312431591">追加</translation>
 <translation id="7798392620021911922"><ph name="TAB_COUNT" /> 個のタブを復元しました</translation>
-<translation id="780301667611848630">いいえ、結構です</translation>
+<translation id="780301667611848630">同意しない</translation>
 <translation id="7808889146555843082">このパスワードを削除しても、<ph name="SITE" /> のアカウントは削除されません。セキュリティを確保するため、パスワードを変更するか、<ph name="SITE" /> のアカウントを削除してください。</translation>
 <translation id="7810647596859435254">アプリで開く…</translation>
 <translation id="7815484226266492798">ロング スクリーンショット</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_ka.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ka.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ka.xtb
index 1b139b50..383d28a7 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ka.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ka.xtb
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">თქვენ შეძლებთ თქვენთვის საინტერესო იმ თემების ნახვასა და ამოშლას, რომლებსაც საიტები იყენებს თქვენთვის რეკლამის საჩვენებლად. თქვენს ინტერესებს Chrome პროგნოზირებს თქვენ მიერ ვების დათვალიერების ბოლოდროინდელი ისტორიის საფუძველზე.</translation>
 <translation id="4000212216660919741">ხაზგარეშე მთავარი გვერდი</translation>
 <translation id="4016425174436051808">თვალის მიდევნება ვერ მოხერხდა. წარმოიქმნა შეფერხება.</translation>
+<translation id="4024768890073681126">თქვენს ბრაუზერს მართავს თქვენი მშობელი</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# სთ}other{# სთ}}</translation>
 <translation id="4035877632587724847">არ დაიშვას</translation>
 <translation id="4036177530563778041">მარტივად გააგრძელეთ იქიდან, სადაც შეჩერდით</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_km.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_km.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_km.xtb
index 264f534..ebc178f 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_km.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_km.xtb
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">អ្នក​អាច​មើលឃើញ និង​លុប​ចេញ​នូវ​ប្រធានបទ​ជា​ទី​ចាប់​អារម្មណ៍​ដែល​គេហទំព័រ​ប្រើប្រាស់​សម្រាប់​បង្ហាញ​ការ​ផ្សាយ​ពាណិជ្ជកម្ម​ដល់​អ្នក។ Chrome ប៉ាន់ស្មានចំណាប់អារម្មណ៍របស់អ្នក ដោយផ្អែកលើប្រវត្តិ​រុករក​តាមអ៊ីនធឺណិតថ្មីៗរបស់អ្នក។</translation>
 <translation id="4000212216660919741">Home គ្មាន​អ៊ីនធឺណិតទេ</translation>
 <translation id="4016425174436051808">មិនអាច​តាមដានបានទេ។ មានអ្វីមួយខុសប្រក្រតី។</translation>
+<translation id="4024768890073681126">កម្មវិធីរុករក​តាមអ៊ីនធឺណិត​របស់អ្នក​ត្រូវបានគ្រប់គ្រង​ដោយ​មាតាបិតារបស់អ្នក</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# ម៉ោង​}other{# ម៉ោង}}</translation>
 <translation id="4035877632587724847">មិនអនុញ្ញាត</translation>
 <translation id="4036177530563778041">ងាយស្រួលបន្ត​ពីចំណុច​ដែលអ្នកបានចាកចេញ</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb
index 00978ec..7b302fae 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">ನಿಮಗೆ ಜಾಹೀರಾತುಗಳನ್ನು ತೋರಿಸಲು ಬಳಸುವ ಆಸಕ್ತಿ ಹೊಂದಿರುವ ವಿಷಯಗಳನ್ನು ಒಳಗೊಂಡಿರುವ ಸೈಟ್‌ಗಳನ್ನು ನೀವು ನೋಡಬಹುದು ಮತ್ತು ತೆಗೆದುಹಾಕಬಹುದು. ನಿಮ್ಮ ಇತ್ತೀಚಿನ ಬ್ರೌಸಿಂಗ್ ಇತಿಹಾಸವನ್ನು ಆಧರಿಸಿ Chrome ನಿಮ್ಮ ಆಸಕ್ತಿಗಳನ್ನು ಅಂದಾಜು ಮಾಡುತ್ತದೆ.</translation>
 <translation id="4000212216660919741">ಆಫ್‌ಲೈನ್ ಹೋಮ್</translation>
 <translation id="4016425174436051808">ಅನುಸರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಏನೋ ತಪ್ಪಾಗಿದೆ.</translation>
+<translation id="4024768890073681126">ನಿಮ್ಮ ಬ್ರೌಸರ್ ಅನ್ನು ನಿಮ್ಮ ಪೋಷಕರು ನಿರ್ವಹಿಸುತ್ತಾರೆ</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# ಗಂಟೆ}one{# ಗಂಟೆಗಳು}other{# ಗಂಟೆಗಳು}}</translation>
 <translation id="4035877632587724847">ಅನುಮತಿಸಬೇಡಿ</translation>
 <translation id="4036177530563778041">ನೀವು ಎಲ್ಲಿಗೆ ನಿಲ್ಲಿಸಿದ್ದಿರೋ, ಅಲ್ಲಿಂದಲೇ ಸುಲಭವಾಗಿ ಮುಂದುವರಿಸಿ</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_ky.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ky.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ky.xtb
index fd93c4b..291185a 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ky.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ky.xtb
@@ -1155,7 +1155,7 @@
 <translation id="7260367682327802201">Android түзмөгүңүздө ушуга окшош параметр болушу мүмкүн. Эгер Chrome'до жана Android түзмөгүндө Жарнамаларды талдоо күйгүзүлсө, компания вебсайттарда жана колдонмолордо көрсөтүлгөн жарнамалардын майнаптуулугун талдай алышы мүмкүн.</translation>
 <translation id="727288900855680735"><ph name="ONE_TIME_CODE" /> коду <ph name="ORIGIN" /> сайтына тапшырылсынбы?</translation>
 <translation id="7274013316676448362">Бөгөттөлгөн сайт</translation>
-<translation id="7286572596625053347"><ph name="LANGUAGE" /> тилине өзгөрсүнбү?</translation>
+<translation id="7286572596625053347"><ph name="LANGUAGE" /> тилин өзгөртөсүзбү?</translation>
 <translation id="7286703216224610554">Реакцияны гана бөлүшүү</translation>
 <translation id="7290209999329137901">Аталышын өзгөртүү мүмкүн эмес</translation>
 <translation id="7291910923717764901">Сүрөттүн бул баракка кошулган сүрөттөмөлөрү</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb
index 3f34cd18..e722a90 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">നിങ്ങളെ പരസ്യങ്ങൾ കാണിക്കാൻ സൈറ്റുകൾ ഉപയോഗിക്കുന്ന, താൽപ്പര്യമുള്ള വിഷയങ്ങൾ കാണാനും നീക്കം ചെയ്യാനും നിങ്ങൾക്ക് കഴിയും. നിങ്ങളുടെ അടുത്തിടെയുള്ള ബ്രൗസിംഗ് ചരിത്രം അടിസ്ഥാനമാക്കി നിങ്ങളുടെ താൽപ്പര്യങ്ങൾ Chrome അനുമാനിക്കുന്നു.</translation>
 <translation id="4000212216660919741">ഓഫ്‌ലൈൻ ഹോം</translation>
 <translation id="4016425174436051808">പിന്തുടരാനാകുന്നില്ല. എന്തോ കുഴപ്പമുണ്ടായി.</translation>
+<translation id="4024768890073681126">നിങ്ങളുടെ ബ്രൗസർ മാനേജ് ചെയ്യുന്നത് നിങ്ങളുടെ രക്ഷിതാവാണ്</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# മണിക്കൂർ}other{# മണിക്കൂർ}}</translation>
 <translation id="4035877632587724847">അനുവദിക്കരുത്</translation>
 <translation id="4036177530563778041">നിങ്ങൾ നിർത്തിയ ഇടത്തുനിന്നും എളുപ്പത്തിൽ തുടരുക</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb
index 173be2a..3b60c66e 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">तुम्हाला जाहिराती दाखवण्यासाठी साइट जे स्वारस्याचे विषय वापरतात, ते तुम्ही पाहू आणि काढून टाकू शकता. तुमच्या अलीकडील ब्राउझिंग इतिहासाच्या आधारे Chrome तुमच्या स्वारस्यांचा अंदाज लावते.</translation>
 <translation id="4000212216660919741">ऑफलाइन होम</translation>
 <translation id="4016425174436051808">फॉलो करू शकत नाही. काहीतरी चूक झाली.</translation>
+<translation id="4024768890073681126">तुमचा ब्राउझर तुमच्या पालकाद्वारे व्यवस्थापित केला जातो</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# तास}other{# तास}}</translation>
 <translation id="4035877632587724847">अनुमती देऊ नका</translation>
 <translation id="4036177530563778041">तम्ही सोडले होते तेथून पुढे सहज सुरू करा</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_my.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_my.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_my.xtb
index 4fcef16c..0dc6e3b 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_my.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_my.xtb
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">ကြော်ငြာပြရန်သုံးသည့် သင်စိတ်ဝင်စားသော ဝဘ်ဆိုက်များ၏ အကြောင်းအရာများကို ကြည့်ကာ ဖယ်ရှားနိုင်သည်။ သင့်လတ်တလော ကြည့်ရှုခြင်းမှတ်တမ်းအပေါ်မူတည်၍ သင့်စိတ်ဝင်စားမှုများကို Chrome က ခန့်မှန်းသည်။</translation>
 <translation id="4000212216660919741">အော့ဖ်လိုင်း ပင်မစာမျက်နှာ</translation>
 <translation id="4016425174436051808">လိုက်ကြည့်၍ မရပါ။ တစ်ခုခုမှားသွားသည်။</translation>
+<translation id="4024768890073681126">သင့်ဘရောင်ဇာကို သင့်မိဘက စီမံခန့်ခွဲသည်</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# နာရီ}other{# နာရီ}}</translation>
 <translation id="4035877632587724847">ခွင့်မပြုပါ</translation>
 <translation id="4036177530563778041">သင်ထားခဲ့သည့်နေရာမှ လွယ်ကူစွာ ရှေ့ဆက်နိုင်သည်</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb
index 7d641132..724b4e8 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">Je kunt interessante onderwerpen bekijken en verwijderen die sites hebben gebruikt om je advertenties te laten zien. Chrome schat je interesses op basis van je recente browsegeschiedenis.</translation>
 <translation id="4000212216660919741">Homepage voor offline</translation>
 <translation id="4016425174436051808">Volgen is mislukt. Er is iets misgegaan.</translation>
+<translation id="4024768890073681126">Je browser wordt beheerd door je ouder</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# uur}other{# uur}}</translation>
 <translation id="4035877632587724847">Niet toestaan</translation>
 <translation id="4036177530563778041">Ga makkelijk verder waar je gebleven was</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb
index 82ffcc90..6ae00405 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">Du kan se og fjerne interesseemnene som nettsteder bruker for å vise deg annonser. Chrome anslår interessene dine basert på den nylige nettleserloggen din.</translation>
 <translation id="4000212216660919741">Hjem uten nett</translation>
 <translation id="4016425174436051808">Kan ikke følge. Noe gikk galt.</translation>
+<translation id="4024768890073681126">Nettleseren administreres av forelderen din</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# t}other{# t}}</translation>
 <translation id="4035877632587724847">Ikke tillat</translation>
 <translation id="4036177530563778041">Du kan enkelt fortsette der du slapp</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb
index ae5220f..1667330 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">Możesz przeglądać i usuwać interesujące Cię tematy, których witryny używają do dobierania wyświetlanych reklam. Chrome ocenia, jakie są Twoje zainteresowania, na podstawie ostatniej historii przeglądania.</translation>
 <translation id="4000212216660919741">Ekran główny offline</translation>
 <translation id="4016425174436051808">Nie udało się dodać do obserwowanych. Coś poszło nie tak.</translation>
+<translation id="4024768890073681126">Przeglądarką zarządza Twój rodzic</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# godzina}few{# godziny}many{# godzin}other{# godziny}}</translation>
 <translation id="4035877632587724847">Nie zezwalaj</translation>
 <translation id="4036177530563778041">Z łatwością kontynuuj od tego samego miejsca</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb
index 140cdda..1eddd28b 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb
@@ -626,7 +626,7 @@
 <translation id="4504667196171871375">По Wi-Fi и моб. интернету</translation>
 <translation id="4508528996305412043">Меню карточки из ленты открыто целиком</translation>
 <translation id="4508642716788467538">Выберите язык</translation>
-<translation id="4509501256689523862">Персонализация объявлений зависит от этого параметра, <ph name="BEGIN_LINK_1" />тем рекламы<ph name="END_LINK_1" />, <ph name="BEGIN_LINK_2" />настроек файлов cookie<ph name="END_LINK_2" />, а также от настроек сайта, который вы просматриваете.</translation>
+<translation id="4509501256689523862">Персонализация рекламы зависит от этого параметра, <ph name="BEGIN_LINK_1" />тем<ph name="END_LINK_1" />, <ph name="BEGIN_LINK_2" />настроек файлов cookie<ph name="END_LINK_2" />, а также от параметров сайта, который вы просматриваете.</translation>
 <translation id="4513387527876475750">{DAYS,plural, =1{# день назад}one{# день назад}few{# дня назад}many{# дней назад}other{# дня назад}}</translation>
 <translation id="451872707440238414">Искать в закладках</translation>
 <translation id="4521489764227272523">Выбранные данные удалены из Chrome и с синхронизированных устройств.
@@ -1423,7 +1423,7 @@
 <translation id="8540136935098276800">Введите URL в правильном формате.</translation>
 <translation id="854522910157234410">Открыть эту страницу</translation>
 <translation id="8551513938758868521">Блокировать доступ к вкладкам инкогнито при закрытии Chrome</translation>
-<translation id="8559961053328923750">Для оценки эффективности рекламы Chrome ограничивает общий объем данных отправляемых сайтами через браузер.</translation>
+<translation id="8559961053328923750">Для оценки эффективности рекламы Chrome ограничивает общий объем данных, отправляемых сайтами через браузер.</translation>
 <translation id="8559990750235505898">Предлагать перевести страницы на других языках</translation>
 <translation id="8560602726703398413">Список для чтения находится в закладках</translation>
 <translation id="8562452229998620586">Здесь будут показаны сохраненные пароли.</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_sr-Latn.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr-Latn.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr-Latn.xtb
index 44c8c01..5da4f94 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr-Latn.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr-Latn.xtb
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">Možete da vidite i uklonite teme interesovanja koje sajtovi koriste da bi vam prikazivali oglase. Chrome procenjuje vaša interesovanja na osnovu nedavne istorije pregledanja.</translation>
 <translation id="4000212216660919741">Oflajn početna stranica</translation>
 <translation id="4016425174436051808">Praćenje nije uspelo. Došlo je do greške.</translation>
+<translation id="4024768890073681126">Roditelj upravlja pregledačem</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# č}one{# č}few{# č}other{# č}}</translation>
 <translation id="4035877632587724847">Ne dozvoli</translation>
 <translation id="4036177530563778041">Lako nastavite tamo gde ste stali</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb
index 75a4b321..57232dc 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">Можете да видите и уклоните теме интересовања које сајтови користе да би вам приказивали огласе. Chrome процењује ваша интересовања на основу недавне историје прегледања.</translation>
 <translation id="4000212216660919741">Офлајн почетна страница</translation>
 <translation id="4016425174436051808">Праћење није успело. Дошло је до грешке.</translation>
+<translation id="4024768890073681126">Родитељ управља прегледачем</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# ч}one{# ч}few{# ч}other{# ч}}</translation>
 <translation id="4035877632587724847">Не дозволи</translation>
 <translation id="4036177530563778041">Лако наставите тамо где сте стали</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb
index 94a3e866..c89a126 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb
@@ -49,7 +49,7 @@
 <translation id="1239792311949352652">แชร์หน้านี้อย่างรวดเร็ว ไปที่การตั้งค่าเพื่อแก้ไขทางลัดนี้</translation>
 <translation id="1240190568154816272">เคล็ดลับการใช้ Chrome</translation>
 <translation id="1240288207750131269">กำลังโหลดภาษา<ph name="LANG" /></translation>
-<translation id="1240903469550363138">หากต้องการดำเนินการต่อ <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" /> จะแชร์ชื่อ อีเมล และรูปโปรไฟล์ของคุณกับเว็บไซต์นี้ อ่าน<ph name="BEGIN_LINK1" />นโยบายความเป็นส่วนตัว<ph name="END_LINK1" />และ<ph name="BEGIN_LINK2" />ข้อกำหนดในการให้บริการ<ph name="END_LINK2" />ของเว็บไซต์</translation>
+<translation id="1240903469550363138">หากต้องการดำเนินการต่อ <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" /> จะแชร์ชื่อ อีเมล และรูปโปรไฟล์ของคุณกับเว็บไซต์นี้ โปรดอ่าน<ph name="BEGIN_LINK1" />นโยบายความเป็นส่วนตัว<ph name="END_LINK1" />และ<ph name="BEGIN_LINK2" />ข้อกำหนดในการให้บริการ<ph name="END_LINK2" />ของเว็บไซต์</translation>
 <translation id="124116460088058876">ภาษาเพิ่มเติม</translation>
 <translation id="1242883863226959074">อุปกรณ์</translation>
 <translation id="124678866338384709">ปิดแท็บปัจจุบัน</translation>
@@ -85,7 +85,7 @@
 <translation id="1383876407941801731">ค้นหา</translation>
 <translation id="1384704387250346179">แปลรูปภาพด้วย Google Lens <ph name="BEGIN_NEW" />ใหม่<ph name="END_NEW" /></translation>
 <translation id="1386674309198842382">ใช้งานเมื่อ <ph name="LAST_UPDATED" /> วันที่ผ่านมา</translation>
-<translation id="13931502444227376">หากต้องการดำเนินการต่อ <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" /> จะแชร์ชื่อ อีเมล และรูปโปรไฟล์ของคุณกับเว็บไซต์นี้ ดู<ph name="BEGIN_LINK1" />ข้อกำหนดในการให้บริการ<ph name="END_LINK1" />ของเว็บไซต์นี้</translation>
+<translation id="13931502444227376">หากต้องการดำเนินการต่อ <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" /> จะแชร์ชื่อ อีเมล และรูปโปรไฟล์ของคุณกับเว็บไซต์นี้ โปรดอ่าน<ph name="BEGIN_LINK1" />ข้อกำหนดในการให้บริการ<ph name="END_LINK1" />ของเว็บไซต์</translation>
 <translation id="1397811292916898096">ค้นหาด้วย <ph name="PRODUCT_NAME" /></translation>
 <translation id="139993653570221430">คุณเปลี่ยนใจได้ทุกเมื่อในการตั้งค่า Chrome การทดลองใช้จะทำงานพร้อมกับวิธีแสดงโฆษณาปัจจุบัน คุณจึงจะไม่เห็นการเปลี่ยนแปลงโดยทันที</translation>
 <translation id="1406000523432664303">“ไม่ติดตาม”</translation>
@@ -177,7 +177,7 @@
 <translation id="1974060860693918893">ขั้นสูง</translation>
 <translation id="1984417487208496350">ไม่มีการปกป้อง (ไม่แนะนำ)</translation>
 <translation id="1986685561493779662">มีชื่อนี้อยู่แล้ว</translation>
-<translation id="1995884366040846621">หากต้องการดำเนินการต่อ <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" /> จะแชร์ชื่อ อีเมล และรูปโปรไฟล์ของคุณกับเว็บไซต์นี้ อ่าน<ph name="BEGIN_LINK1" />นโยบายความเป็นส่วนตัว<ph name="END_LINK1" />ของเว็บไซต์</translation>
+<translation id="1995884366040846621">หากต้องการดำเนินการต่อ <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE" /> จะแชร์ชื่อ อีเมล และรูปโปรไฟล์ของคุณกับเว็บไซต์นี้ โปรดอ่าน<ph name="BEGIN_LINK1" />นโยบายความเป็นส่วนตัว<ph name="END_LINK1" />ของเว็บไซต์</translation>
 <translation id="200114059308480249">รวมข้อความที่อยู่โดยรอบในการค้นหาบน Google ไหม</translation>
 <translation id="2009341475524975924">ระบบสามารถแชร์ข้อมูลบางประเภทระหว่างเว็บไซต์เพื่อวัดประสิทธิภาพของโฆษณา เช่น ช่วงเวลาของวันที่มีการแสดงโฆษณาแก่คุณ</translation>
 <translation id="2013642289801508067">{FILE_COUNT,plural, =1{# ไฟล์}other{# ไฟล์}}</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb
index 98357c55..58cf4b13 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">Bạn có thể xem và xoá những chủ đề quan tâm mà các trang web dựa vào để hiện quảng cáo cho bạn. Chrome ước đoán các mối quan tâm dựa trên nhật ký duyệt web gần đây của bạn.</translation>
 <translation id="4000212216660919741">Nhà ở chế độ không kết nối Internet</translation>
 <translation id="4016425174436051808">Không thể theo dõi. Đã xảy ra lỗi.</translation>
+<translation id="4024768890073681126">Cha mẹ của bạn quản lý trình duyệt này</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# giờ}other{# giờ}}</translation>
 <translation id="4035877632587724847">Không cho phép</translation>
 <translation id="4036177530563778041">Dễ dàng tiếp tục từ nơi bạn đã dừng lại</translation>

chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb
index 71982c8..074aa79 100644
--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb
@@ -542,6 +542,7 @@
 <translation id="3999683152997576765">您可看到并移除被网站用来向您展示广告的兴趣主题。Chrome 会根据您近期的浏览记录推测出您的兴趣。</translation>
 <translation id="4000212216660919741">离线版首页</translation>
 <translation id="4016425174436051808">无法关注。出了点问题。</translation>
+<translation id="4024768890073681126">您的浏览器由您的家长管理</translation>
 <translation id="4034817413553209278">{HOURS,plural, =1{# 小时}other{# 小时}}</translation>
 <translation id="4035877632587724847">不允许</translation>
 <translation id="4036177530563778041">轻松地从上次停下的地方继续</translation>

chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java

diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java
index b6c8047..11c4a292 100644
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java
@@ -46,6 +46,12 @@
     View getView();
 
     /**
+     * Triggered when the current tab or model has changed.
+     * @param incognito Whether or not the current tab model is incognito.
+     */
+    void onTabOrModelChanged(boolean incognito);
+
+    /**
      * Destroys the control container, causing it to release any owned native resources and cancel
      * pending tasks.
      */

chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java

diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
index 19962ee..d4a9245 100644
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
@@ -51,6 +51,7 @@
 import org.chromium.components.browser_ui.widget.gesture.SwipeGestureListener;
 import org.chromium.components.browser_ui.widget.gesture.SwipeGestureListener.SwipeHandler;
 import org.chromium.ui.KeyboardVisibilityDelegate;
+import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.base.ViewUtils;
 import org.chromium.ui.resources.dynamics.ViewResourceAdapter;
 import org.chromium.ui.util.TokenHolder;
@@ -66,6 +67,8 @@
 public class ToolbarControlContainer extends OptimizedFrameLayout implements ControlContainer {
     private final float mTabStripHeight;
 
+    private boolean mIncognito;
+
     private Toolbar mToolbar;
     private ToolbarViewResourceFrameLayout mToolbarContainer;
 
@@ -125,10 +128,53 @@
     }
 
     @Override
+    public void onTabOrModelChanged(boolean incognito) {
+        if (!DeviceFormFactor.isNonMultiDisplayContextOnTablet(getContext())
+                || getBackground() == null) {
+            return;
+        }
+
+        if (mIncognito != incognito) {
+            setBackground(getTempTabStripDrawable(incognito));
+            mIncognito = incognito;
+        }
+    }
+
+    @Override
     public void destroy() {
         ((ToolbarViewResourceAdapter) getToolbarResourceAdapter()).destroy();
     }
 
+    private Drawable getTempTabStripDrawable(boolean incognito) {
+        if (ChromeFeatureList.sTabStripRedesign.isEnabled()) {
+            Drawable bgdColor = new ColorDrawable(
+                    TabUiThemeUtil.getTabStripBackgroundColor(getContext(), incognito));
+            Drawable bdgTabImage = ResourcesCompat.getDrawable(getContext().getResources(),
+                    TabUiThemeUtil.getTSRTabResource(), getContext().getTheme());
+            bdgTabImage.setTint(
+                    TabUiThemeUtil.getTabStripContainerColor(getContext(), incognito, true, false));
+            LayerDrawable backgroundDrawable =
+                    new LayerDrawable(new Drawable[] {bgdColor, bdgTabImage});
+            // Set image size to match tab size.
+            backgroundDrawable.setPadding(0, 0, 0, 0);
+            backgroundDrawable.setLayerSize(1,
+                    ViewUtils.dpToPx(getContext(), TabUiThemeUtil.getMaxTabStripTabWidthDp()),
+                    mToolbar.getTabStripHeight());
+            // Tab should show up at start of layer based on layout.
+            backgroundDrawable.setLayerGravity(1, Gravity.START);
+
+            return backgroundDrawable;
+        } else {
+            final Drawable backgroundDrawable =
+                    AppCompatResources.getDrawable(getContext(), R.drawable.toolbar_background)
+                            .mutate();
+            backgroundDrawable.setTint(ChromeColors.getDefaultThemeColor(getContext(), incognito));
+            backgroundDrawable.setTintMode(PorterDuff.Mode.MULTIPLY);
+
+            return backgroundDrawable;
+        }
+    }
+
     /**
      * @param toolbar The toolbar contained inside this control container. Should be called
      *                after inflation is complete.
@@ -147,6 +193,7 @@
                     browserStateBrowserControlsVisibilityDelegate,
             OneshotSupplier<LayoutStateProvider> layoutStateProviderSupplier) {
         mToolbar = toolbar;
+        mIncognito = isIncognito;
 
         BooleanSupplier isVisible = () -> this.getVisibility() == View.VISIBLE;
         mToolbarContainer.setPostInitializationDependencies(mToolbar, constraintsSupplier,
@@ -161,33 +208,7 @@
             // On tablet, draw a fake tab strip and toolbar until the compositor is
             // ready to draw the real tab strip. (On phone, the toolbar is made entirely
             // of Android views, which are already initialized.)
-
-            if (ChromeFeatureList.sTabStripRedesign.isEnabled()) {
-                Drawable bgdColor = new ColorDrawable(
-                        TabUiThemeUtil.getTabStripBackgroundColor(getContext(), isIncognito));
-                Drawable bdgTabImage = ResourcesCompat.getDrawable(getContext().getResources(),
-                        TabUiThemeUtil.getTSRTabResource(), getContext().getTheme());
-                bdgTabImage.setTint(
-                        TabUiThemeUtil.getTabStripContainerColor(getContext(), false, true, false));
-                LayerDrawable backgroundDrawable =
-                        new LayerDrawable(new Drawable[] {bgdColor, bdgTabImage});
-                // Set image size to match tab size.
-                backgroundDrawable.setPadding(0, 0, 0, 0);
-                backgroundDrawable.setLayerSize(1,
-                        ViewUtils.dpToPx(getContext(), TabUiThemeUtil.getMaxTabStripTabWidthDp()),
-                        mToolbar.getTabStripHeight());
-                // Tab should show up at start of layer based on layout.
-                backgroundDrawable.setLayerGravity(1, Gravity.START);
-                setBackground(backgroundDrawable);
-            } else {
-                final Drawable backgroundDrawable =
-                        AppCompatResources.getDrawable(getContext(), R.drawable.toolbar_background)
-                                .mutate();
-                backgroundDrawable.setTint(
-                        ChromeColors.getDefaultThemeColor(getContext(), isIncognito));
-                backgroundDrawable.setTintMode(PorterDuff.Mode.MULTIPLY);
-                setBackground(backgroundDrawable);
-            }
+            setBackground(getTempTabStripDrawable(isIncognito));
         }
     }
 

chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java

diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
index 9640bfae..4b6dc6a 100644
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
@@ -627,6 +627,12 @@
         mLocationBarBackground = background;
     }
 
+    @VisibleForTesting
+    void setOptionalButtonCoordinatorForTesting(
+            OptionalButtonCoordinator optionalButtonCoordinator) {
+        mOptionalButton = optionalButtonCoordinator;
+    }
+
     @SuppressLint("RtlHardcoded")
     private boolean layoutLocationBar(int containerWidth) {
         TraceEvent.begin("ToolbarPhone.layoutLocationBar");
@@ -1317,7 +1323,12 @@
         // Translate to draw end toolbar buttons.
         ViewUtils.translateCanvasToView(this, mToolbarButtonsContainer, canvas);
 
-        if (mOptionalButton != null && mOptionalButton.getViewVisibility() != View.GONE) {
+        // Draw the optional button if visible. We check for both visibility and width because in
+        // some cases (e.g. the first frame of the showing animation) the view may be visible with a
+        // width of zero. Calling draw in this state results in drawing the inner ImageButton when
+        // it's not supposed to. (See https://crbug.com/1422176 for an example of this happening).
+        if (mOptionalButton != null && mOptionalButton.getViewVisibility() != View.GONE
+                && mOptionalButton.getViewWidth() != 0) {
             canvas.save();
             ViewUtils.translateCanvasToView(
                     mToolbarButtonsContainer, mOptionalButton.getViewForDrawing(), canvas);

chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator.java

diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator.java
index 13527ee..d2b9b56 100644
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator.java
@@ -502,6 +502,7 @@
      */
     public void onTabOrModelChanged() {
         mToolbarLayout.onTabOrModelChanged();
+        mControlContainer.onTabOrModelChanged(mToolbarLayout.isIncognito());
     }
 
     /**

chrome/browser/ui/ash/holding_space/holding_space_client_impl.cc

diff --git a/chrome/browser/ui/ash/holding_space/holding_space_client_impl.cc b/chrome/browser/ui/ash/holding_space/holding_space_client_impl.cc
index f580ace..ac266026 100644
--- a/chrome/browser/ui/ash/holding_space/holding_space_client_impl.cc
+++ b/chrome/browser/ui/ash/holding_space/holding_space_client_impl.cc
@@ -104,11 +104,6 @@
   return GetHoldingSpaceKeyedService(profile_)->AddItemOfType(type, file_path);
 }
 
-void HoldingSpaceClientImpl::AddScreenCapture(HoldingSpaceItem::Type type,
-                                              const base::FilePath& file_path) {
-  GetHoldingSpaceKeyedService(profile_)->AddScreenCapture(type, file_path);
-}
-
 void HoldingSpaceClientImpl::CopyImageToClipboard(const HoldingSpaceItem& item,
                                                   SuccessCallback callback) {
   holding_space_metrics::RecordItemAction(

chrome/browser/ui/ash/holding_space/holding_space_client_impl.h

diff --git a/chrome/browser/ui/ash/holding_space/holding_space_client_impl.h b/chrome/browser/ui/ash/holding_space/holding_space_client_impl.h
index b19cd0c..489ff4b 100644
--- a/chrome/browser/ui/ash/holding_space/holding_space_client_impl.h
+++ b/chrome/browser/ui/ash/holding_space/holding_space_client_impl.h
@@ -28,8 +28,6 @@
   void AddDiagnosticsLog(const base::FilePath& file_path) override;
   const std::string& AddItemOfType(HoldingSpaceItem::Type type,
                                    const base::FilePath& file_path) override;
-  void AddScreenCapture(HoldingSpaceItem::Type type,
-                        const base::FilePath& file_path) override;
   void CopyImageToClipboard(const HoldingSpaceItem&, SuccessCallback) override;
   base::FilePath CrackFileSystemUrl(const GURL& file_system_url) const override;
   bool IsDriveDisabled() const override;

chrome/browser/ui/ash/holding_space/holding_space_keyed_service.cc

diff --git a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.cc b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.cc
index 7e213f3..d6a2c5a 100644
--- a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.cc
+++ b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.cc
@@ -255,13 +255,6 @@
   AddItemOfType(HoldingSpaceItem::Type::kScan, file_path);
 }
 
-void HoldingSpaceKeyedService::AddScreenCapture(
-    HoldingSpaceItem::Type type,
-    const base::FilePath& file_path) {
-  DCHECK(HoldingSpaceItem::IsScreenCapture(type));
-  AddItemOfType(type, file_path);
-}
-
 void HoldingSpaceKeyedService::SetSuggestions(
     const std::vector<std::pair<HoldingSpaceItem::Type, base::FilePath>>&
         suggestions) {

chrome/browser/ui/ash/holding_space/holding_space_keyed_service.h

diff --git a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.h b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.h
index 82b26b9d..2d01fde 100644
--- a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.h
+++ b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.h
@@ -122,12 +122,6 @@
   // Adds a scanned item backed by the provided absolute file path.
   void AddScan(const base::FilePath& file_path);
 
-  // TODO(http://b/274477308): Remove one-off API.
-  // Adds a screen capture item of the specified `type` backed by the provided
-  // absolute file path. NOTE: `type` must refer to a screen capture type.
-  void AddScreenCapture(HoldingSpaceItem::Type type,
-                        const base::FilePath& file_path);
-
   // Replaces the existing suggestions with `suggestions`. The order among
   // `suggestions` is respected, which means that if a suggestion A is in front
   // of a suggestion B in the given array, after calling this function, the

chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc

diff --git a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc
index f34dffc..6cf7ad4 100644
--- a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc
+++ b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc
@@ -1889,8 +1889,8 @@
       holding_space_service->model_for_testing();
 
   const base::FilePath file_path_1 = test_mount_1->CreateArbitraryFile();
-  holding_space_service->AddScreenCapture(HoldingSpaceItem::Type::kScreenshot,
-                                          file_path_1);
+  holding_space_service->AddItemOfType(HoldingSpaceItem::Type::kScreenshot,
+                                       file_path_1);
 
   const base::FilePath file_path_2 = test_mount_2->CreateArbitraryFile();
   holding_space_service->AddDownload(HoldingSpaceItem::Type::kDownload,
@@ -2635,7 +2635,7 @@
       case HoldingSpaceItem::Type::kScreenRecording:
       case HoldingSpaceItem::Type::kScreenRecordingGif:
       case HoldingSpaceItem::Type::kScreenshot:
-        holding_space_service->AddScreenCapture(type, file_path);
+        holding_space_service->AddItemOfType(type, file_path);
         break;
     }
 

chrome/browser/ui/ash/login_screen_client_impl.cc

diff --git a/chrome/browser/ui/ash/login_screen_client_impl.cc b/chrome/browser/ui/ash/login_screen_client_impl.cc
index f588d23..3215d7f 100644
--- a/chrome/browser/ui/ash/login_screen_client_impl.cc
+++ b/chrome/browser/ui/ash/login_screen_client_impl.cc
@@ -35,7 +35,6 @@
 #include "chrome/common/webui_url_constants.h"
 #include "chromeos/ash/components/settings/cros_settings_provider.h"
 #include "components/session_manager/core/session_manager.h"
-#include "components/user_manager/remove_user_delegate.h"
 #include "components/user_manager/user_names.h"
 #include "ui/base/ime/ash/input_method_manager.h"
 
@@ -245,8 +244,7 @@
   ProfileMetrics::LogProfileDeleteUser(
       ProfileMetrics::DELETE_PROFILE_USER_MANAGER);
   user_manager::UserManager::Get()->RemoveUser(
-      account_id, user_manager::UserRemovalReason::LOCAL_USER_INITIATED,
-      /*delegate=*/nullptr);
+      account_id, user_manager::UserRemovalReason::LOCAL_USER_INITIATED);
   if (ash::LoginDisplayHost::default_host())
     ash::LoginDisplayHost::default_host()->UpdateAddUserButtonStatus();
 }

chrome/browser/ui/commerce/price_tracking/shopping_list_ui_tab_helper.cc

diff --git a/chrome/browser/ui/commerce/price_tracking/shopping_list_ui_tab_helper.cc b/chrome/browser/ui/commerce/price_tracking/shopping_list_ui_tab_helper.cc
index 5a3b425..8a51046 100644
--- a/chrome/browser/ui/commerce/price_tracking/shopping_list_ui_tab_helper.cc
+++ b/chrome/browser/ui/commerce/price_tracking/shopping_list_ui_tab_helper.cc
@@ -6,6 +6,7 @@
 
 #include "base/check_is_test.h"
 #include "base/functional/bind.h"
+#include "base/strings/string_number_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
@@ -129,10 +130,12 @@
 
 void ShoppingListUiTabHelper::HandleSubscriptionChange(
     const CommerceSubscription& sub) {
-  // TODO(b:265216263): Block events here if the subscription does not match
-  //                    what is on the current page.
-  UpdatePriceTrackingStateFromSubscriptions();
-  UpdatePriceTrackingIconView();
+  if (sub.id_type == IdentifierType::kProductClusterId &&
+      sub.id == base::NumberToString(
+                    cluster_id_for_page_.value_or(kInvalidSubscriptionId))) {
+    UpdatePriceTrackingStateFromSubscriptions();
+    UpdatePriceTrackingIconView();
+  }
 }
 
 void ShoppingListUiTabHelper::SetShoppingServiceForTesting(

chrome/browser/ui/views/web_apps/web_app_integration_browsertest.cc

diff --git a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest.cc b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest.cc
index 66e44695..b6c60154 100644
--- a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest.cc
+++ b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest.cc
@@ -60,7 +60,7 @@
   helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
   helper_.CheckWindowCreated();
   helper_.OpenInChrome();
-  helper_.CheckTabCreated();
+  helper_.CheckTabCreated(Number::kOne);
 }
 
 IN_PROC_BROWSER_TEST_F(WebAppIntegration, ManifestUpdateDisplayBrowser) {
@@ -309,20 +309,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_29NotPromotableBrowser_11NotPromotable_7NotPromotable_34NotPromotable_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kNotPromotable, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kNotPromotable);
-  helper_.CheckPlatformShortcutAndIcon(Site::kNotPromotable);
-  helper_.LaunchFromChromeApps(Site::kNotPromotable);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_29NotPromotableBrowser_11NotPromotable_7NotPromotable_10NotPromotable_15Standalone) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -624,25 +610,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_39StandaloneMinimalUi_16_71_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.NavigatePwa(Site::kStandalone, Site::kMinimalUi);
-  helper_.CheckCustomToolbar();
-  helper_.OpenInChrome();
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_37Standalone_17_20) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -735,25 +702,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_34Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_37Standalone_18) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -773,23 +721,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_71_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.OpenInChrome();
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_37StandaloneNestedA_17_20) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -845,25 +776,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_39StandaloneMinimalUi_16_71_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.NavigatePwa(Site::kStandalone, Site::kMinimalUi);
-  helper_.CheckCustomToolbar();
-  helper_.OpenInChrome();
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_37Standalone_17_20) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -956,25 +868,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_34Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_37Standalone_18) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -994,23 +887,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_71_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.OpenInChrome();
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_37StandaloneNestedA_17_20) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -1066,25 +942,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_39StandaloneMinimalUi_16_71_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallMenuOption(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.NavigatePwa(Site::kStandalone, Site::kMinimalUi);
-  helper_.CheckCustomToolbar();
-  helper_.OpenInChrome();
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_37Standalone_17_20) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -1177,25 +1034,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_34Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallMenuOption(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_37Standalone_18) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -1215,23 +1053,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_71_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallMenuOption(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.OpenInChrome();
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_37StandaloneNestedA_17_20) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -2569,24 +2390,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneWithShortcutWindowedWebApp_7Standalone_11Standalone_34Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneWithShortcutWindowedWebApp_7Standalone_11Standalone_44Standalone_11Standalone_7Standalone) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -2624,24 +2427,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneNoShortcutWindowedWebApp_7Standalone_11Standalone_34Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneNoShortcutWindowedWebApp_7Standalone_11Standalone_44Standalone_11Standalone_7Standalone) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -2924,20 +2709,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_32NotPromotableNoShortcutBrowserWebApp_11NotPromotable_34NotPromotable_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kNotPromotable, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kBrowser, InstallMode::kWebApp);
-  helper_.CheckAppInListTabbed(Site::kNotPromotable);
-  helper_.LaunchFromChromeApps(Site::kNotPromotable);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_32NotPromotableWithShortcutBrowserWebApp_11NotPromotable_7NotPromotable_37NotPromotable_17_19) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -2954,21 +2725,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_32NotPromotableWithShortcutBrowserWebApp_11NotPromotable_7NotPromotable_34NotPromotable_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kNotPromotable, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kBrowser, InstallMode::kWebApp);
-  helper_.CheckAppInListTabbed(Site::kNotPromotable);
-  helper_.CheckPlatformShortcutAndIcon(Site::kNotPromotable);
-  helper_.LaunchFromChromeApps(Site::kNotPromotable);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_32MinimalUiWithShortcutWindowedWebApp_37MinimalUi_20) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -3412,21 +3168,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_32StandaloneNoShortcutWindowedWebApp_12Standalone_149Standalone_34Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_32StandaloneNoShortcutWindowedWebApp_12Standalone_37StandaloneNestedA_17_20) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -3489,22 +3230,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_32StandaloneWithShortcutWindowedWebApp_12Standalone_7Standalone_149Standalone_34Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_32StandaloneWithShortcutWindowedWebApp_12Standalone_7Standalone_37StandaloneNestedA_17_20) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -5312,5 +5037,280 @@
   helper_.CheckWindowDisplayTabbed();
 }
 
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_39StandaloneMinimalUi_16_71_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.NavigatePwa(Site::kStandalone, Site::kMinimalUi);
+  helper_.CheckCustomToolbar();
+  helper_.OpenInChrome();
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_34Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_71_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.OpenInChrome();
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_39StandaloneMinimalUi_16_71_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.NavigatePwa(Site::kStandalone, Site::kMinimalUi);
+  helper_.CheckCustomToolbar();
+  helper_.OpenInChrome();
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_34Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_71_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.OpenInChrome();
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_39StandaloneMinimalUi_16_71_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallMenuOption(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.NavigatePwa(Site::kStandalone, Site::kMinimalUi);
+  helper_.CheckCustomToolbar();
+  helper_.OpenInChrome();
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_34Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallMenuOption(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_71_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallMenuOption(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.OpenInChrome();
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneNoShortcutWindowedWebApp_12Standalone_149Standalone_34Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneWithShortcutWindowedWebApp_7Standalone_11Standalone_34Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneNoShortcutWindowedWebApp_7Standalone_11Standalone_34Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneWithShortcutWindowedWebApp_12Standalone_7Standalone_149Standalone_34Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32NotPromotableNoShortcutBrowserWebApp_11NotPromotable_34NotPromotable_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kNotPromotable, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckAppInListTabbed(Site::kNotPromotable);
+  helper_.LaunchFromChromeApps(Site::kNotPromotable);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29NotPromotableBrowser_11NotPromotable_7NotPromotable_34NotPromotable_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kNotPromotable, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kNotPromotable);
+  helper_.CheckPlatformShortcutAndIcon(Site::kNotPromotable);
+  helper_.LaunchFromChromeApps(Site::kNotPromotable);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32NotPromotableWithShortcutBrowserWebApp_11NotPromotable_7NotPromotable_34NotPromotable_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kNotPromotable, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckAppInListTabbed(Site::kNotPromotable);
+  helper_.CheckPlatformShortcutAndIcon(Site::kNotPromotable);
+  helper_.LaunchFromChromeApps(Site::kNotPromotable);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
 }  // namespace
 }  // namespace web_app::integration_tests

chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac.cc

diff --git a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac.cc b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac.cc
index f00fbd9..775980f 100644
--- a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac.cc
+++ b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac.cc
@@ -123,44 +123,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_28_149Standalone_1Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.ClosePwa();
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_28_147Standalone_1Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.ClosePwa();
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_74Standalone_72Standalone_1Standalone_127) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -277,44 +239,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_28_149Standalone_1Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.ClosePwa();
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_28_147Standalone_1Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.ClosePwa();
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_74Standalone_72Standalone_1Standalone_127) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -431,44 +355,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_28_149Standalone_1Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallMenuOption(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.ClosePwa();
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_28_147Standalone_1Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallMenuOption(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.ClosePwa();
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_74Standalone_72Standalone_1Standalone_127) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -1229,5 +1115,119 @@
   helper_.CheckWindowDisplayMinimal();
 }
 
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_28_149Standalone_1Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.ClosePwa();
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_28_147Standalone_1Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.ClosePwa();
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_28_149Standalone_1Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.ClosePwa();
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_28_147Standalone_1Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.ClosePwa();
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_28_149Standalone_1Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallMenuOption(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.ClosePwa();
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_28_147Standalone_1Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallMenuOption(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.ClosePwa();
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
 }  // namespace
 }  // namespace web_app::integration_tests

chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac_win_linux.cc

diff --git a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac_win_linux.cc b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac_win_linux.cc
index 2b36007..b6b16855 100644
--- a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac_win_linux.cc
+++ b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac_win_linux.cc
@@ -139,45 +139,6 @@
   helper_.CheckSiteNotHandlesFile(Site::kMinimalUi, FileExtension::kBar);
 }
 
-// TODO(https://crbug.com/1382214): Migrate this to a CUJ.
-IN_PROC_BROWSER_TEST_F(WebAppIntegration, MultiProfileFileLaunch) {
-  // Install file handling PWA in two profiles.
-  helper_.InstallMenuOption(InstallableSite::kFileHandler);
-  helper_.ClosePwa();
-
-  helper_.SwitchActiveProfile(ProfileName::kProfile2);
-  helper_.InstallMenuOption(InstallableSite::kFileHandler);
-  helper_.ClosePwa();
-  helper_.DisableFileHandling(Site::kFileHandler);
-
-  // File handling is disabled in second profile, launching should open
-  // in first profile.
-  helper_.SwitchActiveProfile(ProfileName::kDefault);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckWindowCreated();
-}
-
-// TODO(https://crbug.com/1382214): Migrate this to a CUJ.
-IN_PROC_BROWSER_TEST_F(WebAppIntegration, MultiProfileFileLaunchWhileOpen) {
-  // Install file handling PWA in two profiles.
-  helper_.InstallMenuOption(InstallableSite::kFileHandler);
-  helper_.ClosePwa();
-
-  helper_.SwitchActiveProfile(ProfileName::kProfile2);
-  helper_.InstallMenuOption(InstallableSite::kFileHandler);
-  helper_.DisableFileHandling(Site::kFileHandler);
-
-  // File handling is disabled in second profile, launching should open
-  // in first profile, even if it wasn't closed.
-  helper_.SwitchActiveProfile(ProfileName::kDefault);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckWindowCreated();
-}
-
 IN_PROC_BROWSER_TEST_F(WebAppIntegration, CheckFilesLoadedInSite) {
   helper_.InstallMenuOption(InstallableSite::kFileHandler);
   helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
@@ -198,20 +159,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_29NotPromotableBrowser_11NotPromotable_7NotPromotable_1NotPromotable_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kNotPromotable, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kNotPromotable);
-  helper_.CheckPlatformShortcutAndIcon(Site::kNotPromotable);
-  helper_.LaunchFromPlatformShortcut(Site::kNotPromotable);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_29NotPromotableWindowed_12NotPromotable_7NotPromotable_43NotPromotable_15Standalone) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -541,22 +488,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_29StandaloneBrowser_11Standalone_7Standalone_74Standalone_72Standalone_1Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.DeletePlatformShortcut(Site::kStandalone);
-  helper_.CreateShortcutsFromList(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_29StandaloneNestedAWindowed_8StandaloneNestedAStandalone_117StandaloneNestedA_1StandaloneNestedA_39StandaloneNestedAStandaloneNestedB_21) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -602,87 +533,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_32StandaloneNoShortcutBrowserWebApp_11Standalone_72Standalone_7Standalone_1Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kBrowser, InstallMode::kWebApp);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.CreateShortcutsFromList(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneWithShortcutWindowedWebApp_7Standalone_11Standalone_1Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneNoShortcutWindowedWebApp_7Standalone_11Standalone_1Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32NotPromotableNoShortcutBrowserWebApp_11NotPromotable_1NotPromotable_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kNotPromotable, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kBrowser, InstallMode::kWebApp);
-  helper_.CheckAppInListTabbed(Site::kNotPromotable);
-  helper_.LaunchFromPlatformShortcut(Site::kNotPromotable);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32NotPromotableWithShortcutBrowserWebApp_11NotPromotable_7NotPromotable_1NotPromotable_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kNotPromotable, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kBrowser, InstallMode::kWebApp);
-  helper_.CheckAppInListTabbed(Site::kNotPromotable);
-  helper_.CheckPlatformShortcutAndIcon(Site::kNotPromotable);
-  helper_.LaunchFromPlatformShortcut(Site::kNotPromotable);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_32MinimalUiWithShortcutWindowedWebApp_1MinimalUi_25) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -875,25 +725,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_34Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_37Standalone_18) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -913,25 +744,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_34Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_37Standalone_18) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -951,25 +763,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_34Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallMenuOption(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_37Standalone_18) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -989,51 +782,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_32StandaloneNoShortcutWindowedWebApp_12Standalone_149Standalone_1Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32StandaloneNoShortcutWindowedWebApp_12Standalone_147Standalone_1Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32StandaloneNoShortcutWindowedWebApp_12Standalone_147Standalone_34Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_32StandaloneNoShortcutBrowserWebApp_11Standalone_150Standalone_1Standalone_24) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -1206,54 +954,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_32StandaloneWithShortcutWindowedWebApp_12Standalone_7Standalone_149Standalone_1Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32StandaloneWithShortcutWindowedWebApp_12Standalone_7Standalone_147Standalone_1Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32StandaloneWithShortcutWindowedWebApp_12Standalone_7Standalone_147Standalone_34Standalone_22) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_32StandaloneWithShortcutBrowserWebApp_11Standalone_7Standalone_150Standalone_1Standalone_24) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -3121,381 +2821,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_120FileHandlerOneFooFileAllowAskAgain_22_126FileHandlerOneFooFile_120FileHandlerOneFooFileAllowAskAgain) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_120FileHandlerMultipleFooFilesAllowAskAgain_22_126FileHandlerMultipleFooFiles) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.LaunchFileExpectDialog(
-      Site::kFileHandler, FilesOptions::kMultipleFooFiles,
-      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
-                                 FilesOptions::kMultipleFooFiles);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_120FileHandlerMultipleBarFilesAllowAskAgain_22_126FileHandlerMultipleBarFiles) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.LaunchFileExpectDialog(
-      Site::kFileHandler, FilesOptions::kMultipleBarFiles,
-      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
-                                 FilesOptions::kMultipleBarFiles);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerWithShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_120FileHandlerOneFooFileAllowAskAgain_22_126FileHandlerOneFooFile_120FileHandlerOneFooFileAllowAskAgain) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kBrowser, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerWithShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_120FileHandlerMultipleFooFilesAllowAskAgain_22_126FileHandlerMultipleFooFiles) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kBrowser, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.LaunchFileExpectDialog(
-      Site::kFileHandler, FilesOptions::kMultipleFooFiles,
-      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
-                                 FilesOptions::kMultipleFooFiles);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerWithShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_120FileHandlerOneBarFileAllowAskAgain_22_126FileHandlerOneBarFile) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kBrowser, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneBarFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneBarFile);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerWithShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_120FileHandlerMultipleBarFilesAllowAskAgain_22_126FileHandlerMultipleBarFiles) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kBrowser, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.LaunchFileExpectDialog(
-      Site::kFileHandler, FilesOptions::kMultipleBarFiles,
-      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
-                                 FilesOptions::kMultipleBarFiles);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerNoShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_120FileHandlerOneFooFileAllowAskAgain_22_126FileHandlerOneFooFile_120FileHandlerOneFooFileAllowAskAgain) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kBrowser, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerNoShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_120FileHandlerMultipleFooFilesAllowAskAgain_22_126FileHandlerMultipleFooFiles) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kBrowser, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.LaunchFileExpectDialog(
-      Site::kFileHandler, FilesOptions::kMultipleFooFiles,
-      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
-                                 FilesOptions::kMultipleFooFiles);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerNoShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_120FileHandlerOneBarFileAllowAskAgain_22_126FileHandlerOneBarFile) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kBrowser, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneBarFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneBarFile);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerNoShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_120FileHandlerMultipleBarFilesAllowAskAgain_22_126FileHandlerMultipleBarFiles) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kBrowser, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.LaunchFileExpectDialog(
-      Site::kFileHandler, FilesOptions::kMultipleBarFiles,
-      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
-                                 FilesOptions::kMultipleBarFiles);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_120FileHandlerOneBarFileAllowAskAgain_22_126FileHandlerOneBarFile) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneBarFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneBarFile);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerOneFooFileAllowAskAgain_22_126FileHandlerOneFooFile) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerMultipleFooFilesAllowAskAgain_22_126FileHandlerMultipleFooFiles) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(
-      Site::kFileHandler, FilesOptions::kMultipleFooFiles,
-      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
-                                 FilesOptions::kMultipleFooFiles);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerOneBarFileAllowAskAgain_22_126FileHandlerOneBarFile) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneBarFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneBarFile);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerMultipleBarFilesAllowAskAgain_22_126FileHandlerMultipleBarFiles) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(
-      Site::kFileHandler, FilesOptions::kMultipleBarFiles,
-      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
-                                 FilesOptions::kMultipleBarFiles);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerOneFooFileAllowAskAgain_22_126FileHandlerOneFooFile) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerMultipleFooFilesAllowAskAgain_22_126FileHandlerMultipleFooFiles) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(
-      Site::kFileHandler, FilesOptions::kMultipleFooFiles,
-      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
-                                 FilesOptions::kMultipleFooFiles);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerOneBarFileAllowAskAgain_22_126FileHandlerOneBarFile) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneBarFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneBarFile);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerMultipleBarFilesAllowAskAgain_22_126FileHandlerMultipleBarFiles) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(
-      Site::kFileHandler, FilesOptions::kMultipleBarFiles,
-      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
-                                 FilesOptions::kMultipleBarFiles);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_120FileHandlerOneFooFileDenyAskAgain_127_94_118FileHandlerFoo_118FileHandlerBar_120FileHandlerOneFooFileAllowAskAgain) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -3578,162 +2903,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerOneFooFileAllowAskAgain_22_126FileHandlerOneFooFile) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerMultipleFooFilesAllowAskAgain_22_126FileHandlerMultipleFooFiles) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(
-      Site::kFileHandler, FilesOptions::kMultipleFooFiles,
-      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
-                                 FilesOptions::kMultipleFooFiles);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerOneBarFileAllowAskAgain_22_126FileHandlerOneBarFile) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneBarFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneBarFile);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerMultipleBarFilesAllowAskAgain_22_126FileHandlerMultipleBarFiles) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(
-      Site::kFileHandler, FilesOptions::kMultipleBarFiles,
-      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
-                                 FilesOptions::kMultipleBarFiles);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerOneFooFileAllowAskAgain_22_126FileHandlerOneFooFile) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerMultipleFooFilesAllowAskAgain_22_126FileHandlerMultipleFooFiles) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(
-      Site::kFileHandler, FilesOptions::kMultipleFooFiles,
-      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
-                                 FilesOptions::kMultipleFooFiles);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerOneBarFileAllowAskAgain_22_126FileHandlerOneBarFile) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneBarFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneBarFile);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerMultipleBarFilesAllowAskAgain_22_126FileHandlerMultipleBarFiles) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(
-      Site::kFileHandler, FilesOptions::kMultipleBarFiles,
-      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
-                                 FilesOptions::kMultipleBarFiles);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_120FileHandlerOneFooFileDenyAskAgain_127_94_118FileHandlerFoo_118FileHandlerBar_120FileHandlerOneFooFileAllowAskAgain) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -3820,162 +2989,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerOneFooFileAllowAskAgain_22_126FileHandlerOneFooFile) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerMultipleFooFilesAllowAskAgain_22_126FileHandlerMultipleFooFiles) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(
-      Site::kFileHandler, FilesOptions::kMultipleFooFiles,
-      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
-                                 FilesOptions::kMultipleFooFiles);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerOneBarFileAllowAskAgain_22_126FileHandlerOneBarFile) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneBarFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneBarFile);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerMultipleBarFilesAllowAskAgain_22_126FileHandlerMultipleBarFiles) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(
-      Site::kFileHandler, FilesOptions::kMultipleBarFiles,
-      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
-                                 FilesOptions::kMultipleBarFiles);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerOneFooFileAllowAskAgain_22_126FileHandlerOneFooFile) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerMultipleFooFilesAllowAskAgain_22_126FileHandlerMultipleFooFiles) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(
-      Site::kFileHandler, FilesOptions::kMultipleFooFiles,
-      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
-                                 FilesOptions::kMultipleFooFiles);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerOneBarFileAllowAskAgain_22_126FileHandlerOneBarFile) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneBarFile,
-                                 AllowDenyOptions::kAllow,
-                                 AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneBarFile);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerMultipleBarFilesAllowAskAgain_22_126FileHandlerMultipleBarFiles) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
-  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
-  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
-  helper_.LaunchFileExpectDialog(
-      Site::kFileHandler, FilesOptions::kMultipleBarFiles,
-      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
-  helper_.CheckTabCreated();
-  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
-                                 FilesOptions::kMultipleBarFiles);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_120FileHandlerOneFooFileDenyAskAgain_127_94_118FileHandlerFoo_118FileHandlerBar_120FileHandlerOneFooFileAllowAskAgain) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -4363,6 +3376,954 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_34Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_34Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_34Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallMenuOption(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneNoShortcutWindowedWebApp_12Standalone_149Standalone_1Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneNoShortcutWindowedWebApp_12Standalone_147Standalone_1Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneNoShortcutWindowedWebApp_12Standalone_147Standalone_34Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneNoShortcutBrowserWebApp_11Standalone_72Standalone_7Standalone_1Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CreateShortcutsFromList(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneBrowser_11Standalone_7Standalone_74Standalone_72Standalone_1Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.DeletePlatformShortcut(Site::kStandalone);
+  helper_.CreateShortcutsFromList(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneWithShortcutWindowedWebApp_7Standalone_11Standalone_1Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneNoShortcutWindowedWebApp_7Standalone_11Standalone_1Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneWithShortcutWindowedWebApp_12Standalone_7Standalone_149Standalone_1Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneWithShortcutWindowedWebApp_12Standalone_7Standalone_147Standalone_1Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneWithShortcutWindowedWebApp_12Standalone_7Standalone_147Standalone_34Standalone_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32NotPromotableNoShortcutBrowserWebApp_11NotPromotable_1NotPromotable_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kNotPromotable, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckAppInListTabbed(Site::kNotPromotable);
+  helper_.LaunchFromPlatformShortcut(Site::kNotPromotable);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29NotPromotableBrowser_11NotPromotable_7NotPromotable_1NotPromotable_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kNotPromotable, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kNotPromotable);
+  helper_.CheckPlatformShortcutAndIcon(Site::kNotPromotable);
+  helper_.LaunchFromPlatformShortcut(Site::kNotPromotable);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32NotPromotableWithShortcutBrowserWebApp_11NotPromotable_7NotPromotable_1NotPromotable_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kNotPromotable, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckAppInListTabbed(Site::kNotPromotable);
+  helper_.CheckPlatformShortcutAndIcon(Site::kNotPromotable);
+  helper_.LaunchFromPlatformShortcut(Site::kNotPromotable);
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerOneBarFileAllowAskAgain_22One_126FileHandlerOneBarFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneBarFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneBarFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerMultipleFooFilesAllowAskAgain_22One_126FileHandlerMultipleFooFiles) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(
+      Site::kFileHandler, FilesOptions::kMultipleFooFiles,
+      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
+                                 FilesOptions::kMultipleFooFiles);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerMultipleBarFilesAllowAskAgain_22Two_126FileHandlerMultipleBarFiles) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(
+      Site::kFileHandler, FilesOptions::kMultipleBarFiles,
+      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kTwo);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
+                                 FilesOptions::kMultipleBarFiles);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerOneBarFileAllowAskAgain_22One_126FileHandlerOneBarFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneBarFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneBarFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerMultipleFooFilesAllowAskAgain_22One_126FileHandlerMultipleFooFiles) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(
+      Site::kFileHandler, FilesOptions::kMultipleFooFiles,
+      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
+                                 FilesOptions::kMultipleFooFiles);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerMultipleBarFilesAllowAskAgain_22Two_126FileHandlerMultipleBarFiles) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(
+      Site::kFileHandler, FilesOptions::kMultipleBarFiles,
+      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kTwo);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
+                                 FilesOptions::kMultipleBarFiles);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile_120FileHandlerOneFooFileAllowAskAgain) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_120FileHandlerOneBarFileAllowAskAgain_22One_126FileHandlerOneBarFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneBarFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneBarFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_120FileHandlerMultipleFooFilesAllowAskAgain_22One_126FileHandlerMultipleFooFiles) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.LaunchFileExpectDialog(
+      Site::kFileHandler, FilesOptions::kMultipleFooFiles,
+      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
+                                 FilesOptions::kMultipleFooFiles);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_120FileHandlerMultipleBarFilesAllowAskAgain_22Two_126FileHandlerMultipleBarFiles) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.LaunchFileExpectDialog(
+      Site::kFileHandler, FilesOptions::kMultipleBarFiles,
+      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kTwo);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
+                                 FilesOptions::kMultipleBarFiles);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerOneBarFileAllowAskAgain_22One_126FileHandlerOneBarFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneBarFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneBarFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerMultipleFooFilesAllowAskAgain_22One_126FileHandlerMultipleFooFiles) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(
+      Site::kFileHandler, FilesOptions::kMultipleFooFiles,
+      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
+                                 FilesOptions::kMultipleFooFiles);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerMultipleBarFilesAllowAskAgain_22Two_126FileHandlerMultipleBarFiles) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(
+      Site::kFileHandler, FilesOptions::kMultipleBarFiles,
+      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kTwo);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
+                                 FilesOptions::kMultipleBarFiles);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerOneBarFileAllowAskAgain_22One_126FileHandlerOneBarFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneBarFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneBarFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerMultipleFooFilesAllowAskAgain_22One_126FileHandlerMultipleFooFiles) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(
+      Site::kFileHandler, FilesOptions::kMultipleFooFiles,
+      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
+                                 FilesOptions::kMultipleFooFiles);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerMultipleBarFilesAllowAskAgain_22Two_126FileHandlerMultipleBarFiles) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(
+      Site::kFileHandler, FilesOptions::kMultipleBarFiles,
+      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kTwo);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
+                                 FilesOptions::kMultipleBarFiles);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile_120FileHandlerOneFooFileAllowAskAgain) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_120FileHandlerOneBarFileAllowAskAgain_22One_126FileHandlerOneBarFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneBarFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneBarFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_120FileHandlerMultipleFooFilesAllowAskAgain_22One_126FileHandlerMultipleFooFiles) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.LaunchFileExpectDialog(
+      Site::kFileHandler, FilesOptions::kMultipleFooFiles,
+      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
+                                 FilesOptions::kMultipleFooFiles);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_120FileHandlerMultipleBarFilesAllowAskAgain_22Two_126FileHandlerMultipleBarFiles) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.LaunchFileExpectDialog(
+      Site::kFileHandler, FilesOptions::kMultipleBarFiles,
+      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kTwo);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
+                                 FilesOptions::kMultipleBarFiles);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerOneBarFileAllowAskAgain_22One_126FileHandlerOneBarFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneBarFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneBarFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerMultipleFooFilesAllowAskAgain_22One_126FileHandlerMultipleFooFiles) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(
+      Site::kFileHandler, FilesOptions::kMultipleFooFiles,
+      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
+                                 FilesOptions::kMultipleFooFiles);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerMultipleBarFilesAllowAskAgain_22Two_126FileHandlerMultipleBarFiles) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppSettings(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(
+      Site::kFileHandler, FilesOptions::kMultipleBarFiles,
+      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kTwo);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
+                                 FilesOptions::kMultipleBarFiles);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerOneBarFileAllowAskAgain_22One_126FileHandlerOneBarFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneBarFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneBarFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerMultipleFooFilesAllowAskAgain_22One_126FileHandlerMultipleFooFiles) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(
+      Site::kFileHandler, FilesOptions::kMultipleFooFiles,
+      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
+                                 FilesOptions::kMultipleFooFiles);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_147FileHandler_120FileHandlerMultipleBarFilesAllowAskAgain_22Two_126FileHandlerMultipleBarFiles) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SetOpenInTabFromAppHome(Site::kFileHandler);
+  helper_.LaunchFileExpectDialog(
+      Site::kFileHandler, FilesOptions::kMultipleBarFiles,
+      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kTwo);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
+                                 FilesOptions::kMultipleBarFiles);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile_120FileHandlerOneFooFileAllowAskAgain) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_120FileHandlerOneBarFileAllowAskAgain_22One_126FileHandlerOneBarFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneBarFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneBarFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_120FileHandlerMultipleFooFilesAllowAskAgain_22One_126FileHandlerMultipleFooFiles) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.LaunchFileExpectDialog(
+      Site::kFileHandler, FilesOptions::kMultipleFooFiles,
+      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
+                                 FilesOptions::kMultipleFooFiles);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_120FileHandlerMultipleBarFilesAllowAskAgain_22Two_126FileHandlerMultipleBarFiles) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.LaunchFileExpectDialog(
+      Site::kFileHandler, FilesOptions::kMultipleBarFiles,
+      AllowDenyOptions::kAllow, AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kTwo);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler,
+                                 FilesOptions::kMultipleBarFiles);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
     WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_120FileHandlerMultipleFooFilesAllowAskAgain_123FileHandlerOne_126FileHandlerMultipleFooFiles) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -4399,5 +4360,1093 @@
                                  FilesOptions::kMultipleBarFiles);
 }
 
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_143_160Profile2_29FileHandlerWindowed_143_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.MaybeClosePwa();
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.MaybeClosePwa();
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_143_160Profile2_29FileHandlerWindowed_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.MaybeClosePwa();
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_143_160Profile2_29FileHandlerBrowser_143_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.MaybeClosePwa();
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.MaybeClosePwa();
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_143_160Profile2_29FileHandlerBrowser_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.MaybeClosePwa();
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_143_160Profile2_32FileHandlerWithShortcutWindowedWebApp_143_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.MaybeClosePwa();
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.MaybeClosePwa();
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_143_160Profile2_32FileHandlerWithShortcutWindowedWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.MaybeClosePwa();
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_143_160Profile2_32FileHandlerWithShortcutBrowserWebApp_143_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.MaybeClosePwa();
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.MaybeClosePwa();
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_143_160Profile2_32FileHandlerWithShortcutBrowserWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.MaybeClosePwa();
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_143_160Profile2_32FileHandlerNoShortcutWindowedWebApp_143_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.MaybeClosePwa();
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.MaybeClosePwa();
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_143_160Profile2_32FileHandlerNoShortcutWindowedWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.MaybeClosePwa();
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_143_160Profile2_32FileHandlerNoShortcutBrowserWebApp_143_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.MaybeClosePwa();
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.MaybeClosePwa();
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_143_160Profile2_32FileHandlerNoShortcutBrowserWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.MaybeClosePwa();
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_160Profile2_29FileHandlerWindowed_143_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.MaybeClosePwa();
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_160Profile2_29FileHandlerWindowed_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_160Profile2_29FileHandlerBrowser_143_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.MaybeClosePwa();
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_160Profile2_29FileHandlerBrowser_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerWithShortcutWindowedWebApp_143_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.MaybeClosePwa();
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerWithShortcutWindowedWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerWithShortcutBrowserWebApp_143_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.MaybeClosePwa();
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerWithShortcutBrowserWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerNoShortcutWindowedWebApp_143_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.MaybeClosePwa();
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerNoShortcutWindowedWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerNoShortcutBrowserWebApp_143_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.MaybeClosePwa();
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29FileHandlerBrowser_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerNoShortcutBrowserWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_29FileHandlerWindowed_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_29FileHandlerBrowser_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerWithShortcutWindowedWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerWithShortcutBrowserWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerNoShortcutWindowedWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerNoShortcutBrowserWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_29FileHandlerWindowed_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_29FileHandlerBrowser_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerWithShortcutWindowedWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerWithShortcutBrowserWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerNoShortcutWindowedWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerWithShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerNoShortcutBrowserWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_29FileHandlerWindowed_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_29FileHandlerBrowser_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerWithShortcutWindowedWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerWithShortcutBrowserWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerNoShortcutWindowedWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutWindowedWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerNoShortcutBrowserWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_123FileHandlerOne_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_29FileHandlerWindowed_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kWindowed);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_29FileHandlerBrowser_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.CreateShortcut(Site::kFileHandler, WindowOptions::kBrowser);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerWithShortcutWindowedWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerWithShortcutBrowserWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerNoShortcutWindowedWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32FileHandlerNoShortcutBrowserWebApp_118FileHandlerFoo_118FileHandlerBar_160Profile2_32FileHandlerNoShortcutBrowserWebApp_162FileHandler_160Default_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kFoo);
+  helper_.CheckSiteHandlesFile(Site::kFileHandler, FileExtension::kBar);
+  helper_.SwitchActiveProfile(ProfileName::kProfile2);
+  helper_.InstallPolicyApp(Site::kFileHandler, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.DisableFileHandling(Site::kFileHandler);
+  helper_.SwitchActiveProfile(ProfileName::kDefault);
+  helper_.LaunchFileExpectDialog(Site::kFileHandler, FilesOptions::kOneFooFile,
+                                 AllowDenyOptions::kAllow,
+                                 AskAgainOptions::kAskAgain);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckFilesLoadedInSite(Site::kFileHandler, FilesOptions::kOneFooFile);
+}
+
 }  // namespace
 }  // namespace web_app::integration_tests

chrome/browser/ui/views/web_apps/web_app_integration_browsertest_win_linux.cc

diff --git a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_win_linux.cc b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_win_linux.cc
index da664de..9b236cc 100644
--- a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_win_linux.cc
+++ b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_win_linux.cc
@@ -428,7 +428,7 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_1Standalone_22) {
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_1Standalone_22One) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
   // `docs/webapps/integration-testing-framework` for more info.
@@ -442,12 +442,12 @@
   helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
   helper_.CheckAppInListTabbed(Site::kStandalone);
   helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
+  helper_.CheckTabCreated(Number::kOne);
 }
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_1Standalone_22) {
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_1Standalone_22One) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
   // `docs/webapps/integration-testing-framework` for more info.
@@ -461,12 +461,12 @@
   helper_.SetOpenInTabFromAppHome(Site::kStandalone);
   helper_.CheckAppInListTabbed(Site::kStandalone);
   helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
+  helper_.CheckTabCreated(Number::kOne);
 }
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_1Standalone_22) {
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_1Standalone_22One) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
   // `docs/webapps/integration-testing-framework` for more info.
@@ -480,12 +480,12 @@
   helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
   helper_.CheckAppInListTabbed(Site::kStandalone);
   helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
+  helper_.CheckTabCreated(Number::kOne);
 }
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_1Standalone_22) {
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_1Standalone_22One) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
   // `docs/webapps/integration-testing-framework` for more info.
@@ -499,12 +499,12 @@
   helper_.SetOpenInTabFromAppHome(Site::kStandalone);
   helper_.CheckAppInListTabbed(Site::kStandalone);
   helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
+  helper_.CheckTabCreated(Number::kOne);
 }
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_1Standalone_22) {
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_1Standalone_22One) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
   // `docs/webapps/integration-testing-framework` for more info.
@@ -518,12 +518,12 @@
   helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
   helper_.CheckAppInListTabbed(Site::kStandalone);
   helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
+  helper_.CheckTabCreated(Number::kOne);
 }
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_1Standalone_22) {
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_1Standalone_22One) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
   // `docs/webapps/integration-testing-framework` for more info.
@@ -537,7 +537,7 @@
   helper_.SetOpenInTabFromAppHome(Site::kStandalone);
   helper_.CheckAppInListTabbed(Site::kStandalone);
   helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated();
+  helper_.CheckTabCreated(Number::kOne);
 }
 
 }  // namespace

chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc

diff --git a/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc b/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
index 9d5d8494..059c02a 100644
--- a/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
+++ b/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
@@ -844,7 +844,7 @@
         continue;
       }
       if (app->IsPolicyInstalledApp()) {
-        UninstallPolicyAppById(app_id);
+        UninstallPolicyAppById(profile, app_id);
       }
       if (provider->registrar_unsafe().IsInstalled(app_id)) {
         DCHECK(app->CanUserUninstallWebApp());
@@ -2816,7 +2816,7 @@
   AfterStateCheckAction();
 }
 
-void WebAppIntegrationTestDriver::CheckTabCreated() {
+void WebAppIntegrationTestDriver::CheckTabCreated(Number number) {
   if (!BeforeStateCheckAction(__FUNCTION__)) {
     return;
   }
@@ -2835,6 +2835,16 @@
     ASSERT_TRUE(previous_browser_state.has_value());
     EXPECT_GT(most_recent_browser_state->tabs.size(),
               previous_browser_state->tabs.size());
+    int tab_diff = most_recent_browser_state->tabs.size() -
+                   previous_browser_state->tabs.size();
+    switch (number) {
+      case Number::kOne:
+        ASSERT_EQ(1, tab_diff);
+        break;
+      case Number::kTwo:
+        ASSERT_EQ(2, tab_diff);
+        break;
+    }
 #if BUILDFLAG(IS_MAC)
   }
 #endif
@@ -3652,11 +3662,12 @@
   }
 }
 
-void WebAppIntegrationTestDriver::UninstallPolicyAppById(const AppId& id) {
+void WebAppIntegrationTestDriver::UninstallPolicyAppById(Profile* profile,
+                                                         const AppId& id) {
   base::RunLoop run_loop;
   AppReadinessWaiter app_registration_waiter(
-      profile(), id, apps::Readiness::kUninstalledByUser);
-  WebAppInstallManagerObserverAdapter observer(profile());
+      profile, id, apps::Readiness::kUninstalledByUser);
+  WebAppInstallManagerObserverAdapter observer(profile);
   observer.SetWebAppUninstalledDelegate(
       base::BindLambdaForTesting([&](const AppId& app_id) {
         if (id == app_id) {
@@ -3665,14 +3676,16 @@
       }));
   // If there are still install sources, the app might not be fully uninstalled,
   // so this will listen for the removal of the policy install source.
-  provider()->install_finalizer().SetRemoveManagementTypeCallbackForTesting(
+  WebAppProvider* provider = WebAppProvider::GetForTest(profile);
+  provider->install_finalizer().SetRemoveManagementTypeCallbackForTesting(
       base::BindLambdaForTesting([&](const AppId& app_id) {
         if (id == app_id) {
           run_loop.Quit();
         }
       }));
 
-  const WebApp* web_app = provider()->registrar_unsafe().GetAppById(id);
+  const WebApp* web_app = provider->registrar_unsafe().GetAppById(id);
+  ASSERT_TRUE(web_app);
 
   base::flat_set<GURL> install_urls;
   {
@@ -3685,7 +3698,7 @@
   }
 
   {
-    ScopedListPrefUpdate update(profile()->GetPrefs(),
+    ScopedListPrefUpdate update(profile->GetPrefs(),
                                 prefs::kWebAppInstallForceList);
     size_t removed_count = update->EraseIf([&](const base::Value& item) {
       const base::Value* url_value = item.GetDict().Find(kUrlKey);
@@ -3694,7 +3707,7 @@
     ASSERT_GT(removed_count, 0U);
   }
   run_loop.Run();
-  const WebApp* app = provider()->registrar_unsafe().GetAppById(id);
+  const WebApp* app = provider->registrar_unsafe().GetAppById(id);
   // If the app was fully uninstalled, wait for the change to propagate through
   // App Service.
   if (app == nullptr) {

chrome/browser/ui/views/web_apps/web_app_integration_test_driver.h

diff --git a/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.h b/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.h
index f9ea7e4..982ccfac 100644
--- a/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.h
+++ b/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.h
@@ -348,7 +348,7 @@
   void CheckInstallIconNotShown();
   void CheckLaunchIconShown();
   void CheckLaunchIconNotShown();
-  void CheckTabCreated();
+  void CheckTabCreated(Number number);
   void CheckTabNotCreated();
   void CheckCustomToolbar();
   void CheckNoToolbar();
@@ -415,7 +415,7 @@
                                 const bool install_as_shortcut);
   void ApplyRunOnOsLoginPolicy(Site site, const char* policy);
 
-  void UninstallPolicyAppById(const AppId& id);
+  void UninstallPolicyAppById(Profile* profile, const AppId& id);
   void ForceUpdateManifestContents(Site site,
                                    const GURL& app_url_with_manifest_param);
   void MaybeNavigateTabbedBrowserInScope(Site site);

chrome/browser/ui/web_applications/commands/launch_web_app_command.cc

diff --git a/chrome/browser/ui/web_applications/commands/launch_web_app_command.cc b/chrome/browser/ui/web_applications/commands/launch_web_app_command.cc
index 747b6d6..2f37762 100644
--- a/chrome/browser/ui/web_applications/commands/launch_web_app_command.cc
+++ b/chrome/browser/ui/web_applications/commands/launch_web_app_command.cc
@@ -145,7 +145,8 @@
   }
   base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE,
-      base::BindOnce(std::move(callback), browser, web_contents, container));
+      base::BindOnce(std::move(callback), browser,
+                     base::UnsafeDanglingUntriaged(web_contents), container));
   return base::Value(std::move(debug_value));
 }
 

chrome/browser/ui/webui/ash/login/gaia_screen_handler.cc

diff --git a/chrome/browser/ui/webui/ash/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/ash/login/gaia_screen_handler.cc
index f9c2ca64..efb8769a 100644
--- a/chrome/browser/ui/webui/ash/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/ash/login/gaia_screen_handler.cc
@@ -1019,8 +1019,7 @@
   } else {
     // Removes the account on the device.
     user_manager::UserManager::Get()->RemoveUser(
-        account_id, user_manager::UserRemovalReason::GAIA_REMOVED,
-        nullptr /*delegate*/);
+        account_id, user_manager::UserRemovalReason::GAIA_REMOVED);
   }
 }
 

chrome/browser/ui/webui/nearby_internals/nearby_internals_ui.cc

diff --git a/chrome/browser/ui/webui/nearby_internals/nearby_internals_ui.cc b/chrome/browser/ui/webui/nearby_internals/nearby_internals_ui.cc
index ece5c5e..89540972 100644
--- a/chrome/browser/ui/webui/nearby_internals/nearby_internals_ui.cc
+++ b/chrome/browser/ui/webui/nearby_internals/nearby_internals_ui.cc
@@ -48,7 +48,8 @@
       std::make_unique<NearbyInternalsHttpHandler>(context));
   web_ui->AddMessageHandler(
       std::make_unique<NearbyInternalsPrefsHandler>(context));
-  web_ui->AddMessageHandler(std::make_unique<NearbyInternalsPresenceHandler>());
+  web_ui->AddMessageHandler(
+      std::make_unique<NearbyInternalsPresenceHandler>(context));
   web_ui->AddMessageHandler(
       std::make_unique<NearbyInternalsUiTriggerHandler>(context));
   web_ui->AddMessageHandler(std::make_unique<QuickPairHandler>());

chrome/browser/ui/webui/nearby_internals/nearby_internals_ui_presence_handler.cc

diff --git a/chrome/browser/ui/webui/nearby_internals/nearby_internals_ui_presence_handler.cc b/chrome/browser/ui/webui/nearby_internals/nearby_internals_ui_presence_handler.cc
index e1da3fa..5e58ef5 100644
--- a/chrome/browser/ui/webui/nearby_internals/nearby_internals_ui_presence_handler.cc
+++ b/chrome/browser/ui/webui/nearby_internals/nearby_internals_ui_presence_handler.cc
@@ -3,8 +3,13 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/nearby_internals/nearby_internals_ui_presence_handler.h"
+#include "chrome/browser/ash/nearby/presence/nearby_presence_service_factory.h"
+#include "chrome/browser/nearby_sharing/logging/logging.h"
+#include "chromeos/ash/components/nearby/presence/nearby_presence_service.h"
 
-NearbyInternalsPresenceHandler::NearbyInternalsPresenceHandler() = default;
+NearbyInternalsPresenceHandler::NearbyInternalsPresenceHandler(
+    content::BrowserContext* context)
+    : context_(context) {}
 
 NearbyInternalsPresenceHandler::~NearbyInternalsPresenceHandler() = default;
 
@@ -29,4 +34,28 @@
 }
 
 void NearbyInternalsPresenceHandler::HandleStartPresenceScan(
-    const base::Value::List& args) {}
+    const base::Value::List& args) {
+  ash::nearby::presence::NearbyPresenceService* service =
+      ash::nearby::presence::NearbyPresenceServiceFactory::GetForBrowserContext(
+          context_);
+  if (service) {
+    NS_LOG(VERBOSE) << __func__
+                    << ": NearbyPresenceService was retrieved successfully";
+    ash::nearby::presence::NearbyPresenceService::ScanFilter filter;
+    service->StartScan(filter, this);
+  }
+}
+
+void NearbyInternalsPresenceHandler::OnPresenceDeviceFound(
+    const ash::nearby::presence::NearbyPresenceService::PresenceDevice&
+        presence_device) {
+  NS_LOG(VERBOSE) << __func__;
+}
+
+void NearbyInternalsPresenceHandler::OnPresenceDeviceChanged(
+    const ash::nearby::presence::NearbyPresenceService::PresenceDevice&
+        presence_device) {}
+
+void NearbyInternalsPresenceHandler::OnPresenceDeviceLost(
+    const ash::nearby::presence::NearbyPresenceService::PresenceDevice&
+        presence_device) {}

chrome/browser/ui/webui/nearby_internals/nearby_internals_ui_presence_handler.h

diff --git a/chrome/browser/ui/webui/nearby_internals/nearby_internals_ui_presence_handler.h b/chrome/browser/ui/webui/nearby_internals/nearby_internals_ui_presence_handler.h
index 2d07ddd2..3050e95 100644
--- a/chrome/browser/ui/webui/nearby_internals/nearby_internals_ui_presence_handler.h
+++ b/chrome/browser/ui/webui/nearby_internals/nearby_internals_ui_presence_handler.h
@@ -7,11 +7,18 @@
 
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
+#include "chromeos/ash/components/nearby/presence/nearby_presence_service.h"
 #include "content/public/browser/web_ui_message_handler.h"
 
-class NearbyInternalsPresenceHandler : public content::WebUIMessageHandler {
+namespace content {
+class BrowserContext;
+}  // namespace content
+
+class NearbyInternalsPresenceHandler
+    : public content::WebUIMessageHandler,
+      ash::nearby::presence::NearbyPresenceService::ScanDelegate {
  public:
-  NearbyInternalsPresenceHandler();
+  explicit NearbyInternalsPresenceHandler(content::BrowserContext* context);
   NearbyInternalsPresenceHandler(const NearbyInternalsPresenceHandler&) =
       delete;
   NearbyInternalsPresenceHandler& operator=(
@@ -24,8 +31,20 @@
   void OnJavascriptDisallowed() override;
 
  private:
+  // ash::nearby::presence::NearbyPresenceService::ScanDelegate:
+  void OnPresenceDeviceFound(
+      const ash::nearby::presence::NearbyPresenceService::PresenceDevice&
+          presence_device) override;
+  void OnPresenceDeviceChanged(
+      const ash::nearby::presence::NearbyPresenceService::PresenceDevice&
+          presence_device) override;
+  void OnPresenceDeviceLost(
+      const ash::nearby::presence::NearbyPresenceService::PresenceDevice&
+          presence_device) override;
+
   void Initialize(const base::Value::List& args);
   void HandleStartPresenceScan(const base::Value::List& args);
+  content::BrowserContext* const context_;
 
   base::WeakPtrFactory<NearbyInternalsPresenceHandler> weak_ptr_factory_{this};
 };

chrome/browser/user_bypass/user_bypass_web_contents_observer.cc

diff --git a/chrome/browser/user_bypass/user_bypass_web_contents_observer.cc b/chrome/browser/user_bypass/user_bypass_web_contents_observer.cc
index 34803456..eb2ea98 100644
--- a/chrome/browser/user_bypass/user_bypass_web_contents_observer.cc
+++ b/chrome/browser/user_bypass/user_bypass_web_contents_observer.cc
@@ -9,6 +9,8 @@
 #include "content/public/browser/navigation_handle.h"
 #include "url/gurl.h"
 
+namespace user_bypass {
+
 UserBypassWebContentsObserver::UserBypassWebContentsObserver(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
@@ -43,3 +45,5 @@
 }
 
 WEB_CONTENTS_USER_DATA_KEY_IMPL(UserBypassWebContentsObserver);
+
+}  // namespace user_bypass

chrome/browser/user_bypass/user_bypass_web_contents_observer.h

diff --git a/chrome/browser/user_bypass/user_bypass_web_contents_observer.h b/chrome/browser/user_bypass/user_bypass_web_contents_observer.h
index 68d5455..0977c03 100644
--- a/chrome/browser/user_bypass/user_bypass_web_contents_observer.h
+++ b/chrome/browser/user_bypass/user_bypass_web_contents_observer.h
@@ -12,6 +12,8 @@
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
+namespace user_bypass {
+
 // Helps set the storage partitioning blink runtime feature state based on the
 // available user-specified cookie setting entries for bypass. The state change
 // are made to take effect before the top level frame's navigation commits.
@@ -48,4 +50,5 @@
   WEB_CONTENTS_USER_DATA_KEY_DECL();
 };
 
+}  // namespace user_bypass
 #endif  // CHROME_BROWSER_USER_BYPASS_USER_BYPASS_WEB_CONTENTS_OBSERVER_H_

chrome/browser/user_bypass/user_bypass_web_contents_observer_browsertest.cc

diff --git a/chrome/browser/user_bypass/user_bypass_web_contents_observer_browsertest.cc b/chrome/browser/user_bypass/user_bypass_web_contents_observer_browsertest.cc
index 4e79b092..1bd92f6 100644
--- a/chrome/browser/user_bypass/user_bypass_web_contents_observer_browsertest.cc
+++ b/chrome/browser/user_bypass/user_bypass_web_contents_observer_browsertest.cc
@@ -19,14 +19,14 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
+namespace user_bypass {
+
 namespace {
 constexpr char kUserBypassEnabledHost[] = "a.test";
 constexpr char kUserBypassDisabledHost[] = "b.test";
 constexpr char kArbitraryPage[] = "/title1.html";
 }  // anonymous namespace
 
-namespace content {
-
 class UserBypassWebContentsObserverBrowserTest : public PlatformBrowserTest {
  public:
   UserBypassWebContentsObserverBrowserTest()
@@ -56,7 +56,7 @@
 
   net::EmbeddedTestServer* https_server() { return &https_server_; }
 
-  WebContents* GetActiveWebContents() {
+  content::WebContents* GetActiveWebContents() {
     return chrome_test_utils::GetActiveWebContents(this);
   }
 
@@ -133,4 +133,4 @@
       GetActiveWebContents()->GetPrimaryMainFrame()));
 }
 
-}  // namespace content
+}  // namespace user_bypass

chrome/build/lacros64.pgo.txt

diff --git a/chrome/build/lacros64.pgo.txt b/chrome/build/lacros64.pgo.txt
index 45919d7..90ef9194 100644
--- a/chrome/build/lacros64.pgo.txt
+++ b/chrome/build/lacros64.pgo.txt
@@ -1 +1 @@
-chrome-chromeos-amd64-generic-main-1680854325-1d6ac37f20d0c84498b56e6ef92c35045f165a40.profdata
+chrome-chromeos-amd64-generic-main-1680879718-7c54ef17bded0f0cafabc03bd72c761a5e448cb1.profdata

chrome/build/linux.pgo.txt

diff --git a/chrome/build/linux.pgo.txt b/chrome/build/linux.pgo.txt
index 0d42dc3c..e94233e6 100644
--- a/chrome/build/linux.pgo.txt
+++ b/chrome/build/linux.pgo.txt
@@ -1 +1 @@
-chrome-linux-main-1680847183-ed5984d384725f53e47631f9e1e76cc9f89c8611.profdata
+chrome-linux-main-1680868649-a080d7bbf9e44dfd5a82f6d79fe8d5abd538f293.profdata

chrome/build/mac-arm.pgo.txt

diff --git a/chrome/build/mac-arm.pgo.txt b/chrome/build/mac-arm.pgo.txt
index 8585193..e42f2c9 100644
--- a/chrome/build/mac-arm.pgo.txt
+++ b/chrome/build/mac-arm.pgo.txt
@@ -1 +1 @@
-chrome-mac-arm-main-1680861582-1a117a5a313d79c766e15adebc0846e5885fcc9b.profdata
+chrome-mac-arm-main-1680879718-bb15a1d1cfa3cabb8a0bf1598ff72f9cdb5065ec.profdata

chrome/build/mac.pgo.txt

diff --git a/chrome/build/mac.pgo.txt b/chrome/build/mac.pgo.txt
index 4ada37a5..38e27229 100644
--- a/chrome/build/mac.pgo.txt
+++ b/chrome/build/mac.pgo.txt
@@ -1 +1 @@
-chrome-mac-main-1680847183-aed3cb625d0ccfd111ff8463529d3a28ab578cbc.profdata
+chrome-mac-main-1680868649-6e300551427152f6db1ae0af4c613bfc33260cd3.profdata

chrome/build/win32.pgo.txt

diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt
index 213dbfc..63795f86 100644
--- a/chrome/build/win32.pgo.txt
+++ b/chrome/build/win32.pgo.txt
@@ -1 +1 @@
-chrome-win32-main-1680847183-ea3d32620d6fb22031175f91f3efd4613e8e9977.profdata
+chrome-win32-main-1680873567-575d10612343ebbf37d74b5db118e18559c862d3.profdata

chrome/build/win64.pgo.txt

diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt
index 5c6979b..c0420ae7 100644
--- a/chrome/build/win64.pgo.txt
+++ b/chrome/build/win64.pgo.txt
@@ -1 +1 @@
-chrome-win64-main-1680857630-b9af0b6d496b061caae55504e504f9901a4e02f5.profdata
+chrome-win64-main-1680873567-b473a7caae0cf187dac95d766680cd0bd4dffb12.profdata

chrome/common/safe_browsing/seven_zip_analyzer.cc

diff --git a/chrome/common/safe_browsing/seven_zip_analyzer.cc b/chrome/common/safe_browsing/seven_zip_analyzer.cc
index 1b8aa1c..5dfbfdd0 100644
--- a/chrome/common/safe_browsing/seven_zip_analyzer.cc
+++ b/chrome/common/safe_browsing/seven_zip_analyzer.cc
@@ -22,7 +22,7 @@
 #include <sys/mman.h>
 #endif
 
-namespace safe_browsing::seven_zip_analyzer {
+namespace safe_browsing {
 
 namespace {
 
@@ -137,27 +137,62 @@
 
 }  // namespace
 
-void AnalyzeSevenZipFile(base::File seven_zip_file,
-                         base::File temp_file,
-                         base::File temp_file2,
-                         ArchiveAnalyzerResults* results) {
-  bool too_big_to_unpack =
-      base::checked_cast<uint64_t>(seven_zip_file.GetLength()) >
-      FileTypePolicies::GetInstance()->GetMaxFileSizeToAnalyze("7z");
-  if (too_big_to_unpack) {
-    results->success = false;
-    results->analysis_result = ArchiveAnalysisResult::kTooLarge;
-    return;
-  }
+SevenZipAnalyzer::~SevenZipAnalyzer() = default;
 
-  SevenZipDelegate delegate(results, std::move(temp_file),
-                            std::move(temp_file2));
-  seven_zip::Extract(std::move(seven_zip_file), delegate);
+SevenZipAnalyzer::SevenZipAnalyzer() = default;
 
-  if (delegate.success()) {
-    results->success = true;
-    results->analysis_result = ArchiveAnalysisResult::kValid;
-  }
+void SevenZipAnalyzer::Init(base::File seven_zip_file,
+                            base::FilePath seven_zip_path,
+                            FinishedAnalysisCallback finished_analysis_callback,
+                            GetTempFileCallback get_temp_file_callback,
+                            ArchiveAnalyzerResults* results) {
+  results_ = results;
+  root_seven_zip_path_ = seven_zip_path;
+  finished_analysis_callback_ = std::move(finished_analysis_callback);
+  get_temp_file_callback_ = get_temp_file_callback;
+  seven_zip_file_ = std::move(seven_zip_file);
+  get_temp_file_callback_.Run(base::BindOnce(&SevenZipAnalyzer::FilePreChecks,
+                                             weak_factory_.GetWeakPtr()));
+  get_temp_file_callback_.Run(base::BindOnce(&SevenZipAnalyzer::FilePreChecks,
+                                             weak_factory_.GetWeakPtr()));
 }
 
-}  // namespace safe_browsing::seven_zip_analyzer
+void SevenZipAnalyzer::FilePreChecks(base::File temp_file) {
+  if (!temp_file.IsValid()) {
+    results_->success = false;
+    results_->analysis_result = ArchiveAnalysisResult::kFailedToOpenTempFile;
+    std::move(finished_analysis_callback_).Run();
+    return;
+  }
+  if (!temp_file_.IsValid()) {
+    temp_file_ = std::move(temp_file);
+    return;
+  } else {
+    temp_file2_ = std::move(temp_file);
+  }
+  // If the file is too big to unpack, return failure.
+  bool too_big_to_unpack =
+      base::checked_cast<uint64_t>(seven_zip_file_.GetLength()) >
+      FileTypePolicies::GetInstance()->GetMaxFileSizeToAnalyze("7z");
+  if (too_big_to_unpack) {
+    results_->success = false;
+    results_->analysis_result = ArchiveAnalysisResult::kTooLarge;
+    std::move(finished_analysis_callback_).Run();
+    return;
+  }
+  AnalyzeSevenZipFile();
+}
+
+void SevenZipAnalyzer::AnalyzeSevenZipFile() {
+  SevenZipDelegate delegate(results_, std::move(temp_file_),
+                            std::move(temp_file2_));
+  seven_zip::Extract(std::move(seven_zip_file_), delegate);
+
+  if (delegate.success()) {
+    results_->success = true;
+    results_->analysis_result = ArchiveAnalysisResult::kValid;
+  }
+  std::move(finished_analysis_callback_).Run();
+}
+
+}  // namespace safe_browsing

chrome/common/safe_browsing/seven_zip_analyzer.h

diff --git a/chrome/common/safe_browsing/seven_zip_analyzer.h b/chrome/common/safe_browsing/seven_zip_analyzer.h
index 9a84c17..1707d81 100644
--- a/chrome/common/safe_browsing/seven_zip_analyzer.h
+++ b/chrome/common/safe_browsing/seven_zip_analyzer.h
@@ -9,19 +9,53 @@
 #define CHROME_COMMON_SAFE_BROWSING_SEVEN_ZIP_ANALYZER_H_
 
 #include "base/files/file.h"
+#include "base/functional/callback.h"
+#include "components/safe_browsing/content/common/proto/download_file_types.pb.h"
 
 namespace safe_browsing {
 
 struct ArchiveAnalyzerResults;
+using FinishedAnalysisCallback = base::OnceCallback<void()>;
+using GetTempFileCallback =
+    base::RepeatingCallback<void(base::OnceCallback<void(base::File)>)>;
 
-namespace seven_zip_analyzer {
+class SevenZipAnalyzer {
+ public:
+  SevenZipAnalyzer();
 
-void AnalyzeSevenZipFile(base::File seven_zip_file,
-                         base::File temp_file,
-                         base::File temp_file2,
-                         ArchiveAnalyzerResults* results);
+  ~SevenZipAnalyzer();
 
-}  // namespace seven_zip_analyzer
+  SevenZipAnalyzer(const SevenZipAnalyzer&) = delete;
+  SevenZipAnalyzer& operator=(const SevenZipAnalyzer&) = delete;
+
+  // Loads variables and fetches the needed `temp_file` from the
+  // `temp_file_getter`.
+  void Init(base::File seven_zip_file,
+            base::FilePath seven_zip_path,
+            FinishedAnalysisCallback finished_analysis_callback,
+            GetTempFileCallback get_temp_file_callback,
+            ArchiveAnalyzerResults* results);
+
+ private:
+  // Ensures that the `seven_zip_path` and both `temp_file`(s) are both
+  // valid and should be analyzed.
+  void FilePreChecks(base::File temp_file);
+
+  void AnalyzeSevenZipFile();
+
+  base::FilePath root_seven_zip_path_;
+
+  base::File seven_zip_file_;
+  base::File temp_file_;
+  base::File temp_file2_;
+  raw_ptr<ArchiveAnalyzerResults> results_;
+
+  FinishedAnalysisCallback finished_analysis_callback_;
+  GetTempFileCallback get_temp_file_callback_;
+
+  base::WeakPtrFactory<SevenZipAnalyzer> weak_factory_{this};
+};
+
 }  // namespace safe_browsing
 
 #endif  // CHROME_COMMON_SAFE_BROWSING_SEVEN_ZIP_ANALYZER_H_

chrome/services/file_util/fake_file_util_service.h

diff --git a/chrome/services/file_util/fake_file_util_service.h b/chrome/services/file_util/fake_file_util_service.h
index 6028ac9f..9f68c59 100644
--- a/chrome/services/file_util/fake_file_util_service.h
+++ b/chrome/services/file_util/fake_file_util_service.h
@@ -52,13 +52,13 @@
        mojo::PendingRemote<chrome::mojom::TemporaryFileGetter> temp_file_getter,
        AnalyzeRarFileCallback callback),
       (override));
-  MOCK_METHOD(void,
-              AnalyzeSevenZipFile,
-              (base::File seven_zip_file,
-               base::File temporary_file,
-               base::File temporary_file2,
-               AnalyzeSevenZipFileCallback callback),
-              (override));
+  MOCK_METHOD(
+      void,
+      AnalyzeSevenZipFile,
+      (base::File seven_zip_file,
+       mojo::PendingRemote<chrome::mojom::TemporaryFileGetter> temp_file_getter,
+       AnalyzeSevenZipFileCallback callback),
+      (override));
 
  private:
   mojo::ReceiverSet<chrome::mojom::SafeArchiveAnalyzer> receivers_;

chrome/services/file_util/public/cpp/sandboxed_seven_zip_analyzer.cc

diff --git a/chrome/services/file_util/public/cpp/sandboxed_seven_zip_analyzer.cc b/chrome/services/file_util/public/cpp/sandboxed_seven_zip_analyzer.cc
index 395d0d24..3ea0f1b 100644
--- a/chrome/services/file_util/public/cpp/sandboxed_seven_zip_analyzer.cc
+++ b/chrome/services/file_util/public/cpp/sandboxed_seven_zip_analyzer.cc
@@ -21,9 +21,7 @@
 // thread with either `success_callback` or `failure_callback`.
 void PrepareFileToAnalyze(
     base::FilePath file_path,
-    base::OnceCallback<void(base::File file,
-                            base::File temp_file,
-                            base::File temp_file2)> success_callback,
+    base::OnceCallback<void(base::File file)> success_callback,
     base::OnceCallback<void(safe_browsing::ArchiveAnalysisResult reason)>
         failure_callback) {
   base::File file(file_path, base::File::FLAG_OPEN | base::File::FLAG_READ |
@@ -38,45 +36,8 @@
     return;
   }
 
-  base::FilePath temp_path, temp_path2;
-  base::File temp_file, temp_file2;
-  if (base::CreateTemporaryFile(&temp_path)) {
-    temp_file.Initialize(
-        temp_path, (base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_READ |
-                    base::File::FLAG_WRITE | base::File::FLAG_WIN_TEMPORARY |
-                    base::File::FLAG_DELETE_ON_CLOSE));
-  }
-
-  if (base::CreateTemporaryFile(&temp_path2)) {
-    temp_file2.Initialize(
-        temp_path2, (base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_READ |
-                     base::File::FLAG_WRITE | base::File::FLAG_WIN_TEMPORARY |
-                     base::File::FLAG_DELETE_ON_CLOSE));
-  }
-
-  if (!temp_file.IsValid()) {
-    DLOG(ERROR) << "Could not open temp file: " << temp_path.value();
-    content::GetUIThreadTaskRunner({})->PostTask(
-        FROM_HERE,
-        base::BindOnce(
-            std::move(failure_callback),
-            safe_browsing::ArchiveAnalysisResult::kFailedToOpenTempFile));
-    return;
-  }
-
-  if (!temp_file2.IsValid()) {
-    DLOG(ERROR) << "Could not open temp file: " << temp_path2.value();
-    content::GetUIThreadTaskRunner({})->PostTask(
-        FROM_HERE,
-        base::BindOnce(
-            std::move(failure_callback),
-            safe_browsing::ArchiveAnalysisResult::kFailedToOpenTempFile));
-    return;
-  }
-
   content::GetUIThreadTaskRunner({})->PostTask(
-      FROM_HERE, base::BindOnce(std::move(success_callback), std::move(file),
-                                std::move(temp_file), std::move(temp_file2)));
+      FROM_HERE, base::BindOnce(std::move(success_callback), std::move(file)));
 }
 
 }  // namespace
@@ -135,13 +96,14 @@
   }
 }
 
-void SandboxedSevenZipAnalyzer::AnalyzeFile(base::File file,
-                                            base::File temp_file,
-                                            base::File temp_file2) {
+void SandboxedSevenZipAnalyzer::AnalyzeFile(base::File file) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (remote_analyzer_) {
+    mojo::PendingRemote<chrome::mojom::TemporaryFileGetter>
+        temp_file_getter_remote =
+            temp_file_getter_.GetRemoteTemporaryFileGetter();
     remote_analyzer_->AnalyzeSevenZipFile(
-        std::move(file), std::move(temp_file), std::move(temp_file2),
+        std::move(file), std::move(temp_file_getter_remote),
         base::BindOnce(&SandboxedSevenZipAnalyzer::AnalyzeFileDone,
                        GetWeakPtr()));
   } else {

chrome/services/file_util/public/cpp/sandboxed_seven_zip_analyzer.h

diff --git a/chrome/services/file_util/public/cpp/sandboxed_seven_zip_analyzer.h b/chrome/services/file_util/public/cpp/sandboxed_seven_zip_analyzer.h
index 9c0ce583..8b73eb21e 100644
--- a/chrome/services/file_util/public/cpp/sandboxed_seven_zip_analyzer.h
+++ b/chrome/services/file_util/public/cpp/sandboxed_seven_zip_analyzer.h
@@ -11,6 +11,7 @@
 #include "base/memory/ref_counted_delete_on_sequence.h"
 #include "base/memory/weak_ptr.h"
 #include "base/task/sequenced_task_runner.h"
+#include "chrome/services/file_util/public/cpp/temporary_file_getter.h"
 #include "chrome/services/file_util/public/mojom/file_util_service.mojom.h"
 #include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
@@ -55,7 +56,7 @@
   void ReportFileFailure(safe_browsing::ArchiveAnalysisResult reason);
 
   // Starts the utility process and sends it a file analyze request.
-  void AnalyzeFile(base::File file, base::File temp, base::File temp2);
+  void AnalyzeFile(base::File file);
 
   // The response containing the file analyze results.
   void AnalyzeFileDone(const safe_browsing::ArchiveAnalyzerResults& results);
@@ -72,6 +73,7 @@
   // Remote interfaces to the file util service. Only used from the UI thread.
   mojo::Remote<chrome::mojom::FileUtilService> service_;
   mojo::Remote<chrome::mojom::SafeArchiveAnalyzer> remote_analyzer_;
+  TemporaryFileGetter temp_file_getter_;
 
   base::WeakPtrFactory<SandboxedSevenZipAnalyzer> weak_ptr_factory_{this};
 };

chrome/services/file_util/public/cpp/sandboxed_seven_zip_analyzer_unittest.cc

diff --git a/chrome/services/file_util/public/cpp/sandboxed_seven_zip_analyzer_unittest.cc b/chrome/services/file_util/public/cpp/sandboxed_seven_zip_analyzer_unittest.cc
index 51ff3cd..3766e01 100644
--- a/chrome/services/file_util/public/cpp/sandboxed_seven_zip_analyzer_unittest.cc
+++ b/chrome/services/file_util/public/cpp/sandboxed_seven_zip_analyzer_unittest.cc
@@ -227,10 +227,11 @@
   base::RunLoop run_loop;
 
   FakeFileUtilService service(remote.InitWithNewPipeAndPassReceiver());
-  EXPECT_CALL(service.GetSafeArchiveAnalyzer(), AnalyzeSevenZipFile(_, _, _, _))
+  EXPECT_CALL(service.GetSafeArchiveAnalyzer(), AnalyzeSevenZipFile(_, _, _))
       .WillOnce(
-          [&](base::File zip_file, base::File temporary_file,
-              base::File temporary_file2,
+          [&](base::File zip_file,
+              mojo::PendingRemote<chrome::mojom::TemporaryFileGetter>
+                  temp_file_getter,
               chrome::mojom::SafeArchiveAnalyzer::AnalyzeSevenZipFileCallback
                   callback) {
             EXPECT_TRUE(base::DeleteFile(temp_path));

chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom

diff --git a/chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom b/chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom
index 36cea64..e11c070e 100644
--- a/chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom
+++ b/chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom
@@ -40,8 +40,7 @@
   // in its entirety (using the first temp file), and then files are extracted
   // from the decompressed folders (using the second).
   AnalyzeSevenZipFile(mojo_base.mojom.ReadOnlyFile seven_zip_file,
-                      mojo_base.mojom.File temporary_file,
-                      mojo_base.mojom.File temporary_file2)
+                      pending_remote<TemporaryFileGetter> temp_file_getter)
       => (SafeArchiveAnalyzerResults results);
 };
 

chrome/services/file_util/safe_archive_analyzer.cc

diff --git a/chrome/services/file_util/safe_archive_analyzer.cc b/chrome/services/file_util/safe_archive_analyzer.cc
index 2660f15..af4ce9a 100644
--- a/chrome/services/file_util/safe_archive_analyzer.cc
+++ b/chrome/services/file_util/safe_archive_analyzer.cc
@@ -80,16 +80,23 @@
 
 void SafeArchiveAnalyzer::AnalyzeSevenZipFile(
     base::File seven_zip_file,
-    base::File temporary_file,
-    base::File temporary_file2,
+    mojo::PendingRemote<chrome::mojom::TemporaryFileGetter> temp_file_getter,
     AnalyzeSevenZipFileCallback callback) {
   DCHECK(seven_zip_file.IsValid());
-
-  safe_browsing::ArchiveAnalyzerResults results;
-  safe_browsing::seven_zip_analyzer::AnalyzeSevenZipFile(
-      std::move(seven_zip_file), std::move(temporary_file),
-      std::move(temporary_file2), &results);
-  std::move(callback).Run(results);
+  temp_file_getter_.Bind(std::move(temp_file_getter));
+  callback_ = std::move(callback);
+  AnalysisFinishedCallback analysis_finished_callback =
+      base::BindOnce(&SafeArchiveAnalyzer::AnalysisFinished,
+                     weak_factory_.GetWeakPtr(), base::FilePath());
+  base::RepeatingCallback<void(GetTempFileCallback callback)>
+      temp_file_getter_callback =
+          base::BindRepeating(&SafeArchiveAnalyzer::RequestTemporaryFile,
+                              weak_factory_.GetWeakPtr());
+  timeout_timer_.Start(FROM_HERE, kArchiveAnalysisTimeout, this,
+                       &SafeArchiveAnalyzer::Timeout);
+  seven_zip_analyzer_.Init(std::move(seven_zip_file), base::FilePath(),
+                           std::move(analysis_finished_callback),
+                           std::move(temp_file_getter_callback), &results_);
 }
 
 void SafeArchiveAnalyzer::RequestTemporaryFile(GetTempFileCallback callback) {

chrome/services/file_util/safe_archive_analyzer.h

diff --git a/chrome/services/file_util/safe_archive_analyzer.h b/chrome/services/file_util/safe_archive_analyzer.h
index 0231205..c55abc4f 100644
--- a/chrome/services/file_util/safe_archive_analyzer.h
+++ b/chrome/services/file_util/safe_archive_analyzer.h
@@ -7,6 +7,7 @@
 
 #include "chrome/common/safe_browsing/archive_analyzer_results.h"
 #include "chrome/common/safe_browsing/rar_analyzer.h"
+#include "chrome/common/safe_browsing/seven_zip_analyzer.h"
 #include "chrome/common/safe_browsing/zip_analyzer.h"
 #include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
 #include "mojo/public/cpp/bindings/remote.h"
@@ -43,10 +44,10 @@
       base::File rar_file,
       mojo::PendingRemote<chrome::mojom::TemporaryFileGetter> temp_file_getter,
       AnalyzeRarFileCallback callback) override;
-  void AnalyzeSevenZipFile(base::File seven_zip_file,
-                           base::File temporary_file,
-                           base::File temporary_file2,
-                           AnalyzeSevenZipFileCallback callback) override;
+  void AnalyzeSevenZipFile(
+      base::File seven_zip_file,
+      mojo::PendingRemote<chrome::mojom::TemporaryFileGetter> temp_file_getter,
+      AnalyzeSevenZipFileCallback callback) override;
 
   // Uses `temp_file_getter_` to supply a temporary file to callback.
   void RequestTemporaryFile(GetTempFileCallback callback);
@@ -61,6 +62,7 @@
 
   safe_browsing::ZipAnalyzer zip_analyzer_;
   safe_browsing::RarAnalyzer rar_analyzer_;
+  safe_browsing::SevenZipAnalyzer seven_zip_analyzer_;
 
   // A timer to ensure no archive takes too long to unpack.
   base::OneShotTimer timeout_timer_;

chrome/test/BUILD.gn

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 3aa4a326..94f33ad 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -6246,6 +6246,8 @@
     "//components/tracing:startup_tracing",
     "//components/translate/core/browser:test_support",
     "//components/ukm/content",
+    "//components/unexportable_keys",
+    "//components/unexportable_keys:test_support",
     "//components/unified_consent",
     "//components/url_formatter/spoof_checks/common_words:common",
     "//components/url_formatter/spoof_checks/common_words:common_words_dafsa",

chrome/test/data/webui/chromeos/personalization_app/keyboard_backlight_element_test.ts

diff --git a/chrome/test/data/webui/chromeos/personalization_app/keyboard_backlight_element_test.ts b/chrome/test/data/webui/chromeos/personalization_app/keyboard_backlight_element_test.ts
index 7d878cdb4..3fafcf3 100644
--- a/chrome/test/data/webui/chromeos/personalization_app/keyboard_backlight_element_test.ts
+++ b/chrome/test/data/webui/chromeos/personalization_app/keyboard_backlight_element_test.ts
@@ -236,8 +236,9 @@
     assertTrue(!!selectorContainer);
     const colorContainers = selectorContainer!.querySelectorAll('.selectable');
     assertEquals(9, colorContainers!.length);
-    assertEquals(
-        'Wallpaper color', (colorContainers[8] as HTMLElement).ariaLabel);
+    const wallpaperColorIcon =
+        colorContainers[8]!.querySelector('color-icon') as HTMLElement;
+    assertEquals('Wallpaper color', wallpaperColorIcon.ariaLabel);
     assertEquals(0, selectorContainer!.querySelectorAll('.divider').length);
     assertTrue(!!colorSelectorElement?.shadowRoot!.getElementById(
         'wallpaperColorDescription'));
@@ -262,8 +263,9 @@
         const colorContainers =
             selectorContainer!.querySelectorAll('.selectable');
         assertEquals(9, colorContainers!.length);
-        assertEquals(
-            'Wallpaper color', (colorContainers[0] as HTMLElement).ariaLabel);
+        const wallpaperColorIcon =
+            colorContainers[0]!.querySelector('color-icon') as HTMLElement;
+        assertEquals('Wallpaper color', wallpaperColorIcon.ariaLabel);
         assertEquals(1, selectorContainer!.querySelectorAll('.divider').length);
         assertFalse(!!keyboardBacklightElement?.shadowRoot!.getElementById(
             'wallpaperColorDescription'));

chrome/test/data/webui/chromeos/personalization_app/zone_customization_element_test.ts

diff --git a/chrome/test/data/webui/chromeos/personalization_app/zone_customization_element_test.ts b/chrome/test/data/webui/chromeos/personalization_app/zone_customization_element_test.ts
index a06151a..d88ea1b7 100644
--- a/chrome/test/data/webui/chromeos/personalization_app/zone_customization_element_test.ts
+++ b/chrome/test/data/webui/chromeos/personalization_app/zone_customization_element_test.ts
@@ -47,14 +47,16 @@
       expectedColor: string, colorContainers: NodeListOf<Element>) {
     for (let i = 0; i < colorContainers!.length; i++) {
       const colorContainer = colorContainers[i] as HTMLElement;
+      const colorIconElem =
+          colorContainer!.querySelector('color-icon') as HTMLElement;
       const colorId = colorContainer.id;
       if (colorId === expectedColor) {
         assertEquals(
-            'true', colorContainer.ariaChecked,
+            'true', colorIconElem.ariaChecked,
             `${expectedColor} should be highlighted.`);
       } else {
         assertEquals(
-            'false', colorContainer.ariaChecked,
+            'false', colorIconElem.ariaChecked,
             `${colorId} should not be highlighted.`);
       }
     }

chrome/test/data/webui/chromeos/shortcut_customization/BUILD.gn

diff --git a/chrome/test/data/webui/chromeos/shortcut_customization/BUILD.gn b/chrome/test/data/webui/chromeos/shortcut_customization/BUILD.gn
index 6f726cc1..533f12f 100644
--- a/chrome/test/data/webui/chromeos/shortcut_customization/BUILD.gn
+++ b/chrome/test/data/webui/chromeos/shortcut_customization/BUILD.gn
@@ -30,10 +30,12 @@
     "input_key_test.ts",
     "router_test.ts",
     "search_box_test.ts",
+    "search_result_bolding_test.ts",
     "search_result_row_test.ts",
     "shortcut_customization_test.ts",
     "shortcut_customization_test_util.ts",
     "shortcut_search_handler_test.ts",
+    "shortcuts_page_test.ts",
     "shortcut_utils_test.ts",
     "text_accelerator_test.ts",
   ]

chrome/test/data/webui/chromeos/shortcut_customization/router_test.ts

diff --git a/chrome/test/data/webui/chromeos/shortcut_customization/router_test.ts b/chrome/test/data/webui/chromeos/shortcut_customization/router_test.ts
index 72b5ccb..6ac4154 100644
--- a/chrome/test/data/webui/chromeos/shortcut_customization/router_test.ts
+++ b/chrome/test/data/webui/chromeos/shortcut_customization/router_test.ts
@@ -32,6 +32,18 @@
         window.location.href);
   });
 
+  test('Reset route test', async () => {
+    Router.resetInstanceForTesting(new Router());
+    const url = new URL('chrome://shortcut-customization');
+    url.searchParams.append('testParam', 'testValue');
+    Router.getInstance().navigateTo(url);
+    assertEquals(
+        'chrome://shortcut-customization/?testParam=testValue',
+        window.location.href);
+    Router.getInstance().resetRoute();
+    assertEquals('chrome://shortcut-customization/', window.location.href);
+  });
+
   test('Observer test', async () => {
     Router.resetInstanceForTesting(new Router());
     const router = Router.getInstance();

chrome/test/data/webui/chromeos/shortcut_customization/search_result_bolding_test.ts

diff --git a/chrome/test/data/webui/chromeos/shortcut_customization/search_result_bolding_test.ts b/chrome/test/data/webui/chromeos/shortcut_customization/search_result_bolding_test.ts
new file mode 100644
index 0000000..2e948f6
--- /dev/null
+++ b/chrome/test/data/webui/chromeos/shortcut_customization/search_result_bolding_test.ts
@@ -0,0 +1,88 @@
+// 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.
+import 'chrome://webui-test/mojo_webui_test_support.js';
+
+import {getBoldedDescription} from 'chrome://shortcut-customization/js/search/search_result_bolding.js';
+import {assertEquals} from 'chrome://webui-test/chai_assert.js';
+
+suite('searchResultBoldingTest', function() {
+  test('Tokenize and match result text to query text', () => {
+    assertEquals(
+        '<b>Open</b> new <b>tab</b>',
+        getBoldedDescription('Open new tab', 'Open tab'));
+  });
+
+  test('Bold result text to matching query', () => {
+    assertEquals(
+        'Op<b>e</b>n n<b>e</b>w tab in brows<b>e</b>r',
+        getBoldedDescription('Open new tab in browser', 'e'));
+  });
+
+  test('Bold result including ignored characters', () => {
+    let description = 'Turn on Wi-Fi';
+    assertEquals(
+        'Turn on <b>Wi-F</b>i', getBoldedDescription(description, 'wif'));
+    assertEquals(
+        'Turn on <b>Wi-F</b>i', getBoldedDescription(description, 'wi f'));
+    assertEquals(
+        'Turn on <b>Wi-F</b>i', getBoldedDescription(description, 'wi-f'));
+
+    description = 'Enable touchpad tap-to-click';
+    assertEquals(
+        'Enable touchpad <b>tap-to-cli</b>ck',
+        getBoldedDescription(description, 'tap to cli'));
+    assertEquals(
+        'Enable touchpad <b>tap-to-cli</b>ck',
+        getBoldedDescription(description, 'taptocli'));
+    assertEquals(
+        'Enable touchpad <b>tap-to-cli</b>ck',
+        getBoldedDescription(description, 'tap-to-cli'));
+    assertEquals(
+        'Enable touchpad <b>tap-to-cli</b>ck',
+        getBoldedDescription(description, 'tap top cli'));
+
+    assertEquals(
+        'w<b>xy</b>z <b>Tap-To</b>-Click',
+        getBoldedDescription('wxyz Tap-To-Click', 'tap toxy cli'));
+
+    assertEquals(
+        '<b>Tap</b>-to-click <b>Ti</b>ps <b>Ti</b>tle',
+        getBoldedDescription('Tap-to-click Tips Title', 'tap ti'));
+  });
+
+  test('Test bolding of accented characters', () => {
+    const description = 'Crème Brûlée';
+    assertEquals(
+        'Cr<b>è</b>me Br<b>û</b>l<b>é</b>e',
+        getBoldedDescription(description, 'E U'));
+    assertEquals(
+        '<b>Crème</b> Brûlée', getBoldedDescription(description, 'creme'));
+    assertEquals(
+        'Crè<b>me</b> <b>Brû</b>lée',
+        getBoldedDescription(description, 'me bru'));
+  });
+
+  test('Test no spaces nor characters that have upper/lower case', () => {
+    const description = 'キーボード設定---';  // Keyboard settings
+    assertEquals(
+        '<b>キ</b><b>ー</b>ボ<b>ー</b>ド<b>設</b>定---',
+        getBoldedDescription(description, 'キー設'));
+    assertEquals(
+        'キーボード<b>設</b>定---', getBoldedDescription(description, '設'));
+  });
+
+  test('Test RTL languages', () => {
+    const description = 'افتح علامة تبويب جديدة';  // Open new tab
+    assertEquals(
+        'افتح علامة <b>تبويب</b> جديدة',
+        getBoldedDescription(description, 'تبويب'));
+  });
+
+  test('Test blankspace types in result maintained', async () => {
+    const description = 'Turn&nbsp;on  &nbsp;Wi-Fi ';
+    assertEquals(
+        'Turn&nbsp;on  &nbsp;<b>Wi-F</b>i ',
+        getBoldedDescription(description, 'wif'));
+  });
+});

chrome/test/data/webui/chromeos/shortcut_customization/shortcut_customization_browsertest.js

diff --git a/chrome/test/data/webui/chromeos/shortcut_customization/shortcut_customization_browsertest.js b/chrome/test/data/webui/chromeos/shortcut_customization/shortcut_customization_browsertest.js
index 4e4f2dd..c4b3a76c 100644
--- a/chrome/test/data/webui/chromeos/shortcut_customization/shortcut_customization_browsertest.js
+++ b/chrome/test/data/webui/chromeos/shortcut_customization/shortcut_customization_browsertest.js
@@ -50,8 +50,10 @@
   ['RouterTest', 'router_test.js'],
   ['SearchBoxTest', 'search_box_test.js'],
   ['SearchResultRowTest', 'search_result_row_test.js'],
+  ['SearchResultBoldingTest', 'search_result_bolding_test.js'],
   ['ShortcutCustomizationApp', 'shortcut_customization_test.js'],
   ['ShortcutSearchHandlerTest', 'shortcut_search_handler_test.js'],
+  ['ShortcutsPageTest', 'shortcuts_page_test.js'],
   ['ShortcutUtils', 'shortcut_utils_test.js'],
   ['TextAcceleratorTest', 'text_accelerator_test.js'],
 ];

chrome/test/data/webui/chromeos/shortcut_customization/shortcuts_page_test.ts

diff --git a/chrome/test/data/webui/chromeos/shortcut_customization/shortcuts_page_test.ts b/chrome/test/data/webui/chromeos/shortcut_customization/shortcuts_page_test.ts
new file mode 100644
index 0000000..637f7404
--- /dev/null
+++ b/chrome/test/data/webui/chromeos/shortcut_customization/shortcuts_page_test.ts
@@ -0,0 +1,222 @@
+// 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.
+import 'chrome://shortcut-customization/js/shortcuts_page.js';
+import 'chrome://webui-test/mojo_webui_test_support.js';
+
+import {assert} from 'chrome://resources/js/assert_ts.js';
+import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+import {AcceleratorLookupManager} from 'chrome://shortcut-customization/js/accelerator_lookup_manager.js';
+import {AcceleratorRowElement} from 'chrome://shortcut-customization/js/accelerator_row.js';
+import {createFakeMojoAccelInfo, createFakeMojoLayoutInfo} from 'chrome://shortcut-customization/js/fake_data.js';
+import {AcceleratorCategory, AcceleratorSource, AcceleratorSubcategory, MojoAcceleratorConfig, MojoLayoutInfo} from 'chrome://shortcut-customization/js/shortcut_types.js';
+import {SHORTCUTS_APP_URL} from 'chrome://shortcut-customization/js/shortcut_utils.js';
+import {ShortcutsPageElement} from 'chrome://shortcut-customization/js/shortcuts_page.js';
+import {assertEquals, assertFalse, assertTrue} from 'chrome://webui-test/chai_assert.js';
+import {flushTasks} from 'chrome://webui-test/polymer_test_util.js';
+
+function initShortcutsPageElement(category: AcceleratorCategory):
+    ShortcutsPageElement {
+  const element =
+      document.createElement('shortcuts-page') as ShortcutsPageElement;
+  element.initialData = {category};
+  document.body.appendChild(element);
+  flush();
+  return element;
+}
+
+/**
+ * Initialize the AcceleratorLookupManager, and create fake accelerators equal
+ * to `numFakeAccelerators`, with those accelerators split between two
+ * subcategories based on the value of `numFirstSubCategoryAccelerators`.
+ * @param numFakeAccelerators the number of fake accelerators to create.
+ * @param numFirstSubCategoryAccelerators the number of accelerators in the
+ *     first subcategory; the rest will be in the second subcategory. Should not
+ *     exceed the value of `numFakeAccelerators`.
+ * @returns the AcceleratorLookupManager instance.
+ */
+function initManagerWithFakeData(
+    numFakeAccelerators: number,
+    numFirstSubCategoryAccelerators: number): AcceleratorLookupManager {
+  assert(numFirstSubCategoryAccelerators <= numFakeAccelerators);
+  const manager = AcceleratorLookupManager.getInstance();
+  const acceleratorConfig:
+      MojoAcceleratorConfig = {[AcceleratorSource.kAsh]: {}};
+  for (let i = 0; i < numFakeAccelerators; i++) {
+    acceleratorConfig[AcceleratorCategory.kGeneral]![i] =
+        [createFakeMojoAccelInfo()];
+  }
+  manager.setAcceleratorLookup(acceleratorConfig);
+
+  const blankLayoutInfos =
+      Array<MojoLayoutInfo>(numFakeAccelerators)
+          .fill(createFakeMojoLayoutInfo(
+              'description', /*action=*/ 0, AcceleratorCategory.kGeneral,
+              AcceleratorSource.kAsh));
+  const layoutInfos = blankLayoutInfos.map((layoutInfo, index) => {
+    return {
+      ...layoutInfo,
+      subCategory: index < numFirstSubCategoryAccelerators ?
+          AcceleratorSubcategory.kApps :
+          AcceleratorSubcategory.kGeneralControls,
+      action: index,
+    };
+  });
+  manager.setAcceleratorLayoutLookup(layoutInfos);
+  return manager;
+}
+
+/**
+ * Check if any part of the given `element` is visible within the viewport.
+ * Does not account for horizontal visibility.
+ * @param element The element to check for visibility.
+ * @returns True if any part of the element is visible within the viewport.
+ */
+function isVisibleVerticallyInViewport(element: HTMLElement): boolean {
+  const rect = element.getBoundingClientRect();
+  return rect.top < window.innerHeight && rect.bottom >= 0;
+}
+
+/**
+ * Override the specified function and parameters for the given class to avoid
+ * scroll animations that delay element property updates.
+ *
+ * This function has been adapted from `disableAnimationBehavior` in
+ * chrome/test/data/webui/tab_search/tab_search_test_helper.ts.
+ */
+function disableScrollAnimation(element: any) {
+  const originalFunction = element.prototype['scrollIntoView'];
+  element.prototype['scrollIntoView'] = function(options: any) {
+    const args = [];
+    if (typeof options === 'object' && options !== null) {
+      const noAnimationOptions = Object.assign({}, options);
+      // Delete the `behavior` property from the args, since that's the property
+      // that enables smooth scrolling.
+      delete noAnimationOptions.behavior;
+
+      args.push(noAnimationOptions);
+    }
+    originalFunction.apply(this, args);
+  };
+}
+
+suite('ShortcutsPageTest', function() {
+  let shortcutsPageElement: ShortcutsPageElement|null = null;
+
+  let manager: AcceleratorLookupManager|null = null;
+
+  teardown(() => {
+    if (manager) {
+      manager.reset();
+    }
+    if (shortcutsPageElement) {
+      shortcutsPageElement.remove();
+    }
+    shortcutsPageElement = null;
+
+    // Reset the scroll position to the top of the page since the tests depend
+    // on it.
+    window.scrollTo({top: 0});
+  });
+
+  test('AcceleratorSubsections render correctly', () => {
+    const numFakeAccelerators = 10;
+    const numFirstCategoryAccelerators = 4;
+    manager = initManagerWithFakeData(
+        numFakeAccelerators, numFirstCategoryAccelerators);
+
+    shortcutsPageElement =
+        initShortcutsPageElement(AcceleratorCategory.kGeneral);
+    flush();
+    const subsections = shortcutsPageElement.shadowRoot?.querySelectorAll(
+        'accelerator-subsection');
+    assertTrue(!!subsections);
+    assertEquals(2, subsections.length);
+
+    const rowsForFirstSubsection =
+        subsections.item(0).shadowRoot?.querySelectorAll('accelerator-row');
+    assertTrue(!!rowsForFirstSubsection);
+    assertEquals(numFirstCategoryAccelerators, rowsForFirstSubsection.length);
+
+    const rowsForSecondSubsection =
+        subsections.item(1).shadowRoot?.querySelectorAll('accelerator-row');
+    assertTrue(!!rowsForSecondSubsection);
+    assertEquals(
+        numFakeAccelerators - numFirstCategoryAccelerators,
+        rowsForSecondSubsection.length);
+  });
+
+  test('ScrollIntoView works when route changes', async () => {
+    // Create enough accelerators so that the last accelerator is out of view.
+    const numFakeAccelerators = 40;
+    const numFirstCategoryAccelerators = 10;
+    manager = initManagerWithFakeData(
+        numFakeAccelerators, numFirstCategoryAccelerators);
+
+    shortcutsPageElement =
+        initShortcutsPageElement(AcceleratorCategory.kGeneral);
+    flush();
+    const subsections = shortcutsPageElement.shadowRoot?.querySelectorAll(
+        'accelerator-subsection');
+    assertTrue(!!subsections);
+
+    const rowsForSecondSubsection =
+        subsections.item(1).shadowRoot?.querySelectorAll('accelerator-row');
+    assertTrue(!!rowsForSecondSubsection);
+    const lastAcceleratorRow =
+        rowsForSecondSubsection.item(rowsForSecondSubsection.length - 1);
+
+    // The AcceleratorRow is at the bottom of the page, so it's hidden.
+    assertFalse(isVisibleVerticallyInViewport(lastAcceleratorRow));
+
+    // Disable smooth scroll so that the scroll completes instantly.
+    disableScrollAnimation(AcceleratorRowElement);
+
+    // Trigger onRouteChanged as if the user had selected a SearchResultRow.
+    shortcutsPageElement.onRouteChanged(new URL(`${SHORTCUTS_APP_URL}?action=${
+        lastAcceleratorRow.action}&category=${AcceleratorCategory.kGeneral}`));
+
+    await flushTasks();
+
+    // After `onRouteChanged`, the AcceleratorRow is now visible.
+    assertTrue(isVisibleVerticallyInViewport(lastAcceleratorRow));
+  });
+
+  test('ScrollIntoView works when page changes', async () => {
+    // Create enough accelerators so that the last accelerator is out of view.
+    const numFakeAccelerators = 40;
+    manager = initManagerWithFakeData(numFakeAccelerators, 10);
+
+    shortcutsPageElement =
+        initShortcutsPageElement(AcceleratorCategory.kGeneral);
+    flush();
+    const subsections = shortcutsPageElement.shadowRoot?.querySelectorAll(
+        'accelerator-subsection');
+    assertTrue(!!subsections);
+
+    const rowsForSecondSubsection =
+        subsections.item(1).shadowRoot?.querySelectorAll('accelerator-row');
+    assertTrue(!!rowsForSecondSubsection);
+    const lastAcceleratorRow =
+        rowsForSecondSubsection.item(rowsForSecondSubsection.length - 1);
+
+    // The AcceleratorRow is at the bottom of the page, so it's hidden.
+    assertFalse(isVisibleVerticallyInViewport(lastAcceleratorRow));
+
+    // Disable smooth scroll so that the scroll completes instantly.
+    disableScrollAnimation(AcceleratorRowElement);
+
+    // Update the URL of the app and trigger onNavigationPageChanged as if the
+    // user had selected a SearchResultRow.
+    window.history.pushState(
+        {}, '',
+        `${SHORTCUTS_APP_URL}?action=${lastAcceleratorRow.action}&category=${
+            AcceleratorCategory.kGeneral}`);
+    shortcutsPageElement.onNavigationPageChanged({isActive: true});
+
+    await flushTasks();
+
+    // After `onNavigationPageChanged`, the AcceleratorRow is now visible.
+    assertTrue(isVisibleVerticallyInViewport(lastAcceleratorRow));
+  });
+});

chrome/test/data/webui/new_tab_page/modules/history_clusters/test_support.ts

diff --git a/chrome/test/data/webui/new_tab_page/modules/history_clusters/test_support.ts b/chrome/test/data/webui/new_tab_page/modules/history_clusters/test_support.ts
index 169059a..3c9c83f 100644
--- a/chrome/test/data/webui/new_tab_page/modules/history_clusters/test_support.ts
+++ b/chrome/test/data/webui/new_tab_page/modules/history_clusters/test_support.ts
@@ -2,31 +2,30 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {Annotation, SearchQuery, URLVisit} from 'chrome://new-tab-page/history_cluster_types.mojom-webui.js';
+import {SearchQuery, URLVisit} from 'chrome://new-tab-page/history_cluster_types.mojom-webui.js';
 import {LAYOUT_1_MIN_IMAGE_VISITS, LAYOUT_1_MIN_VISITS, MIN_RELATED_SEARCHES} from 'chrome://new-tab-page/lazy_load.js';
 
-export function createVisit(
-    visitId: bigint, normalizedUrl: string, urlForDisplay: string,
-    pageTitle: string, hasUrlKeyedImage: boolean, relativeDate: string = '',
-    annotations: Annotation[] = []): URLVisit {
-  return {
-    visitId: visitId,
-    normalizedUrl: {url: normalizedUrl},
-    urlForDisplay: urlForDisplay,
-    pageTitle: pageTitle,
-    titleMatchPositions: [],
-    urlForDisplayMatchPositions: [],
-    duplicates: [],
-    relativeDate: relativeDate,
-    annotations: annotations,
-    debugInfo: {},
-    rawVisitData: {
-      url: {url: ''},
-      visitTime: {internalValue: BigInt(0)},
-    },
-    hasUrlKeyedImage: hasUrlKeyedImage,
-    isKnownToSync: true,
-  };
+export function createVisit(overrides?: Partial<URLVisit>): URLVisit {
+  return Object.assign(
+      {
+        visitId: BigInt(1),
+        normalizedUrl: {url: 'https://www.foo.com'},
+        urlForDisplay: 'www.foo.com',
+        pageTitle: 'Test Title',
+        titleMatchPositions: [],
+        urlForDisplayMatchPositions: [],
+        duplicates: [],
+        relativeDate: '',
+        annotations: [],
+        debugInfo: {},
+        rawVisitData: {
+          url: {url: ''},
+          visitTime: {internalValue: BigInt(0)},
+        },
+        hasUrlKeyedImage: false,
+        isKnownToSync: true,
+      },
+      overrides);
 }
 
 export const GOOGLE_SEARCH_BASE_URL = 'https://www.google.com/search';
@@ -38,15 +37,22 @@
   const result: URLVisit[] = [];
 
   // Create SRP visit.
-  result.push(createVisit(
-      BigInt(0), `${GOOGLE_SEARCH_BASE_URL}?q=foo`, 'www.google.com', 'SRP',
-      false));
+  result.push(createVisit({
+    visitId: BigInt(0),
+    normalizedUrl: {url: `${GOOGLE_SEARCH_BASE_URL}?q=foo`},
+    urlForDisplay: 'www.google.com',
+    pageTitle: 'SRP',
+  }));
 
   // Create general visits.
   for (let i = 1; i <= numVisits; i++) {
-    result.push(createVisit(
-        BigInt(i), `https://www.foo.com/${i}`, `www.foo.com/${i}`,
-        `Test Title ${i}`, i <= numImageVisits));
+    result.push(createVisit({
+      visitId: BigInt(i),
+      normalizedUrl: {url: `https://www.foo.com/${i}`},
+      urlForDisplay: `www.foo.com/${i}`,
+      pageTitle: `Test Title ${i}`,
+      hasUrlKeyedImage: i <= numImageVisits,
+    }));
   }
   return result;
 }

chrome/test/data/webui/new_tab_page/modules/history_clusters/tile_test.ts

diff --git a/chrome/test/data/webui/new_tab_page/modules/history_clusters/tile_test.ts b/chrome/test/data/webui/new_tab_page/modules/history_clusters/tile_test.ts
index f32d413..bc9b4374 100644
--- a/chrome/test/data/webui/new_tab_page/modules/history_clusters/tile_test.ts
+++ b/chrome/test/data/webui/new_tab_page/modules/history_clusters/tile_test.ts
@@ -7,13 +7,13 @@
 import {Annotation, URLVisit} from 'chrome://new-tab-page/history_cluster_types.mojom-webui.js';
 import {PageImageServiceBrowserProxy, TileModuleElement} from 'chrome://new-tab-page/lazy_load.js';
 import {$$} from 'chrome://new-tab-page/new_tab_page.js';
-import {PageImageServiceHandlerRemote} from 'chrome://resources/cr_components/page_image_service/page_image_service.mojom-webui.js';
+import {ClientId as PageImageServiceClientId, PageImageServiceHandlerRemote} from 'chrome://resources/cr_components/page_image_service/page_image_service.mojom-webui.js';
 import {assertEquals, assertTrue} from 'chrome://webui-test/chai_assert.js';
 import {fakeMetricsPrivate, MetricsTracker} from 'chrome://webui-test/metrics_test_support.js';
 import {flushTasks, waitAfterNextRender} from 'chrome://webui-test/polymer_test_util.js';
 import {TestMock} from 'chrome://webui-test/test_mock.js';
 
-import {installMock} from '../../test_support.js';
+import {assertStyle, installMock} from '../../test_support.js';
 
 import {createVisit} from './test_support.js';
 
@@ -30,8 +30,10 @@
     metrics = fakeMetricsPrivate();
   });
 
-  function initializeModule(visit: URLVisit): TileModuleElement {
+  function initializeModule(
+      visit: URLVisit, smallFormat: boolean = false): TileModuleElement {
     const tileElement = new TileModuleElement();
+    tileElement.smallFormat = smallFormat;
     tileElement.visit = visit;
     document.body.append(tileElement);
     return tileElement;
@@ -39,14 +41,15 @@
 
   test('Tile element populated with correct data', async () => {
     // Arrange.
-    const tileElement = initializeModule(createVisit(
-        BigInt(1), 'https://www.test.com/1', 'https://www.test.com/1',
-        'Test Title 1', false, '1 min ago', [Annotation.kBookmarked]));
+    const tileElement = initializeModule(createVisit({
+      relativeDate: '1 min ago',
+      annotations: [Annotation.kBookmarked],
+    }));
 
     // Assert.
     await waitAfterNextRender(tileElement);
     assertTrue(!!tileElement);
-    assertEquals($$(tileElement, '#title')!.innerHTML, 'Test Title 1');
+    assertEquals($$(tileElement, '#title')!.innerHTML, 'Test Title');
     assertEquals('1 min ago', $$(tileElement, '#date')!.innerHTML);
     assertTrue(
         !!window.getComputedStyle($$<HTMLImageElement>(tileElement, '#icon')!)
@@ -64,9 +67,10 @@
                 null;
             imageServiceHandler.setResultFor(
                 'getPageImageUrl', Promise.resolve(imageResult));
-            initializeModule(createVisit(
-                BigInt(1), 'https://www.test.com/1', 'https://www.test.com/1',
-                'Test Title 1', true, '1 min ago'));
+            initializeModule(createVisit({
+              hasUrlKeyedImage: true,
+              relativeDate: '1 min ago',
+            }));
 
             await flushTasks();
 
@@ -78,4 +82,52 @@
                 metrics.count(
                     'NewTabPage.HistoryClusters.ImageLoadSuccess', success));
           }));
+
+  test('Tile shows background image if exists', async () => {
+    // Set result for getPageImageUrl.
+    imageServiceHandler.setResultFor('getPageImageUrl', Promise.resolve({
+      result: {imageUrl: {url: 'https://example.com/image.png'}},
+    }));
+    const visit = createVisit({hasUrlKeyedImage: true});
+    const tileElement = initializeModule(visit);
+
+    // Assert.
+    const [clientId, pageUrl] =
+        await imageServiceHandler.whenCalled('getPageImageUrl');
+    assertEquals(PageImageServiceClientId.NtpQuests, clientId);
+    assertEquals(visit.normalizedUrl, pageUrl);
+
+    await flushTasks();
+    assertTrue(!!$$(tileElement, '#image img'));
+    assertTrue(!$$(tileElement, '#image page-favicon'));
+  });
+
+  test('Tile does not call for or display image if small format', async () => {
+    // Set result for getPageImageUrl.
+    imageServiceHandler.setResultFor('getPageImageUrl', Promise.resolve({
+      result: {imageUrl: {url: 'https://example.com/image.png'}},
+    }));
+    const visit = createVisit({hasUrlKeyedImage: true});
+    const tileElement = initializeModule(visit, true);
+
+    // Assert.
+    await flushTasks();
+    assertEquals(0, imageServiceHandler.getCallCount('getPageImageUrl'));
+    assertStyle($$(tileElement, '#image')!, 'display', 'none');
+  });
+
+  test('Tile shows favicon if no image', async () => {
+    // Set result for getPageImageUrl.
+    imageServiceHandler.setResultFor('getPageImageUrl', Promise.resolve({
+      result: null,
+    }));
+    const visit = createVisit({hasUrlKeyedImage: true});
+    const tileElement = initializeModule(visit);
+
+    // Assert.
+    await flushTasks();
+    assertEquals(1, imageServiceHandler.getCallCount('getPageImageUrl'));
+    assertTrue(!$$(tileElement, '#image img'));
+    assertTrue(!!$$(tileElement, '#image page-favicon'));
+  });
 });

chrome/test/enterprise/e2e/policy/homepage/homepage.py

diff --git a/chrome/test/enterprise/e2e/policy/homepage/homepage.py b/chrome/test/enterprise/e2e/policy/homepage/homepage.py
index 9f04a78..2b3d50d 100644
--- a/chrome/test/enterprise/e2e/policy/homepage/homepage.py
+++ b/chrome/test/enterprise/e2e/policy/homepage/homepage.py
@@ -54,7 +54,7 @@
 
     # verify the home page is the value of HomepageLocation
     homepage = self._getHomepageLocation(self.win_config['client'])
-    self.assertIn("http://www.example.com/", homepage)
+    self.assertIn("https://www.example.com/", homepage)
 
   @test
   def test_HomepageIsNewTab(self):

chrome/test/webapps/coverage/coverage_cros.tsv

diff --git a/chrome/test/webapps/coverage/coverage_cros.tsv b/chrome/test/webapps/coverage/coverage_cros.tsv
index 7a7e956..bfd9c64 100644
--- a/chrome/test/webapps/coverage/coverage_cros.tsv
+++ b/chrome/test/webapps/coverage/coverage_cros.tsv
@@ -261,32 +261,32 @@
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌑	launch_from_launch_icon_Standalone🌑	check_window_created🌑
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_window_created🌑
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_window_created🌑
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created🌑
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created🌑
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created🌑
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created🌑
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created🌑
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
-create_shortcut_NotPromotable_Browser🌕	launch_from_chrome_apps_NotPromotable🌓	check_tab_created🌕
-create_shortcut_NotPromotable_Browser🌕	launch_from_platform_shortcut_NotPromotable🌑	check_tab_created🌑
-install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created🌕
-install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌑	check_tab_created🌑
-install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created🌕
-install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌑	check_tab_created🌑
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created_One🌑
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created_One🌑
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created_One🌑
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created_One🌑
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created_One🌑
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
+create_shortcut_NotPromotable_Browser🌕	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
+create_shortcut_NotPromotable_Browser🌕	launch_from_platform_shortcut_NotPromotable🌑	check_tab_created_One🌑
+install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
+install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌑	check_tab_created_One🌑
+install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
+install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌑	check_tab_created_One🌑
 create_shortcut_MinimalUi_Windowed🌕	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
@@ -371,21 +371,21 @@
 create_shortcut_Standalone_Browser🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
 install_omnibox_icon_Standalone🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
 install_menu_option_Standalone🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
-create_shortcut_Standalone_Browser🌕	delete_platform_shortcut_Standalone🌑	create_shortcuts_from_list_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
+create_shortcut_Standalone_Browser🌕	delete_platform_shortcut_Standalone🌑	create_shortcuts_from_list_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
 create_shortcut_Standalone_Windowed🌕	delete_platform_shortcut_Standalone🌑	create_shortcuts_from_list_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_window_created🌑
 install_omnibox_icon_Standalone🌕	delete_platform_shortcut_Standalone🌑	create_shortcuts_from_list_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_window_created🌑
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	delete_platform_shortcut_Standalone🌑	create_shortcuts_from_list_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_window_created🌑
 install_menu_option_Standalone🌕	delete_platform_shortcut_Standalone🌑	create_shortcuts_from_list_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_window_created🌑
-install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcuts_from_list_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
+install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcuts_from_list_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	create_shortcuts_from_list_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_window_created🌑
-create_shortcut_Standalone_Windowed🌕	open_in_chrome🌕	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	open_in_chrome🌕	check_tab_created🌕
-install_menu_option_Standalone🌕	open_in_chrome🌕	check_tab_created🌕
-create_shortcut_Standalone_Windowed🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created🌕
-install_menu_option_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
+create_shortcut_Standalone_Windowed🌕	open_in_chrome🌕	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕
+install_menu_option_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
+install_menu_option_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
 create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌓
 create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌓
 install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌓
@@ -506,10 +506,10 @@
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcut_Standalone_Windowed🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	install_omnibox_icon_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	install_menu_option_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌓
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌓
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌓
@@ -1029,51 +1029,51 @@
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_pwa_window_created_FileHandler_One🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_pwa_window_created_FileHandler_One🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_pwa_window_created_FileHandler_One🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
-create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
-install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
-install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
+create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_OneFooFile🌑
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_pwa_window_created_FileHandler_One🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_pwa_window_created_FileHandler_One🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_pwa_window_created_FileHandler_One🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
-create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
-install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
-install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
+create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_OneBarFile🌑
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_pwa_window_created_FileHandler_One🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_pwa_window_created_FileHandler_One🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_pwa_window_created_FileHandler_One🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
-create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
-install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
-install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
+create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌑	check_tab_created_One🌑	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌑
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_pwa_window_created_FileHandler_Two🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_pwa_window_created_FileHandler_Two🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_pwa_window_created_FileHandler_Two🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
-create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
-install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
-install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_tab_created🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
+create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_tab_created_Two🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_tab_created_Two🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_tab_created_Two🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_tab_created_Two🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_tab_created_Two🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_tab_created_Two🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_tab_created_Two🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_tab_created_Two🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌑	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌑	check_tab_created_Two🌑	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌑
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_Remember🌑	launch_file_expect_no_dialog_FileHandler_OneFooFile🌑
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_Remember🌑	launch_file_expect_no_dialog_FileHandler_OneFooFile🌑
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_Remember🌑	launch_file_expect_no_dialog_FileHandler_OneFooFile🌑

chrome/test/webapps/coverage/coverage_linux.tsv

diff --git a/chrome/test/webapps/coverage/coverage_linux.tsv b/chrome/test/webapps/coverage/coverage_linux.tsv
index fa2e442..0f4b70a4 100644
--- a/chrome/test/webapps/coverage/coverage_linux.tsv
+++ b/chrome/test/webapps/coverage/coverage_linux.tsv
@@ -1,5 +1,5 @@
 # This is a generated file.
-# Full coverage: 73%, with partial coverage: 92%
+# Full coverage: 75%, with partial coverage: 93%
 create_shortcut_Standalone_Windowed🌕	launch_from_menu_option_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 create_shortcut_Standalone_Windowed🌕	launch_from_launch_icon_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
@@ -519,32 +519,32 @@
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-create_shortcut_NotPromotable_Browser🌕	launch_from_chrome_apps_NotPromotable🌓	check_tab_created🌕
-create_shortcut_NotPromotable_Browser🌕	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created🌕
-install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created🌕
-install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created🌕
-install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created🌕
-install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+create_shortcut_NotPromotable_Browser🌕	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
+create_shortcut_NotPromotable_Browser🌕	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕
+install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
+install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕
+install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
+install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
@@ -629,19 +629,19 @@
 create_shortcut_Standalone_Browser🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
 install_omnibox_icon_Standalone🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
 install_menu_option_Standalone🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
-create_shortcut_Standalone_Browser🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
+create_shortcut_Standalone_Browser🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
 create_shortcut_Standalone_Windowed🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_omnibox_icon_Standalone🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_menu_option_Standalone🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
+install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	open_in_chrome🌕	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	open_in_chrome🌕	check_tab_created🌕
-install_menu_option_Standalone🌕	open_in_chrome🌕	check_tab_created🌕
-create_shortcut_Standalone_Windowed🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created🌕
-install_menu_option_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created🌕
+create_shortcut_Standalone_Windowed🌕	open_in_chrome🌕	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕
+install_menu_option_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
+install_menu_option_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
 create_shortcut_Standalone_Windowed🌕	open_app_settings_from_chrome_apps_Standalone🌕	check_browser_navigation_is_app_settings_Standalone🌕
 create_shortcut_Standalone_Windowed🌕	open_app_settings_from_app_menu_Standalone🌕	check_browser_navigation_is_app_settings_Standalone🌕
 install_omnibox_icon_Standalone🌕	open_app_settings_from_chrome_apps_Standalone🌕	check_browser_navigation_is_app_settings_Standalone🌕
@@ -687,16 +687,16 @@
 install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
 install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
 create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌕
 create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌕
 install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌕
@@ -819,10 +819,10 @@
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcut_Standalone_Windowed🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	install_omnibox_icon_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	install_menu_option_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌕
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌕
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌕
@@ -1342,51 +1342,131 @@
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_Remember🌕	launch_file_expect_no_dialog_FileHandler_OneFooFile🌕
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_Remember🌕	launch_file_expect_no_dialog_FileHandler_OneFooFile🌕
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_Remember🌕	launch_file_expect_no_dialog_FileHandler_OneFooFile🌕

chrome/test/webapps/coverage/coverage_mac.tsv

diff --git a/chrome/test/webapps/coverage/coverage_mac.tsv b/chrome/test/webapps/coverage/coverage_mac.tsv
index fc6a495a..7a106cd 100644
--- a/chrome/test/webapps/coverage/coverage_mac.tsv
+++ b/chrome/test/webapps/coverage/coverage_mac.tsv
@@ -1,5 +1,5 @@
 # This is a generated file.
-# Full coverage: 75%, with partial coverage: 93%
+# Full coverage: 76%, with partial coverage: 94%
 create_shortcut_Standalone_Windowed🌕	launch_from_menu_option_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 create_shortcut_Standalone_Windowed🌕	launch_from_launch_icon_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
@@ -525,32 +525,32 @@
 install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_not_created🌕
 install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_not_created🌕
 install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_not_created🌕
-create_shortcut_Standalone_Windowed🌕	close_pwa🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Windowed🌕	close_pwa🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	close_pwa🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	close_pwa🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_menu_option_Standalone🌕	close_pwa🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_menu_option_Standalone🌕	close_pwa🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_NotPromotable_Browser🌕	launch_from_chrome_apps_NotPromotable🌓	check_tab_created🌕
-create_shortcut_NotPromotable_Browser🌕	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created🌕
-install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created🌕
-install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created🌕
-install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created🌕
-install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created🌕
+create_shortcut_Standalone_Windowed🌕	close_pwa🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	close_pwa🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	close_pwa🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	close_pwa🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_menu_option_Standalone🌕	close_pwa🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_menu_option_Standalone🌕	close_pwa🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_NotPromotable_Browser🌕	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
+create_shortcut_NotPromotable_Browser🌕	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕
+install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
+install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕
+install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
+install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
@@ -635,19 +635,19 @@
 create_shortcut_Standalone_Browser🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
 install_omnibox_icon_Standalone🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
 install_menu_option_Standalone🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
-create_shortcut_Standalone_Browser🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
+create_shortcut_Standalone_Browser🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
 create_shortcut_Standalone_Windowed🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_not_created🌕
 install_omnibox_icon_Standalone🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_not_created🌕
 install_menu_option_Standalone🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_not_created🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
+install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	open_in_chrome🌕	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	open_in_chrome🌕	check_tab_created🌕
-install_menu_option_Standalone🌕	open_in_chrome🌕	check_tab_created🌕
-create_shortcut_Standalone_Windowed🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created🌕
-install_menu_option_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created🌕
+create_shortcut_Standalone_Windowed🌕	open_in_chrome🌕	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕
+install_menu_option_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
+install_menu_option_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
 create_shortcut_Standalone_Windowed🌕	open_app_settings_from_chrome_apps_Standalone🌕	check_browser_navigation_is_app_settings_Standalone🌕
 create_shortcut_Standalone_Windowed🌕	open_app_settings_from_app_menu_Standalone🌕	check_browser_navigation_is_app_settings_Standalone🌕
 install_omnibox_icon_Standalone🌕	open_app_settings_from_chrome_apps_Standalone🌕	check_browser_navigation_is_app_settings_Standalone🌕
@@ -693,16 +693,16 @@
 install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
 install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌑	check_window_created🌑
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
-create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
-install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
-install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created🌑
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
+create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
+install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
+install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
 create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌕
 create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌕
 install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌕
@@ -825,10 +825,10 @@
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcut_Standalone_Windowed🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	install_omnibox_icon_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	install_menu_option_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌕
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌕
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌕
@@ -1332,51 +1332,131 @@
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_Remember🌕	launch_file_expect_no_dialog_FileHandler_OneFooFile🌕
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_Remember🌕	launch_file_expect_no_dialog_FileHandler_OneFooFile🌕
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_Remember🌕	launch_file_expect_no_dialog_FileHandler_OneFooFile🌕

chrome/test/webapps/coverage/coverage_win.tsv

diff --git a/chrome/test/webapps/coverage/coverage_win.tsv b/chrome/test/webapps/coverage/coverage_win.tsv
index f4c1b20f..93acf718 100644
--- a/chrome/test/webapps/coverage/coverage_win.tsv
+++ b/chrome/test/webapps/coverage/coverage_win.tsv
@@ -1,5 +1,5 @@
 # This is a generated file.
-# Full coverage: 75%, with partial coverage: 93%
+# Full coverage: 76%, with partial coverage: 94%
 create_shortcut_Standalone_Windowed🌕	launch_from_menu_option_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 create_shortcut_Standalone_Windowed🌕	launch_from_launch_icon_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
@@ -519,32 +519,32 @@
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-create_shortcut_NotPromotable_Browser🌕	launch_from_chrome_apps_NotPromotable🌓	check_tab_created🌕
-create_shortcut_NotPromotable_Browser🌕	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created🌕
-install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created🌕
-install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created🌕
-install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created🌕
-install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+create_shortcut_NotPromotable_Browser🌕	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
+create_shortcut_NotPromotable_Browser🌕	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕
+install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
+install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕
+install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
+install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
@@ -629,19 +629,19 @@
 create_shortcut_Standalone_Browser🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
 install_omnibox_icon_Standalone🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
 install_menu_option_Standalone🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
-create_shortcut_Standalone_Browser🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
+create_shortcut_Standalone_Browser🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
 create_shortcut_Standalone_Windowed🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_omnibox_icon_Standalone🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_menu_option_Standalone🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
+install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	open_in_chrome🌕	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	open_in_chrome🌕	check_tab_created🌕
-install_menu_option_Standalone🌕	open_in_chrome🌕	check_tab_created🌕
-create_shortcut_Standalone_Windowed🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created🌕
-install_menu_option_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created🌕
+create_shortcut_Standalone_Windowed🌕	open_in_chrome🌕	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕
+install_menu_option_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
+install_menu_option_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
 create_shortcut_Standalone_Windowed🌕	open_app_settings_from_chrome_apps_Standalone🌕	check_browser_navigation_is_app_settings_Standalone🌕
 create_shortcut_Standalone_Windowed🌕	open_app_settings_from_app_menu_Standalone🌕	check_browser_navigation_is_app_settings_Standalone🌕
 install_omnibox_icon_Standalone🌕	open_app_settings_from_chrome_apps_Standalone🌕	check_browser_navigation_is_app_settings_Standalone🌕
@@ -687,16 +687,16 @@
 install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
 install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
 create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌕
 create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌕
 install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌕
@@ -819,10 +819,10 @@
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcut_Standalone_Windowed🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	install_omnibox_icon_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	install_menu_option_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌕
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌕
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌕
@@ -1342,51 +1342,131 @@
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_OneBarFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneBarFile🌕
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleFooFiles_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_MultipleFooFiles🌕
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
-install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+create_shortcut_FileHandler_Browser🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+create_shortcut_FileHandler_Windowed🌕	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_FileHandler🌕	launch_file_expect_dialog_FileHandler_MultipleBarFiles_Allow_AskAgain🌕	check_tab_created_Two🌕	check_files_loaded_in_site_FileHandler_MultipleBarFiles🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	maybe_close_pwa🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Windowed🌕	maybe_close_pwa🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+create_shortcut_FileHandler_Browser🌕	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_pwa_window_created_FileHandler_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Windowed🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	create_shortcut_FileHandler_Browser🌕	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_WithShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
+install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	switch_active_profile_Profile2🌕	install_policy_app_FileHandler_NoShortcut_Browser_WebApp🌓	disable_file_handling_FileHandler🌕	switch_active_profile_Default🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_AskAgain🌕	check_tab_created_One🌕	check_files_loaded_in_site_FileHandler_OneFooFile🌕
 create_shortcut_FileHandler_Windowed🌕	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_Remember🌕	launch_file_expect_no_dialog_FileHandler_OneFooFile🌕
 install_policy_app_FileHandler_WithShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_Remember🌕	launch_file_expect_no_dialog_FileHandler_OneFooFile🌕
 install_policy_app_FileHandler_NoShortcut_Windowed_WebApp🌓	launch_file_expect_dialog_FileHandler_OneFooFile_Allow_Remember🌕	launch_file_expect_no_dialog_FileHandler_OneFooFile🌕

chrome/test/webapps/data/actions.md

diff --git a/chrome/test/webapps/data/actions.md b/chrome/test/webapps/data/actions.md
index d55589ad..3db75570 100644
--- a/chrome/test/webapps/data/actions.md
+++ b/chrome/test/webapps/data/actions.md
@@ -20,7 +20,7 @@
 
 TODO(dmurph): Possibly this table up into markdown-header section.
 
-| # Action base name | Argument Types | Output Actions | Unique Identifier (next: 160) | Status (WIP, Implemented, Not Implemented, Parameterized) | Description | Metadata, implementation bug, etc |
+| # Action base name | Argument Types | Output Actions | Unique Identifier (next: 163) | Status (WIP, Implemented, Not Implemented, Parameterized) | Description | Metadata, implementation bug, etc |
 | --- | --- | --- | --- | --- | --- | --- |
 | # Badging |
 | check_app_badge_empty | Site |  | 2 | Not Implemented | Check that the 'badge' on the app icon is empty |  |
@@ -98,7 +98,7 @@
 | check_platform_shortcut_and_icon | Site |  | 7 | Implemented | The icon of the platform shortcut (on the desktop) is correct | cliffordcheng@, doc |
 | check_run_on_os_login_disabled | Site |  | 107 | Implemented | Check run on os login is disabled. | phillis@ |
 | check_run_on_os_login_enabled | Site |  | 106 | Implemented | Check run on os login is enabled. | phillis@ |
-| check_tab_created |  |  | 22 | Implemented | A tab was created in a chrome browser window |  |
+| check_tab_created | Number |  | 22 | Implemented | A given number of tabs were created in a chrome browser window |  |
 | check_tab_not_created |  |  | 94 | Implemented | A tab was not created by the last state change action | cliffordcheng@, P1 |
 | check_user_cannot_set_run_on_os_login | Site | check_user_cannot_set_run_on_os_login_app_settings($1) & check_user_cannot_set_run_on_os_login_app_home($1) | 159 | Parameterized | Check an user is unable to change the run on os login state from UI surfaces due to policy.  | dibyapal@ |
 | check_user_cannot_set_run_on_os_login_app_settings | Site | | 158 | Implemented | Check user can't change the app's run_on_os_login state from the app settings page. | |
@@ -143,6 +143,7 @@
 | sync_turn_off |  |  | 41 | Implemented | Turn chrome sync off for "Apps": chrome://settings/syncSetup/advanced |  |
 | sync_turn_on |  |  | 42 | Implemented | Turn chrome sync on for "Apps": chrome://settings/syncSetup/advanced |  |
 | switch_incognito_profile |  |  | 73 | Implemented | Switch to using incognito mode | P2 |
+| switch_active_profile | ProfileName |  | 160 | Implemented | Switch to using a different profile |  |
 | # File handling |
 | check_site_handles_file | Site, FileExtension |  | 118 | Implemented |  |  |
 | check_site_not_handles_file | Site, FileExtension |  | 122 | Implemented |  |  |
@@ -152,6 +153,8 @@
 | check_files_loaded_in_site | Site, FilesOptions |  | 126 | Not Implemented | Check that the appropriate file contents have loaded in in PWA windows. |  |
 | add_file_handling_policy_approval | Site |  | 124 | Not Implemented |  |  |
 | remove_file_handling_policy_approval | Site |  | 125 | Not Implemented |  |  |
+| enable_file_handling | Site |  | 161 | Implemented |  |  |
+| disable_file_handling | Site |  | 162 | Implemented |  |  |
 | # Window Controls Overlay
 | check_window_controls_overlay_toggle | Site, IsShown |  | 112 | WIP |  |  |
 | check_window_controls_overlay | Site, IsOn |  | 113 | WIP |  |  |
@@ -187,4 +190,4 @@
 | install_locally | Site |  | 46 | Implemented | Find the app in the app list (chrome://apps) and install it by right-clicking on the app and selecting the 'install' option. Win/Mac/Linux only. |  |
 | uninstall_from_list | Site |  | 10 | Implemented | Uninstall the webapp from wherever apps are listed by chrome. On WML, this is from chrome://apps, and on ChromeOS, this is from the 'launcher' |  |
 | create_shortcuts_from_list | Site |  | 72 | Implemented | "create shortcuts" in chrome://apps. Win/Mac/Linux only. | P2 |
-| open_app_settings_from_chrome_apps | Site |  | 96 | Implemented |  | phillis@ |
\ No newline at end of file
+| open_app_settings_from_chrome_apps | Site |  | 96 | Implemented |  | phillis@ |

chrome/test/webapps/data/critical_user_journeys.md

diff --git a/chrome/test/webapps/data/critical_user_journeys.md b/chrome/test/webapps/data/critical_user_journeys.md
index 9adab92..67aa5b83 100644
--- a/chrome/test/webapps/data/critical_user_journeys.md
+++ b/chrome/test/webapps/data/critical_user_journeys.md
@@ -121,12 +121,12 @@
 | M | install_policy_app(Standalone, ShortcutOptions::All, Windowed, WebApp) | launch_from_platform_shortcut | check_window_created |
 | WMLC | install_or_shortcut_windowed | launch | check_window_display_standalone |
 | WMLC | install_or_shortcut_tabbed | set_open_in_window | launch | check_window_created |
-| WLC | install_or_shortcut_windowed | set_open_in_tab | launch_from_shortcut_or_list | check_tab_created |
+| WLC | install_or_shortcut_windowed | set_open_in_tab | launch_from_shortcut_or_list | check_tab_created(One) |
 | M | install_or_shortcut_by_user_windowed | set_open_in_tab | launch_from_platform_shortcut | check_tab_not_created |
-| M | install_or_shortcut_by_user_windowed | close_pwa | set_open_in_tab | launch_from_platform_shortcut | check_tab_created |
-| M | install_policy_app(Standalone, ShortcutOptions::All, Windowed, WebApp) | set_open_in_tab | launch_from_platform_shortcut | check_tab_created |
-| M | install_or_shortcut_windowed | set_open_in_tab | launch_from_chrome_apps | check_tab_created |
-| WMLC | install_or_shortcut_tabbed(NotPromotable) | launch_from_shortcut_or_list(NotPromotable) | check_tab_created |
+| M | install_or_shortcut_by_user_windowed | close_pwa | set_open_in_tab | launch_from_platform_shortcut | check_tab_created(One) |
+| M | install_policy_app(Standalone, ShortcutOptions::All, Windowed, WebApp) | set_open_in_tab | launch_from_platform_shortcut | check_tab_created(One) |
+| M | install_or_shortcut_windowed | set_open_in_tab | launch_from_chrome_apps | check_tab_created(One) |
+| WMLC | install_or_shortcut_tabbed(NotPromotable) | launch_from_shortcut_or_list(NotPromotable) | check_tab_created(One) |
 | WMLC | install_or_shortcut_windowed(MinimalUi) | launch(MinimalUi) | check_window_display_minimal |
 | WMLC | install_or_shortcut_windowed(Tabbed) | maybe_close_pwa | launch(Tabbed) | check_window_display_tabbed |
 | WMLC | install_or_shortcut_windowed(NotPromotable) | launch_not_from_platform_shortcut(NotPromotable) | check_window_created |
@@ -141,14 +141,14 @@
 | WMLC | install_or_shortcut | delete_profile | check_app_list_empty |
 | WMLC | install_or_shortcut | delete_profile | check_app_not_in_list |
 | WMLC | install_or_shortcut_with_shortcut | delete_profile | check_platform_shortcut_not_exists |
-| WMLC | install_or_shortcut_tabbed_with_shortcut | delete_platform_shortcut | create_shortcuts_from_list | launch_from_platform_shortcut | check_tab_created |
+| WMLC | install_or_shortcut_tabbed_with_shortcut | delete_platform_shortcut | create_shortcuts_from_list | launch_from_platform_shortcut | check_tab_created(One) |
 | WLC | install_or_shortcut_windowed_with_shortcut | delete_platform_shortcut | create_shortcuts_from_list | launch_from_platform_shortcut | check_window_created |
 | M | install_or_shortcut_by_user_windowed_with_shortcut | delete_platform_shortcut | create_shortcuts_from_list | launch_from_platform_shortcut | check_window_not_created |
 | M |  install_policy_app(Standalone, WithShortcut, Windowed, WebApp) | delete_platform_shortcut | create_shortcuts_from_list | launch_from_platform_shortcut | check_window_created |
-| WMLC | install_tabbed_no_shortcut | create_shortcuts_from_list | launch_from_platform_shortcut | check_tab_created |
+| WMLC | install_tabbed_no_shortcut | create_shortcuts_from_list | launch_from_platform_shortcut | check_tab_created(One) |
 | WMLC | install_windowed_no_shortcut | create_shortcuts_from_list | launch_from_platform_shortcut | check_window_created |
-| WMLC | install_or_shortcut_by_user_windowed | open_in_chrome | check_tab_created |
-| WMLC | install_or_shortcut_by_user_windowed | navigate_pwa(Standalone, MinimalUi) | open_in_chrome | check_tab_created |
+| WMLC | install_or_shortcut_by_user_windowed | open_in_chrome | check_tab_created(One) |
+| WMLC | install_or_shortcut_by_user_windowed | navigate_pwa(Standalone, MinimalUi) | open_in_chrome | check_tab_created(One) |
 | WML | install_or_shortcut_windowed | open_app_settings | check_browser_navigation_is_app_settings |
 
 ## Sync-initiated install tests
@@ -168,9 +168,9 @@
 | WML | install_or_shortcut_by_user_windowed(NotPromotable) | switch_profile_clients | install_locally(NotPromotable) | navigate_browser(NotPromotable) | check_launch_icon_shown |
 | WML | install_or_shortcut_by_user(NotPromotable) | switch_profile_clients | install_locally(NotPromotable) | check_platform_shortcut_and_icon(NotPromotable) |
 | WML | install_or_shortcut_by_user_windowed | switch_profile_clients | install_locally | launch | check_window_created |
-| WMLC | install_or_shortcut_by_user_tabbed | switch_profile_clients | launch_from_shortcut_or_list | check_tab_created |
-| WML | install_or_shortcut_by_user_tabbed | switch_profile_clients | install_locally | launch_from_shortcut_or_list | check_tab_created |
-| WML | install_or_shortcut_by_user_windowed | switch_profile_clients | launch_from_shortcut_or_list | check_tab_created |
+| WMLC | install_or_shortcut_by_user_tabbed | switch_profile_clients | launch_from_shortcut_or_list | check_tab_created(One) |
+| WML | install_or_shortcut_by_user_tabbed | switch_profile_clients | install_locally | launch_from_shortcut_or_list | check_tab_created(One) |
+| WML | install_or_shortcut_by_user_windowed | switch_profile_clients | launch_from_shortcut_or_list | check_tab_created(One) |
 | WMLC | install_or_shortcut_by_user | switch_profile_clients | uninstall_from_list | check_app_not_in_list |
 | WMLC | install_or_shortcut_by_user | switch_profile_clients | uninstall_from_list | switch_profile_clients(Client1) | check_app_not_in_list |
 | WML | install_or_shortcut_by_user | switch_profile_clients | check_app_in_list_not_locally_installed |
@@ -208,7 +208,7 @@
 | WMLC | install_policy_app(Standalone, ShortcutOptions::All, Browser, WebApp) | install_or_shortcut_by_user_windowed | check_app_in_list_windowed |
 | WMLC | install_policy_app(Standalone, ShortcutOptions::All, Browser, WebApp) | install_or_shortcut_by_user_windowed | check_platform_shortcut_and_icon |
 | WMLC | install_policy_app(Standalone, ShortcutOptions::All, Browser, WebApp) | install_or_shortcut_by_user_windowed | check_window_created |
-| WMLC | install_or_shortcut_by_user_tabbed | install_policy_app(Standalone, ShortcutOptions::All, Windowed, WebApp) | launch_from_shortcut_or_list | check_tab_created |
+| WMLC | install_or_shortcut_by_user_tabbed | install_policy_app(Standalone, ShortcutOptions::All, Windowed, WebApp) | launch_from_shortcut_or_list | check_tab_created(One) |
 | WMLC | install_or_shortcut_by_user_tabbed | install_policy_app(Standalone, ShortcutOptions::All, WindowOptions::All, WebApp) | uninstall_policy_app | check_app_in_list_tabbed |
 | WMLC | install_or_shortcut_by_user_tabbed | install_policy_app(Standalone, ShortcutOptions::All, WindowOptions::All, WebApp) | uninstall_policy_app | check_platform_shortcut_and_icon |
 | WMLC | install_or_shortcut_by_user_windowed | install_policy_app(Standalone, ShortcutOptions::All, WindowOptions::All, WebApp) | uninstall_policy_app | check_app_in_list_windowed |
@@ -331,19 +331,34 @@
 | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- |
 | # Single file opens should open just one window or tab. |
 | WMLC | install_or_shortcut_windowed(FileHandler) | launch_file_expect_dialog(FileHandler, OneFooFile, Allow, AskAgain) | check_pwa_window_created(FileHandler, One) | check_files_loaded_in_site(FileHandler, OneFooFile) |
-| WMLC | install_or_shortcut_tabbed(FileHandler) | launch_file_expect_dialog(FileHandler, OneFooFile, Allow, AskAgain) | check_tab_created | check_files_loaded_in_site(FileHandler, OneFooFile) |
-| WMLC | install_or_shortcut_windowed(FileHandler) | set_open_in_tab(FileHandler) | launch_file_expect_dialog(FileHandler, OneFooFile, Allow, AskAgain) | check_tab_created | check_files_loaded_in_site(FileHandler, OneFooFile) |
+| WMLC | install_or_shortcut_tabbed(FileHandler) | launch_file_expect_dialog(FileHandler, OneFooFile, Allow, AskAgain) | check_tab_created(One) | check_files_loaded_in_site(FileHandler, OneFooFile) |
+| WMLC | install_or_shortcut_windowed(FileHandler) | set_open_in_tab(FileHandler) | launch_file_expect_dialog(FileHandler, OneFooFile, Allow, AskAgain) | check_tab_created(One) | check_files_loaded_in_site(FileHandler, OneFooFile) |
 | WMLC | install_or_shortcut_windowed(FileHandler) | launch_file_expect_dialog(FileHandler, OneBarFile, Allow, AskAgain) | check_pwa_window_created(FileHandler, One) | check_files_loaded_in_site(FileHandler, OneBarFile) |
-| WMLC | install_or_shortcut_tabbed(FileHandler) | launch_file_expect_dialog(FileHandler, OneBarFile, Allow, AskAgain) | check_tab_created | check_files_loaded_in_site(FileHandler, OneBarFile) |
-| WMLC | install_or_shortcut_windowed(FileHandler) | set_open_in_tab(FileHandler) | launch_file_expect_dialog(FileHandler, OneBarFile, Allow, AskAgain) | check_tab_created | check_files_loaded_in_site(FileHandler, OneBarFile) |
+| WMLC | install_or_shortcut_tabbed(FileHandler) | launch_file_expect_dialog(FileHandler, OneBarFile, Allow, AskAgain) | check_tab_created(One) | check_files_loaded_in_site(FileHandler, OneBarFile) |
+| WMLC | install_or_shortcut_windowed(FileHandler) | set_open_in_tab(FileHandler) | launch_file_expect_dialog(FileHandler, OneBarFile, Allow, AskAgain) | check_tab_created(One) | check_files_loaded_in_site(FileHandler, OneBarFile) |
 | # Opening multiple Foo files only opens one window or tab. |
 | WMLC | install_or_shortcut_windowed(FileHandler) | launch_file_expect_dialog(FileHandler, MultipleFooFiles, Allow, AskAgain) | check_pwa_window_created(FileHandler, One) | check_files_loaded_in_site(FileHandler, MultipleFooFiles) |
-| WMLC | install_or_shortcut_tabbed(FileHandler) | launch_file_expect_dialog(FileHandler, MultipleFooFiles, Allow, AskAgain) | check_tab_created | check_files_loaded_in_site(FileHandler, MultipleFooFiles) |
-| WMLC | install_or_shortcut_windowed(FileHandler) | set_open_in_tab(FileHandler) | launch_file_expect_dialog(FileHandler, MultipleFooFiles, Allow, AskAgain) | check_tab_created | check_files_loaded_in_site(FileHandler, MultipleFooFiles) |
+| WMLC | install_or_shortcut_tabbed(FileHandler) | launch_file_expect_dialog(FileHandler, MultipleFooFiles, Allow, AskAgain) | check_tab_created(One) | check_files_loaded_in_site(FileHandler, MultipleFooFiles) |
+| WMLC | install_or_shortcut_windowed(FileHandler) | set_open_in_tab(FileHandler) | launch_file_expect_dialog(FileHandler, MultipleFooFiles, Allow, AskAgain) | check_tab_created(One) | check_files_loaded_in_site(FileHandler, MultipleFooFiles) |
 | # Opening multiple Bar files opens multiple windows or tabs. |
 | WMLC | install_or_shortcut_windowed(FileHandler) | launch_file_expect_dialog(FileHandler, MultipleBarFiles, Allow, AskAgain) | check_pwa_window_created(FileHandler, Two) | check_files_loaded_in_site(FileHandler, MultipleBarFiles) |
-| WMLC | install_or_shortcut_tabbed(FileHandler) | launch_file_expect_dialog(FileHandler, MultipleBarFiles, Allow, AskAgain) | check_tab_created | check_files_loaded_in_site(FileHandler, MultipleBarFiles) |
-| WMLC | install_or_shortcut_windowed(FileHandler) | set_open_in_tab(FileHandler) | launch_file_expect_dialog(FileHandler, MultipleBarFiles, Allow, AskAgain) | check_tab_created | check_files_loaded_in_site(FileHandler, MultipleBarFiles) |
+| WMLC | install_or_shortcut_tabbed(FileHandler) | launch_file_expect_dialog(FileHandler, MultipleBarFiles, Allow, AskAgain) | check_tab_created(Two) | check_files_loaded_in_site(FileHandler, MultipleBarFiles) |
+| WMLC | install_or_shortcut_windowed(FileHandler) | set_open_in_tab(FileHandler) | launch_file_expect_dialog(FileHandler, MultipleBarFiles, Allow, AskAgain) | check_tab_created(Two) | check_files_loaded_in_site(FileHandler, MultipleBarFiles) |
+
+### Multi-profile behavior
+
+| #Platforms | Test -> | | | | | | | | | | | | | | | | |
+| --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- |
+| # To slightly reduce number of generated tests, and work around test name limitations, separate out some by_user and policy install cases.
+| # Launch a file in the primary profile, while the PWA is not currently open.
+| WML | install_or_shortcut_by_user_windowed(FileHandler) | maybe_close_pwa | switch_active_profile(Profile2) | install_or_shortcut(FileHandler) | maybe_close_pwa | disable_file_handling(FileHandler) | switch_active_profile(Default) | launch_file_expect_dialog(FileHandler, OneFooFile, Allow, AskAgain) | check_pwa_window_created(FileHandler, One) | check_files_loaded_in_site(FileHandler, OneFooFile) |
+| WML | install_or_shortcut_by_user_tabbed(FileHandler) | switch_active_profile(Profile2) | install_or_shortcut(FileHandler) | maybe_close_pwa | disable_file_handling(FileHandler) | switch_active_profile(Default) | launch_file_expect_dialog(FileHandler, OneFooFile, Allow, AskAgain) | check_tab_created(One) | check_files_loaded_in_site(FileHandler, OneFooFile) |
+| # Launch a file in the primary profile, while the PWA is open in the secondary profile.
+| WML | install_or_shortcut_by_user_windowed(FileHandler) | maybe_close_pwa | switch_active_profile(Profile2) | install_or_shortcut(FileHandler) | disable_file_handling(FileHandler) | switch_active_profile(Default) | launch_file_expect_dialog(FileHandler, OneFooFile, Allow, AskAgain) | check_pwa_window_created(FileHandler, One) | check_files_loaded_in_site(FileHandler, OneFooFile) |
+| WML | install_or_shortcut_by_user_tabbed(FileHandler) | switch_active_profile(Profile2) | install_or_shortcut(FileHandler) | disable_file_handling(FileHandler) | switch_active_profile(Default) | launch_file_expect_dialog(FileHandler, OneFooFile, Allow, AskAgain) | check_tab_created(One) | check_files_loaded_in_site(FileHandler, OneFooFile) |
+| WML | install_policy_app(FileHandler, ShortcutOptions::All, Windowed, WebApp) | switch_active_profile(Profile2) | install_or_shortcut(FileHandler) | disable_file_handling(FileHandler) | switch_active_profile(Default) | launch_file_expect_dialog(FileHandler, OneFooFile, Allow, AskAgain) | check_pwa_window_created(FileHandler, One) | check_files_loaded_in_site(FileHandler, OneFooFile) |
+| WML | install_policy_app(FileHandler, ShortcutOptions::All, Browser, WebApp) | switch_active_profile(Profile2) | install_or_shortcut(FileHandler) | disable_file_handling(FileHandler) | switch_active_profile(Default) | launch_file_expect_dialog(FileHandler, OneFooFile, Allow, AskAgain) | check_tab_created(One) | check_files_loaded_in_site(FileHandler, OneFooFile) |
+
 
 ### Dialog option
 
@@ -364,6 +379,7 @@
 | WMLC | install_or_shortcut(FileHandler) | add_file_handling_policy_approval(FileHandler) | launch_file_expect_no_dialog(FileHandler, OneFooFile) | check_pwa_window_created(FileHandler, One) |
 | WMLC | install_or_shortcut(FileHandler) | add_file_handling_policy_approval(FileHandler) | remove_file_handling_policy_approval(FileHandler) | launch_file_expect_dialog(FileHandler, OneFooFile, Allow, AskAgain) |
 
+
 ## Sub Apps
 
 | #Platforms | Test -> | | | | | | | | | | | | | | | | |

chrome/test/webapps/data/enums.md

diff --git a/chrome/test/webapps/data/enums.md b/chrome/test/webapps/data/enums.md
index 202cbf9..e21230a 100644
--- a/chrome/test/webapps/data/enums.md
+++ b/chrome/test/webapps/data/enums.md
@@ -40,3 +40,4 @@
 | InstallMode | WebApp* | WebShortcut |
 | UpdateDialogResponse | AcceptUpdate | CancelDialogAndUninstall | SkipUpdate |
 | SubAppInstallDialogOptions | UserAllow* | UserDeny | PolicyOverride |
+| ProfileName | Default | Profile2 |

chrome/test/webapps/data/framework_supported_actions.csv

diff --git a/chrome/test/webapps/data/framework_supported_actions.csv b/chrome/test/webapps/data/framework_supported_actions.csv
index ba00ccb..aebcf231 100644
--- a/chrome/test/webapps/data/framework_supported_actions.csv
+++ b/chrome/test/webapps/data/framework_supported_actions.csv
@@ -60,6 +60,7 @@
 set_open_in_window_from_app_settings,                  🌕, 🌕,  🌕,   🌕
 switch_incognito_profile,                              🌕, 🌕,  🌕,   🌕,
 switch_profile_clients,                                🌕, 🌕,  🌕,   🌕,
+switch_active_profile,                                 🌕, 🌕,  🌕,   🌑,
 sync_turn_off,                                         🌕, 🌕,  🌕,   🌕,
 sync_turn_on,                                          🌕, 🌕,  🌕,   🌕,
 uninstall_from_list,                                   🌕, 🌕,  🌕,   🌕,
@@ -84,3 +85,5 @@
 check_browser_navigation,                              🌕, 🌕,  🌕,   🌕,
 check_browser_navigation_is_app_settings,              🌕, 🌕,  🌕,   🌑,
 await_manifest_update,                                 🌕, 🌕,  🌕,   🌕,
+enable_file_handling,                                  🌕, 🌕,  🌕,   🌑,
+disable_file_handling,                                 🌕, 🌕,  🌕,   🌑,

chrome/updater/app/app_uninstall.cc

diff --git a/chrome/updater/app/app_uninstall.cc b/chrome/updater/app/app_uninstall.cc
index 2b60664..a49ceb2 100644
--- a/chrome/updater/app/app_uninstall.cc
+++ b/chrome/updater/app/app_uninstall.cc
@@ -39,6 +39,12 @@
 #include "chrome/updater/posix/setup.h"
 #endif
 
+#if BUILDFLAG(IS_LINUX)
+// TODO(crbug.com/1431487): Remove these includes after investigation.
+#include "base/ranges/algorithm.h"
+#include "url/gurl.h"
+#endif
+
 namespace updater {
 namespace {
 
@@ -63,8 +69,9 @@
     if (base::PathExists(version_executable_path)) {
       base::CommandLine command_line(version_executable_path);
       command_line.AppendSwitch(kUninstallSelfSwitch);
-      if (IsSystemInstall(scope))
+      if (IsSystemInstall(scope)) {
         command_line.AppendSwitch(kSystemSwitch);
+      }
       command_line.AppendSwitch(kEnableLoggingSwitch);
       command_line.AppendSwitchASCII(kLoggingModuleSwitch,
                                      kLoggingModuleSwitchValue);
@@ -133,6 +140,12 @@
     // currently-running version of the updater.
     uninstall_data.version = base::Version(kUpdaterVersion);
   }
+// TODO(crbug.com/1431487): Remove this code after investigation.
+#if BUILDFLAG(IS_LINUX)
+  CHECK(base::ranges::none_of(config_->PingUrl(), [](const GURL& url) {
+    return url.DomainIs("update.googleapis.com");
+  })) << "Attempted to send an uninstall ping to non-local server";
+#endif
   update_client::UpdateClientFactory(config_)->SendUninstallPing(
       uninstall_data, reason,
       base::BindOnce(

chromecast/bindings/bindings_manager_fuchsia.h

diff --git a/chromecast/bindings/bindings_manager_fuchsia.h b/chromecast/bindings/bindings_manager_fuchsia.h
index 865cd20..eca8919c 100644
--- a/chromecast/bindings/bindings_manager_fuchsia.h
+++ b/chromecast/bindings/bindings_manager_fuchsia.h
@@ -5,6 +5,7 @@
 #ifndef CHROMECAST_BINDINGS_BINDINGS_MANAGER_FUCHSIA_H_
 #define CHROMECAST_BINDINGS_BINDINGS_MANAGER_FUCHSIA_H_
 
+#include <chromium/cast/cpp/fidl.h>
 #include <fuchsia/mem/cpp/fidl.h>
 
 #include <list>
@@ -12,7 +13,6 @@
 #include <string>
 
 #include "chromecast/bindings/bindings_manager.h"
-#include "fuchsia_web/runners/cast/fidl/fidl/hlcpp/chromium/cast/cpp/fidl.h"
 
 namespace chromecast {
 namespace bindings {

chromeos/ash/components/BUILD.gn

diff --git a/chromeos/ash/components/BUILD.gn b/chromeos/ash/components/BUILD.gn
index 17cf462..c067ba6 100644
--- a/chromeos/ash/components/BUILD.gn
+++ b/chromeos/ash/components/BUILD.gn
@@ -35,6 +35,7 @@
     "//chromeos/ash/components/memory:unit_tests",
     "//chromeos/ash/components/multidevice:unit_tests",
     "//chromeos/ash/components/nearby/common:unit_tests",
+    "//chromeos/ash/components/nearby/presence:unit_tests",
     "//chromeos/ash/components/network:unit_tests",
     "//chromeos/ash/components/osauth/impl:unit_tests",
     "//chromeos/ash/components/peripheral_notification:unit_tests",

chromeos/ash/components/dbus/DEPS

diff --git a/chromeos/ash/components/dbus/DEPS b/chromeos/ash/components/dbus/DEPS
index 16ccc93..eed826e 100644
--- a/chromeos/ash/components/dbus/DEPS
+++ b/chromeos/ash/components/dbus/DEPS
@@ -1,6 +1,7 @@
 noparent = True
 
 include_rules = [
+  "+ash/constants",
   "+base",
   # Please do not add any chromeos/ dependencies here: https://crbug.com/863439
   # Unless what is added is itself a standalone component,

chromeos/ash/components/dbus/hermes/BUILD.gn

diff --git a/chromeos/ash/components/dbus/hermes/BUILD.gn b/chromeos/ash/components/dbus/hermes/BUILD.gn
index 1d5d4d9..3d19da9 100644
--- a/chromeos/ash/components/dbus/hermes/BUILD.gn
+++ b/chromeos/ash/components/dbus/hermes/BUILD.gn
@@ -17,6 +17,7 @@
   visibility = [ ":*" ]
   defines = [ "IS_HERMES_CLIENT_IMPL" ]
   deps = [
+    "//ash/constants",
     "//base",
     "//chromeos/dbus/common",
     "//components/device_event_log",

chromeos/ash/components/dbus/hermes/hermes_euicc_client.cc

diff --git a/chromeos/ash/components/dbus/hermes/hermes_euicc_client.cc b/chromeos/ash/components/dbus/hermes/hermes_euicc_client.cc
index d9217d4..59ebb9a 100644
--- a/chromeos/ash/components/dbus/hermes/hermes_euicc_client.cc
+++ b/chromeos/ash/components/dbus/hermes/hermes_euicc_client.cc
@@ -4,6 +4,8 @@
 
 #include "chromeos/ash/components/dbus/hermes/hermes_euicc_client.h"
 
+#include "ash/constants/ash_features.h"
+#include "base/check.h"
 #include "base/functional/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
@@ -35,11 +37,19 @@
                    &installed_carrier_profiles_);
   RegisterProperty(hermes::euicc::kPendingProfilesProperty,
                    &pending_carrier_profiles_);
+  RegisterProperty(hermes::euicc::kProfilesProperty, &profiles_);
   RegisterProperty(hermes::euicc::kPhysicalSlotProperty, &physical_slot_);
 }
 
 HermesEuiccClient::Properties::~Properties() = default;
 
+// TODO(b/271854446): Inline this accessor once the feature is launched.
+dbus::Property<std::vector<dbus::ObjectPath>>&
+HermesEuiccClient::Properties::profiles() {
+  DCHECK(features::IsSmdsDbusMigrationEnabled());
+  return profiles_;
+}
+
 class HermesEuiccClientImpl : public HermesEuiccClient {
  public:
   explicit HermesEuiccClientImpl(dbus::Bus* bus) : bus_(bus) {}

chromeos/ash/components/dbus/hermes/hermes_euicc_client.h

diff --git a/chromeos/ash/components/dbus/hermes/hermes_euicc_client.h b/chromeos/ash/components/dbus/hermes/hermes_euicc_client.h
index aa89436..73aa66c 100644
--- a/chromeos/ash/components/dbus/hermes/hermes_euicc_client.h
+++ b/chromeos/ash/components/dbus/hermes/hermes_euicc_client.h
@@ -123,6 +123,7 @@
     installed_carrier_profiles() {
       return installed_carrier_profiles_;
     }
+    dbus::Property<std::vector<dbus::ObjectPath>>& profiles();
     dbus::Property<std::vector<dbus::ObjectPath>>& pending_carrier_profiles() {
       return pending_carrier_profiles_;
     }
@@ -142,6 +143,11 @@
     // installation on this device.
     dbus::Property<std::vector<dbus::ObjectPath>> pending_carrier_profiles_;
 
+    // List of all carrier profiles known to the device. This includes
+    // currently installed profiles and pending profiles scanned from
+    // SM-DS or SM-DP+ servers.
+    dbus::Property<std::vector<dbus::ObjectPath>> profiles_;
+
     // Physical slot number of the Euicc.
     dbus::Property<int32_t> physical_slot_;
   };

chromeos/ash/components/nearby/presence/BUILD.gn

diff --git a/chromeos/ash/components/nearby/presence/BUILD.gn b/chromeos/ash/components/nearby/presence/BUILD.gn
new file mode 100644
index 0000000..f8fe585
--- /dev/null
+++ b/chromeos/ash/components/nearby/presence/BUILD.gn
@@ -0,0 +1,44 @@
+# 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.
+
+import("//build/config/chromeos/ui_mode.gni")
+import("//testing/test.gni")
+
+assert(is_chromeos_ash, "Non-Chrome-OS builds must not depend on //ash")
+
+static_library("presence") {
+  sources = [
+    "nearby_presence_service.cc",
+    "nearby_presence_service.h",
+    "nearby_presence_service_impl.cc",
+    "nearby_presence_service_impl.h",
+  ]
+
+  deps = [
+    "//ash/constants",
+    "//ash/public/cpp",
+    "//base",
+    "//chrome/browser/profiles:profile",
+    "//components/keyed_service/content:content",
+    "//components/keyed_service/core",
+    "//components/pref_registry:pref_registry",
+    "//components/prefs",
+  ]
+}
+
+static_library("test_support") {
+  testonly = true
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [ "nearby_presence_service_impl_unittest.cc" ]
+
+  deps = [
+    "//base",
+    "//base/test:test_support",
+    "//chromeos/ash/components/nearby/presence:presence",
+    "//testing/gtest",
+  ]
+}

chromeos/ash/components/nearby/presence/DEPS

diff --git a/chromeos/ash/components/nearby/presence/DEPS b/chromeos/ash/components/nearby/presence/DEPS
new file mode 100644
index 0000000..2494de8e
--- /dev/null
+++ b/chromeos/ash/components/nearby/presence/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+components/keyed_service/core/keyed_service.h",
+]

chromeos/ash/components/nearby/presence/DIR_METADATA

diff --git a/chromeos/ash/components/nearby/presence/DIR_METADATA b/chromeos/ash/components/nearby/presence/DIR_METADATA
new file mode 100644
index 0000000..b06d6ee2
--- /dev/null
+++ b/chromeos/ash/components/nearby/presence/DIR_METADATA
@@ -0,0 +1,4 @@
+buganizer {
+  component_id: 1342830
+}
+team_email: "chromeos-cross-device-eng@google.com "

chromeos/ash/components/nearby/presence/OWNERS

diff --git a/chromeos/ash/components/nearby/presence/OWNERS b/chromeos/ash/components/nearby/presence/OWNERS
new file mode 100644
index 0000000..cedfca3
--- /dev/null
+++ b/chromeos/ash/components/nearby/presence/OWNERS
@@ -0,0 +1,3 @@
+hansberry@chromium.org
+julietlevesque@google.com
+akingsb@google.com

chromeos/ash/components/nearby/presence/nearby_presence_service.cc

diff --git a/chromeos/ash/components/nearby/presence/nearby_presence_service.cc b/chromeos/ash/components/nearby/presence/nearby_presence_service.cc
new file mode 100644
index 0000000..db671d0
--- /dev/null
+++ b/chromeos/ash/components/nearby/presence/nearby_presence_service.cc
@@ -0,0 +1,38 @@
+// 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 "chromeos/ash/components/nearby/presence/nearby_presence_service.h"
+
+namespace ash::nearby::presence {
+
+NearbyPresenceService::NearbyPresenceService() = default;
+NearbyPresenceService::~NearbyPresenceService() = default;
+
+NearbyPresenceService::ScanFilter::ScanFilter() = default;
+NearbyPresenceService::ScanFilter::~ScanFilter() = default;
+
+NearbyPresenceService::ScanFilter::ScanFilter(const ScanFilter& scan_filter) {
+  identity_type_ = scan_filter.identity_type_;
+  actions_ = scan_filter.actions_;
+}
+
+NearbyPresenceService::ScanDelegate::ScanDelegate() = default;
+NearbyPresenceService::ScanDelegate::~ScanDelegate() = default;
+
+NearbyPresenceService::PresenceDevice::PresenceDevice(
+    PresenceDevice::DeviceType device_type,
+    std::string stable_device_id,
+    std::string device_name,
+    std::vector<ActionType> actions,
+    int rssi) {
+  device_type_ = device_type;
+  stable_device_id_ = stable_device_id;
+  device_name_ = device_name;
+  actions_ = actions;
+  rssi_ = rssi;
+}
+
+NearbyPresenceService::PresenceDevice::~PresenceDevice() = default;
+
+}  // namespace ash::nearby::presence

chromeos/ash/components/nearby/presence/nearby_presence_service.h

diff --git a/chromeos/ash/components/nearby/presence/nearby_presence_service.h b/chromeos/ash/components/nearby/presence/nearby_presence_service.h
new file mode 100644
index 0000000..2426c08
--- /dev/null
+++ b/chromeos/ash/components/nearby/presence/nearby_presence_service.h
@@ -0,0 +1,93 @@
+// 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.
+
+#ifndef CHROMEOS_ASH_COMPONENTS_NEARBY_PRESENCE_NEARBY_PRESENCE_SERVICE_H_
+#define CHROMEOS_ASH_COMPONENTS_NEARBY_PRESENCE_NEARBY_PRESENCE_SERVICE_H_
+
+#include <memory>
+#include <string>
+#include <vector>
+
+namespace ash::nearby::presence {
+
+// This service implements Nearby Presence on top of the Nearby Presence .mojom
+// interface.
+class NearbyPresenceService {
+ public:
+  NearbyPresenceService();
+  virtual ~NearbyPresenceService();
+
+  enum class IdentityType { kPrivate };
+
+  // TODO(b/276642472): Include real NearbyPresence ActionType.
+  enum class ActionType {
+    action_1,
+    action_2,
+  };
+
+  struct ScanSession {
+    std::string session_name;
+  };
+
+  // TODO(b/276642472): Move PresenceDevice into its own class and file, to
+  // inherit from the upcoming Nearby Connections Device class.
+  class PresenceDevice {
+   public:
+    enum class DeviceType {
+      kUnspecified,
+      kPhone,
+      kTablet,
+      kDisplay,
+      kChromeOS,
+      kTv,
+      kWatch
+    };
+
+    PresenceDevice(DeviceType device_type,
+                   std::string stable_device_id,
+                   std::string device_name,
+                   std::vector<ActionType> actions,
+                   int rssi);
+    PresenceDevice(const PresenceDevice&) = delete;
+    PresenceDevice& operator=(const PresenceDevice&) = delete;
+    ~PresenceDevice();
+
+   private:
+    DeviceType device_type_;
+    std::string stable_device_id_;
+    std::string device_name_;
+    std::vector<ActionType> actions_;
+    int rssi_;
+  };
+
+  struct ScanFilter {
+    ScanFilter();
+    ScanFilter(const ScanFilter&);
+    ~ScanFilter();
+
+    IdentityType identity_type_;
+    std::vector<ActionType> actions_;
+  };
+
+  class ScanDelegate {
+   public:
+    ScanDelegate();
+    virtual ~ScanDelegate();
+
+    virtual void OnPresenceDeviceFound(
+        const PresenceDevice& presence_device) = 0;
+    virtual void OnPresenceDeviceChanged(
+        const PresenceDevice& presence_device) = 0;
+    virtual void OnPresenceDeviceLost(
+        const PresenceDevice& presence_device) = 0;
+  };
+
+  virtual std::unique_ptr<ScanSession> StartScan(
+      ScanFilter scan_filter,
+      ScanDelegate* scan_delegate) = 0;
+};
+
+}  // namespace ash::nearby::presence
+
+#endif  // CHROMEOS_ASH_COMPONENTS_NEARBY_PRESENCE_NEARBY_PRESENCE_SERVICE_H_

chromeos/ash/components/nearby/presence/nearby_presence_service_impl.cc

diff --git a/chromeos/ash/components/nearby/presence/nearby_presence_service_impl.cc b/chromeos/ash/components/nearby/presence/nearby_presence_service_impl.cc
new file mode 100644
index 0000000..52994129
--- /dev/null
+++ b/chromeos/ash/components/nearby/presence/nearby_presence_service_impl.cc
@@ -0,0 +1,32 @@
+// 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 "chromeos/ash/components/nearby/presence/nearby_presence_service_impl.h"
+#include "base/check.h"
+
+namespace ash::nearby::presence {
+
+NearbyPresenceServiceImpl::NearbyPresenceServiceImpl() = default;
+NearbyPresenceServiceImpl::~NearbyPresenceServiceImpl() = default;
+
+std::unique_ptr<NearbyPresenceService::ScanSession>
+NearbyPresenceServiceImpl::StartScan(ScanFilter scan_filter,
+                                     ScanDelegate* scan_delegate) {
+  CHECK(scan_delegate);
+
+  // TODO(b/276359326): create the StartScan() implementation, the following is
+  // only used for testing the scan delegate.
+  std::unique_ptr<NearbyPresenceService::ScanSession> session;
+
+  auto device = NearbyPresenceService::PresenceDevice(
+      NearbyPresenceService::PresenceDevice::DeviceType::kChromeOS,
+      /*stable_device_id_=*/"0", /*device_name_=*/"",
+      /*actions_=*/{}, /*rssi_=*/1);
+  scan_delegate->OnPresenceDeviceFound(device);
+  return session;
+}
+
+void NearbyPresenceServiceImpl::Shutdown() {}
+
+}  // namespace ash::nearby::presence

chromeos/ash/components/nearby/presence/nearby_presence_service_impl.h

diff --git a/chromeos/ash/components/nearby/presence/nearby_presence_service_impl.h b/chromeos/ash/components/nearby/presence/nearby_presence_service_impl.h
new file mode 100644
index 0000000..3e2dfc5
--- /dev/null
+++ b/chromeos/ash/components/nearby/presence/nearby_presence_service_impl.h
@@ -0,0 +1,36 @@
+// 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.
+
+#ifndef CHROMEOS_ASH_COMPONENTS_NEARBY_PRESENCE_NEARBY_PRESENCE_SERVICE_IMPL_H_
+#define CHROMEOS_ASH_COMPONENTS_NEARBY_PRESENCE_NEARBY_PRESENCE_SERVICE_IMPL_H_
+
+#include "chromeos/ash/components/nearby/presence/nearby_presence_service.h"
+#include "components/keyed_service/core/keyed_service.h"
+
+#include <memory>
+#include <string>
+
+namespace ash::nearby::presence {
+
+class NearbyPresenceServiceImpl : public NearbyPresenceService,
+                                  public KeyedService {
+ public:
+  NearbyPresenceServiceImpl();
+  NearbyPresenceServiceImpl(const NearbyPresenceServiceImpl&) = delete;
+  NearbyPresenceServiceImpl& operator=(const NearbyPresenceServiceImpl&) =
+      delete;
+  ~NearbyPresenceServiceImpl() override;
+
+  // NearbyPresenceService:
+  std::unique_ptr<ScanSession> StartScan(ScanFilter scan_filter,
+                                         ScanDelegate* scan_delegate) override;
+
+ private:
+  // KeyedService:
+  void Shutdown() override;
+};
+
+}  // namespace ash::nearby::presence
+
+#endif  // CHROMEOS_ASH_COMPONENTS_NEARBY_PRESENCE_NEARBY_PRESENCE_SERVICE_IMPL_H_

chromeos/ash/components/nearby/presence/nearby_presence_service_impl_unittest.cc

diff --git a/chromeos/ash/components/nearby/presence/nearby_presence_service_impl_unittest.cc b/chromeos/ash/components/nearby/presence/nearby_presence_service_impl_unittest.cc
new file mode 100644
index 0000000..f014ef0
--- /dev/null
+++ b/chromeos/ash/components/nearby/presence/nearby_presence_service_impl_unittest.cc
@@ -0,0 +1,69 @@
+// 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 "chromeos/ash/components/nearby/presence/nearby_presence_service_impl.h"
+
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+#include <memory>
+
+namespace ash::nearby::presence {
+
+namespace {
+
+class FakeScanDelegate : public NearbyPresenceService::ScanDelegate {
+ public:
+  FakeScanDelegate() = default;
+  FakeScanDelegate(const FakeScanDelegate&) = delete;
+  FakeScanDelegate& operator=(const FakeScanDelegate&) = delete;
+  ~FakeScanDelegate() override = default;
+
+  void OnPresenceDeviceFound(
+      const NearbyPresenceService::PresenceDevice& presence_device) override {
+    found_called = true;
+  }
+  void OnPresenceDeviceChanged(
+      const NearbyPresenceService::PresenceDevice& presence_device) override {
+    changed_called = true;
+  }
+  void OnPresenceDeviceLost(
+      const NearbyPresenceService::PresenceDevice& presence_device) override {
+    lost_called = true;
+  }
+
+  bool WasOnPresenceDeviceFoundCalled() { return found_called; }
+
+ private:
+  bool found_called = false;
+  bool changed_called = false;
+  bool lost_called = false;
+};
+
+}  // namespace
+
+class NearbyPresenceServiceImplTest : public testing::Test {
+ public:
+  NearbyPresenceServiceImplTest() = default;
+  ~NearbyPresenceServiceImplTest() override = default;
+
+  // testing::Test:
+  void SetUp() override {
+    nearby_presence_service = std::make_unique<NearbyPresenceServiceImpl>();
+  }
+
+  std::unique_ptr<NearbyPresenceServiceImpl> nearby_presence_service;
+};
+
+TEST_F(NearbyPresenceServiceImplTest, StartScan) {
+  NearbyPresenceService::ScanFilter filter;
+  FakeScanDelegate scan_delegate;
+
+  // Call start scan and verify it calls the OnPresenceDeviceFound delegate
+  // function.
+  nearby_presence_service->StartScan(filter, &scan_delegate);
+  EXPECT_TRUE(scan_delegate.WasOnPresenceDeviceFoundCalled());
+}
+
+}  // namespace ash::nearby::presence

chromeos/ash/components/network/metrics/DEPS

diff --git a/chromeos/ash/components/network/metrics/DEPS b/chromeos/ash/components/network/metrics/DEPS
deleted file mode 100644
index 896f509..0000000
--- a/chromeos/ash/components/network/metrics/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  "+mojo/public/cpp/bindings",
-]
\ No newline at end of file

chromeos/strings/chromeos_strings_bs.xtb

diff --git a/chromeos/strings/chromeos_strings_bs.xtb b/chromeos/strings/chromeos_strings_bs.xtb
index a2ab19a..fc49a3f 100644
--- a/chromeos/strings/chromeos_strings_bs.xtb
+++ b/chromeos/strings/chromeos_strings_bs.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4/IPv6</translation>
 <translation id="2080070583977670716">Više postavki</translation>
 <translation id="2085089206770112532">Smanjivanje osvjetljenja ekrana</translation>
+<translation id="209751264101900360">Od zore do mraka – protok oblaka</translation>
 <translation id="2102231663024125441">Uređivanje teksta</translation>
 <translation id="2105810540595158374">Uređaj je kontroler za igre.</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />, verzija <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">Mediji</translation>
 <translation id="4289540628985791613">Pregled</translation>
 <translation id="4289849978083912975">Prezentacija</translation>
+<translation id="4293621540182258188">Od zore do mraka – protok zemlje</translation>
 <translation id="4297501883039923494">Zaustavljeno – nepoznata greška</translation>
 <translation id="4300073214558989"><ph name="IMAGE_COUNT" /> slike/a</translation>
 <translation id="4311195029067684288">Puno</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">Pojačavanje osvjetljenja ekrana</translation>
 <translation id="57838592816432529">Isključi zvuk</translation>
 <translation id="5784136236926853061">Visoka HTTP latentnost</translation>
+<translation id="5809090008577139505">Polarna svjetlost</translation>
 <translation id="5826644637650799838">O umjetnosti</translation>
 <translation id="5832805196449965646">Dodaj osobu</translation>
 <translation id="583281660410589416">Nepoznato</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">boja tipki</translation>
 <translation id="5916084858004523819">Zabranjeno</translation>
 <translation id="5916664084637901428">Uključeno</translation>
+<translation id="5918201491776799918">Odaberi ekskluzivnu ilustraciju Chromebooka Plus</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{Vaš fajl je uspješno skeniran i sačuvan u folder <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}one{Vaši fajlovi su uspješno skenirani i sačuvani u folder <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}few{Vaši fajlovi su uspješno skenirani i sačuvani u folder <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}other{Vaši fajlovi su uspješno skenirani i sačuvani u folder <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}}</translation>
 <translation id="5931523347251946569">Fajl nije pronađen</translation>
 <translation id="5939518447894949180">Vrati na zadano</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073">Odaberite <ph name="TOPIC_SOURCE" /> <ph name="TOPIC_SOURCE_DESC" /></translation>
 <translation id="8151185429379586178">Alati za razvojne programere</translation>
+<translation id="8153923300383192510">Ekskluzivno za Chromebook Plus</translation>
 <translation id="8179976553408161302">Enter</translation>
 <translation id="8183974620058026102">Priloži</translation>
 <translation id="8206859287963243715">Mobilna mreža</translation>

chromeos/strings/chromeos_strings_cy.xtb

diff --git a/chromeos/strings/chromeos_strings_cy.xtb b/chromeos/strings/chromeos_strings_cy.xtb
index 8322f50e..17055dd2 100644
--- a/chromeos/strings/chromeos_strings_cy.xtb
+++ b/chromeos/strings/chromeos_strings_cy.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4/IPv6</translation>
 <translation id="2080070583977670716">Rhagor o osodiadau</translation>
 <translation id="2085089206770112532">Disgleirdeb y sgrîn i lawr</translation>
+<translation id="209751264101900360">Gwawr i dywyllwch - Llif Cwmwl</translation>
 <translation id="2102231663024125441">Golygu testun</translation>
 <translation id="2105810540595158374">Mae'r ddyfais yn rheolydd gêm.</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />, fersiwn <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">Cyfryngau</translation>
 <translation id="4289540628985791613">Trosolwg</translation>
 <translation id="4289849978083912975">Sioe sleidiau</translation>
+<translation id="4293621540182258188">Gwawr i dywyllwch - Llif y Ddaear</translation>
 <translation id="4297501883039923494">Wedi stopio - Gwall anhysbys</translation>
 <translation id="4300073214558989"><ph name="IMAGE_COUNT" /> Llun</translation>
 <translation id="4311195029067684288">Llawn</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">Disgleirdeb y sgrîn i fyny</translation>
 <translation id="57838592816432529">Distewi</translation>
 <translation id="5784136236926853061">Cuddni HTTP uchel</translation>
+<translation id="5809090008577139505">Awrora</translation>
 <translation id="5826644637650799838">Ynghylch y gelf</translation>
 <translation id="5832805196449965646">Ychwanegu Person</translation>
 <translation id="583281660410589416">Anhysbys</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">lliw bysell</translation>
 <translation id="5916084858004523819">Gwaharddedig</translation>
 <translation id="5916664084637901428">Ymlaen</translation>
+<translation id="5918201491776799918">Dewiswch gelfwaith unigryw Chromebook Plus</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{Mae eich ffeil wedi'i sganio a'i chadw i <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}zero{Mae eich ffeiliau wedi'u sganio a'u cadw i <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}two{Mae eich ffeiliau wedi'u sganio a'u cadw i <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}few{Mae eich ffeiliau wedi'u sganio a'u cadw i <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}many{Mae eich ffeiliau wedi'u sganio a'u cadw i <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}other{Mae eich ffeiliau wedi'u sganio a'u cadw i <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}}</translation>
 <translation id="5931523347251946569">Ni chanfuwyd y ffeil</translation>
 <translation id="5939518447894949180">Ailosod</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073">Dewiswch <ph name="TOPIC_SOURCE" /> <ph name="TOPIC_SOURCE_DESC" /></translation>
 <translation id="8151185429379586178">Offer datblygwyr</translation>
+<translation id="8153923300383192510">Unigryw i Chromebook Plus</translation>
 <translation id="8179976553408161302">Enter</translation>
 <translation id="8183974620058026102">Atodi</translation>
 <translation id="8206859287963243715">Symudol</translation>

chromeos/strings/chromeos_strings_en-GB.xtb

diff --git a/chromeos/strings/chromeos_strings_en-GB.xtb b/chromeos/strings/chromeos_strings_en-GB.xtb
index 7fd2528..38c9427 100644
--- a/chromeos/strings/chromeos_strings_en-GB.xtb
+++ b/chromeos/strings/chromeos_strings_en-GB.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4/IPv6</translation>
 <translation id="2080070583977670716">More settings</translation>
 <translation id="2085089206770112532">Display brightness down</translation>
+<translation id="209751264101900360">Dawn to dark - Cloud flow</translation>
 <translation id="2102231663024125441">Text editing</translation>
 <translation id="2105810540595158374">Device is a game controller.</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />, version <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">Media</translation>
 <translation id="4289540628985791613">Overview</translation>
 <translation id="4289849978083912975">Slideshow</translation>
+<translation id="4293621540182258188">Dawn to dark - Earth flow</translation>
 <translation id="4297501883039923494">Stopped – unknown error</translation>
 <translation id="4300073214558989"><ph name="IMAGE_COUNT" /> images</translation>
 <translation id="4311195029067684288">Full</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">Display brightness up</translation>
 <translation id="57838592816432529">Mute</translation>
 <translation id="5784136236926853061">High HTTP latency</translation>
+<translation id="5809090008577139505">Aurora</translation>
 <translation id="5826644637650799838">About the art</translation>
 <translation id="5832805196449965646">Add Person</translation>
 <translation id="583281660410589416">Unknown</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">key colour</translation>
 <translation id="5916084858004523819">Prohibited</translation>
 <translation id="5916664084637901428">On</translation>
+<translation id="5918201491776799918">Select Chromebook Plus exclusive artwork</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{Your file has been successfully scanned and saved to <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}other{Your files have been successfully scanned and saved to <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}}</translation>
 <translation id="5931523347251946569">File not found</translation>
 <translation id="5939518447894949180">Reset</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073">Select <ph name="TOPIC_SOURCE" /> <ph name="TOPIC_SOURCE_DESC" /></translation>
 <translation id="8151185429379586178">Developer tools</translation>
+<translation id="8153923300383192510">Chromebook Plus exclusive</translation>
 <translation id="8179976553408161302">Enter</translation>
 <translation id="8183974620058026102">Attach</translation>
 <translation id="8206859287963243715">Mobile</translation>

chromeos/strings/chromeos_strings_fi.xtb

diff --git a/chromeos/strings/chromeos_strings_fi.xtb b/chromeos/strings/chromeos_strings_fi.xtb
index c4bcd50..5c4dd33 100644
--- a/chromeos/strings/chromeos_strings_fi.xtb
+++ b/chromeos/strings/chromeos_strings_fi.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4/IPv6</translation>
 <translation id="2080070583977670716">Lisää asetuksia</translation>
 <translation id="2085089206770112532">Vähennä näytön kirkkautta</translation>
+<translation id="209751264101900360">Aamusta iltaan – Pilvien kulku</translation>
 <translation id="2102231663024125441">Tekstin muokkaaminen</translation>
 <translation id="2105810540595158374">Laite on peliohjain.</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />, versio <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">Media</translation>
 <translation id="4289540628985791613">Yleiskatsaus</translation>
 <translation id="4289849978083912975">Diaesitys</translation>
+<translation id="4293621540182258188">Aamusta iltaan – Maan kulku</translation>
 <translation id="4297501883039923494">Pysähtynyt – Tuntematon virhe</translation>
 <translation id="4300073214558989"><ph name="IMAGE_COUNT" /> kuvaa</translation>
 <translation id="4311195029067684288">Täynnä</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">Lisää näytön kirkkautta</translation>
 <translation id="57838592816432529">Mykistä</translation>
 <translation id="5784136236926853061">Suuri HTTP-viive</translation>
+<translation id="5809090008577139505">Aurora</translation>
 <translation id="5826644637650799838">Tietoa taideteoksesta</translation>
 <translation id="5832805196449965646">Lisää henkilö</translation>
 <translation id="583281660410589416">Tuntematon</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">avaimen väri</translation>
 <translation id="5916084858004523819">Kielletty</translation>
 <translation id="5916664084637901428">Päällä</translation>
+<translation id="5918201491776799918">Valitse vain Chromebook Plus kuvamateriaali</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{Tiedostosi skannaus onnistui. Se on tallennettu tänne: <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}other{Tiedostojesi skannaus onnistui. Ne on tallennettu tänne: <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}}</translation>
 <translation id="5931523347251946569">Tiedostoa ei löydy</translation>
 <translation id="5939518447894949180">Tyhjennä</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073">Valitse <ph name="TOPIC_SOURCE" /> <ph name="TOPIC_SOURCE_DESC" /></translation>
 <translation id="8151185429379586178">Kehittäjän työkalut</translation>
+<translation id="8153923300383192510">Vain Chromebook Plus</translation>
 <translation id="8179976553408161302">Enter</translation>
 <translation id="8183974620058026102">Liitä</translation>
 <translation id="8206859287963243715">Matkapuhelin</translation>

chromeos/strings/chromeos_strings_gu.xtb

diff --git a/chromeos/strings/chromeos_strings_gu.xtb b/chromeos/strings/chromeos_strings_gu.xtb
index de3f21e..9ef689f 100644
--- a/chromeos/strings/chromeos_strings_gu.xtb
+++ b/chromeos/strings/chromeos_strings_gu.xtb
@@ -106,6 +106,7 @@
 <translation id="1759842336958782510">Chrome</translation>
 <translation id="1768959921651994223">પ્રમાણીકરણનો પ્રકાર</translation>
 <translation id="1782199038061388045">અનુવાદ</translation>
+<translation id="1790209694022261219">વિન્ડો અને ડેસ્ક</translation>
 <translation id="1792647875738159689">સ્કૅન કરવાનું કાર્ય રદ કરી રહ્યાં છીએ</translation>
 <translation id="1801418420130173017">ઘેરી થીમ બંધ કરો</translation>
 <translation id="1807246157184219062">આછું</translation>
@@ -374,6 +375,7 @@
 <translation id="4311195029067684288">પૂર્ણ</translation>
 <translation id="4333390807948134856"><ph name="KEY_NAME" /> કી દબાવી</translation>
 <translation id="435692326371619097">નેટવર્ક APN સેટિંગ મેનેજ કરો. APN સેલ્યુલર નેટવર્ક અને ઇન્ટરનેટ વચ્ચે કનેક્શન સ્થાપિત કરે છે. <ph name="BEGIN_LINK" />વધુ જાણો<ph name="END_LINK" /></translation>
+<translation id="437294888293595148">બધા શૉર્ટકટ રીસેટ કરો</translation>
 <translation id="4378373042927530923">ચલાવ્યું નથી</translation>
 <translation id="4378551569595875038">કનેક્ટિંગ...</translation>
 <translation id="4382484599443659549">PDF</translation>

chromeos/strings/chromeos_strings_hr.xtb

diff --git a/chromeos/strings/chromeos_strings_hr.xtb b/chromeos/strings/chromeos_strings_hr.xtb
index dc6a099..cb47472 100644
--- a/chromeos/strings/chromeos_strings_hr.xtb
+++ b/chromeos/strings/chromeos_strings_hr.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4/IPv6</translation>
 <translation id="2080070583977670716">Više postavki</translation>
 <translation id="2085089206770112532">Smanjivanje svjetline zaslona</translation>
+<translation id="209751264101900360">Od zore do mraka – tok oblaka</translation>
 <translation id="2102231663024125441">Uređivanje teksta</translation>
 <translation id="2105810540595158374">Uređaj je kontroler za videoigre.</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />, verzija <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">Mediji</translation>
 <translation id="4289540628985791613">Pregled</translation>
 <translation id="4289849978083912975">Prezentacija</translation>
+<translation id="4293621540182258188">Od zore do mraka – tok Zemlje</translation>
 <translation id="4297501883039923494">Zaustavljeno – nepoznata pogreška</translation>
 <translation id="4300073214558989"><ph name="IMAGE_COUNT" /> slika/slike</translation>
 <translation id="4311195029067684288">Potpuno</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">Pojačavanje svjetline zaslona</translation>
 <translation id="57838592816432529">Isključi zvuk</translation>
 <translation id="5784136236926853061">Visoka latencija HTTP-a</translation>
+<translation id="5809090008577139505">Aurora</translation>
 <translation id="5826644637650799838">O umjetnosti</translation>
 <translation id="5832805196449965646">Dodaj osobu</translation>
 <translation id="583281660410589416">Nepoznato</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">boja tipke</translation>
 <translation id="5916084858004523819">Zabranjeno</translation>
 <translation id="5916664084637901428">Uključi</translation>
+<translation id="5918201491776799918">Odaberite ekskluzivna umjetnička djela za Chromebook Plus</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{Vaša je datoteka skenirana i spremljena u mapu <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}one{Vaše su datoteke skenirane i spremljene u mapu <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}few{Vaše su datoteke skenirane i spremljene u mapu <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}other{Vaše su datoteke skenirane i spremljene u mapu <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}}</translation>
 <translation id="5931523347251946569">Datoteka nije pronađena</translation>
 <translation id="5939518447894949180">Ponovno postavi</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073">Odaberite <ph name="TOPIC_SOURCE" /> <ph name="TOPIC_SOURCE_DESC" /></translation>
 <translation id="8151185429379586178">Alati za razvojne programere</translation>
+<translation id="8153923300383192510">Ekskluzivno za Chromebook Plus</translation>
 <translation id="8179976553408161302">Enter</translation>
 <translation id="8183974620058026102">Priloži</translation>
 <translation id="8206859287963243715">Mobitel</translation>

chromeos/strings/chromeos_strings_is.xtb

diff --git a/chromeos/strings/chromeos_strings_is.xtb b/chromeos/strings/chromeos_strings_is.xtb
index ce884b0..86110e3 100644
--- a/chromeos/strings/chromeos_strings_is.xtb
+++ b/chromeos/strings/chromeos_strings_is.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4/IPv6</translation>
 <translation id="2080070583977670716">Fleiri stillingar</translation>
 <translation id="2085089206770112532">Draga úr birtustigi skjás</translation>
+<translation id="209751264101900360">Frá dögun til rökkurs - flæði skýja</translation>
 <translation id="2102231663024125441">Breytingar á texta</translation>
 <translation id="2105810540595158374">Tækið er leikjafjarstýring.</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />, útgáfa <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">Margmiðlun</translation>
 <translation id="4289540628985791613">Yfirlit</translation>
 <translation id="4289849978083912975">Skyggnusýning</translation>
+<translation id="4293621540182258188">Frá dögun til rökkurs - flæði jarðar</translation>
 <translation id="4297501883039923494">Stöðvað – óþekkt villa</translation>
 <translation id="4300073214558989"><ph name="IMAGE_COUNT" /> myndir</translation>
 <translation id="4311195029067684288">Allur</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">Auka birtustig skjás</translation>
 <translation id="57838592816432529">Þagga</translation>
 <translation id="5784136236926853061">Langur HTTP-biðtími</translation>
+<translation id="5809090008577139505">Norðurljós</translation>
 <translation id="5826644637650799838">Um listaverkið</translation>
 <translation id="5832805196449965646">Bæta notanda við</translation>
 <translation id="583281660410589416">Óþekkt</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">litur lykils</translation>
 <translation id="5916084858004523819">Bannað</translation>
 <translation id="5916664084637901428">Kveikt</translation>
+<translation id="5918201491776799918">Veldu sérstök Chromebook Plus-listaverk</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{Skráin var skönnuð og vistuð í <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}one{Skrárnar voru skannaðar og vistaðar í <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}other{Skrárnar voru skannaðar og vistaðar í <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}}</translation>
 <translation id="5931523347251946569">Skráin fannst ekki</translation>
 <translation id="5939518447894949180">Endurstilla</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073">Velja <ph name="TOPIC_SOURCE" /> <ph name="TOPIC_SOURCE_DESC" /></translation>
 <translation id="8151185429379586178">Forritunartól</translation>
+<translation id="8153923300383192510">Aðeins í Chromebook Plus</translation>
 <translation id="8179976553408161302">Enter</translation>
 <translation id="8183974620058026102">Hengja við</translation>
 <translation id="8206859287963243715">Farsímakerfi</translation>

chromeos/strings/chromeos_strings_it.xtb

diff --git a/chromeos/strings/chromeos_strings_it.xtb b/chromeos/strings/chromeos_strings_it.xtb
index c056d2c..038bf435 100644
--- a/chromeos/strings/chromeos_strings_it.xtb
+++ b/chromeos/strings/chromeos_strings_it.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4/IPv6</translation>
 <translation id="2080070583977670716">Altre impostazioni</translation>
 <translation id="2085089206770112532">Riduci la luminosità del display</translation>
+<translation id="209751264101900360">Dall'alba al tramonto - Flusso Nuvola</translation>
 <translation id="2102231663024125441">Modifica del testo</translation>
 <translation id="2105810540595158374">Il dispositivo è un controller.</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />, versione <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">Multimediali</translation>
 <translation id="4289540628985791613">Panoramica</translation>
 <translation id="4289849978083912975">Presentazione</translation>
+<translation id="4293621540182258188">Dall'alba al tramonto - Flusso Terra</translation>
 <translation id="4297501883039923494">Operazione interrotta - Errore sconosciuto</translation>
 <translation id="4300073214558989"><ph name="IMAGE_COUNT" /> immagini</translation>
 <translation id="4311195029067684288">Completo</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">Aumenta la luminosità del display</translation>
 <translation id="57838592816432529">Disattiva audio</translation>
 <translation id="5784136236926853061">Latenza HTTP elevata</translation>
+<translation id="5809090008577139505">Aurora</translation>
 <translation id="5826644637650799838">Informazioni sullo sfondo</translation>
 <translation id="5832805196449965646">Aggiungi persona</translation>
 <translation id="583281660410589416">Sconosciuto</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">colore tasti</translation>
 <translation id="5916084858004523819">Non consentito</translation>
 <translation id="5916664084637901428">On</translation>
+<translation id="5918201491776799918">Seleziona un'opera d'arte esclusiva di Chromebook Plus</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{Il file è stato scansionato correttamente e salvato in <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}other{I file sono stati scansionati correttamente e salvati in <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}}</translation>
 <translation id="5931523347251946569">File non trovato</translation>
 <translation id="5939518447894949180">Reimposta</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073">Seleziona <ph name="TOPIC_SOURCE" /> <ph name="TOPIC_SOURCE_DESC" /></translation>
 <translation id="8151185429379586178">Strumenti per sviluppatori</translation>
+<translation id="8153923300383192510">Esclusiva Chromebook Plus</translation>
 <translation id="8179976553408161302">Invio</translation>
 <translation id="8183974620058026102">Allega</translation>
 <translation id="8206859287963243715">Cellulare</translation>

chromeos/strings/chromeos_strings_ja.xtb

diff --git a/chromeos/strings/chromeos_strings_ja.xtb b/chromeos/strings/chromeos_strings_ja.xtb
index da7f3f5..c14aae9d 100644
--- a/chromeos/strings/chromeos_strings_ja.xtb
+++ b/chromeos/strings/chromeos_strings_ja.xtb
@@ -777,7 +777,7 @@
 <translation id="7791543448312431591">追加</translation>
 <translation id="779591286616261875">新しい報告を送信</translation>
 <translation id="7799817062559422778">ライトモード</translation>
-<translation id="780301667611848630">いいえ、結構です</translation>
+<translation id="780301667611848630">同意しない</translation>
 <translation id="7805768142964895445">ステータス</translation>
 <translation id="7819857487979277519">PSK（WPA または RSN）</translation>
 <translation id="7841134249932030522">ダークモードを有効にする</translation>

chromeos/strings/chromeos_strings_ka.xtb

diff --git a/chromeos/strings/chromeos_strings_ka.xtb b/chromeos/strings/chromeos_strings_ka.xtb
index 233cccb..c3919ac 100644
--- a/chromeos/strings/chromeos_strings_ka.xtb
+++ b/chromeos/strings/chromeos_strings_ka.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4/IPv6</translation>
 <translation id="2080070583977670716">დამატებითი პარამეტრები</translation>
 <translation id="2085089206770112532">ეკრანის სიკაშკაშის დაკლება</translation>
+<translation id="209751264101900360">მზის ამოსვლიდან მზის ჩასვლამდე — ღრუბლების ნაკადი</translation>
 <translation id="2102231663024125441">ტექსტის რედაქტირება</translation>
 <translation id="2105810540595158374">მოწყობილობა არის სათამაშო კონტროლერი.</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />, ვერსია <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">მედია</translation>
 <translation id="4289540628985791613">მიმოხილვა</translation>
 <translation id="4289849978083912975">სლაიდშოუ</translation>
+<translation id="4293621540182258188">მზის ამოსვლიდან მზის ჩასვლამდე — ხმელეთის ნაკადი</translation>
 <translation id="4297501883039923494">გაჩერდა — უცნობი შეცდომა</translation>
 <translation id="4300073214558989"><ph name="IMAGE_COUNT" /> სურათი</translation>
 <translation id="4311195029067684288">მთლიანი</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">ეკრანის სიკაშკაშის მომატება</translation>
 <translation id="57838592816432529">დადუმება</translation>
 <translation id="5784136236926853061">HTTP რეაგირების დრო დიდია</translation>
+<translation id="5809090008577139505">ციალი</translation>
 <translation id="5826644637650799838">ხელოვნების შესახებ</translation>
 <translation id="5832805196449965646">მომხმარებლის დამატება</translation>
 <translation id="583281660410589416">უცნობი</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">კლავიშების ფერი</translation>
 <translation id="5916084858004523819">აკრძალული</translation>
 <translation id="5916664084637901428">ჩართვა</translation>
+<translation id="5918201491776799918">აირჩიეთ ექსკლუზიურად Chromebook Plus-ზე ხელმისაწვდომი ნამუშევრები</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{თქვენი ფაილი წარმატებით დასკანირდა და შეინახა საქაღალდეში <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}other{თქვენი ფაილები წარმატებით დასკანირდა და შეინახა საქაღალდეში <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}}</translation>
 <translation id="5931523347251946569">ფაილი ვერ მოიძებნა</translation>
 <translation id="5939518447894949180">გადატვირთვა</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073">აირჩიეთ <ph name="TOPIC_SOURCE" /> <ph name="TOPIC_SOURCE_DESC" /></translation>
 <translation id="8151185429379586178">დეველოპერის ხელსაწყოები</translation>
+<translation id="8153923300383192510">ექსკლუზიურად Chromebook Plus-ისთვის</translation>
 <translation id="8179976553408161302">Enter</translation>
 <translation id="8183974620058026102">დანართი</translation>
 <translation id="8206859287963243715">ფიჭური</translation>

chromeos/strings/chromeos_strings_km.xtb

diff --git a/chromeos/strings/chromeos_strings_km.xtb b/chromeos/strings/chromeos_strings_km.xtb
index b7d9913..a4661e33 100644
--- a/chromeos/strings/chromeos_strings_km.xtb
+++ b/chromeos/strings/chromeos_strings_km.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4/IPv6</translation>
 <translation id="2080070583977670716">ការកំណត់ច្រើនទៀត</translation>
 <translation id="2085089206770112532">គ្រាប់ចុចព្រួញចុះក្រោមសម្រាប់បន្ថយពន្លឺផ្ទាំងអេក្រង់</translation>
+<translation id="209751264101900360">ពីព្រលឹម​ដល់​ព្រលប់ - ចលនាពពក</translation>
 <translation id="2102231663024125441">ការកែ​អក្សរ</translation>
 <translation id="2105810540595158374">ឧបករណ៍គឺជាឧបករណ៍បញ្ជាហ្គេម។</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />, កំណែ <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">កំសាន្ត</translation>
 <translation id="4289540628985791613">ទិដ្ឋភាពទូទៅ</translation>
 <translation id="4289849978083912975">បញ្ចាំងស្លាយ</translation>
+<translation id="4293621540182258188">ពីព្រលឹម​ដល់​ព្រលប់ - ចលនាពពក</translation>
 <translation id="4297501883039923494">បានឈប់ - មានបញ្ហា​ដែលមិនស្គាល់</translation>
 <translation id="4300073214558989">រូបភាព <ph name="IMAGE_COUNT" /></translation>
 <translation id="4311195029067684288">ពេញ</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">គ្រាប់ចុចព្រួញឡើងលើសម្រាប់បង្កើនពន្លឺផ្ទាំងអេក្រង់</translation>
 <translation id="57838592816432529">បិទសម្លេង</translation>
 <translation id="5784136236926853061">ការពន្យារ HTTP ខ្ពស់</translation>
+<translation id="5809090008577139505">អ៊ូរ៉ូរ៉ា</translation>
 <translation id="5826644637650799838">អំពីសិល្បៈ</translation>
 <translation id="5832805196449965646">បន្ថែមបុគ្គល</translation>
 <translation id="583281660410589416">មិនស្គាល់</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">ពណ៌គ្រាប់ចុច</translation>
 <translation id="5916084858004523819">ត្រូវបាន​ហាមឃាត់</translation>
 <translation id="5916664084637901428">បើក</translation>
+<translation id="5918201491776799918">ជ្រើសរើស​ស្នាដៃសិល្បៈ​ផ្ដាច់​មុខ​របស់ Chromebook Plus</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{ឯកសាររបស់អ្នកត្រូវបានស្កេន និងរក្សាទុកនៅក្នុង <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" /> ដោយជោគជ័យហើយ។}other{ឯកសាររបស់អ្នកត្រូវបានស្កេន និងរក្សាទុកនៅក្នុង <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" /> ដោយជោគជ័យហើយ។}}</translation>
 <translation id="5931523347251946569">រក​មិន​ឃើញ​ឯកសារទេ</translation>
 <translation id="5939518447894949180">កំណត់ឡើងវិញ</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073">ជ្រើសរើស <ph name="TOPIC_SOURCE" /> <ph name="TOPIC_SOURCE_DESC" /></translation>
 <translation id="8151185429379586178">ឧបករណ៍អ្នកអភិវឌ្ឍន៍</translation>
+<translation id="8153923300383192510">Chromebook Plus ផ្ដាច់មុខ</translation>
 <translation id="8179976553408161302">បញ្ចូល</translation>
 <translation id="8183974620058026102">ភ្ជាប់</translation>
 <translation id="8206859287963243715">ប្រព័ន្ធទូរស័ព្ទ</translation>

chromeos/strings/chromeos_strings_kn.xtb

diff --git a/chromeos/strings/chromeos_strings_kn.xtb b/chromeos/strings/chromeos_strings_kn.xtb
index b5a9aea..dcd0d6c 100644
--- a/chromeos/strings/chromeos_strings_kn.xtb
+++ b/chromeos/strings/chromeos_strings_kn.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4/IPv6</translation>
 <translation id="2080070583977670716">ಇನ್ನಷ್ಟು ಸೆಟ್ಟಿಂಗ್‌ಗಳು</translation>
 <translation id="2085089206770112532">ಡಿಸ್‌ಪ್ಲೇ ಪ್ರಖರತೆಯನ್ನು ಕಡಿಮೆ ಮಾಡಿ</translation>
+<translation id="209751264101900360">ಡಾನ್ ಟು ಡಾರ್ಕ್ - ಕ್ಲೌಡ್ ಫ್ಲೋ</translation>
 <translation id="2102231663024125441">ಪಠ್ಯ ಎಡಿಟ್ ಮಾಡುವಿಕೆ</translation>
 <translation id="2105810540595158374">ಸಾಧನವು ಗೇಮ್ ಕಂಟ್ರೋಲ್ ಆಗಿದೆ.</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />, ಆವೃತ್ತಿ <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">ಮಾದ್ಯಮ</translation>
 <translation id="4289540628985791613">ಅವಲೋಕನ</translation>
 <translation id="4289849978083912975">ಸ್ಲೈಡ್ ಶೋ</translation>
+<translation id="4293621540182258188">ಡಾನ್ ಟು ಡಾರ್ಕ್ - ಅರ್ಥ್ ಫ್ಲೋ</translation>
 <translation id="4297501883039923494">ನಿಲ್ಲಿಸಲಾಗಿದೆ - ಅಪರಿಚಿತ ದೋಷ</translation>
 <translation id="4300073214558989"><ph name="IMAGE_COUNT" /> ಚಿತ್ರಗಳು</translation>
 <translation id="4311195029067684288">ಪೂರ್ಣ</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">ಡಿಸ್‌ಪ್ಲೇ ಪ್ರಖರತೆಯನ್ನು ಹೆಚ್ಚಿಸಿ</translation>
 <translation id="57838592816432529">ಮ್ಯೂಟ್</translation>
 <translation id="5784136236926853061">ಅಧಿಕ HTTP ವಿಳಂಬ</translation>
+<translation id="5809090008577139505">ಅರೋರಾ</translation>
 <translation id="5826644637650799838">ಕಲೆಯ ಕುರಿತು</translation>
 <translation id="5832805196449965646">ವ್ಯಕ್ತಿಯನ್ನು ಸೇರಿಸು</translation>
 <translation id="583281660410589416">ಅಪರಿಚಿತ</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">ಕೀ ಬಣ್ಣ</translation>
 <translation id="5916084858004523819">ನಿಷೇಧಿಸಲಾಗಿದೆ</translation>
 <translation id="5916664084637901428">ಆನ್‌</translation>
+<translation id="5918201491776799918">Chromebook Plus ಎಕ್ಸ್‌ಕ್ಲೂಸಿವ್ ಆರ್ಟ್‌ವರ್ಕ್ ಅನ್ನು ಆಯ್ಕೆಮಾಡಿ</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{ನಿಮ್ಮ ಫೈಲ್ ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸ್ಕ್ಯಾನ್ ಮಾಡಲಾಗಿದೆ ಮತ್ತು <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" /> ಗೆ ಉಳಿಸಲಾಗಿದೆ.}one{ನಿಮ್ಮ ಫೈಲ್‌ಗಳನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸ್ಕ್ಯಾನ್ ಮಾಡಲಾಗಿದೆ ಮತ್ತು <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" /> ಗೆ ಉಳಿಸಲಾಗಿದೆ.}other{ನಿಮ್ಮ ಫೈಲ್‌ಗಳನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸ್ಕ್ಯಾನ್ ಮಾಡಲಾಗಿದೆ ಮತ್ತು <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" /> ಗೆ ಉಳಿಸಲಾಗಿದೆ.}}</translation>
 <translation id="5931523347251946569">ಫೈಲ್ ಕಂಡುಬಂದಿಲ್ಲ</translation>
 <translation id="5939518447894949180">ಮರುಹೊಂದಿಸು</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073"><ph name="TOPIC_SOURCE" /> <ph name="TOPIC_SOURCE_DESC" /> ಆಯ್ಕೆಮಾಡಿ</translation>
 <translation id="8151185429379586178">ಡೆವಲಪರ್ ಪರಿಕರಗಳು</translation>
+<translation id="8153923300383192510">Chromebook Plus ಎಕ್ಸ್‌ಕ್ಲೂಸಿವ್</translation>
 <translation id="8179976553408161302">Enter</translation>
 <translation id="8183974620058026102">ಲಗತ್ತಿಸಿ</translation>
 <translation id="8206859287963243715">ಸೆಲ್ಯುಲಾರ್</translation>

chromeos/strings/chromeos_strings_ml.xtb

diff --git a/chromeos/strings/chromeos_strings_ml.xtb b/chromeos/strings/chromeos_strings_ml.xtb
index abe6df2e..48d9a7d 100644
--- a/chromeos/strings/chromeos_strings_ml.xtb
+++ b/chromeos/strings/chromeos_strings_ml.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4/IPv6</translation>
 <translation id="2080070583977670716">കൂടുതൽ ക്രമീകരണങ്ങൾ</translation>
 <translation id="2085089206770112532">ഡിസ്‌പ്ലേ തെളിച്ചം കുറയ്‌ക്കുക</translation>
+<translation id="209751264101900360">ഉദയം മുതൽ അസ്തമയം വരെ - മേഘം</translation>
 <translation id="2102231663024125441">ടെക്‌സ്റ്റ് തിരുത്തൽ</translation>
 <translation id="2105810540595158374">ഉപകരണം ഒരു ഗെയിം കൺട്രോളറാണ്.</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />, പതിപ്പ് <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">മീഡിയ</translation>
 <translation id="4289540628985791613">അവലോകനം</translation>
 <translation id="4289849978083912975">സ്ലൈഡ് ഷോ</translation>
+<translation id="4293621540182258188">ഉദയം മുതൽ അസ്തമയം വരെ - ഭൂമി</translation>
 <translation id="4297501883039923494">പ്രിന്റ് ജോലി നിർത്തി - അജ്ഞാതമായ പിശക്</translation>
 <translation id="4300073214558989"><ph name="IMAGE_COUNT" /> ചിത്രങ്ങൾ</translation>
 <translation id="4311195029067684288">പൂർണ്ണം</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">ഡിസ്‌പ്ലേ തെളിച്ചം കൂട്ടുക</translation>
 <translation id="57838592816432529">മ്യൂട്ട് ചെയ്യുക</translation>
 <translation id="5784136236926853061">ഉയർന്ന HTTP പ്രതികരണ സമയം</translation>
+<translation id="5809090008577139505">ഒറോറ</translation>
 <translation id="5826644637650799838">ആർട്ടിനെ കുറിച്ച്</translation>
 <translation id="5832805196449965646">വ്യക്തിയെ ചേർക്കുക</translation>
 <translation id="583281660410589416">അജ്ഞാതം</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">കീയുടെ നിറം</translation>
 <translation id="5916084858004523819">നിരോധിച്ചിരിക്കുന്നു</translation>
 <translation id="5916664084637901428">ഓൺ ചെയ്യുക</translation>
+<translation id="5918201491776799918">Chromebook Plus-ന് വേണ്ടിയുള്ള എക്‌സ്ക്ലൂസീവ് ആർട്ട്‌വർക്ക്</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{നിങ്ങളുടെ ഫയൽ സ്‌കാൻ ചെയ്ത് <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" /> എന്നതിലേക്ക് സംരക്ഷിച്ചു.}other{നിങ്ങളുടെ ഫയലുകൾ സ്‌കാൻ ചെയ്ത് <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" /> എന്നതിലേക്ക് സംരക്ഷിച്ചു.}}</translation>
 <translation id="5931523347251946569">ഫയൽ കണ്ടെത്തിയില്ല</translation>
 <translation id="5939518447894949180">റീസെറ്റ് ചെയ്യുക</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073"><ph name="TOPIC_SOURCE" /> <ph name="TOPIC_SOURCE_DESC" /> തിരഞ്ഞെടുക്കുക</translation>
 <translation id="8151185429379586178">ഡെവലപ്പര്‍ ടൂളുകൾ</translation>
+<translation id="8153923300383192510">Chromebook Plus എക്‌സ്ക്ലൂസീവ്</translation>
 <translation id="8179976553408161302">Enter</translation>
 <translation id="8183974620058026102">അറ്റാച്ച് ചെയ്യുക</translation>
 <translation id="8206859287963243715">സെല്ലുലാര്‍‌</translation>

chromeos/strings/chromeos_strings_mr.xtb

diff --git a/chromeos/strings/chromeos_strings_mr.xtb b/chromeos/strings/chromeos_strings_mr.xtb
index 4ac5158..71a018a 100644
--- a/chromeos/strings/chromeos_strings_mr.xtb
+++ b/chromeos/strings/chromeos_strings_mr.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4/IPv6</translation>
 <translation id="2080070583977670716">अधिक सेटिंग्ज</translation>
 <translation id="2085089206770112532">डिस्प्लेचा ब्राइटनेस कमी करा</translation>
+<translation id="209751264101900360">डॉन टू डार्क - क्लाउड फ्लो</translation>
 <translation id="2102231663024125441">मजकूर संपादन</translation>
 <translation id="2105810540595158374">डिव्हाइस हे गेम नियंत्रक आहे.</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />, आवृत्ती <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">माध्यम</translation>
 <translation id="4289540628985791613">विहंगावलोकन</translation>
 <translation id="4289849978083912975">स्लाइड शो</translation>
+<translation id="4293621540182258188">डॉन टू डार्क - अर्थ फ्लो</translation>
 <translation id="4297501883039923494">थांबले - अज्ञात एरर</translation>
 <translation id="4300073214558989"><ph name="IMAGE_COUNT" /> इमेज</translation>
 <translation id="4311195029067684288">पूर्ण</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">डिस्प्लेचा ब्राइटनेस वाढवा</translation>
 <translation id="57838592816432529">म्यूट करा</translation>
 <translation id="5784136236926853061">उच्च HTTP लेटन्सी</translation>
+<translation id="5809090008577139505">ऑरोरा</translation>
 <translation id="5826644637650799838">आर्टविषयी</translation>
 <translation id="5832805196449965646">व्यक्ती जोडा</translation>
 <translation id="583281660410589416">अज्ञात</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">कीचा रंग</translation>
 <translation id="5916084858004523819">प्रतिबंधित</translation>
 <translation id="5916664084637901428">सुरू</translation>
+<translation id="5918201491776799918">Chromebook Plus साठी खास आर्टवर्क निवडा</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{तुमची फाइल यशस्वीरीत्या स्कॅन करण्यात आली आहे आणि <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" /> वर सेव्ह केली आहे.}other{तुमच्या फाइल यशस्वीरीत्या स्कॅन करण्यात आल्या आहेत आणि <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" /> वर सेव्ह केल्या आहेत.}}</translation>
 <translation id="5931523347251946569">फाइल सापडली नाही</translation>
 <translation id="5939518447894949180">रीसेट करा</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073"><ph name="TOPIC_SOURCE" /> <ph name="TOPIC_SOURCE_DESC" /> निवडा</translation>
 <translation id="8151185429379586178">डेव्हलपर टूल</translation>
+<translation id="8153923300383192510">Chromebook Plus साठी खास</translation>
 <translation id="8179976553408161302">Enter</translation>
 <translation id="8183974620058026102">अटॅच करा</translation>
 <translation id="8206859287963243715">सेल्यूलर</translation>

chromeos/strings/chromeos_strings_my.xtb

diff --git a/chromeos/strings/chromeos_strings_my.xtb b/chromeos/strings/chromeos_strings_my.xtb
index 373e68d..d34d04b 100644
--- a/chromeos/strings/chromeos_strings_my.xtb
+++ b/chromeos/strings/chromeos_strings_my.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4/IPv6</translation>
 <translation id="2080070583977670716">ဆက်တင်များ ပိုမိုပြရန်</translation>
 <translation id="2085089206770112532">ဖန်သားပြင်တောက်ပမှု လျှော့ရန်</translation>
+<translation id="209751264101900360">အရုဏ်တက်မှ မှောင်ချိန်အထိ - တိမ်ရွေ့လျားမှုပုံစံ</translation>
 <translation id="2102231663024125441">စာသား တည်းဖြတ်ခြင်း</translation>
 <translation id="2105810540595158374">ကိရိယာသည် ဂိမ်းခလုတ်ဖြစ်သည်။</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />၊ ဗားရှင်း <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">မီဒီယာ</translation>
 <translation id="4289540628985791613">အကျဉ်းချုပ်</translation>
 <translation id="4289849978083912975">ဆလိုက်ရှိုး</translation>
+<translation id="4293621540182258188">အရုဏ်တက်မှ မှောင်ချိန်အထိ - ကမ္ဘာမြေလည်ပတ်မှုပုံစံ</translation>
 <translation id="4297501883039923494">ရပ်သွားသည် - အမည်မသိ အမှား</translation>
 <translation id="4300073214558989"><ph name="IMAGE_COUNT" /> ပုံ</translation>
 <translation id="4311195029067684288">အပြည့်</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">ဖန်သားပြင်တောက်ပမှု တိုးရန်</translation>
 <translation id="57838592816432529">တိတ်ရန်</translation>
 <translation id="5784136236926853061">HTTP တုံ့ပြန်ချိန် ကြာနေသည်</translation>
+<translation id="5809090008577139505">ဝင်ရိုးစွန်း အလင်းတန်းများ</translation>
 <translation id="5826644637650799838">နောက်ခံပုံ အကြောင်း</translation>
 <translation id="5832805196449965646">လူကို ထည့်ပေးရန်</translation>
 <translation id="583281660410589416">မသိရ</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">ကီးအရောင်</translation>
 <translation id="5916084858004523819">တားမြစ်ထားသည်</translation>
 <translation id="5916664084637901428">ဖွင့်ရန်</translation>
+<translation id="5918201491776799918">Chromebook Plus အထူးပိုစတာပုံ ရွေးချယ်ရန်</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{သင်၏ဖိုင်ကို စကင်ဖတ်ပြီး <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" /> တွင် သိမ်းပြီးပြီ။}other{သင်၏ဖိုင်များကို စကင်ဖတ်ပြီး <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" /> တွင် သိမ်းပြီးပြီ။}}</translation>
 <translation id="5931523347251946569">ဖိုင်ကို ရှာမတွေ့ပါ</translation>
 <translation id="5939518447894949180">ပြင်ဆင်သတ်မှတ်ရန်</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073"><ph name="TOPIC_SOURCE" /> <ph name="TOPIC_SOURCE_DESC" /> ကို ရွေးပါ</translation>
 <translation id="8151185429379586178">ပြုစုသူ ကိရိယာများ</translation>
+<translation id="8153923300383192510">Chromebook Plus အထူး</translation>
 <translation id="8179976553408161302">အင်တာ</translation>
 <translation id="8183974620058026102">ပူးတွဲရန်</translation>
 <translation id="8206859287963243715">ဆဲလ်လူလာ</translation>

chromeos/strings/chromeos_strings_nl.xtb

diff --git a/chromeos/strings/chromeos_strings_nl.xtb b/chromeos/strings/chromeos_strings_nl.xtb
index 22fca6c..c62854f6 100644
--- a/chromeos/strings/chromeos_strings_nl.xtb
+++ b/chromeos/strings/chromeos_strings_nl.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4/IPv6</translation>
 <translation id="2080070583977670716">Meer instellingen</translation>
 <translation id="2085089206770112532">Helderheid van scherm verlagen</translation>
+<translation id="209751264101900360">Dageraad naar donker - Cloud Flow</translation>
 <translation id="2102231663024125441">Tekstbewerking</translation>
 <translation id="2105810540595158374">Apparaat is een gamecontroller.</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />, versie <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">Media</translation>
 <translation id="4289540628985791613">Overzicht</translation>
 <translation id="4289849978083912975">Diavoorstelling</translation>
+<translation id="4293621540182258188">Dageraad naar donker - Earth Flow</translation>
 <translation id="4297501883039923494">Gestopt: onbekende fout</translation>
 <translation id="4300073214558989"><ph name="IMAGE_COUNT" /> afbeeldingen</translation>
 <translation id="4311195029067684288">Volledig</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">Helderheid van scherm verhogen</translation>
 <translation id="57838592816432529">Geluid uitzetten</translation>
 <translation id="5784136236926853061">Hoge HTTP-vertraging</translation>
+<translation id="5809090008577139505">Aurora</translation>
 <translation id="5826644637650799838">Over de achtergrond</translation>
 <translation id="5832805196449965646">Persoon toevoegen</translation>
 <translation id="583281660410589416">Onbekend</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">toetskleur</translation>
 <translation id="5916084858004523819">Verboden</translation>
 <translation id="5916664084637901428">Aan</translation>
+<translation id="5918201491776799918">Selecteer kunstwerken exclusief voor de Chromebook Plus</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{Je bestand is gescand en opgeslagen in <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}other{Je bestanden zijn gescand en opgeslagen in <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}}</translation>
 <translation id="5931523347251946569">Bestand niet gevonden</translation>
 <translation id="5939518447894949180">Resetten</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073"><ph name="TOPIC_SOURCE" /> <ph name="TOPIC_SOURCE_DESC" /> selecteren</translation>
 <translation id="8151185429379586178">Ontwikkelaarstools</translation>
+<translation id="8153923300383192510">Exclusief voor de Chromebook Plus</translation>
 <translation id="8179976553408161302">Enter</translation>
 <translation id="8183974620058026102">Bijvoegen</translation>
 <translation id="8206859287963243715">Mobiel</translation>

chromeos/strings/chromeos_strings_no.xtb

diff --git a/chromeos/strings/chromeos_strings_no.xtb b/chromeos/strings/chromeos_strings_no.xtb
index 59b4972..85efff7 100644
--- a/chromeos/strings/chromeos_strings_no.xtb
+++ b/chromeos/strings/chromeos_strings_no.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4/IPv6</translation>
 <translation id="2080070583977670716">Flere innstillinger</translation>
 <translation id="2085089206770112532">Skjermlysstyrke ned</translation>
+<translation id="209751264101900360">Fra morgen til kveld – skyflyt</translation>
 <translation id="2102231663024125441">Tekstbehandling</translation>
 <translation id="2105810540595158374">Enheten er en spillkontroller.</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />, versjon <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">Medier</translation>
 <translation id="4289540628985791613">Oversikt</translation>
 <translation id="4289849978083912975">Lysbildefremvisning</translation>
+<translation id="4293621540182258188">Fra morgen til kveld – jordflyt</translation>
 <translation id="4297501883039923494">Stoppet – ukjent feil</translation>
 <translation id="4300073214558989"><ph name="IMAGE_COUNT" /> bilder</translation>
 <translation id="4311195029067684288">Full</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">Skjermlysstyrke opp</translation>
 <translation id="57838592816432529">Kutt lyden</translation>
 <translation id="5784136236926853061">Høy HTTP-tidsforsinkelse</translation>
+<translation id="5809090008577139505">Nordlys</translation>
 <translation id="5826644637650799838">Om kunsten</translation>
 <translation id="5832805196449965646">Legg til person</translation>
 <translation id="583281660410589416">Ukjent</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">tastefarge</translation>
 <translation id="5916084858004523819">Forbudt</translation>
 <translation id="5916664084637901428">På</translation>
+<translation id="5918201491776799918">Velg eksklusiv Chromebook Plus-video</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{Filen er skannet og lagret i <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}other{Filene er skannet og lagret i <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}}</translation>
 <translation id="5931523347251946569">Fant ikke filen</translation>
 <translation id="5939518447894949180">Tilbakestill</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073">Velg <ph name="TOPIC_SOURCE" /> <ph name="TOPIC_SOURCE_DESC" /></translation>
 <translation id="8151185429379586178">Utviklerverktøy</translation>
+<translation id="8153923300383192510">Bare på Chromebook Plus</translation>
 <translation id="8179976553408161302">Enter</translation>
 <translation id="8183974620058026102">Tilknytt</translation>
 <translation id="8206859287963243715">Mobil</translation>

chromeos/strings/chromeos_strings_pl.xtb

diff --git a/chromeos/strings/chromeos_strings_pl.xtb b/chromeos/strings/chromeos_strings_pl.xtb
index 9ce1089..bc32ce88 100644
--- a/chromeos/strings/chromeos_strings_pl.xtb
+++ b/chromeos/strings/chromeos_strings_pl.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4/IPv6</translation>
 <translation id="2080070583977670716">Więcej ustawień</translation>
 <translation id="2085089206770112532">Zmniejsz jasność wyświetlacza</translation>
+<translation id="209751264101900360">Od świtu do zmierzchu – płynące chmury</translation>
 <translation id="2102231663024125441">Edytowanie tekstu</translation>
 <translation id="2105810540595158374">Urządzenie to kontroler do gier.</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />, wersja <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">Multimedia</translation>
 <translation id="4289540628985791613">Przegląd</translation>
 <translation id="4289849978083912975">Pokaz slajdów</translation>
+<translation id="4293621540182258188">Od świtu do zmierzchu – osuwisko</translation>
 <translation id="4297501883039923494">Zatrzymano – nieznany błąd</translation>
 <translation id="4300073214558989">Obrazy: <ph name="IMAGE_COUNT" /></translation>
 <translation id="4311195029067684288">Pełne</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">Zwiększ jasność wyświetlacza</translation>
 <translation id="57838592816432529">Wycisz</translation>
 <translation id="5784136236926853061">Duże opóźnienie HTTP</translation>
+<translation id="5809090008577139505">Aurora</translation>
 <translation id="5826644637650799838">Informacje o grafice</translation>
 <translation id="5832805196449965646">Dodaj osobę</translation>
 <translation id="583281660410589416">Nieznany</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">kolor klawiszy</translation>
 <translation id="5916084858004523819">Niedozwolone</translation>
 <translation id="5916664084637901428">Włączone</translation>
+<translation id="5918201491776799918">Wybierz wyjątkowe animacje na Chromebooka Plus</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{Plik został zeskanowany i zapisany w folderze <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}few{Pliki zostały zeskanowane i zapisane w folderze <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}many{Pliki zostały zeskanowane i zapisane w folderze <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}other{Pliki zostały zeskanowane i zapisane w folderze <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}}</translation>
 <translation id="5931523347251946569">Nie znaleziono pliku</translation>
 <translation id="5939518447894949180">Resetuj</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073">Wybierz <ph name="TOPIC_SOURCE" /> (<ph name="TOPIC_SOURCE_DESC" />)</translation>
 <translation id="8151185429379586178">Narzędzia dla deweloperów</translation>
+<translation id="8153923300383192510">Tylko na Chromebooku Plus</translation>
 <translation id="8179976553408161302">Enter</translation>
 <translation id="8183974620058026102">Załącz</translation>
 <translation id="8206859287963243715">Komórka</translation>

chromeos/strings/chromeos_strings_sr-Latn.xtb

diff --git a/chromeos/strings/chromeos_strings_sr-Latn.xtb b/chromeos/strings/chromeos_strings_sr-Latn.xtb
index 9541a5d..f5804766 100644
--- a/chromeos/strings/chromeos_strings_sr-Latn.xtb
+++ b/chromeos/strings/chromeos_strings_sr-Latn.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4 ili IPv6</translation>
 <translation id="2080070583977670716">Više podešavanja</translation>
 <translation id="2085089206770112532">Smanjite osvetljenost ekrana</translation>
+<translation id="209751264101900360">Od zore do mraka – tok oblaka</translation>
 <translation id="2102231663024125441">Uređivanje teksta</translation>
 <translation id="2105810540595158374">Uređaj je kontroler za igre.</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />, verzija <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">Mediji</translation>
 <translation id="4289540628985791613">Pregled</translation>
 <translation id="4289849978083912975">Projekcija slajdova</translation>
+<translation id="4293621540182258188">Od zore do mraka – tok Zemlje</translation>
 <translation id="4297501883039923494">Zaustavljeno – nepoznata greška</translation>
 <translation id="4300073214558989"><ph name="IMAGE_COUNT" /> slika</translation>
 <translation id="4311195029067684288">Potpuno</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">Povećajte osvetljenost ekrana</translation>
 <translation id="57838592816432529">Isključi zvuk</translation>
 <translation id="5784136236926853061">Veliko HTTP kašnjenje</translation>
+<translation id="5809090008577139505">Aurora</translation>
 <translation id="5826644637650799838">O pozadini</translation>
 <translation id="5832805196449965646">Dodaj osobu</translation>
 <translation id="583281660410589416">Nepoznato</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">boja ključa</translation>
 <translation id="5916084858004523819">Zabranjeno</translation>
 <translation id="5916664084637901428">Uključeno</translation>
+<translation id="5918201491776799918">Izaberite ekskluzivna umetnička dela za Chromebook Plus</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{Fajl je skeniran i sačuvan u folderu <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}one{Fajlovi su skenirani i sačuvani u folderu <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}few{Fajlovi su skenirani i sačuvani u folderu <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}other{Fajlovi su skenirani i sačuvani u folderu <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}}</translation>
 <translation id="5931523347251946569">Fajl nije pronađen</translation>
 <translation id="5939518447894949180">Resetuj</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073">Izaberite <ph name="TOPIC_SOURCE" /> <ph name="TOPIC_SOURCE_DESC" /></translation>
 <translation id="8151185429379586178">Alatke za programere</translation>
+<translation id="8153923300383192510">Samo za Chromebook Plus</translation>
 <translation id="8179976553408161302">Enter</translation>
 <translation id="8183974620058026102">Prilog</translation>
 <translation id="8206859287963243715">Mobilni uređaj</translation>

chromeos/strings/chromeos_strings_sr.xtb

diff --git a/chromeos/strings/chromeos_strings_sr.xtb b/chromeos/strings/chromeos_strings_sr.xtb
index a74757b..f8dcf7f 100644
--- a/chromeos/strings/chromeos_strings_sr.xtb
+++ b/chromeos/strings/chromeos_strings_sr.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4 или IPv6</translation>
 <translation id="2080070583977670716">Више подешавања</translation>
 <translation id="2085089206770112532">Смањите осветљеност екрана</translation>
+<translation id="209751264101900360">Од зоре до мрака – ток облака</translation>
 <translation id="2102231663024125441">Уређивање текста</translation>
 <translation id="2105810540595158374">Уређај је контролер за игре.</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />, верзија <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">Медији</translation>
 <translation id="4289540628985791613">Преглед</translation>
 <translation id="4289849978083912975">Пројекција слајдова</translation>
+<translation id="4293621540182258188">Од зоре до мрака – ток Земље</translation>
 <translation id="4297501883039923494">Заустављено – непозната грешка</translation>
 <translation id="4300073214558989"><ph name="IMAGE_COUNT" /> слика</translation>
 <translation id="4311195029067684288">Потпуно</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">Повећајте осветљеност екрана</translation>
 <translation id="57838592816432529">Искључи звук</translation>
 <translation id="5784136236926853061">Велико HTTP кашњење</translation>
+<translation id="5809090008577139505">Аурора</translation>
 <translation id="5826644637650799838">О позадини</translation>
 <translation id="5832805196449965646">Додај особу</translation>
 <translation id="583281660410589416">Непознато</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">боја кључа</translation>
 <translation id="5916084858004523819">Забрањено</translation>
 <translation id="5916664084637901428">Укључено</translation>
+<translation id="5918201491776799918">Изаберите ексклузивна уметничка дела за Chromebook Plus</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{Фајл је скениран и сачуван у фолдеру <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}one{Фајлови су скенирани и сачувани у фолдеру <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}few{Фајлови су скенирани и сачувани у фолдеру <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}other{Фајлови су скенирани и сачувани у фолдеру <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}}</translation>
 <translation id="5931523347251946569">Фајл није пронађен</translation>
 <translation id="5939518447894949180">Ресетуј</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073">Изаберите <ph name="TOPIC_SOURCE" /> <ph name="TOPIC_SOURCE_DESC" /></translation>
 <translation id="8151185429379586178">Алатке за програмере</translation>
+<translation id="8153923300383192510">Само за Chromebook Plus</translation>
 <translation id="8179976553408161302">Enter</translation>
 <translation id="8183974620058026102">Прилог</translation>
 <translation id="8206859287963243715">Мобилни уређај</translation>

chromeos/strings/chromeos_strings_vi.xtb

diff --git a/chromeos/strings/chromeos_strings_vi.xtb b/chromeos/strings/chromeos_strings_vi.xtb
index 3300781..3c71c44 100644
--- a/chromeos/strings/chromeos_strings_vi.xtb
+++ b/chromeos/strings/chromeos_strings_vi.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4/IPv6</translation>
 <translation id="2080070583977670716">Chế độ cài đặt khác</translation>
 <translation id="2085089206770112532">Giảm độ sáng màn hình</translation>
+<translation id="209751264101900360">Sáng đến tối – Luồng đám mây</translation>
 <translation id="2102231663024125441">Chỉnh sửa văn bản</translation>
 <translation id="2105810540595158374">Thiết bị là tay điều khiển trò chơi.</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />, phiên bản <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">Truyền thông</translation>
 <translation id="4289540628985791613">Tổng quan</translation>
 <translation id="4289849978083912975">Bản trình chiếu</translation>
+<translation id="4293621540182258188">Sáng đến tối – Luồng trái đất</translation>
 <translation id="4297501883039923494">Đã dừng – Lỗi không xác định</translation>
 <translation id="4300073214558989"><ph name="IMAGE_COUNT" /> hình ảnh</translation>
 <translation id="4311195029067684288">Toàn màn hình</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">Tăng độ sáng màn hình</translation>
 <translation id="57838592816432529">Tắt tiếng</translation>
 <translation id="5784136236926853061">Yêu cầu HTTP có độ trễ cao</translation>
+<translation id="5809090008577139505">Aurora</translation>
 <translation id="5826644637650799838">Giới thiệu về hình nền</translation>
 <translation id="5832805196449965646">Thêm người</translation>
 <translation id="583281660410589416">Không xác định</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">màu phím</translation>
 <translation id="5916084858004523819">Bị cấm</translation>
 <translation id="5916664084637901428">Bật</translation>
+<translation id="5918201491776799918">Chọn hình minh hoạ độc quyền cho Chromebook Plus</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{Tệp của bạn đã được quét thành công và lưu vào <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}other{Các tệp của bạn đã được quét thành công và lưu vào <ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />.}}</translation>
 <translation id="5931523347251946569">Không tìm thấy tệp</translation>
 <translation id="5939518447894949180">Đặt lại</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073">Chọn <ph name="TOPIC_SOURCE" /> <ph name="TOPIC_SOURCE_DESC" /></translation>
 <translation id="8151185429379586178">Công cụ dành cho nhà phát triển</translation>
+<translation id="8153923300383192510">Dành riêng cho Chromebook Plus</translation>
 <translation id="8179976553408161302">Enter</translation>
 <translation id="8183974620058026102">Đính kèm</translation>
 <translation id="8206859287963243715">Di động</translation>

chromeos/strings/chromeos_strings_zh-CN.xtb

diff --git a/chromeos/strings/chromeos_strings_zh-CN.xtb b/chromeos/strings/chromeos_strings_zh-CN.xtb
index 9592d2c..96390f3 100644
--- a/chromeos/strings/chromeos_strings_zh-CN.xtb
+++ b/chromeos/strings/chromeos_strings_zh-CN.xtb
@@ -140,6 +140,7 @@
 <translation id="2056550196601855911">IPv4/IPv6</translation>
 <translation id="2080070583977670716">更多设置</translation>
 <translation id="2085089206770112532">调低显示屏亮度</translation>
+<translation id="209751264101900360">黎明到黄昏 - 白云流动</translation>
 <translation id="2102231663024125441">文字修改</translation>
 <translation id="2105810540595158374">设备类型是游戏控制器。</translation>
 <translation id="2119172414412204879"><ph name="BOARD_NAME" />，版本 <ph name="MILESTONE_VERSION" /></translation>
@@ -370,6 +371,7 @@
 <translation id="4275663329226226506">媒体</translation>
 <translation id="4289540628985791613">概述</translation>
 <translation id="4289849978083912975">幻灯片</translation>
+<translation id="4293621540182258188">黎明到黄昏 - 地面流动</translation>
 <translation id="4297501883039923494">已停止 - 未知错误</translation>
 <translation id="4300073214558989"><ph name="IMAGE_COUNT" /> 张图片</translation>
 <translation id="4311195029067684288">全屏</translation>
@@ -544,6 +546,7 @@
 <translation id="576835345334454681">调高显示屏亮度</translation>
 <translation id="57838592816432529">静音</translation>
 <translation id="5784136236926853061">HTTP 延迟时间较长</translation>
+<translation id="5809090008577139505">极光</translation>
 <translation id="5826644637650799838">关于该壁纸</translation>
 <translation id="5832805196449965646">添加用户</translation>
 <translation id="583281660410589416">未知</translation>
@@ -562,6 +565,7 @@
 <translation id="5907649332524363701">按键颜色</translation>
 <translation id="5916084858004523819">已禁止</translation>
 <translation id="5916664084637901428">已启用</translation>
+<translation id="5918201491776799918">选择 Chromebook Plus 专有艺术作品</translation>
 <translation id="5921506667911082617">{COUNT,plural, =1{系统已成功扫描完您的文件并已将扫描版保存至<ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />。}other{系统已成功扫描完您的文件并已将扫描版保存至<ph name="LINK_BEGIN" /><ph name="FOLDER_NAME" /><ph name="LINK_END" />。}}</translation>
 <translation id="5931523347251946569">未找到文件</translation>
 <translation id="5939518447894949180">重置</translation>
@@ -818,6 +822,7 @@
 <translation id="8138405288920084977">LTEAdvanced</translation>
 <translation id="8143951647992294073">选择 <ph name="TOPIC_SOURCE" /> - <ph name="TOPIC_SOURCE_DESC" /></translation>
 <translation id="8151185429379586178">开发者工具</translation>
+<translation id="8153923300383192510">Chromebook Plus 专有</translation>
 <translation id="8179976553408161302">Enter</translation>
 <translation id="8183974620058026102">附加</translation>
 <translation id="8206859287963243715">蜂窝网络设备</translation>

components/autofill/core/browser/form_data_importer_unittest.cc

diff --git a/components/autofill/core/browser/form_data_importer_unittest.cc b/components/autofill/core/browser/form_data_importer_unittest.cc
index 7d69866..3c17170 100644
--- a/components/autofill/core/browser/form_data_importer_unittest.cc
+++ b/components/autofill/core/browser/form_data_importer_unittest.cc
@@ -1473,37 +1473,6 @@
   ExtractAddressProfileAndVerifyExtractionOfDefaultProfile(*form_structure);
 }
 
-// A maximum of two address profiles are imported per form.
-// This test is flaky for an unknown reason.
-// TODO(crbug.com/1297212): Understand flakiness.
-TEST_P(FormDataImporterTest,
-       DISABLED_ImportAddressProfiles_ThreeValidProfilesSameForm) {
-  TypeValuePairs profile_type_value_pairs = GetDefaultProfileTypeValuePairs();
-
-  TypeValuePairs second_profile_type_value_pairs =
-      GetSecondProfileTypeValuePairs();
-
-  TypeValuePairs third_profile_type_value_pairs =
-      GetThirdProfileTypeValuePairs();
-
-  // Merge the type value pairs into one and construct the corresponding form
-  // structure.
-  profile_type_value_pairs.insert(profile_type_value_pairs.end(),
-                                  second_profile_type_value_pairs.begin(),
-                                  second_profile_type_value_pairs.end());
-  profile_type_value_pairs.insert(profile_type_value_pairs.end(),
-                                  third_profile_type_value_pairs.begin(),
-                                  third_profile_type_value_pairs.end());
-
-  std::unique_ptr<FormStructure> form_structure =
-      ConstructFormStructureFromTypeValuePairs(profile_type_value_pairs);
-
-  // Extract from the form structure and verify that only the first two profiles
-  // are extracted.
-  ExtractAddressProfilesAndVerifyExpectation(
-      *form_structure, {ConstructDefaultProfile(), ConstructSecondProfile()});
-}
-
 TEST_P(FormDataImporterTest, ImportAddressProfiles_SameProfileWithConflict) {
   TypeValuePairs initial_type_value_pairs{
       {NAME_FULL, kDefaultFullName},

components/browser_ui/strings/android/translations/browser_ui_strings_fr.xtb

diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_fr.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_fr.xtb
index bb0e2e8..e59ef5c 100644
--- a/components/browser_ui/strings/android/translations/browser_ui_strings_fr.xtb
+++ b/components/browser_ui/strings/android/translations/browser_ui_strings_fr.xtb
@@ -399,7 +399,7 @@
 <translation id="8324158725704657629">Ne plus me demander</translation>
 <translation id="8362795839483915693">Vous pouvez faire un zoom avant ou arrière sur les sites que vous consultez</translation>
 <translation id="8372893542064058268">Autorisez la synchronisation en arrière-plan pour un site spécifique.</translation>
-<translation id="8376384591331888629">Inclure les cookies tiers de ce site</translation>
+<translation id="8376384591331888629">Y compris les cookies tiers de ce site</translation>
 <translation id="83792324527827022">Un site utilise votre appareil photo et votre micro</translation>
 <translation id="8380167699614421159">Ce site affiche des annonces intrusives ou trompeuses</translation>
 <translation id="8394832520002899662">Appuyez pour revenir au site</translation>
@@ -417,7 +417,7 @@
 <translation id="851751545965956758">Interdire à tous les sites de se connecter à des appareils</translation>
 <translation id="8525306231823319788">Plein écran</translation>
 <translation id="8528440122773422556">L'ensemble des données et cookies stockés par tous les sites dépendant de <ph name="ORIGIN" /> ou par l'application associée sur votre écran d'accueil seront effacés</translation>
-<translation id="8541410041357371550">Ce site obtient vos thèmes publicitaires via Chrome pour vous présenter des annonces plus pertinentes</translation>
+<translation id="8541410041357371550">Ce site obtient vos thèmes d'annonces auprès de Chrome pour vous présenter des annonces plus pertinentes</translation>
 <translation id="8564613706851221529">{COUNT,plural, =1{Cookies autorisés pour <ph name="FPS_MEMBERS_COUNT" /> site <ph name="FPS_OWNER" />}one{Cookies autorisés pour <ph name="FPS_MEMBERS_COUNT" /> site <ph name="FPS_OWNER" />}other{Cookies autorisés pour <ph name="FPS_MEMBERS_COUNT" /> sites <ph name="FPS_OWNER" />}}</translation>
 <translation id="857943718398505171">Autorisé (recommandé)</translation>
 <translation id="8609465669617005112">Monter</translation>

components/browser_ui/strings/android/translations/browser_ui_strings_ja.xtb

diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_ja.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_ja.xtb
index cd22720e..2da8f75 100644
--- a/components/browser_ui/strings/android/translations/browser_ui_strings_ja.xtb
+++ b/components/browser_ui/strings/android/translations/browser_ui_strings_ja.xtb
@@ -198,7 +198,7 @@
 <translation id="4534723447064627427"><ph name="APP_NAME" /> にマイクへのアクセスを許可するには、<ph name="BEGIN_LINK" />Android の設定<ph name="END_LINK" />でもマイクをオンにしてください。</translation>
 <translation id="4566417217121906555">マイクをミュート</translation>
 <translation id="4570913071927164677">詳細</translation>
-<translation id="4598549027014564149">シークレット モードのとき、サイトは Cookie を使用して関連サイトを含む他のサイトでの閲覧アクティビティを確認することができません。閲覧アクティビティは、広告のカスタマイズなどには使用されません。一部のサイトで機能を使用できなくなる可能性があります。</translation>
+<translation id="4598549027014564149">シークレット モードのとき、サイトは Cookie を使用して関連サイトを含む他のサイトでの閲覧アクティビティを確認することができません。閲覧アクティビティは、広告のパーソナライズなどには使用されません。一部のサイトで機能を使用できなくなる可能性があります。</translation>
 <translation id="4645575059429386691">保護者により管理されています</translation>
 <translation id="4670064810192446073">バーチャル リアリティ（VR）</translation>
 <translation id="4751476147751820511">モーション センサーまたは光センサー</translation>
@@ -364,7 +364,7 @@
 <translation id="7719367874908701697">ページのズーム</translation>
 <translation id="7781829728241885113">昨日</translation>
 <translation id="7791543448312431591">追加</translation>
-<translation id="780301667611848630">いいえ、結構です</translation>
+<translation id="780301667611848630">同意しない</translation>
 <translation id="7804248752222191302">サイトでカメラが使用されています</translation>
 <translation id="7807060072011926525">Google から提供</translation>
 <translation id="7835852323729233924">再生中のメディア</translation>

components/browser_ui/strings/android/translations/browser_ui_strings_ru.xtb

diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_ru.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_ru.xtb
index 349f22674..dd15c769d 100644
--- a/components/browser_ui/strings/android/translations/browser_ui_strings_ru.xtb
+++ b/components/browser_ui/strings/android/translations/browser_ui_strings_ru.xtb
@@ -186,7 +186,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="4440642537584213025">Развернуть раздел "<ph name="TARGET_DESCRIPTION" />"</translation>
@@ -417,7 +417,7 @@
 <translation id="851751545965956758">Не разрешать сайтам подключаться к устройствам</translation>
 <translation id="8525306231823319788">Полноэкранный режим</translation>
 <translation id="8528440122773422556">Будут удалены все данные и файлы cookie, сохраненные сайтами, которые связаны с <ph name="ORIGIN" />, или их приложением на главном экране.</translation>
-<translation id="8541410041357371550">Этот сайт использует темы рекламы из Chrome, чтобы показывать вам более подходящие объявления</translation>
+<translation id="8541410041357371550">Этот сайт использует темы из Chrome, чтобы показывать вам более подходящую рекламу</translation>
 <translation id="8564613706851221529">{COUNT,plural, =1{Файлы cookie разрешены для <ph name="FPS_MEMBERS_COUNT" /> сайта <ph name="FPS_OWNER" />}one{Файлы cookie разрешены для <ph name="FPS_MEMBERS_COUNT" /> сайта <ph name="FPS_OWNER" />}few{Файлы cookie разрешены для <ph name="FPS_MEMBERS_COUNT" /> сайтов <ph name="FPS_OWNER" />}many{Файлы cookie разрешены для <ph name="FPS_MEMBERS_COUNT" /> сайтов <ph name="FPS_OWNER" />}other{Файлы cookie разрешены для <ph name="FPS_MEMBERS_COUNT" /> сайта <ph name="FPS_OWNER" />}}</translation>
 <translation id="857943718398505171">Разрешено (рекомендуется)</translation>
 <translation id="8609465669617005112">Переместить вверх</translation>

components/browser_ui/strings/android/translations/browser_ui_strings_th.xtb

diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_th.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_th.xtb
index 68523f26..01f637e6 100644
--- a/components/browser_ui/strings/android/translations/browser_ui_strings_th.xtb
+++ b/components/browser_ui/strings/android/translations/browser_ui_strings_th.xtb
@@ -394,7 +394,7 @@
 <translation id="8211406090763984747">การเชื่อมต่อปลอดภัย</translation>
 <translation id="8249310407154411074">เลื่อนไปบนสุด</translation>
 <translation id="8261506727792406068">ลบ</translation>
-<translation id="8284326494547611709">คำบรรยาย</translation>
+<translation id="8284326494547611709">คำบรรยายแทนเสียง</translation>
 <translation id="8300705686683892304">จัดการโดยแอป</translation>
 <translation id="8324158725704657629">ไม่ต้องถามอีก</translation>
 <translation id="8362795839483915693">คุณซูมเข้าหรือออกในเว็บไซต์ที่เข้าชมได้</translation>

components/certificate_transparency/data/log_list.json

diff --git a/components/certificate_transparency/data/log_list.json b/components/certificate_transparency/data/log_list.json
index 8bd5e5f2..cc8168af 100644
--- a/components/certificate_transparency/data/log_list.json
+++ b/components/certificate_transparency/data/log_list.json
@@ -1,6 +1,6 @@
 {
-  "version": "20.31",
-  "log_list_timestamp": "2023-04-06T12:53:54Z",
+  "version": "20.32",
+  "log_list_timestamp": "2023-04-07T12:56:01Z",
   "operators": [
     {
       "name": "Google",

components/commerce/core/commerce_feature_list.cc

diff --git a/components/commerce/core/commerce_feature_list.cc b/components/commerce/core/commerce_feature_list.cc
index 5c9bf8c..ed3c268 100644
--- a/components/commerce/core/commerce_feature_list.cc
+++ b/components/commerce/core/commerce_feature_list.cc
@@ -309,7 +309,7 @@
 const base::FeatureParam<base::TimeDelta>
     kCodeBasedRuleDiscountCouponDeletionTime{
         &commerce::kCodeBasedRBD, kCodeBasedRuleDiscountCouponDeletionTimeParam,
-        base::Seconds(10)};
+        base::Seconds(6)};
 
 const char kRevertIconOnFailureParam[] =
     "shopping-list-revert-page-action-icon-on-failure";

components/commerce/core/subscriptions/commerce_subscription.cc

diff --git a/components/commerce/core/subscriptions/commerce_subscription.cc b/components/commerce/core/subscriptions/commerce_subscription.cc
index b272569..5c7e66f 100644
--- a/components/commerce/core/subscriptions/commerce_subscription.cc
+++ b/components/commerce/core/subscriptions/commerce_subscription.cc
@@ -32,6 +32,7 @@
 UserSeenOffer::~UserSeenOffer() = default;
 
 const int64_t kUnknownSubscriptionTimestamp = 0;
+const uint64_t kInvalidSubscriptionId = 0;
 
 CommerceSubscription::CommerceSubscription(
     SubscriptionType type,

components/commerce/core/subscriptions/commerce_subscription.h

diff --git a/components/commerce/core/subscriptions/commerce_subscription.h b/components/commerce/core/subscriptions/commerce_subscription.h
index fbe27b0..898c68f 100644
--- a/components/commerce/core/subscriptions/commerce_subscription.h
+++ b/components/commerce/core/subscriptions/commerce_subscription.h
@@ -74,6 +74,7 @@
 };
 
 extern const int64_t kUnknownSubscriptionTimestamp;
+extern const uint64_t kInvalidSubscriptionId;
 
 struct CommerceSubscription {
   // The CommerceSubscription instantiation outside of this subscriptions/

components/history/core/browser/expire_history_backend.cc

diff --git a/components/history/core/browser/expire_history_backend.cc b/components/history/core/browser/expire_history_backend.cc
index c0ea411..441f674 100644
--- a/components/history/core/browser/expire_history_backend.cc
+++ b/components/history/core/browser/expire_history_backend.cc
@@ -291,10 +291,7 @@
   if (visits.empty())
     return;
 
-  base::TimeTicks start = base::TimeTicks::Now();
-
   const VisitVector visits_and_redirects = GetVisitsAndRedirectParents(visits);
-  base::TimeDelta get_redirects_time = base::TimeTicks::Now() - start;
 
   DeleteEffects effects;
   DeleteVisitRelatedInfo(visits_and_redirects, &effects);
@@ -310,15 +307,6 @@
 
   // Pick up any bits possibly left over.
   ParanoidExpireHistory();
-
-  base::TimeDelta expire_visits_time = base::TimeTicks::Now() - start;
-  UMA_HISTOGRAM_TIMES("History.ExpireVisits.TotalDuration", expire_visits_time);
-  if (!expire_visits_time.is_zero()) {
-    UMA_HISTOGRAM_PERCENTAGE(
-        "History.ExpireVisits.GetRedirectsDurationPercentage",
-        base::ClampRound<base::Histogram::Sample>(get_redirects_time /
-                                                  expire_visits_time * 100));
-  }
 }
 
 void ExpireHistoryBackend::ExpireHistoryBeforeForTesting(base::Time end_time) {

components/history/core/browser/in_memory_database.cc

diff --git a/components/history/core/browser/in_memory_database.cc b/components/history/core/browser/in_memory_database.cc
index 0f746a8..ad9c026 100644
--- a/components/history/core/browser/in_memory_database.cc
+++ b/components/history/core/browser/in_memory_database.cc
@@ -103,8 +103,6 @@
     // Unable to get data from the history database. This is OK, the file may
     // just not exist yet.
   }
-  UMA_HISTOGRAM_COUNTS_1M("History.InMemoryDBKeywordURLItemCount",
-                          db_.GetLastChangeCount());
 
   // Copy search terms to memory.
   if (!db_.Execute(
@@ -113,8 +111,6 @@
     // Unable to get data from the history database. This is OK, the file may
     // just not exist yet.
   }
-  UMA_HISTOGRAM_COUNTS_1M("History.InMemoryDBKeywordTermsCount",
-                          db_.GetLastChangeCount());
 
   // Detach from the history database on disk.
   if (!db_.Execute("DETACH history")) {

components/mirroring/service/mirroring_features.cc

diff --git a/components/mirroring/service/mirroring_features.cc b/components/mirroring/service/mirroring_features.cc
index 61efe150..b954a74 100644
--- a/components/mirroring/service/mirroring_features.cc
+++ b/components/mirroring/service/mirroring_features.cc
@@ -29,7 +29,7 @@
 // --enable-cast-streaming-with-hidpi.
 BASE_FEATURE(kCastEnableStreamingWithHiDPI,
              "CastEnableStreamingWithHiDPI",
-             base::FEATURE_DISABLED_BY_DEFAULT);
+             base::FEATURE_ENABLED_BY_DEFAULT);
 
 }  // namespace features
 }  // namespace mirroring

components/omnibox/browser/actions/history_clusters_action.cc

diff --git a/components/omnibox/browser/actions/history_clusters_action.cc b/components/omnibox/browser/actions/history_clusters_action.cc
index 6b4783f..46251c7 100644
--- a/components/omnibox/browser/actions/history_clusters_action.cc
+++ b/components/omnibox/browser/actions/history_clusters_action.cc
@@ -109,11 +109,7 @@
           GetFullJourneysUrlForQuery(query),
           takes_over_match),
       matched_keyword_data_(matched_keyword_data),
-      query_(query) {
-#if BUILDFLAG(IS_ANDROID)
-    CreateOrUpdateJavaObject(query);
-#endif
-}
+      query_(query) {}
 
 void HistoryClustersAction::RecordActionShown(size_t position,
                                               bool executed) const {
@@ -179,13 +175,13 @@
 #endif
 
 #if BUILDFLAG(IS_ANDROID)
-base::android::ScopedJavaGlobalRef<jobject>
-HistoryClustersAction::GetJavaObject() const {
-  return j_omnibox_action_;
-}
-
-void HistoryClustersAction::CreateOrUpdateJavaObject(const std::string& query) {
-  j_omnibox_action_.Reset(BuildHistoryClustersAction(strings_.hint, query));
+base::android::ScopedJavaLocalRef<jobject>
+HistoryClustersAction::GetOrCreateJavaObject(JNIEnv* env) const {
+  if (!j_omnibox_action_) {
+    j_omnibox_action_.Reset(
+        BuildHistoryClustersAction(env, strings_.hint, query_));
+  }
+  return base::android::ScopedJavaLocalRef<jobject>(j_omnibox_action_);
 }
 #endif
 

components/omnibox/browser/actions/history_clusters_action.h

diff --git a/components/omnibox/browser/actions/history_clusters_action.h b/components/omnibox/browser/actions/history_clusters_action.h
index 025b48d..a768925d 100644
--- a/components/omnibox/browser/actions/history_clusters_action.h
+++ b/components/omnibox/browser/actions/history_clusters_action.h
@@ -57,9 +57,8 @@
   const gfx::VectorIcon& GetVectorIcon() const override;
 #endif
 #if BUILDFLAG(IS_ANDROID)
-  base::android::ScopedJavaGlobalRef<jobject> GetJavaObject() const override;
-
-  void CreateOrUpdateJavaObject(const std::string& query);
+  base::android::ScopedJavaLocalRef<jobject> GetOrCreateJavaObject(
+      JNIEnv* env) const override;
 #endif
 
  private:
@@ -73,7 +72,7 @@
   std::string query_;
 
 #if BUILDFLAG(IS_ANDROID)
-  base::android::ScopedJavaGlobalRef<jobject> j_omnibox_action_;
+  mutable base::android::ScopedJavaGlobalRef<jobject> j_omnibox_action_;
 #endif
 };
 

components/omnibox/browser/actions/omnibox_action.cc

diff --git a/components/omnibox/browser/actions/omnibox_action.cc b/components/omnibox/browser/actions/omnibox_action.cc
index 1b99e865..4a25da70d 100644
--- a/components/omnibox/browser/actions/omnibox_action.cc
+++ b/components/omnibox/browser/actions/omnibox_action.cc
@@ -119,9 +119,10 @@
 }
 
 #if BUILDFLAG(IS_ANDROID)
-base::android::ScopedJavaGlobalRef<jobject> OmniboxAction::GetJavaObject()
-    const {
-  return base::android::ScopedJavaGlobalRef<jobject>();
+base::android::ScopedJavaLocalRef<jobject> OmniboxAction::GetOrCreateJavaObject(
+    JNIEnv* env) const {
+  NOTREACHED() << "This implementation does not have a java counterpart";
+  return {};
 }
 #endif
 

components/omnibox/browser/actions/omnibox_action.h

diff --git a/components/omnibox/browser/actions/omnibox_action.h b/components/omnibox/browser/actions/omnibox_action.h
index 53f609a..4765a2a 100644
--- a/components/omnibox/browser/actions/omnibox_action.h
+++ b/components/omnibox/browser/actions/omnibox_action.h
@@ -172,7 +172,8 @@
   virtual OmniboxActionId ActionId() const;
 
 #if BUILDFLAG(IS_ANDROID)
-  virtual base::android::ScopedJavaGlobalRef<jobject> GetJavaObject() const;
+  virtual base::android::ScopedJavaLocalRef<jobject> GetOrCreateJavaObject(
+      JNIEnv* env) const;
 #endif
 
  protected:

components/omnibox/browser/actions/omnibox_action_in_suggest.cc

diff --git a/components/omnibox/browser/actions/omnibox_action_in_suggest.cc b/components/omnibox/browser/actions/omnibox_action_in_suggest.cc
index bdb5a8e..45a31e3 100644
--- a/components/omnibox/browser/actions/omnibox_action_in_suggest.cc
+++ b/components/omnibox/browser/actions/omnibox_action_in_suggest.cc
@@ -31,23 +31,22 @@
               l10n_util::GetStringUTF16(IDS_ACC_OMNIBOX_ACTION_IN_SUGGEST)),
           {},
           false),
-      action_info_{std::move(action_info)} {
-#if BUILDFLAG(IS_ANDROID)
-  std::string serialized_action;
-  if (!action_info_.SerializeToString(&serialized_action)) {
-    serialized_action.clear();
-  }
-  j_omnibox_action_.Reset(
-      BuildOmniboxActionInSuggest(strings_.hint, serialized_action));
-#endif
-}
+      action_info_{std::move(action_info)} {}
 
 OmniboxActionInSuggest::~OmniboxActionInSuggest() = default;
 
 #if BUILDFLAG(IS_ANDROID)
-base::android::ScopedJavaGlobalRef<jobject>
-OmniboxActionInSuggest::GetJavaObject() const {
-  return j_omnibox_action_;
+base::android::ScopedJavaLocalRef<jobject>
+OmniboxActionInSuggest::GetOrCreateJavaObject(JNIEnv* env) const {
+  if (!j_omnibox_action_) {
+    std::string serialized_action;
+    if (!action_info_.SerializeToString(&serialized_action)) {
+      serialized_action.clear();
+    }
+    j_omnibox_action_.Reset(
+        BuildOmniboxActionInSuggest(env, strings_.hint, serialized_action));
+  }
+  return base::android::ScopedJavaLocalRef<jobject>(j_omnibox_action_);
 }
 #endif
 

components/omnibox/browser/actions/omnibox_action_in_suggest.h

diff --git a/components/omnibox/browser/actions/omnibox_action_in_suggest.h b/components/omnibox/browser/actions/omnibox_action_in_suggest.h
index ebd1e3a..f2b3447 100644
--- a/components/omnibox/browser/actions/omnibox_action_in_suggest.h
+++ b/components/omnibox/browser/actions/omnibox_action_in_suggest.h
@@ -15,8 +15,8 @@
   explicit OmniboxActionInSuggest(omnibox::ActionInfo action_info);
 
 #if BUILDFLAG(IS_ANDROID)
-  base::android::ScopedJavaGlobalRef<jobject> GetJavaObject() const override;
-  void CreateOrUpdateJavaObject(const std::string& query);
+  base::android::ScopedJavaLocalRef<jobject> GetOrCreateJavaObject(
+      JNIEnv* env) const override;
 #endif
 
   void RecordActionShown(size_t position, bool executed) const override;
@@ -28,7 +28,7 @@
 
   omnibox::ActionInfo action_info_{};
 #if BUILDFLAG(IS_ANDROID)
-  base::android::ScopedJavaGlobalRef<jobject> j_omnibox_action_;
+  mutable base::android::ScopedJavaGlobalRef<jobject> j_omnibox_action_;
 #endif
 };
 

components/omnibox/browser/actions/omnibox_pedal.cc

diff --git a/components/omnibox/browser/actions/omnibox_pedal.cc b/components/omnibox/browser/actions/omnibox_pedal.cc
index 7aafd05..f39142f 100644
--- a/components/omnibox/browser/actions/omnibox_pedal.cc
+++ b/components/omnibox/browser/actions/omnibox_pedal.cc
@@ -230,11 +230,7 @@
 OmniboxPedal::OmniboxPedal(OmniboxPedalId id, LabelStrings strings, GURL url)
     : OmniboxAction(strings, url),
       id_(id),
-      verbatim_synonym_group_(false, true, 0) {
-#if BUILDFLAG(IS_ANDROID)
-  CreateOrUpdateJavaObject();
-#endif
-}
+      verbatim_synonym_group_(false, true, 0) {}
 
 /* static */ const OmniboxPedal* OmniboxPedal::FromAction(
     const OmniboxAction* action) {
@@ -252,9 +248,6 @@
 
 void OmniboxPedal::SetNavigationUrl(const GURL& url) {
   url_ = url;
-#if BUILDFLAG(IS_ANDROID)
-  CreateOrUpdateJavaObject();
-#endif
 }
 
 #if defined(SUPPORT_PEDALS_VECTOR_ICONS)
@@ -325,13 +318,12 @@
 }
 
 #if BUILDFLAG(IS_ANDROID)
-base::android::ScopedJavaGlobalRef<jobject> OmniboxPedal::GetJavaObject()
-    const {
-  return j_omnibox_action_;
-}
-
-void OmniboxPedal::CreateOrUpdateJavaObject() {
-  j_omnibox_action_.Reset(BuildOmniboxPedal(strings_.hint, PedalId()));
+base::android::ScopedJavaLocalRef<jobject> OmniboxPedal::GetOrCreateJavaObject(
+    JNIEnv* env) const {
+  if (!j_omnibox_action_) {
+    j_omnibox_action_.Reset(BuildOmniboxPedal(env, strings_.hint, PedalId()));
+  }
+  return base::android::ScopedJavaLocalRef<jobject>(j_omnibox_action_);
 }
 #endif
 

components/omnibox/browser/actions/omnibox_pedal.h

diff --git a/components/omnibox/browser/actions/omnibox_pedal.h b/components/omnibox/browser/actions/omnibox_pedal.h
index b3cfcc2..615a7ed3 100644
--- a/components/omnibox/browser/actions/omnibox_pedal.h
+++ b/components/omnibox/browser/actions/omnibox_pedal.h
@@ -235,8 +235,8 @@
   OmniboxActionId ActionId() const override;
 
 #if BUILDFLAG(IS_ANDROID)
-  base::android::ScopedJavaGlobalRef<jobject> GetJavaObject() const override;
-  void CreateOrUpdateJavaObject();
+  base::android::ScopedJavaLocalRef<jobject> GetOrCreateJavaObject(
+      JNIEnv* env) const override;
 #endif
 
  protected:
@@ -258,7 +258,7 @@
   std::vector<SynonymGroup> synonym_groups_;
 
 #if BUILDFLAG(IS_ANDROID)
-  base::android::ScopedJavaGlobalRef<jobject> j_omnibox_action_;
+  mutable base::android::ScopedJavaGlobalRef<jobject> j_omnibox_action_;
 #endif
 };
 

components/omnibox/browser/actions/omnibox_pedal_jni_wrapper.cc

diff --git a/components/omnibox/browser/actions/omnibox_pedal_jni_wrapper.cc b/components/omnibox/browser/actions/omnibox_pedal_jni_wrapper.cc
index 4cc8c49..7c98bbe 100644
--- a/components/omnibox/browser/actions/omnibox_pedal_jni_wrapper.cc
+++ b/components/omnibox/browser/actions/omnibox_pedal_jni_wrapper.cc
@@ -31,18 +31,18 @@
 }  // namespace
 
 base::android::ScopedJavaGlobalRef<jobject> BuildOmniboxPedal(
+    JNIEnv* env,
     const std::u16string& hint,
     OmniboxPedalId pedal_id) {
-  JNIEnv* env = base::android::AttachCurrentThread();
   return base::android::ScopedJavaGlobalRef(Java_OmniboxPedal_Constructor(
       env, base::android::ConvertUTF16ToJavaString(env, hint),
       static_cast<int32_t>(pedal_id)));
 }
 
 base::android::ScopedJavaGlobalRef<jobject> BuildHistoryClustersAction(
+    JNIEnv* env,
     const std::u16string& hint,
     const std::string& query) {
-  JNIEnv* env = base::android::AttachCurrentThread();
   return base::android::ScopedJavaGlobalRef(
       Java_HistoryClustersAction_Constructor(
           env, base::android::ConvertUTF16ToJavaString(env, hint),
@@ -50,9 +50,9 @@
 }
 
 base::android::ScopedJavaGlobalRef<jobject> BuildOmniboxActionInSuggest(
+    JNIEnv* env,
     const std::u16string& hint,
     const std::string& serialized_action) {
-  JNIEnv* env = base::android::AttachCurrentThread();
   return base::android::ScopedJavaGlobalRef(Java_OmniboxActionInSuggest_build(
       env, base::android::ConvertUTF16ToJavaString(env, hint),
       base::android::ToJavaByteArray(env, serialized_action)));
@@ -64,15 +64,17 @@
     const std::vector<scoped_refptr<OmniboxAction>>& actions) {
   jclass clazz =
       org_chromium_components_omnibox_action_OmniboxAction_clazz(env);
-  // Fires if OmniboxPedal is not part of this build target.
+  // Fires if OmniboxAction is not part of this build target.
   DCHECK(clazz);
   base::android::ScopedJavaLocalRef<jobjectArray> jactions(
       env, env->NewObjectArray(actions.size(), clazz, nullptr));
   base::android::CheckException(env);
 
   for (size_t index = 0; index < actions.size(); index++) {
-    env->SetObjectArrayElement(jactions.obj(), index,
-                               actions[index]->GetJavaObject().obj());
+    auto jobj = actions[index]->GetOrCreateJavaObject(env);
+    if (jobj) {
+      env->SetObjectArrayElement(jactions.obj(), index, jobj.obj());
+    }
   }
 
   return jactions;

components/omnibox/browser/actions/omnibox_pedal_jni_wrapper.h

diff --git a/components/omnibox/browser/actions/omnibox_pedal_jni_wrapper.h b/components/omnibox/browser/actions/omnibox_pedal_jni_wrapper.h
index 33a9149..50105c3 100644
--- a/components/omnibox/browser/actions/omnibox_pedal_jni_wrapper.h
+++ b/components/omnibox/browser/actions/omnibox_pedal_jni_wrapper.h
@@ -8,14 +8,17 @@
 #include <vector>
 
 base::android::ScopedJavaGlobalRef<jobject> BuildOmniboxPedal(
+    JNIEnv* env,
     const std::u16string& hint,
     OmniboxPedalId pedal_id);
 
 base::android::ScopedJavaGlobalRef<jobject> BuildHistoryClustersAction(
+    JNIEnv* env,
     const std::u16string& hint,
     const std::string& query);
 
 base::android::ScopedJavaGlobalRef<jobject> BuildOmniboxActionInSuggest(
+    JNIEnv* env,
     const std::u16string& hint,
     const std::string& serialized_action);
 

components/policy/resources/policy_templates_de.xtb

diff --git a/components/policy/resources/policy_templates_de.xtb b/components/policy/resources/policy_templates_de.xtb
index 8b38c0f..c8f78d6 100644
--- a/components/policy/resources/policy_templates_de.xtb
+++ b/components/policy/resources/policy_templates_de.xtb
@@ -4265,11 +4265,6 @@
 <translation id="4996161752665479028">SSH in der Terminal System App aktivieren</translation>
 <translation id="4997074784107449343">Die Option „Als Bild drucken“ ist für die Druckvorschau von PDF-Dokumenten standardmäßig nicht aktiviert, wenn sie verfügbar ist.</translation>
 <translation id="500149597848135831">Alle Variationen aktivieren</translation>
-<translation id="5014511262203433035">Mit dieser Richtlinie wird festgelegt, ob Nutzer den Nur-HTTPS-Modus in den Einstellungen aktivieren können. Über den Nur-HTTPS-Modus werden alle Aufrufe von Websites auf HTTPS umgestellt.
-      Wenn diese Einstellung nicht konfiguriert oder auf „Zugelassen“ festgelegt ist, dürfen Nutzer den Nur-HTTPS-Modus aktivieren.
-      Ist sie auf „Nicht zugelassen“ festgelegt, dürfen Nutzer den Nur-HTTPS-Modus nicht aktivieren.
-      Wenn diese Einstellung auf „force_enabled“ gesetzt ist, wird der Nur-HTTPS-Modus aktiviert und Nutzer können ihn nicht deaktivieren.
-      Die erzwungene Aktivierung des Nur-HTTPS-Modus wird ab M112 unterstützt.</translation>
 <translation id="5017369989680827157">Wenn die Richtlinie auf „True“ gesetzt oder nicht konfiguriert ist, können Nutzer das automatische Ausfüllen von Adressdaten in der UI steuern.
 
       Ist sie auf „False“ gesetzt, schlägt Autofill keine Adressdaten vor und füllt entsprechende Felder auch nicht automatisch aus. Außerdem werden keine zusätzlichen Adressinformationen gespeichert, die Nutzer beim Surfen im Internet senden.</translation>
@@ -5346,6 +5341,7 @@
 <translation id="6049117606554031363">Melden des Boardstatus auf Geräten aktivieren</translation>
 <translation id="6050796253724099706">Gesprochenes Feedback auf dem Anmeldebildschirm aktivieren</translation>
 <translation id="605132676434455096">Hinzufügen neuer Profile nicht zulassen</translation>
+<translation id="6053260874233331700">Zugriff auf Standortbestimmung auf dem Anmeldebildschirm nicht zulassen.</translation>
 <translation id="6053681087509103368">Zulassen, dass WebRTC veraltete Versionen des TLS/DTLS-Protokolls verwendet</translation>
 <translation id="6056517174496942473">Attestierungsablauf <ph name="CHROME_ENTERPRISE_DEVICE_TRUST_CONNECTOR" /> für eine Liste von URLs aktivieren</translation>
 <translation id="6058879286588763839">Es sei denn, „<ph name="DEVICE_ADVANCED_BATTERY_CHARGE_MODE_ENABLED_POLICY_NAME" />“ ist festgelegt, wodurch „<ph name="DEVICE_BATTERY_CHARGE_MODE_POLICY_NAME" />“ überschrieben wird, dann wird durch das Konfigurieren von „<ph name="DEVICE_BATTERY_CHARGE_MODE_POLICY_NAME" />“ die Energieverwaltungsrichtlinie für den Akkulademodus festgelegt, sofern die Funktion vom Gerät unterstützt wird. Mit dieser Richtlinie kannst du das Aufladen des Akkus dynamisch steuern. So lässt sich der durch unnötige Belastung entstehende Akkuverschleiß verringern und die Lebensdauer des Akkus verlängern.
@@ -7066,6 +7062,11 @@
 <translation id="759957074386651883">Safe Browsing-Einstellungen</translation>
 <translation id="7602621823177962064">Melden der Informationen zum Arbeitsspeicher auf Geräten deaktivieren</translation>
 <translation id="7604169113182304895">Diese Liste kann auf freiwilliger Basis für Android-Apps übernommen werden. Es ist nicht möglich, die Verwendung zu erzwingen.</translation>
+<translation id="7605203688694672897">Damit kannst du die Zugriffsebene für die Standortbestimmung auf Geräteebene für das <ph name="PRODUCT_OS_NAME" />-System festlegen. Diese gilt, bevor sich ein Nutzer anmeldet. Nach der Anmeldung können Nutzer die Zugriffsebene für die Standortbestimmung über die Einstellung pro Nutzer festlegen.
+
+Wenn die Richtlinie nicht konfiguriert oder auf „<ph name="ALLOW" />“ festgelegt ist, ist der Zugriff auf die Standortbestimmung auf dem Anmeldebildschirm für verwaltete Geräte zulässig. Wenn ein ungültiger Richtlinienwert gesendet wird, wird der Zugriff auf „<ph name="DISALLOW" />“ zurückgesetzt. Bei nicht verwalteten Geräten lautet der Wert immer „<ph name="DISALLOW" />“.
+
+ACHTUNG: Du musst vorsichtig sein, wenn du diese Einstellung änderst, da dadurch möglicherweise andere Richtlinien nicht mehr funktionieren, die die Standortbestimmung betreffen (z. B. „<ph name="SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_POLICY" />“). Speziell die Optionen „<ph name="POLICY_ENUM_SYSTEMTIMEZONEAUTOMATICDETECTION_TIMEZONEAUTOMATICDETECTIONSENDWIFIACCESSPOINTS" />“ und „<ph name="POLICY_ENUM_SYSTEMTIMEZONEAUTOMATICDETECTION_TIMEZONEAUTOMATICDETECTIONSENDALLLOCATIONINFO" />“ der Richtlinie „<ph name="SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_POLICY" />“ funktionieren nicht mehr, wenn diese Richtlinie auf „<ph name="DISALLOW" />“ gesetzt ist. Sie verwenden dann nur die <ph name="IP" />-basierte Standortauflösung auf dem Anmeldebildschirm (<ph name="LOG_IN" />).</translation>
 <translation id="7608186022704392724">Durch die Funktion der automatischen PIN-Eingabe ändert sich die Eingabe von PINs unter <ph name="PRODUCT_OS_NAME" />.
           Statt das Textfeld anzuzeigen, das auch für die Eingabe des Passworts verwendet wird, zeigt diese Funktion eine spezielle UI, an der Nutzer erkennen, wie viele Ziffern für die PIN benötigt werden. In der Folge wird die Länge der jeweiligen PIN außerhalb der verschlüsselten Nutzerdaten gespeichert. Es werden nur PINs mit mindestens 6 und höchstens 12 Ziffern unterstützt.
 
@@ -7866,6 +7867,7 @@
       Ist die Richtlinie deaktiviert, wird keine Warnung angezeigt, wenn der Nutzer versucht, den Browser zu schließen.</translation>
 <translation id="830440838848984847">Nutzern die Anmeldung in <ph name="PRODUCT_NAME" /> erlauben</translation>
 <translation id="8306117673860983372">Anmeldeeinstellungen</translation>
+<translation id="8307340233340602723">Zugriff auf Standortbestimmung für Geräte zulassen oder ablehnen</translation>
 <translation id="830819203330820450">Wenn diese Richtlinie aktiviert oder nicht konfiguriert ist (Standard), können Webseiten
       Bildschirmfreigabe-APIs (z. B. "getDisplayMedia()" oder die Desktop Capture-Erweiterungs-API) verwenden,
       um den Nutzer aufzufordern, einen Tab, ein Fenster oder einen Desktop für die Aufnahme auszuwählen.
@@ -8858,6 +8860,7 @@
 <translation id="9213751049772256263">Alle Variationen deaktivieren</translation>
 <translation id="9217154963008402249">Häufigkeit von Kontrollnetzwerkpaketen</translation>
 <translation id="9220314833408124365">Setzt die standardmäßige Verweisrichtlinie auf „no-referrer-when-downgrade“</translation>
+<translation id="9221827710437832530">Zugriff auf Standortbestimmung auf dem Anmeldebildschirm zulassen.</translation>
 <translation id="922540222991413931">Installationsquellen für Erweiterungen, Apps und Nutzerskripte konfigurieren</translation>
 <translation id="924557436754151212">Gespeicherte Passwörter bei erster Ausführung aus Standardbrowser importieren</translation>
 <translation id="926104720905645793">Mit dieser Richtlinie wird festgelegt, ob Cloud-Berichte für <ph name="PRODUCT_NAME" /> erstellt werden. Dabei werden Daten zum Betrieb des Browsers in die <ph name="GOOGLE_ADMIN_CONSOLE_PRODUCT_NAME" /> hochgeladen.

components/policy/resources/policy_templates_es-419.xtb

diff --git a/components/policy/resources/policy_templates_es-419.xtb b/components/policy/resources/policy_templates_es-419.xtb
index b6875d4..a740cb8 100644
--- a/components/policy/resources/policy_templates_es-419.xtb
+++ b/components/policy/resources/policy_templates_es-419.xtb
@@ -4347,11 +4347,6 @@
 <translation id="4996161752665479028">Habilitar SSH en la app del sistema de la terminal</translation>
 <translation id="4997074784107449343">Cuando la opción Imprimir como imagen está disponible, no se establece como opción predeterminada en las vistas previas de impresión de documentos PDF.</translation>
 <translation id="500149597848135831">Habilitar todas las variaciones</translation>
-<translation id="5014511262203433035">Esta política controla si los usuarios pueden habilitar el modo solo HTTPS en la Configuración. El modo solo HTTPS actualiza todas las navegaciones a páginas HTTPS.
-      Si no estableces esta configuración o la habilitas, los usuarios podrán habilitar el modo solo HTTPS.
-      Si inhabilitas esta configuración, los usuarios no podrán habilitar el modo solo HTTPS.
-      Si estableces esta configuración en force_enabled, se habilitará el modo solo HTTPS y los usuarios no podrán inhabilitarlo.
-      La habilitación forzosa del modo solo HTTPS es compatible a partir de la versión M112.</translation>
 <translation id="5017369989680827157">Si estableces la política como verdadera o no la estableces, los usuarios podrán configurar la función Autocompletar para las direcciones que aparecen en la IU.
 
       Si la estableces como falsa, la función Autocompletar nunca sugerirá ni completará datos de las direcciones, ni guardará información adicional relacionada que envíen los usuarios cuando navegan por la Web.</translation>

components/policy/resources/policy_templates_es.xtb

diff --git a/components/policy/resources/policy_templates_es.xtb b/components/policy/resources/policy_templates_es.xtb
index c7ad02c..3812599 100644
--- a/components/policy/resources/policy_templates_es.xtb
+++ b/components/policy/resources/policy_templates_es.xtb
@@ -4287,11 +4287,6 @@
 <translation id="4996161752665479028">Habilitar SSH en la aplicación del sistema Terminal</translation>
 <translation id="4997074784107449343">Cuando la opción Imprimir como imagen está disponible, no se establece como opción predeterminada en las vistas previas de impresión de documentos PDF.</translation>
 <translation id="500149597848135831">Habilitar todas las variaciones</translation>
-<translation id="5014511262203433035">Esta política controla si los usuarios pueden habilitar el modo Solo HTTPS en Configuración. El modo Solo HTTPS cambia todos los accesos a páginas al protocolo HTTPS.
-      Si esta opción no se establece o se le asigna el valor allowed, los usuarios podrán habilitar el modo Solo HTTPS.
-      Si se le asigna el valor disallowed, los usuarios no podrán habilitar el modo Solo HTTPS.
-      Si se le asigna el valor force_enabled, se habilitará el modo Solo HTTPS y los usuarios no podrán inhabilitarlo.
-      Se puede forzar la habilitación del modo Solo HTTPS a partir de la versión M112.</translation>
 <translation id="5017369989680827157">Si se asigna el valor "Verdadero" a esta política o no se le asigna ninguno, se dará a los usuarios el control de la función de autocompletar direcciones en la UI.
 
       Si se le asigna el valor "Falso", la función Autocompletar nunca sugerirá ni completará información de direcciones, ni tampoco guardará la información adicional de direcciones que envíen los usuarios mientras naveguen por la Web.</translation>

components/policy/resources/policy_templates_fr.xtb

diff --git a/components/policy/resources/policy_templates_fr.xtb b/components/policy/resources/policy_templates_fr.xtb
index 70e27fb..06ca208 100644
--- a/components/policy/resources/policy_templates_fr.xtb
+++ b/components/policy/resources/policy_templates_fr.xtb
@@ -4275,11 +4275,6 @@
 <translation id="4996161752665479028">Activer les connexions SSH dans Terminal System App</translation>
 <translation id="4997074784107449343">Lorsqu'elle est disponible, l'option "Imprimer en tant qu'image" permettant de générer un aperçu avant impression d'un PDF n'est pas proposée par défaut.</translation>
 <translation id="500149597848135831">Activer toutes les variantes</translation>
-<translation id="5014511262203433035">Cette règle détermine si les utilisateurs peuvent ou non activer le mode HTTPS uniquement dans les paramètres. Ce mode fait passer toutes les navigations en HTTPS.
-      Si ce paramètre n'est pas défini ou s'il est défini sur "Autorisé", les utilisateurs seront autorisés à activer le mode HTTPS uniquement.
-      Si ce paramètre est défini sur "Interdit", les utilisateurs ne seront pas autorisés à activer le mode HTTPS uniquement.
-      Si ce paramètre est défini sur "force_enabled", le mode HTTPS uniquement sera activé et les utilisateurs ne pourront pas le désactiver.
-      L'activation forcée du mode HTTPS uniquement est disponible à partir de M112.</translation>
 <translation id="5017369989680827157">Si cette règle est définie sur "True" ou qu'elle n'est pas configurée, les utilisateurs contrôlent la saisie automatique des adresses dans l'interface utilisateur.
 
       Si cette règle est définie sur "False", les adresses ne sont jamais suggérées ni saisies automatiquement. De même, les informations complémentaires liées à une adresse que les utilisateurs fournissent sur une page Web ne sont pas enregistrées.</translation>

components/policy/resources/policy_templates_id.xtb

diff --git a/components/policy/resources/policy_templates_id.xtb b/components/policy/resources/policy_templates_id.xtb
index 03e04295..f2e2fa1 100644
--- a/components/policy/resources/policy_templates_id.xtb
+++ b/components/policy/resources/policy_templates_id.xtb
@@ -4355,11 +4355,6 @@
 <translation id="4996161752665479028">Aktifkan SSH di Terminal System App</translation>
 <translation id="4997074784107449343">Opsi Cetak sebagai gambar tidak akan disetel sebagai default untuk pratinjau cetak dokumen PDF jika tersedia.</translation>
 <translation id="500149597848135831">Aktifkan semua variasi</translation>
-<translation id="5014511262203433035">Kebijakan ini mengontrol apakah pengguna dapat mengaktifkan Mode Khusus HTTPS di Setelan. Mode Khusus HTTPS mengupgrade semua navigasi ke HTTPS.
-      Jika setelan ini tidak disetel atau disetel ke diizinkan, pengguna akan diizinkan mengaktifkan Mode Khusus HTTPS.
-      Jika setelan ini disetel ke tidak diizinkan, pengguna tidak akan diizinkan mengaktifkan Mode Khusus HTTPS.
-      Jika setelan ini disetel ke force_enabled, Mode Khusus HTTPS akan diaktifkan dan pengguna tidak akan dapat menonaktifkannya.
-      Mengaktifkan paksa Mode Khusus HTTPS didukung mulai dari M112 dan seterusnya.</translation>
 <translation id="5017369989680827157">Jika kebijakan ditetapkan ke Benar (True) atau tidak ditetapkan, pengguna akan dapat mengontrol fitur Isi otomatis alamat di UI.
 
       Jika kebijakan ditetapkan ke Salah (False), Isi otomatis tidak akan menyarankan atau mengisi informasi alamat, juga tidak akan menyimpan informasi alamat tambahan yang dikirimkan pengguna saat menjelajahi web.</translation>

components/policy/resources/policy_templates_it.xtb

diff --git a/components/policy/resources/policy_templates_it.xtb b/components/policy/resources/policy_templates_it.xtb
index 6a28a5a..89032b635 100644
--- a/components/policy/resources/policy_templates_it.xtb
+++ b/components/policy/resources/policy_templates_it.xtb
@@ -4282,11 +4282,6 @@
 <translation id="4996161752665479028">Attiva SSH in Terminal System App</translation>
 <translation id="4997074784107449343">L'opzione Stampa come immagine non viene impostata per impostazione predefinita per le anteprime di stampa dei documenti PDF quando disponibile.</translation>
 <translation id="500149597848135831">Attiva tutte le varianti</translation>
-<translation id="5014511262203433035">Questo criterio consente di stabilire se gli utenti possono attivare o meno la Modalità solo HTTPS nelle Impostazioni. La Modalità solo HTTPS esegue l'upgrade di tutte le navigazioni alle estensioni HTTPS.
-      Se questa impostazione non viene configurata o se viene impostata su allowed, gli utenti potranno attivare la Modalità solo HTTPS.
-      Se viene impostata su disallowed, gli utenti non potranno attivare la Modalità solo HTTPS.
-      Se viene impostata su force_enabled, la Modalità solo HTTPS verrà attivata e gli utenti non potranno disattivarla.
-      L'attivazione forzata della Modalità solo HTTPS è supportata a partire dalla versione M112.</translation>
 <translation id="5017369989680827157">Se il criterio è impostato su True o se non viene configurato, gli utenti possono controllare la compilazione automatica per gli indirizzi nella UI.
 
       Se il criterio è impostato su False, la compilazione automatica non fornisce mai suggerimenti né compila le informazioni relative agli indirizzi, né salva le nuove informazioni inviate dagli utenti durante la navigazione sul Web.</translation>
@@ -5372,6 +5367,7 @@
 <translation id="6049117606554031363">Attiva i report sullo stato della scheda del dispositivo</translation>
 <translation id="6050796253724099706">Attiva la funzione di lettura vocale nella schermata di accesso</translation>
 <translation id="605132676434455096">Non consentire l'aggiunta di nuovi profili</translation>
+<translation id="6053260874233331700">Non consentire l'accesso alla geolocalizzazione nella schermata di accesso.</translation>
 <translation id="6053681087509103368">Consenti a WebRTC di usare versioni obsolete del protocollo TLS/DTLS</translation>
 <translation id="6056517174496942473">Attiva flusso di attestazione <ph name="CHROME_ENTERPRISE_DEVICE_TRUST_CONNECTOR" /> per un elenco di URL</translation>
 <translation id="6058879286588763839">A meno che <ph name="DEVICE_ADVANCED_BATTERY_CHARGE_MODE_ENABLED_POLICY_NAME" /> non venga specificato, sovrascrivendo <ph name="DEVICE_BATTERY_CHARGE_MODE_POLICY_NAME" />, la configurazione di <ph name="DEVICE_BATTERY_CHARGE_MODE_POLICY_NAME" /> consente di specificare il criterio di gestione della modalità di ricarica della batteria (se supportato dal dispositivo). Per estendere la durata della batteria, il criterio controlla dinamicamente la ricarica della batteria riducendo al minimo l'usura e preservandone l'efficienza.
@@ -7101,6 +7097,11 @@
 <translation id="759957074386651883">Impostazioni di Navigazione sicura</translation>
 <translation id="7602621823177962064">Disattiva i report sulle informazioni relative alla memoria del dispositivo</translation>
 <translation id="7604169113182304895">Le app Android potrebbero decidere volontariamente se rispettare o meno questo elenco. Non è possibile imporre il rispetto dell'elenco.</translation>
+<translation id="7605203688694672897">Imposta il livello di accesso alla geolocalizzazione a livello di dispositivo per il sistema <ph name="PRODUCT_OS_NAME" />, che viene applicato prima dell'accesso dell'utente. Dopo l'accesso, gli utenti possono controllare il livello di accesso alla geolocalizzazione tramite le impostazioni per utente.
+
+Se il criterio non viene configurato o se viene impostato su <ph name="ALLOW" />, l'accesso alla geolocalizzazione nella schermata di accesso sarà consentito per i dispositivi gestiti. Se viene inviato un valore del criterio non valido, l'accesso viene reimpostato su <ph name="DISALLOW" />. Per i dispositivi non gestiti il valore è sempre <ph name="DISALLOW" />.
+
+AVVISO: fai attenzione quando modifichi questa impostazione perché potrebbe violare altri criteri che riguardano la geolocalizzazione (ad esempio <ph name="SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_POLICY" />). In particolare, se questo criterio viene impostato su <ph name="DISALLOW" />, le opzioni <ph name="POLICY_ENUM_SYSTEMTIMEZONEAUTOMATICDETECTION_TIMEZONEAUTOMATICDETECTIONSENDWIFIACCESSPOINTS" /> e <ph name="POLICY_ENUM_SYSTEMTIMEZONEAUTOMATICDETECTION_TIMEZONEAUTOMATICDETECTIONSENDALLLOCATIONINFO" /> del criterio <ph name="SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_POLICY" /> non funzioneranno correttamente e nella schermata di <ph name="LOG_IN" /> verrà usata soltanto la risoluzione della posizione basata sull'<ph name="IP" />.</translation>
 <translation id="7608186022704392724">La funzionalità di invio automatico del PIN modifica il modo in cui i PIN vengono inseriti in <ph name="PRODUCT_OS_NAME" />.
           Anziché mostrare lo stesso campo di testo utilizzato per l'inserimento della password, questa funzionalità mostra un'UI speciale che indica chiaramente all'utente da quante cifre deve essere formato il PIN. Di conseguenza, la lunghezza del PIN dell'utente viene memorizzata al di fuori dei dati criptati dell'utente. Sono supportati soltanto i PIN formati da 6-12 cifre.
 
@@ -7886,6 +7887,7 @@
       Se viene impostato su Disattivato, non viene mostrata una finestra di dialogo di avviso quando l'utente sta tentando di uscire.</translation>
 <translation id="830440838848984847">Consenti agli utenti di accedere a <ph name="PRODUCT_NAME" /></translation>
 <translation id="8306117673860983372">Impostazioni di accesso</translation>
+<translation id="8307340233340602723">Consenti o nega l'accesso alla geolocalizzazione del dispositivo</translation>
 <translation id="830819203330820450">Se il criterio è attivato o non configurato (impostazione predefinita), una pagina web può usare le API di condivisione schermo (ad esempio, getDisplayMedia() o l'API dell'estensione di acquisizione schermata desktop) per richiedere all'utente di selezionare una scheda, una finestra o una schermata desktop da acquisire.
 
       Se il criterio è disattivato, le chiamate alle API di condivisione schermo avranno esito negativo con un errore; tuttavia, questo criterio non viene preso in considerazione (e un sito sarà autorizzato a utilizzare le API di condivisione schermo) se il sito corrisponde a un modello di origine in uno dei seguenti criteri:
@@ -8846,6 +8848,7 @@
 <translation id="9213751049772256263">Disattiva tutte le varianti</translation>
 <translation id="9217154963008402249">Frequenza dei pacchetti di rete di monitoraggio</translation>
 <translation id="9220314833408124365">Viene usato un criterio relativo al referrer predefinito no-referrer-when-downgrade</translation>
+<translation id="9221827710437832530">Consenti l'accesso alla geolocalizzazione nella schermata di accesso.</translation>
 <translation id="922540222991413931">Configura fonti di installazione di estensioni, applicazioni e script utente</translation>
 <translation id="924557436754151212">Importa password salvate dal browser predefinito alla prima esecuzione</translation>
 <translation id="926104720905645793">Questo criterio consente di controllare il reporting su cloud di <ph name="PRODUCT_NAME" />, che consente di caricare informazioni sul funzionamento del browser nella <ph name="GOOGLE_ADMIN_CONSOLE_PRODUCT_NAME" />.

components/policy/resources/policy_templates_ja.xtb

diff --git a/components/policy/resources/policy_templates_ja.xtb b/components/policy/resources/policy_templates_ja.xtb
index 271b3ff..6fded45 100644
--- a/components/policy/resources/policy_templates_ja.xtb
+++ b/components/policy/resources/policy_templates_ja.xtb
@@ -4105,11 +4105,6 @@
 <translation id="4996161752665479028">Terminal System App の SSH を有効にする</translation>
 <translation id="4997074784107449343">「画像として印刷する」オプションが使用可能な場合、「画像として印刷する」オプションは PDF ドキュメントの印刷プレビューでデフォルトで設定されません。</translation>
 <translation id="500149597848135831">すべてのバリエーションを有効にします</translation>
-<translation id="5014511262203433035">このポリシーでは、ユーザーが [設定] で HTTPS 専用モードを有効にできるかどうかを管理します。HTTPS 専用モードでは、移動先がすべて HTTPS にアップグレードされます。
-      未設定のままにした場合や [allowed（許可する）] に設定した場合、ユーザーは HTTPS 専用モードを有効にできます。
-      [disallowed（許可しない）] に設定した場合、ユーザーは HTTPS 専用モードを有効にできません。
-      [force_enabled（強制的に有効にする）] に設定した場合、HTTPS 専用モードが有効になり、ユーザーはこのモードを無効にできません。
-      HTTPS 専用モードの強制的な有効化は、M112 以降でサポートされます。</translation>
 <translation id="5017369989680827157">このポリシーを True に設定するか未設定のままにした場合、ユーザーは UI で住所の自動入力を制御できます。このポリシーを False に設定した場合、住所情報が候補として表示されたり、自動入力されたりすることはありません。また、ユーザーがウェブの利用中に送信した住所情報が追加で保存されることもありません。</translation>
 <translation id="5017691827598069017">ファスト ペアリング（ファスト Bluetooth ペアリング）を有効にする</translation>
 <translation id="5021550478471824215">このポリシーでは、事前設定のネットワーク ファイル共有のリストを指定できます。個々の項目は、<ph name="SHARE_URL_FIELD_NAME" /> と <ph name="MODE_FIELD_NAME" /> の 2 つのプロパティで構成されるオブジェクトとなります。

components/policy/resources/policy_templates_ko.xtb

diff --git a/components/policy/resources/policy_templates_ko.xtb b/components/policy/resources/policy_templates_ko.xtb
index 503a450..b4265d45 100644
--- a/components/policy/resources/policy_templates_ko.xtb
+++ b/components/policy/resources/policy_templates_ko.xtb
@@ -4283,11 +4283,6 @@
 <translation id="4996161752665479028">터미널 시스템 앱에서 SSH를 사용 설정합니다.</translation>
 <translation id="4997074784107449343">이미지로 인쇄 옵션이 사용 가능한 경우 PDF 문서의 인쇄 미리보기로 기본적으로 설정되지 않습니다.</translation>
 <translation id="500149597848135831">모든 변형 허용</translation>
-<translation id="5014511262203433035">이 정책은 사용자가 설정에서 HTTPS 전용 모드를 사용 설정할 수 있는지 결정합니다. HTTPS 전용 모드는 모든 탐색을 HTTPS로 업그레이드합니다.
-      이 설정을 설정하지 않거나 허용됨으로 설정할 경우 사용자는 HTTPS 전용 모드를 사용 설정할 수 있습니다.
-      이 설정을 허용되지 않음으로 설정할 경우 사용자는 HTTPS 전용 모드를 사용 설정할 수 없습니다.
-      이 설정이 force_enabled로 설정된 경우 HTTPS 전용 모드가 사용 설정되고 사용자가 사용 중지할 수 없습니다.
-      HTTPS 전용 모드 강제 사용 설정은 M112부터 지원됩니다.</translation>
 <translation id="5017369989680827157">정책을 True로 설정하거나 설정하지 않으면 사용자가 UI의 주소 자동 완성을 제어할 수 있습니다.
 
       정책을 False로 설정하면 자동 완성에서 주소 정보를 제안하거나 채워 넣지 않고, 사용자가 웹을 탐색하는 동안 제출한 추가 주소 정보도 저장하지 않습니다.</translation>

components/policy/resources/policy_templates_nl.xtb

diff --git a/components/policy/resources/policy_templates_nl.xtb b/components/policy/resources/policy_templates_nl.xtb
index 0d94a65..7727cc9f 100644
--- a/components/policy/resources/policy_templates_nl.xtb
+++ b/components/policy/resources/policy_templates_nl.xtb
@@ -4259,11 +4259,6 @@
 <translation id="4996161752665479028">SSH aanzetten in Terminal System App</translation>
 <translation id="4997074784107449343">Als de optie Afdrukken als afbeelding beschikbaar is, wordt deze standaard niet ingesteld voor afdrukvoorbeelden van pdf-documenten.</translation>
 <translation id="500149597848135831">Alle varianten aanzetten</translation>
-<translation id="5014511262203433035">Met dit beleid wordt bepaald of gebruikers de modus Alleen HTTPS kunnen aanzetten in de instellingen. Met de modus Alleen HTTPS worden alle navigaties naar HTTPS geüpgraded.
-      Als deze instelling niet is ingesteld of is ingesteld op Toegestaan, kunnen gebruikers de modus Alleen HTTPS aanzetten.
-      Als deze instelling is ingesteld op Niet toegestaan, kunnen gebruikers de modus Alleen HTTPS niet aanzetten.
-      Als deze instelling is ingesteld op force_enabled, wordt de modus Alleen HTTPS aangezet en kunnen gebruikers deze niet uitzetten.
-      Afdwingen dat de modus Alleen HTTPS wordt aangezet, wordt ondersteund vanaf M112.</translation>
 <translation id="5017369989680827157">Als je het beleid instelt op 'True' of niet instelt, krijgen gebruikers de controle over 'Automatisch invullen' voor adressen in de UI.
 
       Als je het beleid instelt op 'False', wordt er nooit adresinformatie voorgesteld of ingevuld door 'Automatisch invullen'. Ook wordt er geen aanvullende adresinformatie opgeslagen die gebruikers opgeven als ze internetten.</translation>
@@ -5340,6 +5335,7 @@
 <translation id="6049117606554031363">Rapportage van moederbordstatus van apparaat aanzetten</translation>
 <translation id="6050796253724099706">Gesproken feedback op het inlogscherm aanzetten</translation>
 <translation id="605132676434455096">Toevoegen van nieuwe profielen niet toestaan</translation>
+<translation id="6053260874233331700">Toegang tot geolocatie op het inlogscherm niet toestaan.</translation>
 <translation id="6053681087509103368">Toestaan dat WebRTC verouderde versies van het TLD-/DTLS-protocol gebruikt</translation>
 <translation id="6056517174496942473">Het attestproces <ph name="CHROME_ENTERPRISE_DEVICE_TRUST_CONNECTOR" /> aanzetten voor een lijst met URL's</translation>
 <translation id="6058879286588763839">Als je <ph name="DEVICE_BATTERY_CHARGE_MODE_POLICY_NAME" /> instelt, geef je het stroombeheerbeleid voor de batterijoplaadmodus op (als dit wordt ondersteund op het apparaat), tenzij <ph name="DEVICE_ADVANCED_BATTERY_CHARGE_MODE_ENABLED_POLICY_NAME" /> is opgegeven (dat voorrang krijgt op <ph name="DEVICE_BATTERY_CHARGE_MODE_POLICY_NAME" />). Dit beleid beheert het opladen van de batterij op dynamische wijze door spanning en belasting te minimaliseren. Zo wordt de batterijduur verlengd.
@@ -7060,6 +7056,12 @@
 <translation id="759957074386651883">Safe Browsing-instellingen</translation>
 <translation id="7602621823177962064">Rapportage van geheugeninformatie van apparaat uitzetten</translation>
 <translation id="7604169113182304895">Het is mogelijk dat Android-apps deze lijst op vrijwillige basis respecteren. Je kunt ze niet dwingen om de lijst te respecteren.</translation>
+<translation id="7605203688694672897">Stel het toegangsniveau voor geolocatie op apparaatniveau in voor het <ph name="PRODUCT_OS_NAME" />-systeem. Dit is van kracht voordat een gebruiker inlogt. Nadat gebruikers zijn ingelogd, kunnen ze het toegangsniveau voor geolocatie bepalen per gebruiker.
+
+Als je het beleid niet instelt of instelt op <ph name="ALLOW" />, is toegang tot geolocatie op het inlogscherm toegestaan voor de beheerde apparaten. Als er een ongeldige beleidswaarde wordt gestuurd, valt de toegang terug op <ph name="DISALLOW" />. Voor niet-beheerde apparaten is dit altijd <ph name="DISALLOW" />.
+
+WAARSCHUWING: Als je deze instelling wijzigt, kan dit ervoor zorgen dat ander beleid met betrekking tot geolocatie niet meer werkt (bijv. <ph name="SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_POLICY" />).
+Met name als dit beleid wordt ingesteld op <ph name="DISALLOW" />, werken de opties <ph name="POLICY_ENUM_SYSTEMTIMEZONEAUTOMATICDETECTION_TIMEZONEAUTOMATICDETECTIONSENDWIFIACCESSPOINTS" /> en <ph name="POLICY_ENUM_SYSTEMTIMEZONEAUTOMATICDETECTION_TIMEZONEAUTOMATICDETECTIONSENDALLLOCATIONINFO" /> van het beleid <ph name="SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_POLICY" /> niet meer en gebruiken ze alleen de op <ph name="IP" /> gebaseerde locatie-omzetting op het scherm <ph name="LOG_IN" />.</translation>
 <translation id="7608186022704392724">Met de functie voor automatisch versturen van pincodes kun je wijzigen hoe pincodes worden ingevoerd in <ph name="PRODUCT_OS_NAME" />.
           Deze functie heeft een speciale UI die gebruikers duidelijk laat zien hoeveel tekens er voor hun pincode zijn vereist in plaats van hetzelfde tekstveld voor de invoer van het wachtwoord te tonen. Hierdoor wordt de lengte van de pincode van de gebruiker niet samen met de versleutelde gegevens van die gebruiker opgeslagen. Alleen pincodes die tussen 6 en 12 cijfers lang zijn, worden ondersteund.
 
@@ -7849,6 +7851,7 @@
       Als dit beleid niet wordt toegepast, wordt er geen waarschuwingsdialoogvenster getoond als de gebruiker probeert de browser te sluiten.</translation>
 <translation id="830440838848984847">Gebruikers toestaan om in te loggen op <ph name="PRODUCT_NAME" /></translation>
 <translation id="8306117673860983372">Inloginstellingen</translation>
+<translation id="8307340233340602723">Toegang tot geolocatie op apparaat toestaan of weigeren</translation>
 <translation id="830819203330820450">Als dit beleid aanstaat of niet is ingesteld (standaard), kan een webpagina via API's voor scherm delen (bijvoorbeeld getDisplayMedia() of de API voor de extensie Bureaublad streamen) de gebruiker vragen een tabblad, venster of bureaublad te selecteren om vast te leggen.
 
       Als dit beleid uitstaat, mislukken aanroepen van API's voor scherm delen en wordt er een fout getoond. Er wordt echter geen rekening gehouden met dit beleid (en een site mag API's voor scherm delen gebruiken) als de site overeenkomt met het patroon van een oorsprong in een van de volgende beleidsregels:
@@ -8819,6 +8822,7 @@
 <translation id="9213751049772256263">Alle varianten uitzetten</translation>
 <translation id="9217154963008402249">Frequentie van netwerkpakketten voor bijhouden</translation>
 <translation id="9220314833408124365">'no-referrer-when-downgrade' gebruiken als standaardbeleid voor verwijzende URL's</translation>
+<translation id="9221827710437832530">Toegang tot geolocatie op het inlogscherm toestaan.</translation>
 <translation id="922540222991413931">Installatiebronnen voor het configureren van extensies, apps en gebruikersscripts</translation>
 <translation id="924557436754151212">Opgeslagen wachtwoorden importeren uit standaardbrowser bij eerste uitvoering</translation>
 <translation id="926104720905645793">Dit beleid beheert <ph name="PRODUCT_NAME" />-cloudrapportage waarmee informatie over de browseractiviteit wordt geüpload naar <ph name="GOOGLE_ADMIN_CONSOLE_PRODUCT_NAME" />.

components/policy/resources/policy_templates_pt-BR.xtb

diff --git a/components/policy/resources/policy_templates_pt-BR.xtb b/components/policy/resources/policy_templates_pt-BR.xtb
index 347b99e8..6e02443 100644
--- a/components/policy/resources/policy_templates_pt-BR.xtb
+++ b/components/policy/resources/policy_templates_pt-BR.xtb
@@ -4344,11 +4344,6 @@
 <translation id="4996161752665479028">Ativar SSH no app Terminal System</translation>
 <translation id="4997074784107449343">Não usar "Imprimir como imagem" como padrão na visualização da impressão de documentos PDF quando a opção estiver disponível.</translation>
 <translation id="500149597848135831">Permitir todas as variações</translation>
-<translation id="5014511262203433035">Esta política controla se os usuários podem ativar o HTTPS-Only Mode nas Configurações. O HTTPS-Only Mode faz upgrade de todas as navegações para HTTPS.
-      Se esta configuração for deixada sem definição ou for permitida, os usuários poderão ativar o HTTPS-Only Mode.
-      Se ela não for permitida, os usuários não poderão ativar o HTTPS-Only Mode.
-      Se esta configuração for definida como "force_enabled", o HTTPS-Only Mode será ativado e não vai poder ser desativado pelos usuários.
-      Na versão M112 e mais recentes, é possível forçar a ativação do HTTPS-Only Mode.</translation>
 <translation id="5017369989680827157">Se a política for definida como verdadeira ou não for definida, os usuários poderão controlar o preenchimento automático de endereços na IU.
 
       Se ela for definida como falsa, o preenchimento automático nunca fará sugestões ou preencherá informações de endereço nem salvará outros dados desse tipo que os usuários enviarem ao navegar na Web.</translation>
@@ -5453,6 +5448,7 @@
 <translation id="6049117606554031363">Ativar relatórios de status da placa do dispositivo</translation>
 <translation id="6050796253724099706">Ativar a resposta falada na tela de login</translation>
 <translation id="605132676434455096">Não permitir adição de novos perfis</translation>
+<translation id="6053260874233331700">Não permitir o acesso à geolocalização na tela de login.</translation>
 <translation id="6053681087509103368">Permitir que WebRTC use versões obsoletas do protocolo TLD/DTLS</translation>
 <translation id="6056517174496942473">Ativar o fluxo de atestado <ph name="CHROME_ENTERPRISE_DEVICE_TRUST_CONNECTOR" /> para uma lista de URLs</translation>
 <translation id="6058879286588763839">A menos que <ph name="DEVICE_ADVANCED_BATTERY_CHARGE_MODE_ENABLED_POLICY_NAME" /> seja especificada, o que substitui <ph name="DEVICE_BATTERY_CHARGE_MODE_POLICY_NAME" />, a definição de <ph name="DEVICE_BATTERY_CHARGE_MODE_POLICY_NAME" /> especifica a política de gerenciamento de energia para o modo de carregamento da bateria, se compatível com o dispositivo. Para prolongar a duração da bateria, a política controla de maneira dinâmica o carregamento da bateria minimizando o estresse e o desgaste.
@@ -7213,6 +7209,28 @@
 <translation id="759957074386651883">Configurações da política Safe Browsing</translation>
 <translation id="7602621823177962064">Desativar relatórios de informações da memória do dispositivo</translation>
 <translation id="7604169113182304895">Os apps Android podem optar voluntariamente por respeitar essa lista. Não é possível forçá-los a respeitá-la.</translation>
+<translation id="7605203688694672897">Defina o nível de acesso à geolocalização do dispositivo para o
+sistema <ph name="PRODUCT_OS_NAME" />, que entra
+em vigo antes de um usuário fazer login. Após o login, os usuários podem controlar o
+nível de acesso à geolocalização pela configuração individual.
+
+Se a política for definida como <ph name="ALLOW" /> ou deixada sem definição, o acesso à
+geolocalização na tela de login será permitido para os dispositivos gerenciados. Se um valor inválido da política for enviado,
+o acesso voltará para
+<ph name="DISALLOW" />. Para dispositivos não gerenciados, o valor é sempre
+<ph name="DISALLOW" />.
+
+AVISO: tenha cuidado ao mudar essa configuração, porque ela pode corromper outras políticas
+que envolvem a geolocalização
+(como <ph name="SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_POLICY" />).
+Se essa política for definida como <ph name="DISALLOW" />, as opções
+<ph name="POLICY_ENUM_SYSTEMTIMEZONEAUTOMATICDETECTION_TIMEZONEAUTOMATICDETECTIONSENDWIFIACCESSPOINTS" />
+e
+<ph name="POLICY_ENUM_SYSTEMTIMEZONEAUTOMATICDETECTION_TIMEZONEAUTOMATICDETECTIONSENDALLLOCATIONINFO" />
+da política
+<ph name="SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_POLICY" />
+vão falhar e usar na tela de <ph name="LOG_IN" /> apenas a
+resolução de localização baseada no <ph name="IP" />.</translation>
 <translation id="7608186022704392724">O recurso de envio automático do PIN muda a forma como ele é inserido no <ph name="PRODUCT_OS_NAME" />.
           Em vez de mostrar o mesmo campo de texto usado na entrada de senha, esse
           recurso apresenta uma IU especial que mostra claramente ao usuário quantos
@@ -8029,6 +8047,7 @@
       Se ela for desativada, uma caixa de diálogo não será aberta quando o usuário tenta sair.</translation>
 <translation id="830440838848984847">Permitir que usuários façam login no <ph name="PRODUCT_NAME" /></translation>
 <translation id="8306117673860983372">Configurações de login</translation>
+<translation id="8307340233340602723">Permitir ou negar acesso à geolocalização do dispositivo</translation>
 <translation id="830819203330820450">Se ativada ou não configurada (padrão), uma página da Web poderá usar
       APIs de compartilhamento de tela (por exemplo, getDisplayMedia() ou a API de extensão Desktop Capture)
       para pedir que o usuário selecione uma guia, janela ou área de trabalho para captura.
@@ -9041,6 +9060,7 @@
 <translation id="9213751049772256263">Desativar todas as variações</translation>
 <translation id="9217154963008402249">Frequência de pacotes de monitoramento de rede</translation>
 <translation id="9220314833408124365">Usar uma política de referenciador padrão de no-referrer-when-downgrade</translation>
+<translation id="9221827710437832530">Permitir acesso à geolocalização na tela de login.</translation>
 <translation id="922540222991413931">Configurar extensão, aplicativo e origens de instalação do script do usuário</translation>
 <translation id="924557436754151212">Importar senhas salvas do navegador padrão na primeira execução</translation>
 <translation id="926104720905645793">Esta política controla os relatórios de nuvem do <ph name="PRODUCT_NAME" />, que faz upload de informações sobre a operação do navegador para o <ph name="GOOGLE_ADMIN_CONSOLE_PRODUCT_NAME" />.

components/policy/resources/policy_templates_ru.xtb

diff --git a/components/policy/resources/policy_templates_ru.xtb b/components/policy/resources/policy_templates_ru.xtb
index fe177403..27157e19 100644
--- a/components/policy/resources/policy_templates_ru.xtb
+++ b/components/policy/resources/policy_templates_ru.xtb
@@ -4263,11 +4263,6 @@
 <translation id="4996161752665479028">Разрешить протокол SSH в системном приложении терминала</translation>
 <translation id="4997074784107449343">Параметр "Печатать как изображение" по умолчанию отключен в предварительном просмотре при печати PDF-документов.</translation>
 <translation id="500149597848135831">Включить все варианты</translation>
-<translation id="5014511262203433035">Это правило определяет, могут ли пользователи включать в настройках режим "Только HTTPS". Если этот режим активирован, используется только протокол HTTPS.
-      Если это правило не настроено или для него установлено значение Allowed, пользователи смогут включить режим "Только HTTPS".
-      Если установлено значение Disallowed, пользователи не смогут включить этот режим.
-      Если установлено значение Force_enabled, режим "Только HTTPS" активируется по умолчанию, и пользователи не могут его отключить.
-      Принудительное включение режима "Только HTTPS" поддерживается начиная с версии M112.</translation>
 <translation id="5017369989680827157">Если правило не настроено или задано значение True, пользователи смогут сами управлять автозаполнением адресов через интерфейс.
 
       Если задано значение False, функция автозаполнения никогда не будет предлагать вводить адреса. Кроме того, не будут сохраняться адреса, указываемые пользователями на веб-сайтах.</translation>
@@ -5355,6 +5350,7 @@
 <translation id="6049117606554031363">Включить отправку данных о статусе процессора устройства</translation>
 <translation id="6050796253724099706">Включить озвучивание текста на экране входа</translation>
 <translation id="605132676434455096">Запретить добавление новых профилей</translation>
+<translation id="6053260874233331700">Запрещать доступ к геолокации на странице входа</translation>
 <translation id="6053681087509103368">Разрешить WebRTC использовать устаревшие версии протоколов TLS и DTLS</translation>
 <translation id="6056517174496942473">Включить проверку <ph name="CHROME_ENTERPRISE_DEVICE_TRUST_CONNECTOR" /> для списка URL</translation>
 <translation id="6058879286588763839">Если правило <ph name="DEVICE_ADVANCED_BATTERY_CHARGE_MODE_ENABLED_POLICY_NAME" />, которое может переопределить <ph name="DEVICE_BATTERY_CHARGE_MODE_POLICY_NAME" />, не указано, то <ph name="DEVICE_BATTERY_CHARGE_MODE_POLICY_NAME" /> задает режимы зарядки батареи при условии, что они поддерживаются на устройстве. С помощью этого правила можно контролировать процесс зарядки, чтобы увеличить время работы от батареи и свести к минимуму ее износ.
@@ -7091,6 +7087,11 @@
 <translation id="759957074386651883">Настройки Безопасного просмотра</translation>
 <translation id="7602621823177962064">Отключить отправку данных о памяти устройства</translation>
 <translation id="7604169113182304895">Вы не можете принудить приложения Android соблюдать правила в отношении этого списка.</translation>
+<translation id="7605203688694672897">Настройте уровень доступа к геолокации устройства для <ph name="PRODUCT_OS_NAME" />, который будет применяться до входа пользователей. После входа пользователи самостоятельно смогут устанавливать уровень доступа к геолокации.
+
+Если правило не настроено или для него задано значение <ph name="ALLOW" />, на управляемых устройствах будет разрешен доступ к геолокации на экране входа. Если для правила установлено недопустимое значение, оно будет изменено на <ph name="DISALLOW" />. На неуправляемых устройствах для этого правила всегда задано значение <ph name="DISALLOW" />.
+
+Важно! Обратите внимание, что изменение значения этого параметра может повлиять на другие правила, связанные с геолокацией (например, <ph name="SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_POLICY" />). В частности, если для этого правила установить значение <ph name="DISALLOW" />, работа правила <ph name="SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_POLICY" />, для которого задано значение <ph name="POLICY_ENUM_SYSTEMTIMEZONEAUTOMATICDETECTION_TIMEZONEAUTOMATICDETECTIONSENDWIFIACCESSPOINTS" /> или <ph name="POLICY_ENUM_SYSTEMTIMEZONEAUTOMATICDETECTION_TIMEZONEAUTOMATICDETECTIONSENDALLLOCATIONINFO" />, будет нарушена, так как на экране "<ph name="LOG_IN" />" можно будет использовать только данные о местоположении, определенном по <ph name="IP" />-адресу.</translation>
 <translation id="7608186022704392724">С помощью функции автоматической отправки PIN-кодов можно изменить способ их ввода в <ph name="PRODUCT_OS_NAME" />.
           Вместо текстового поля, которое используется для ввода паролей,
           появится специальный интерфейс, в котором в явной форме указано, сколько
@@ -7894,6 +7895,7 @@
       Если правило отключено, при закрытии браузера пользователь не увидит диалоговое окно с предупреждением.</translation>
 <translation id="830440838848984847">Разрешить пользователям входить в <ph name="PRODUCT_NAME" /></translation>
 <translation id="8306117673860983372">Настройки входа</translation>
+<translation id="8307340233340602723">Разрешать или запрещать доступ к геолокации устройства</translation>
 <translation id="830819203330820450">Если правило включено или не настроено (это значение выбрано по умолчанию), веб-страница может использовать
       API, предназначенные для демонстрации экрана (например, getDisplayMedia() или Desktop Capture API),
       чтобы предложить пользователю выбрать вкладку, окно или рабочий стол, который нужно показать.
@@ -8890,6 +8892,7 @@
 <translation id="9213751049772256263">Отключить все варианты</translation>
 <translation id="9217154963008402249">Частота отправки сетевых пакетов</translation>
 <translation id="9220314833408124365">Использовать no-referrer-when-downgrade в качестве правила по умолчанию в отношении URL перехода</translation>
+<translation id="9221827710437832530">Разрешать доступ к геолокации на странице входа</translation>
 <translation id="922540222991413931">Настроить источники для установки расширений, приложений и пользовательских скриптов</translation>
 <translation id="924557436754151212">Импорт сохраненных паролей из браузера, используемого по умолчанию, при первом запуске</translation>
 <translation id="926104720905645793">Определяет, может ли <ph name="PRODUCT_NAME" /> загружать отчеты об операциях в браузере в <ph name="GOOGLE_ADMIN_CONSOLE_PRODUCT_NAME" />.

components/policy/resources/policy_templates_th.xtb

diff --git a/components/policy/resources/policy_templates_th.xtb b/components/policy/resources/policy_templates_th.xtb
index 25c963d..27576b23 100644
--- a/components/policy/resources/policy_templates_th.xtb
+++ b/components/policy/resources/policy_templates_th.xtb
@@ -4268,11 +4268,6 @@
 <translation id="4996161752665479028">เปิดใช้ SSH ในแอประบบเทอร์มินัล</translation>
 <translation id="4997074784107449343">ตัวเลือกการพิมพ์เป็นรูปภาพจะมีค่าเริ่มต้นเป็นไม่ได้ตั้งค่าสำหรับตัวอย่างก่อนพิมพ์เอกสาร PDF เมื่อพร้อมใช้งาน</translation>
 <translation id="500149597848135831">เปิดใช้รูปแบบทั้งหมด</translation>
-<translation id="5014511262203433035">นโยบายนี้ควบคุมว่าผู้ใช้เปิดใช้โหมด "HTTPS เท่านั้น" ในการตั้งค่าได้หรือไม่ โหมด "HTTPS เท่านั้น" จะอัปเกรดการนำทางทั้งหมดให้เป็นแบบ HTTPS
-      หากไม่ได้ตั้งค่านี้หรือตั้งค่าเป็น "อนุญาต" ผู้ใช้จะได้รับอนุญาตให้เปิดใช้โหมด "HTTPS เท่านั้น"
-      หากตั้งค่านี้เป็น "ไม่อนุญาต" ผู้ใช้จะไม่ได้รับอนุญาตให้เปิดใช้โหมด "HTTPS เท่านั้น"
-      หากตั้งค่านี้เป็น force_enabled ระบบจะเปิดใช้โหมด "HTTPS เท่านั้น" และผู้ใช้จะปิดใช้การตั้งค่านี้ไม่ได้
-      ระบบรองรับการบังคับให้เปิดใช้โหมด "HTTPS เท่านั้น" ในเวอร์ชัน M112 เป็นต้นไป</translation>
 <translation id="5017369989680827157">การตั้งค่านโยบายเป็น "จริง" หรือไม่ได้ตั้งค่าให้ผู้ใช้ควบคุมการป้อนที่อยู่อัตโนมัติใน UI ได้
 
       การตั้งค่านโยบายเป็น "เท็จ" หมายความว่าการป้อนข้อความอัตโนมัติจะไม่แนะนำหรือกรอกข้อมูลที่อยู่ และจะไม่บันทึกข้อมูลที่อยู่อื่นๆ ที่ผู้ใช้ส่งขณะท่องเว็บ</translation>
@@ -5347,6 +5342,7 @@
 <translation id="6049117606554031363">เปิดใช้การรายงานสถานะของบอร์ดอุปกรณ์</translation>
 <translation id="6050796253724099706">เปิดใช้ฟีเจอร์อธิบายและอ่านออกเสียงในหน้าจอการเข้าสู่ระบบ</translation>
 <translation id="605132676434455096">ไม่อนุญาตให้เพิ่มโปรไฟล์ใหม่</translation>
+<translation id="6053260874233331700">ไม่อนุญาตให้เข้าถึงตำแหน่งทางภูมิศาสตร์ในหน้าจอเข้าสู่ระบบ</translation>
 <translation id="6053681087509103368">อนุญาตให้ WebRTC ใช้โปรโตคอล TLS/DTLS เวอร์ชันที่ล้าสมัย</translation>
 <translation id="6056517174496942473">เปิดใช้โฟลว์เอกสารรับรองของ <ph name="CHROME_ENTERPRISE_DEVICE_TRUST_CONNECTOR" /> สำหรับรายการ URL</translation>
 <translation id="6058879286588763839">หากไม่ได้ระบุ <ph name="DEVICE_ADVANCED_BATTERY_CHARGE_MODE_ENABLED_POLICY_NAME" /> ไว้ (ถ้าระบุ จะเป็นการลบล้าง <ph name="DEVICE_BATTERY_CHARGE_MODE_POLICY_NAME" />) การตั้งค่า <ph name="DEVICE_BATTERY_CHARGE_MODE_POLICY_NAME" /> จะระบุนโยบายการจัดการพลังงานของโหมดการชาร์จแบตเตอรี่ (หากอุปกรณ์รองรับ) นโยบายจะควบคุมการชาร์จแบตเตอรี่แบบไดนามิกโดยลดความเค้นและการสึกหรอให้เหลือน้อยที่สุด ทั้งนี้เพื่อยืดอายุการใช้งานแบตเตอรี่
@@ -7069,6 +7065,11 @@
 <translation id="759957074386651883">การตั้งค่า Safe Browsing</translation>
 <translation id="7602621823177962064">ปิดใช้การรายงานข้อมูลหน่วยความจำของอุปกรณ์</translation>
 <translation id="7604169113182304895">แอป Android อาจเลือกใช้รายการด้วยความสมัครใจ คุณไม่สามารถบังคับแอปให้เลือกได้</translation>
+<translation id="7605203688694672897">ตั้งค่าระดับการเข้าถึงตำแหน่งทางภูมิศาสตร์ระดับอุปกรณ์สำหรับระบบ <ph name="PRODUCT_OS_NAME" /> ซึ่งมีผลก่อนที่ผู้ใช้จะลงชื่อเข้าใช้ หลังจากลงชื่อเข้าใช้ ผู้ใช้จะควบคุมระดับการเข้าถึงตำแหน่งทางภูมิศาสตร์ผ่านการตั้งค่าของผู้ใช้แต่ละรายได้
+
+หากไม่ได้ตั้งค่าหรือตั้งค่าเป็น <ph name="ALLOW" /> ระบบจะอนุญาตการเข้าถึงตำแหน่งทางภูมิศาสตร์ในหน้าจอเข้าสู่ระบบสำหรับอุปกรณ์ที่มีการจัดการ หากส่งค่านโยบายที่ไม่ถูกต้อง สิทธิ์เข้าถึงจะกลับไปเป็น <ph name="DISALLOW" /> สำหรับอุปกรณ์ที่ไม่มีการจัดการ สิทธิ์ดังกล่าวจะเป็น <ph name="DISALLOW" /> เสมอ
+
+คําเตือน: โปรดระมัดระวังเมื่อเปลี่ยนแปลงการตั้งค่านี้ เนื่องจากอาจละเมิดนโยบายอื่นๆ ที่เกี่ยวข้องกับตำแหน่งทางภูมิศาสตร์ (เช่น <ph name="SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_POLICY" />) กล่าวคือ หากตั้งค่านโยบายนี้เป็น <ph name="DISALLOW" /> ตัวเลือก <ph name="POLICY_ENUM_SYSTEMTIMEZONEAUTOMATICDETECTION_TIMEZONEAUTOMATICDETECTIONSENDWIFIACCESSPOINTS" /> และ <ph name="POLICY_ENUM_SYSTEMTIMEZONEAUTOMATICDETECTION_TIMEZONEAUTOMATICDETECTIONSENDALLLOCATIONINFO" /> ของนโยบาย <ph name="SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_POLICY" /> จะทำงานผิดปกติ และจะใช้ตำแหน่งที่อิงตาม <ph name="IP" /> ในหน้าจอ<ph name="LOG_IN" />เท่านั้น</translation>
 <translation id="7608186022704392724">ฟีเจอร์ส่ง PIN อัตโนมัติจะเปลี่ยนรูปแบบการป้อน PIN ใน "<ph name="PRODUCT_OS_NAME" />"
           ฟีเจอร์นี้จะแสดง UI พิเศษให้ผู้ใช้เห็นอย่างชัดเจนว่า PIN ต้องมีกี่หลัก แทนการแสดงช่องข้อความแบบเดียวกับที่ใช้ป้อนรหัสผ่าน ดังนั้นระบบจะจัดเก็บความยาว PIN ของผู้ใช้ไว้นอกข้อมูลที่เข้ารหัสของผู้ใช้ ใช้ได้เฉพาะ PIN ที่มีความยาวระหว่าง 6 ถึง 12 หลัก
 
@@ -7855,6 +7856,7 @@
       หากตั้งค่านโยบายนี้เป็น "ปิดใช้" กล่องคำเตือนจะไม่แสดงขึ้นมาเมื่อผู้ใช้พยายามออก</translation>
 <translation id="830440838848984847">อนุญาตให้ผู้ใช้ลงชื่อเข้าใช้ <ph name="PRODUCT_NAME" /></translation>
 <translation id="8306117673860983372">การตั้งค่าการลงชื่อเข้าใช้</translation>
+<translation id="8307340233340602723">อนุญาตหรือปฏิเสธการเข้าถึงตำแหน่งทางภูมิศาสตร์ของอุปกรณ์</translation>
 <translation id="830819203330820450">หากเปิดใช้หรือไม่ได้กำหนดค่า (ค่าเริ่มต้น) หน้าเว็บจะใช้ API การแชร์หน้าจอ (เช่น getDisplayMedia() หรือ API ส่วนขยายสำหรับการจับภาพเดสก์ท็อป) เพื่อแจ้งให้ผู้ใช้เลือกแท็บ หน้าต่าง หรือเดสก์ท็อปที่จะจับภาพได้
 
       เมื่อปิดใช้นโยบายนี้ การเรียกใช้ API การแชร์หน้าจอจะไม่สำเร็จและมีข้อความแสดงข้อผิดพลาด อย่างไรก็ตาม ระบบจะไม่พิจารณานโยบายนี้ (และเว็บไซต์จะได้รับอนุญาตให้ใช้ API การแชร์หน้าจอ) หากเว็บไซต์ตรงกับรูปแบบต้นทางในนโยบาย <ph name="SCREEN_CAPTURE_ALLOWED_BY_ORIGINS_POLICY_NAME" />, <ph name="WINDOW_CAPTURE_ALLOWED_BY_ORIGINS_POLICY_NAME" />, <ph name="TAB_CAPTURE_ALLOWED_BY_ORIGINS_POLICY_NAME" /> หรือ <ph name="SAME_ORIGIN_TAB_CAPTURE_ALLOWED_BY_ORIGINS_POLICY_NAME" />
@@ -8814,6 +8816,7 @@
 <translation id="9213751049772256263">ปิดใช้รูปแบบทั้งหมด</translation>
 <translation id="9217154963008402249">ความถี่ในการติดตามดูแพ็กเก็ตเครือข่าย</translation>
 <translation id="9220314833408124365">ใช้นโยบาย URL ที่มาเริ่มต้นเป็น "ไม่มี URL ที่มาเมื่อดาวน์เกรด"</translation>
+<translation id="9221827710437832530">อนุญาตให้เข้าถึงตำแหน่งทางภูมิศาสตร์ในหน้าจอเข้าสู่ระบบ</translation>
 <translation id="922540222991413931">กำหนดค่าส่วนขยาย แอปพลิเคชัน และแหล่งติดตั้งสคริปต์ของผู้ใช้</translation>
 <translation id="924557436754151212">นำเข้ารหัสผ่านที่บันทึกไว้จากเบราว์เซอร์เริ่มต้นในการเรียกใช้งานครั้งแรก</translation>
 <translation id="926104720905645793">นโยบายนี้ควบคุมการรายงานในระบบคลาวด์ของ <ph name="PRODUCT_NAME" /> ซึ่งอัปโหลดข้อมูลเกี่ยวกับการทำงานของเบราว์เซอร์ไปยัง <ph name="GOOGLE_ADMIN_CONSOLE_PRODUCT_NAME" />

components/policy/resources/policy_templates_tr.xtb

diff --git a/components/policy/resources/policy_templates_tr.xtb b/components/policy/resources/policy_templates_tr.xtb
index 0283070c..26a71486 100644
--- a/components/policy/resources/policy_templates_tr.xtb
+++ b/components/policy/resources/policy_templates_tr.xtb
@@ -4301,11 +4301,6 @@
 <translation id="4996161752665479028">Terminal Sistem Uygulaması'nda SSH'yi etkinleştir</translation>
 <translation id="4997074784107449343">Resim olarak yazdır, PDF dokümanların yazdırma önizlemelerinde kullanılabildiği durumlarda varsayılan olarak seçilmez.</translation>
 <translation id="500149597848135831">Tüm varyasyonları etkinleştirme</translation>
-<translation id="5014511262203433035">Bu politika, kullanıcıların Yalnızca HTTPS Modunu Ayarlar'da etkinleştirip etkinleştiremeyeceğini kontrol eder. Yalnızca HTTPS Modu, tüm gezinmeleri HTTPS'ye yükseltir.
-      Bu ayar belirtilmezse veya izin verildi olarak seçilirse kullanıcılar Yalnızca HTTPS Modunu etkinleştirebilir.
-      Bu ayar izin verilmedi olarak seçilirse kullanıcılar Yalnızca HTTPS Modunu etkinleştiremez.
-      Bu ayar, force_enabled değerine ayarlanırsa "yalnızca HTTPS modu" etkinleştirilir ve kullanıcılar bu modu devre dışı bırakamaz.
-      Yalnızca HTTPS modunu etkinleştirmeye zorla seçeneği, M112 ve sonraki sürümlerde desteklenir.</translation>
 <translation id="5017369989680827157">Politikayı True (Doğru) değerine ayarlamak veya ayarlamadan bırakmak, kullanıcı arayüzünde adresler için Otomatik doldurma kontrolünü kullanıcıya verir.
 
       Politikayı False (Yanlış) değerine ayarlamak, Otomatik doldurmanın hiçbir zaman öneride bulunmayacağı, adres bilgilerini doldurmayacağı ve kullanıcının web'e göz atarken gönderdiği ek adres bilgilerini kaydetmeyeceği anlamına gelir.</translation>

components/policy/resources/policy_templates_uk.xtb

diff --git a/components/policy/resources/policy_templates_uk.xtb b/components/policy/resources/policy_templates_uk.xtb
index 64070eb..5c8fbd6 100644
--- a/components/policy/resources/policy_templates_uk.xtb
+++ b/components/policy/resources/policy_templates_uk.xtb
@@ -4281,11 +4281,6 @@
 <translation id="4996161752665479028">Увімкнути SSH у системному додатку Термінал</translation>
 <translation id="4997074784107449343">Не налаштовувати опцію "Друкувати як зображення" за умовчанням для попереднього перегляду під час друку документів PDF (коли вона доступна).</translation>
 <translation id="500149597848135831">Увімкнути всі варіанти</translation>
-<translation id="5014511262203433035">Це правило визначає, чи можуть користувачі вмикати в налаштуваннях режим "Лише HTTPS". У цьому режимі весь трафік переходить на протокол HTTPS.
-      Якщо це правило не налаштувати або ввімкнути, користувачі зможуть вмикати режим "Лише HTTPS".
-      Якщо його вимкнено, користувачі не зможуть цього робити.
-      Якщо для цього правила вказати значення force_enabled, режим "Лише HTTPS" буде ввімкнено за умовчанням, і користувачі не зможуть його вимкнути.
-      Примусове ввімкнення режиму "Лише HTTPS" підтримується, починаючи з версії M112.</translation>
 <translation id="5017369989680827157">Якщо для цього правила вибрано значення True або його не налаштовано, користувачі можуть контролювати автозаповнення адрес в інтерфейсі.
 
       Якщо для нього вибрано значення False, функція автозаповнення не пропонуватиме та не вводитиме адресу, а також не зберігатиме додаткові дані про неї, які користувач вводить під час веб-перегляду.</translation>

components/policy/resources/policy_templates_vi.xtb

diff --git a/components/policy/resources/policy_templates_vi.xtb b/components/policy/resources/policy_templates_vi.xtb
index 197636b..0183551 100644
--- a/components/policy/resources/policy_templates_vi.xtb
+++ b/components/policy/resources/policy_templates_vi.xtb
@@ -4324,11 +4324,6 @@
 <translation id="4996161752665479028">Bật SSH trong Ứng dụng hệ thống thiết bị đầu cuối</translation>
 <translation id="4997074784107449343">Khi lựa chọn in dưới dạng hình ảnh có sẵn thì hệ thống sẽ không đặt lựa chọn này thành chế độ mặc định cho phần xem trước bản in của tài liệu PDF.</translation>
 <translation id="500149597848135831">Cho phép tất cả các biến</translation>
-<translation id="5014511262203433035">Chính sách này kiểm soát việc người dùng có thể bật chế độ Chỉ giao thức HTTPS trong phần Cài đặt hay không. Chế độ Chỉ giao thức HTTPS nâng mọi hình thức chuyển hướng lên giao thức HTTPS.
-      Nếu bạn không đặt chế độ cài đặt này hoặc đặt thành cho phép, thì người dùng sẽ được phép bật chế độ Chỉ giao thức HTTPS.
-      Nếu bạn đặt chế độ cài đặt này thành không cho phép, thì người dùng sẽ không được phép bật chế độ Chỉ giao thức HTTPS.
-      Nếu bạn đặt chế độ cài đặt này thành force_enabled (buộc bật), thì chế độ Chỉ giao thức HTTPS sẽ bật và người dùng sẽ không thể tắt chế độ này.
-      Tuỳ chọn buộc bật chế độ Chỉ giao thức HTTPS được hỗ trợ trên M112 trở đi.</translation>
 <translation id="5017369989680827157">Nếu bạn đặt chính sách này thành True hoặc không đặt chính sách này, thì người dùng sẽ có quyền kiểm soát tính năng Tự động điền cho địa chỉ trong giao diện người dùng.
 
       Nếu bạn đặt chính sách này thành False, thì tính năng Tự động điền sẽ không bao giờ gợi ý hoặc điền thông tin địa chỉ hay lưu thông tin địa chỉ bổ sung mà người dùng gửi trong khi duyệt web.</translation>

components/policy/resources/policy_templates_zh-CN.xtb

diff --git a/components/policy/resources/policy_templates_zh-CN.xtb b/components/policy/resources/policy_templates_zh-CN.xtb
index fc0a9e5..ab48045 100644
--- a/components/policy/resources/policy_templates_zh-CN.xtb
+++ b/components/policy/resources/policy_templates_zh-CN.xtb
@@ -4247,11 +4247,6 @@
 <translation id="4996161752665479028">启用终端系统应用中的 SSH</translation>
 <translation id="4997074784107449343">在 PDF 文档的打印预览中，“以图片形式打印”选项（若有）默认处于未选中状态。</translation>
 <translation id="500149597848135831">启用所有变体</translation>
-<translation id="5014511262203433035">此政策用于控制用户能否在“设置”中启用 HTTPS-Only 模式。HTTPS-Only 模式会将所有导航路径升级到 HTTPS。
-      如果此设置设为“allowed”或未配置，用户将能启用 HTTPS-Only 模式。
-      如果此设置设为“disallowed”，用户将无法启用 HTTPS-Only 模式。
-      如果此设置设为“force_enabled”，系统将会启用 HTTPS-Only 模式，且用户无法停用该模式。
-      从 M112 开始，系统支持强制启用 HTTPS-Only 模式。</translation>
 <translation id="5017369989680827157">如果此政策设为 True 或未设置，用户可以控制是否在界面中自动填充地址。
 
       如果此政策设为 False，“自动填充”功能一律不会建议或填充地址信息，也不会保存用户在浏览网页时提交的其他地址信息。</translation>
@@ -5326,6 +5321,7 @@
 <translation id="6049117606554031363">启用设备主板状态报告功能</translation>
 <translation id="6050796253724099706">为登录屏幕启用语音反馈</translation>
 <translation id="605132676434455096">禁止添加新的个人资料</translation>
+<translation id="6053260874233331700">禁止在登录屏幕上访问地理定位。</translation>
 <translation id="6053681087509103368">允许 WebRTC 使用已过时的 TLD/DTLS 协议版本</translation>
 <translation id="6056517174496942473">为一系列网址启用 <ph name="CHROME_ENTERPRISE_DEVICE_TRUST_CONNECTOR" /> 认证流程</translation>
 <translation id="6058879286588763839">您可以通过设置 <ph name="DEVICE_BATTERY_CHARGE_MODE_POLICY_NAME" /> 来指定电池充电模式电源管理政策（如果相应设备支持的话），除非指定了会覆盖 <ph name="DEVICE_BATTERY_CHARGE_MODE_POLICY_NAME" /> 的 <ph name="DEVICE_ADVANCED_BATTERY_CHARGE_MODE_ENABLED_POLICY_NAME" />。此政策会动态地控制电池充电，尽可能减少电池应力和损耗，从而延长电池寿命。
@@ -7048,6 +7044,12 @@
 <translation id="759957074386651883">安全浏览设置</translation>
 <translation id="7602621823177962064">停用设备内存信息报告功能</translation>
 <translation id="7604169113182304895">Android 应用可能会主动选择采纳该列表。您无法强制此类应用采纳该列表。</translation>
+<translation id="7605203688694672897">为 <ph name="PRODUCT_OS_NAME" /> 系统设置设备级地理定位访问权限级别。此设置在用户登录前有效。登录后，用户可以通过按用户进行的设置来控制地理定位访问权限级别。
+
+如果此政策未设置或设为 <ph name="ALLOW" />，受管设备将可以在登录屏幕上访问地理定位。如果发送的政策值无效，则访问权限会回退到 <ph name="DISALLOW" />。对于非受管设备，政策值始终为 <ph name="DISALLOW" />。
+
+警告：更改此设置时应小心谨慎，因为它可能会破坏其他与地理定位相关的政策（例如 <ph name="SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_POLICY" />）！
+具体而言，当此政策设置为 <ph name="DISALLOW" /> 时，<ph name="SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_POLICY" /> 政策的 <ph name="POLICY_ENUM_SYSTEMTIMEZONEAUTOMATICDETECTION_TIMEZONEAUTOMATICDETECTIONSENDWIFIACCESSPOINTS" /> 和 <ph name="POLICY_ENUM_SYSTEMTIMEZONEAUTOMATICDETECTION_TIMEZONEAUTOMATICDETECTIONSENDALLLOCATIONINFO" /> 选项将失效，在<ph name="LOG_IN" />屏幕上只能使用基于 <ph name="IP" /> 的位置解析方法。</translation>
 <translation id="7608186022704392724">PIN 码自动提交功能会更改 PIN 码在 <ph name="PRODUCT_OS_NAME" /> 中的输入方式。
           该功能会显示一个特殊界面以清楚地指明用户的 PIN 码需要包含的位数，而不会显示原本用于输入密码的文本字段。因此，用户的 PIN 码长度会存储在用户加密数据之外。仅支持长度介于 6-12 位数字的 PIN 码。
 
@@ -7832,6 +7834,7 @@
       如果此政策已停用，当用户尝试退出时，系统不会显示警告对话框。</translation>
 <translation id="830440838848984847">允许用户登录 <ph name="PRODUCT_NAME" /></translation>
 <translation id="8306117673860983372">登录设置</translation>
+<translation id="8307340233340602723">允许或拒绝设备访问地理定位信息</translation>
 <translation id="830819203330820450">如果此政策已启用或未配置（默认），网页可以使用屏幕共享 API（例如 getDisplayMedia() 或 Desktop Capture Extension API）提示用户选择要截取的标签页、窗口或桌面。
 
       如果此政策已停用，对屏幕共享 API 的所有调用都会失败并会返回错误；但在以下情况下，系统将不会考虑此政策（相应网站将能够使用屏幕共享 API）：该网站与 <ph name="SCREEN_CAPTURE_ALLOWED_BY_ORIGINS_POLICY_NAME" />、<ph name="WINDOW_CAPTURE_ALLOWED_BY_ORIGINS_POLICY_NAME" />、<ph name="TAB_CAPTURE_ALLOWED_BY_ORIGINS_POLICY_NAME" /> 或 <ph name="SAME_ORIGIN_TAB_CAPTURE_ALLOWED_BY_ORIGINS_POLICY_NAME" /> 政策中的来源格式匹配。
@@ -8792,6 +8795,7 @@
 <translation id="9213751049772256263">停用所有变体</translation>
 <translation id="9217154963008402249">发送监控网络数据包的频率</translation>
 <translation id="9220314833408124365">使用默认引荐来源网址政策值 no-referrer-when-downgrade</translation>
+<translation id="9221827710437832530">允许在登录屏幕上访问地理定位。</translation>
 <translation id="922540222991413931">配置扩展程序、应用和用户脚本安装源</translation>
 <translation id="924557436754151212">首次运行时，从默认浏览器导入保存的密码</translation>
 <translation id="926104720905645793">此政策旨在控制 <ph name="PRODUCT_NAME" /> 云报告功能，该功能可将与浏览器操作相关的信息上传到 <ph name="GOOGLE_ADMIN_CONSOLE_PRODUCT_NAME" />。

components/policy/resources/policy_templates_zh-TW.xtb

diff --git a/components/policy/resources/policy_templates_zh-TW.xtb b/components/policy/resources/policy_templates_zh-TW.xtb
index 1f1ae87..9ba0909 100644
--- a/components/policy/resources/policy_templates_zh-TW.xtb
+++ b/components/policy/resources/policy_templates_zh-TW.xtb
@@ -4223,11 +4223,6 @@
 <translation id="4996161752665479028">啟用 Terminal System App 中的 SSH</translation>
 <translation id="4997074784107449343">在 PDF 文件的列印預覽畫面中，「以圖片形式列印」不是預設選項 (如果有)。</translation>
 <translation id="500149597848135831">啟用所有變化版本</translation>
-<translation id="5014511262203433035">這項政策可控管使用者是否能夠在「設定」中啟用僅限 HTTPS 模式。此模式會禁止瀏覽僅支援 HTTP 的網站。
-      如果將這項政策設為允許或不設定，使用者將可啟用僅限 HTTPS 模式。
-      如果將這項政策設為禁止，使用者無法啟用僅限 HTTPS 模式。
-      如果將這項政策設為 force_enabled，系統會啟用現僅限 HTTPS 模式，而且使用者無法停用。
-      自 M112 版起，系統將支援強制啟用僅限 HTTPS 模式。</translation>
 <translation id="5017369989680827157">如果將這項政策設為 True 或不設定，使用者即可控制 UI 中的地址自動填入功能。
 
       如果將這項政策設為 False，自動填入功能一律不會建議或填入地址資訊，也不會在使用者瀏覽網頁時儲存其提交的其他地址資訊。</translation>

components/safe_browsing/core/browser/db/v4_get_hash_protocol_manager.cc

diff --git a/components/safe_browsing/core/browser/db/v4_get_hash_protocol_manager.cc b/components/safe_browsing/core/browser/db/v4_get_hash_protocol_manager.cc
index 0ea00a06..5739abc6 100644
--- a/components/safe_browsing/core/browser/db/v4_get_hash_protocol_manager.cc
+++ b/components/safe_browsing/core/browser/db/v4_get_hash_protocol_manager.cc
@@ -318,6 +318,8 @@
                            &prefixes_to_request, &cached_full_hash_infos,
                            mechanism_experiment_cache_selection);
 
+  base::UmaHistogramBoolean("SafeBrowsing.V4GetHash.CacheFullyHit",
+                            prefixes_to_request.empty());
   if (prefixes_to_request.empty()) {
     // 100% cache hits (positive or negative) so we can call the callback right
     // away.

components/signin/public/base/signin_metrics.h

diff --git a/components/signin/public/base/signin_metrics.h b/components/signin/public/base/signin_metrics.h
index 7747de1..1380cf6 100644
--- a/components/signin/public/base/signin_metrics.h
+++ b/components/signin/public/base/signin_metrics.h
@@ -52,7 +52,7 @@
   kForceSignoutAlwaysAllowedForTest = 11,
   // User cleared account cookies when there's no sync consent, which has caused
   // sign out.
-  kUserDeletedAccountCookies = 12,
+  // Deprecated (re-numbered in M114): kUserDeletedAccountCookies = 12,
   // Signout triggered by MobileIdentityConsistency rollback.
   // Deprecated: kMobileIdentityConsistencyRollback = 13,
   // Sign-out when the account id migration to Gaia ID did not finish,
@@ -81,9 +81,14 @@
   kGaiaCookieUpdated = 22,
   // Profile Signout during reconciliation.
   kAccountReconcilorReconcile = 23,
+  // Signin manager updates the unconsented primary account.
+  kSigninManagerUpdateUPA = 24,
+  // User cleared account cookies when there's no sync consent, which has caused
+  // sign out.
+  kUserDeletedAccountCookies = 25,
 
   // Keep this as the last enum.
-  kMaxValue = kAccountReconcilorReconcile
+  kMaxValue = kUserDeletedAccountCookies
 };
 
 // Enum values used for use with "AutoLogin.Reverse" histograms.

components/strings/components_strings_bs.xtb

diff --git a/components/strings/components_strings_bs.xtb b/components/strings/components_strings_bs.xtb
index 38e38a4d..ec26d5f8 100644
--- a/components/strings/components_strings_bs.xtb
+++ b/components/strings/components_strings_bs.xtb
@@ -730,6 +730,7 @@
 <translation id="2718207025093645426">Upravljani korisnik ili uređaj nema učitana pravila.</translation>
 <translation id="2721148159707890343">Zahtjev je uspio</translation>
 <translation id="2723669454293168317">Pokrenite sigurnosnu provjeru u postavkama Chromea</translation>
+<translation id="2725492561136085792">Pritisnite Enter da aktivirate radnju.</translation>
 <translation id="2726001110728089263">Bočna ladica</translation>
 <translation id="2728127805433021124">Certifikat servera je potpisan korištenjem slabog algoritma za potpisivanje.</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />Pokrenuti dijagnostiku povezivosti<ph name="END_LINK" /></translation>
@@ -826,6 +827,7 @@
 <translation id="299990983510665749">Hatchback vozila</translation>
 <translation id="3002501248619246229">Provjerite medije na ulaznoj ladici</translation>
 <translation id="3005723025932146533">Prikaži sačuvanu kopiju</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" />, pritisnite Tab da pregledate dostupne radnje, a zatim pritisnite Enter da izvršite odabranu radnju.</translation>
 <translation id="3013291976881901233">MIDI uređaji</translation>
 <translation id="301521992641321250">Automatski blokirano</translation>
 <translation id="3016780570757425217">Poznavanje vaše lokacije</translation>
@@ -1985,6 +1987,7 @@
 <translation id="5872692522325383488">IBAN je sačuvan</translation>
 <translation id="5873013647450402046">Vaša banka želi potvrditi vaš identitet.</translation>
 <translation id="5877831137320480913">Ljepota i fitnes</translation>
+<translation id="5879989559903563723">Nije dozvoljeno u Načinu rada za gosta</translation>
 <translation id="5884465125445718607">Koverta Chinese #6</translation>
 <translation id="5887400589839399685">Kartica je sačuvana</translation>
 <translation id="5887687176710214216">Posljednji put je posjećeno jučer</translation>
@@ -3226,6 +3229,7 @@
 <translation id="8949493680961858543">A1x4</translation>
 <translation id="8951415078585015151">Zakon i uprava</translation>
 <translation id="8957210676456822347">Postupak odobrenja na zaštitnom portalu</translation>
+<translation id="8959282183248574156"><ph name="NICKNAME_COUNT" />/<ph name="NICKNAME_MAX" /></translation>
 <translation id="8963117664422609631">Idite u postavke web lokacije</translation>
 <translation id="8963213021028234748"><ph name="MARKUP_1" />Prijedlozi:<ph name="MARKUP_2" />Provjerite imate li vezu za prijenos podataka<ph name="MARKUP_3" />Ponovo učitajte ovu stranicu kasnije<ph name="MARKUP_4" />Provjerite unesenu adresu<ph name="MARKUP_5" /></translation>
 <translation id="8968766641738584599">Sačuvaj karticu</translation>

components/strings/components_strings_cy.xtb

diff --git a/components/strings/components_strings_cy.xtb b/components/strings/components_strings_cy.xtb
index 2fe94f8..9cd1584 100644
--- a/components/strings/components_strings_cy.xtb
+++ b/components/strings/components_strings_cy.xtb
@@ -730,6 +730,7 @@
 <translation id="2718207025093645426">Nid oes gan ddefnyddiwr neu ddyfais a reolir unrhyw bolisi wedi'i lwytho.</translation>
 <translation id="2721148159707890343">Roedd y cais yn llwyddiannus</translation>
 <translation id="2723669454293168317">Rhedeg gwiriad diogelwch yng ngosodiadau Chrome</translation>
+<translation id="2725492561136085792">Pwyswch Enter i weithredu'r weithred hon.</translation>
 <translation id="2726001110728089263">Hambwrdd Ochr</translation>
 <translation id="2728127805433021124">Llofnodir tystysgrif gweinyddwr gan ddefnyddio algorithm llofnodi gwan.</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />Wrthi'n Rhedeg Diagnosteg Cysylltedd<ph name="END_LINK" /></translation>
@@ -826,6 +827,7 @@
 <translation id="299990983510665749">Car cefn codi</translation>
 <translation id="3002501248619246229">Gwiriwch y cyfryngau hambwrdd mewnbwn</translation>
 <translation id="3005723025932146533">Dangos y copi sydd wedi'i gadw</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" />, pwyswch Tab i bori'r gweithredoedd sydd ar gael, yna Enter i weithredu'r weithred a ddewiswyd.</translation>
 <translation id="3013291976881901233">Dyfeisiau MIDI</translation>
 <translation id="301521992641321250">Rhwystrwyd yn awtomatig</translation>
 <translation id="3016780570757425217">Gwybod eich lleoliad</translation>

components/strings/components_strings_de.xtb

diff --git a/components/strings/components_strings_de.xtb b/components/strings/components_strings_de.xtb
index 8e26329..988a4c57 100644
--- a/components/strings/components_strings_de.xtb
+++ b/components/strings/components_strings_de.xtb
@@ -1983,6 +1983,7 @@
 <translation id="5872692522325383488">IBAN gespeichert</translation>
 <translation id="5873013647450402046">Deine Bank muss deine Identität bestätigen.</translation>
 <translation id="5877831137320480913">Schönheit und Fitness</translation>
+<translation id="5879989559903563723">Im Gastmodus nicht zulässig</translation>
 <translation id="5884465125445718607">Umschlag Chinesisch Nr. 6</translation>
 <translation id="5887400589839399685">Karte gespeichert</translation>
 <translation id="5887687176710214216">Gestern zuletzt besucht</translation>
@@ -3225,6 +3226,7 @@
 <translation id="8949493680961858543">A1x4</translation>
 <translation id="8951415078585015151">Recht und Behörden</translation>
 <translation id="8957210676456822347">Erfassungsportal-Autorisierung</translation>
+<translation id="8959282183248574156"><ph name="NICKNAME_COUNT" />/<ph name="NICKNAME_MAX" /></translation>
 <translation id="8963117664422609631">Website-Einstellungen aufrufen</translation>
 <translation id="8963213021028234748"><ph name="MARKUP_1" />Vorschläge:<ph name="MARKUP_2" />Vergewissere dich, dass du über eine Datenverbindung verfügst.<ph name="MARKUP_3" />Lade diese Webseite später neu.<ph name="MARKUP_4" />Überprüfe die von dir eingegebene Adresse.<ph name="MARKUP_5" /></translation>
 <translation id="8968766641738584599">Karte speichern</translation>

components/strings/components_strings_en-GB.xtb

diff --git a/components/strings/components_strings_en-GB.xtb b/components/strings/components_strings_en-GB.xtb
index b8aa2ea..31d80f54 100644
--- a/components/strings/components_strings_en-GB.xtb
+++ b/components/strings/components_strings_en-GB.xtb
@@ -730,6 +730,7 @@
 <translation id="2718207025093645426">Managed user or device does not have a policy loaded.</translation>
 <translation id="2721148159707890343">Request succeeded</translation>
 <translation id="2723669454293168317">Run a safety check in Chrome settings</translation>
+<translation id="2725492561136085792">Press Enter to activate this action.</translation>
 <translation id="2726001110728089263">Side tray</translation>
 <translation id="2728127805433021124">Server's certificate is signed using a weak signature algorithm.</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />Running Connectivity Diagnostics<ph name="END_LINK" /></translation>
@@ -826,6 +827,7 @@
 <translation id="299990983510665749">Hatchbacks</translation>
 <translation id="3002501248619246229">Check input tray media</translation>
 <translation id="3005723025932146533">Show saved copy</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" />, press Tab to browse available actions, then Enter to execute selected action.</translation>
 <translation id="3013291976881901233">MIDI devices</translation>
 <translation id="301521992641321250">Automatically blocked</translation>
 <translation id="3016780570757425217">Know your location</translation>

components/strings/components_strings_fi.xtb

diff --git a/components/strings/components_strings_fi.xtb b/components/strings/components_strings_fi.xtb
index c5fa7e8..ab53d5d 100644
--- a/components/strings/components_strings_fi.xtb
+++ b/components/strings/components_strings_fi.xtb
@@ -730,6 +730,7 @@
 <translation id="2718207025093645426">Hallinnoidulla käyttäjällä tai laitteella ei ole ladattua käytäntöä.</translation>
 <translation id="2721148159707890343">Pyyntö onnistui</translation>
 <translation id="2723669454293168317">Tee turvatarkistus Chromen asetuksissa</translation>
+<translation id="2725492561136085792">Aktivoi toiminto painamalla Enter.</translation>
 <translation id="2726001110728089263">Sivulokero</translation>
 <translation id="2728127805433021124">Palvelimen varmenne on allekirjoitettu heikolla allekirjoitusalgoritmilla.</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />yhteysdiagnostiikkaa<ph name="END_LINK" /></translation>
@@ -826,6 +827,7 @@
 <translation id="299990983510665749">Viistoperät</translation>
 <translation id="3002501248619246229">Tarkista syöttölokeron media</translation>
 <translation id="3005723025932146533">Näytä tallennettu kopio</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" />, selaa käytettävissä olevia toimintoja painamalla sarkainta ja suorita valittu toiminto painamalla Enter.</translation>
 <translation id="3013291976881901233">MIDI-laitteet</translation>
 <translation id="301521992641321250">Estetty automaattisesti</translation>
 <translation id="3016780570757425217">Saada sijaintisi selville.</translation>

components/strings/components_strings_fr.xtb

diff --git a/components/strings/components_strings_fr.xtb b/components/strings/components_strings_fr.xtb
index 1c48ecc..b5bf5b8 100644
--- a/components/strings/components_strings_fr.xtb
+++ b/components/strings/components_strings_fr.xtb
@@ -1287,13 +1287,13 @@
 <translation id="4173827307318847180">{MORE_ITEMS,plural, =1{<ph name="ITEM_COUNT" /> élément supplémentaire}one{<ph name="ITEM_COUNT" /> élément supplémentaire}other{<ph name="ITEM_COUNT" /> éléments supplémentaires}}</translation>
 <translation id="4176463684765177261">Désactivé</translation>
 <translation id="4176535426287761656">Propriétés de villégiature et multipropriété</translation>
-<translation id="4177501066905053472">Thèmes publicitaires</translation>
+<translation id="4177501066905053472">Thèmes des annonces</translation>
 <translation id="4179515394835346607"><ph name="ROW_NAME" /> <ph name="ROW_CONTENT" /></translation>
 <translation id="4186035307311647330">Ne plus suivre le prix</translation>
 <translation id="4194250254487269611">Impossible d'enregistrer votre carte pour le moment</translation>
 <translation id="4195643157523330669">Ouvrir dans un nouvel onglet</translation>
 <translation id="4196861286325780578">&amp;Rétablir le déplacement</translation>
-<translation id="4202218894997543208">Thèmes bloqués</translation>
+<translation id="4202218894997543208">Thèmes que vous avez bloqués</translation>
 <translation id="4202554117186904723">5e rouleau</translation>
 <translation id="4203769790323223880">Appareil photo non autorisé</translation>
 <translation id="4203896806696719780"><ph name="BEGIN_LINK" />Vérifier les configurations du pare-feu et de l'antivirus<ph name="END_LINK" /></translation>
@@ -1390,7 +1390,7 @@
 <translation id="437040971055499437">Un événement lié à la sécurité se produit</translation>
 <translation id="4371591986692297148">Inactive</translation>
 <translation id="4372948949327679948">Valeur attendue : <ph name="VALUE_TYPE" />.</translation>
-<translation id="4375864595697821259">Débloquez un thème si vous souhaitez qu'il fasse partie de ceux que Chrome peut choisir pour estimer vos centres d'intérêt</translation>
+<translation id="4375864595697821259">Ajoutez de nouveau un thème si vous souhaitez qu'il fasse partie de ceux que Chrome peut choisir pour estimer vos centres d'intérêt</translation>
 <translation id="4377125064752653719">Vous avez tenté d'accéder à <ph name="DOMAIN" />, mais le certificat présenté par le serveur a été révoqué par son émetteur. Cela signifie que le certificat présenté par le serveur ne doit pas être approuvé. Il est donc possible que vous communiquiez avec un pirate informatique.</translation>
 <translation id="4378154925671717803">Téléphone</translation>
 <translation id="4384395682990721132">A4x3</translation>
@@ -2207,7 +2207,7 @@
 <translation id="6429267199680088961">A4 Tab</translation>
 <translation id="643051589346665201">Changer de mot de passe Google</translation>
 <translation id="6431119592588449664">Le rapport est importé</translation>
-<translation id="6432297414176614592">En savoir plus sur les thèmes publicitaires</translation>
+<translation id="6432297414176614592">En savoir plus sur les thèmes des annonces</translation>
 <translation id="6433490469411711332">Modifier les coordonnées</translation>
 <translation id="6433595998831338502"><ph name="HOST_NAME" /> n'autorise pas la connexion.</translation>
 <translation id="6433797564277305076">Confirmez vos cartes plus rapidement en utilisant le déverrouillage de l'appareil</translation>
@@ -3075,7 +3075,7 @@
 <translation id="8533619373899488139">Pour consulter la liste des URL bloquées et des autres règles définies par votre administrateur système, rendez-vous sur &lt;strong&gt;chrome://policy&lt;/strong&gt;.</translation>
 <translation id="8539500321752640291">Accorder les deux autorisations ?</translation>
 <translation id="8541158209346794904">Appareil Bluetooth</translation>
-<translation id="8541410041357371550">Ce site obtient vos thèmes publicitaires via Chrome pour vous présenter des annonces plus pertinentes</translation>
+<translation id="8541410041357371550">Ce site obtient vos thèmes d'annonces auprès de Chrome pour vous présenter des annonces plus pertinentes</translation>
 <translation id="8542014550340843547">Triple agrafe en bas</translation>
 <translation id="8542617028204211143">SRA0</translation>
 <translation id="8543181531796978784">Vous pouvez <ph name="BEGIN_ERROR_LINK" />signaler un problème de détection<ph name="END_ERROR_LINK" />. Si vous avez compris les risques auxquels vous vous exposez, vous pouvez <ph name="BEGIN_LINK" />consulter ce site dangereux<ph name="END_LINK" />.</translation>

components/strings/components_strings_hr.xtb

diff --git a/components/strings/components_strings_hr.xtb b/components/strings/components_strings_hr.xtb
index e5faa86..cb100643 100644
--- a/components/strings/components_strings_hr.xtb
+++ b/components/strings/components_strings_hr.xtb
@@ -730,6 +730,7 @@
 <translation id="2718207025093645426">Upravljani korisnik ili uređaj nema učitano pravilo.</translation>
 <translation id="2721148159707890343">Zahtjev je uspio</translation>
 <translation id="2723669454293168317">Izvršite sigurnosnu provjeru u postavkama Chromea</translation>
+<translation id="2725492561136085792">Pritisnite Enter da biste aktivirali ovu radnju.</translation>
 <translation id="2726001110728089263">Bočna ladica</translation>
 <translation id="2728127805433021124">Certifikat poslužitelja potpisan je slabim algoritmom potpisa.</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />pokrenuti Dijagnostiku povezivosti<ph name="END_LINK" /></translation>
@@ -826,6 +827,7 @@
 <translation id="299990983510665749">Monovolumenska vozila</translation>
 <translation id="3002501248619246229">Provjera medija ladice za ulaganje</translation>
 <translation id="3005723025932146533">Prikaži spremljenu kopiju</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" />, pritisnite Tab da biste pregledali dostupne radnje, a zatim Enter da biste izvršili odabranu radnju.</translation>
 <translation id="3013291976881901233">MIDI uređaji</translation>
 <translation id="301521992641321250">Automatski blokirano</translation>
 <translation id="3016780570757425217">znati vašu lokaciju</translation>
@@ -1984,6 +1986,7 @@
 <translation id="5872692522325383488">IBAN je spremljen</translation>
 <translation id="5873013647450402046">Vaša banka želi potvrditi vaš identitet.</translation>
 <translation id="5877831137320480913">Ljepota i fitness</translation>
+<translation id="5879989559903563723">Nije dopušteno u načinu rada za goste</translation>
 <translation id="5884465125445718607">Kineska omotnica br. 6</translation>
 <translation id="5887400589839399685">Kartica je spremljena</translation>
 <translation id="5887687176710214216">Posljednji posjet bio je jučer</translation>
@@ -3226,6 +3229,7 @@
 <translation id="8949493680961858543">A1x4</translation>
 <translation id="8951415078585015151">Pravo i vlada</translation>
 <translation id="8957210676456822347">Autorizacija obaveznog portala za autentifikaciju</translation>
+<translation id="8959282183248574156"><ph name="NICKNAME_COUNT" />/<ph name="NICKNAME_MAX" /></translation>
 <translation id="8963117664422609631">Otvorite postavke web-lokacije</translation>
 <translation id="8963213021028234748"><ph name="MARKUP_1" />Prijedlozi:<ph name="MARKUP_2" />Provjerite imate li podatkovnu vezu.<ph name="MARKUP_3" />Ponovo učitajte web-stranicu kasnije.<ph name="MARKUP_4" />Provjerite adresu koju ste unijeli.<ph name="MARKUP_5" /></translation>
 <translation id="8968766641738584599">Spremanje kartice</translation>

components/strings/components_strings_is.xtb

diff --git a/components/strings/components_strings_is.xtb b/components/strings/components_strings_is.xtb
index ccce953..40f0bba 100644
--- a/components/strings/components_strings_is.xtb
+++ b/components/strings/components_strings_is.xtb
@@ -730,6 +730,7 @@
 <translation id="2718207025093645426">Engin regla er virk fyrir notanda eða tæki sem er stýrt.</translation>
 <translation id="2721148159707890343">Beiðni tókst</translation>
 <translation id="2723669454293168317">Keyra öryggisathugun í stillingum Chrome</translation>
+<translation id="2725492561136085792">Ýttu á Enter til að virkja aðgerðina.</translation>
 <translation id="2726001110728089263">Hliðarbakki</translation>
 <translation id="2728127805433021124">Vottorð þjónsins er undirritað með ótraustu undirritunarreikniriti.</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />Keyrir greiningu á tengigetu<ph name="END_LINK" /></translation>
@@ -826,6 +827,7 @@
 <translation id="299990983510665749">Hlaðbakar</translation>
 <translation id="3002501248619246229">Athuga miðil í innbakka</translation>
 <translation id="3005723025932146533">Sýna vistað afrit</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" />, ýttu á dálkalykilinn til að skoða hvaða aðgerðir eru í boði og síðan á Enter til að framkvæma valda aðgerð.</translation>
 <translation id="3013291976881901233">MIDI-tæki</translation>
 <translation id="301521992641321250">Sjálfkrafa lokað á</translation>
 <translation id="3016780570757425217">Komast að staðsetningunni þinni</translation>

components/strings/components_strings_it.xtb

diff --git a/components/strings/components_strings_it.xtb b/components/strings/components_strings_it.xtb
index 625b89d4..8d181df 100644
--- a/components/strings/components_strings_it.xtb
+++ b/components/strings/components_strings_it.xtb
@@ -730,6 +730,7 @@
 <translation id="2718207025093645426">L'utente o dispositivo gestito non ha criteri caricati.</translation>
 <translation id="2721148159707890343">Richiesta riuscita</translation>
 <translation id="2723669454293168317">Esegui un controllo di sicurezza nelle impostazioni di Chrome</translation>
+<translation id="2725492561136085792">Premi Invio per attivare questa azione.</translation>
 <translation id="2726001110728089263">Vassoio laterale</translation>
 <translation id="2728127805433021124">Il certificato del server è stato firmato utilizzando un algoritmo di firma debole.</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />Eseguire lo strumento Diagnostica della connettività<ph name="END_LINK" /></translation>
@@ -826,6 +827,7 @@
 <translation id="299990983510665749">Due volumi</translation>
 <translation id="3002501248619246229">Controlla contenuti multimediali cassetto di input</translation>
 <translation id="3005723025932146533">Mostra copia salvata</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" />, premi Tab per sfogliare le azioni disponibili, quindi Invio per eseguire l'azione selezionata.</translation>
 <translation id="3013291976881901233">Dispositivi MIDI</translation>
 <translation id="301521992641321250">Bloccata automaticamente</translation>
 <translation id="3016780570757425217">Conoscere la tua posizione</translation>
@@ -1982,6 +1984,7 @@
 <translation id="5872692522325383488">IBAN salvato</translation>
 <translation id="5873013647450402046">La tua banca vuole confermare la tua identità.</translation>
 <translation id="5877831137320480913">Bellezza e fitness</translation>
+<translation id="5879989559903563723">Autorizzazione non consentita in modalità Ospite</translation>
 <translation id="5884465125445718607">Busta Chinese #6</translation>
 <translation id="5887400589839399685">Carta salvata</translation>
 <translation id="5887687176710214216">Ultima visita: ieri</translation>
@@ -3223,6 +3226,7 @@
 <translation id="8949493680961858543">A1x4</translation>
 <translation id="8951415078585015151">Diritto e pubblica amministrazione</translation>
 <translation id="8957210676456822347">Autorizzazione Captive Portal</translation>
+<translation id="8959282183248574156"><ph name="NICKNAME_COUNT" />/<ph name="NICKNAME_MAX" /></translation>
 <translation id="8963117664422609631">Vai alle Impostazioni sito</translation>
 <translation id="8963213021028234748"><ph name="MARKUP_1" />Suggerimenti.<ph name="MARKUP_2" />Assicurati di avere una connessione dati<ph name="MARKUP_3" />Ricarica la pagina web in un secondo momento<ph name="MARKUP_4" />Controlla l'indirizzo inserito<ph name="MARKUP_5" /></translation>
 <translation id="8968766641738584599">Salva carta</translation>

components/strings/components_strings_ja.xtb

diff --git a/components/strings/components_strings_ja.xtb b/components/strings/components_strings_ja.xtb
index c40c05f..6da56d9 100644
--- a/components/strings/components_strings_ja.xtb
+++ b/components/strings/components_strings_ja.xtb
@@ -2791,7 +2791,7 @@
 <translation id="7800977246388195491">Chrome では、ユーザーの最近の閲覧履歴に基づいて興味 / 関心のあるトピックが記録されます。また、アクセスしたサイトによりユーザーの好みが特定される場合もあります。その後、パーソナライズド広告を表示するために、このような情報をサイトから求められることがあります。広告を表示するために使用するトピックやサイトは選択できます。</translation>
 <translation id="7802523362929240268">正規のサイトです</translation>
 <translation id="7802989406998618639">カード発行会社による本人確認のため、<ph name="SIDE_OF_CARD" />に記載されている <ph name="NUMBER_OF_DIGITS" /> 桁のセキュリティ コードを入力してください</translation>
-<translation id="780301667611848630">いいえ、結構です</translation>
+<translation id="780301667611848630">同意しない</translation>
 <translation id="7805768142964895445">ステータス</translation>
 <translation id="7812922009395017822">Mir</translation>
 <translation id="7813600968533626083">Chrome から候補を削除してもよろしいですか？</translation>
@@ -2802,7 +2802,7 @@
 <translation id="7840103971441592723">スクリーン キャプチャを開始しました</translation>
 <translation id="7844689747373518809">{COUNT,plural, =0{なし}=1{1 個のアプリ（<ph name="EXAMPLE_APP_1" />）}=2{2 個のアプリ（<ph name="EXAMPLE_APP_1" />、<ph name="EXAMPLE_APP_2" />）}other{# 個のアプリ（<ph name="EXAMPLE_APP_1" />、<ph name="EXAMPLE_APP_2" />、<ph name="AND_MORE" />）}}</translation>
 <translation id="7855695075675558090"><ph name="TOTAL_LABEL" /> <ph name="FORMATTED_TOTAL_AMOUNT" /> <ph name="CURRENCY_CODE" /></translation>
-<translation id="7857116075376571629">その後にアクセスしたサイトは、表示する広告をカスタマイズするためのトピックを Chrome に要求できます。Chrome では、共有するトピックを 3 つまでにして、閲覧履歴と個人情報を保護します。</translation>
+<translation id="7857116075376571629">その後にアクセスしたサイトは、表示する広告をパーソナライズするためのトピックを Chrome に要求できます。Chrome では、共有するトピックを 3 つまでにして、閲覧履歴と個人情報を保護します。</translation>
 <translation id="7860345425589240791">新しい有効期限と <ph name="SIDE_OF_CARD" /> に記載されている CVC を入力してください</translation>
 <translation id="7862185352068345852">このサイトを離れますか？</translation>
 <translation id="7865448901209910068">最高速度</translation>

components/strings/components_strings_ka.xtb

diff --git a/components/strings/components_strings_ka.xtb b/components/strings/components_strings_ka.xtb
index a876181e..1bfd55ab 100644
--- a/components/strings/components_strings_ka.xtb
+++ b/components/strings/components_strings_ka.xtb
@@ -730,6 +730,7 @@
 <translation id="2718207025093645426">წესები არ ჩატვირთულა მართული მომხმარებლისთვის ან მოწყობილობისთვის.</translation>
 <translation id="2721148159707890343">მოთხოვნა წარმატებით განხორციელდა</translation>
 <translation id="2723669454293168317">გაუშვით უსაფრთხოების შემოწმება Chrome-ის პარამეტრებიდან</translation>
+<translation id="2725492561136085792">ამ მოქმედების გასააქტიურებლად დააჭირეთ Enter-ს.</translation>
 <translation id="2726001110728089263">გვერდითი ლანგარი</translation>
 <translation id="2728127805433021124">სერვერის სერტიფიკატი ხელმოწერილია სუსტი ხელმოწერის ალგორითმის გამოყენებით.</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />კავშირის დიაგნოსტიკის ხელსაწყოს გაშვება<ph name="END_LINK" /></translation>
@@ -826,6 +827,7 @@
 <translation id="299990983510665749">ჰეტჩბეკები</translation>
 <translation id="3002501248619246229">შეამოწმეთ შეყვანის ლანგრის მედია</translation>
 <translation id="3005723025932146533">შენახული ასლის ჩვენება</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" />, ხელმისაწვდომი ქმედებების გასაცნობად დააჭირეთ კლავიშს „Tab“, არჩეული ქმედების შესასრულებლად დააჭირეთ Enter-ს.</translation>
 <translation id="3013291976881901233">MIDI მოწყობილობები</translation>
 <translation id="301521992641321250">დაბლოკილია ავტომატურად</translation>
 <translation id="3016780570757425217">თქვენი მდებარეობის ცოდნა</translation>

components/strings/components_strings_km.xtb

diff --git a/components/strings/components_strings_km.xtb b/components/strings/components_strings_km.xtb
index db3da12f..70a62375 100644
--- a/components/strings/components_strings_km.xtb
+++ b/components/strings/components_strings_km.xtb
@@ -733,6 +733,7 @@
 <translation id="2718207025093645426">អ្នកប្រើប្រាស់ ឬឧបករណ៍ដែលស្ថិតក្រោមការគ្រប់គ្រងមិនបានផ្ទុកគោលការណ៍ទេ។</translation>
 <translation id="2721148159707890343">សំណើរបានជោគជ័យ</translation>
 <translation id="2723669454293168317">ដំណើរការ​ការពិនិត្យ​សុវត្ថិភាព​នៅក្នុងការកំណត់ Chrome</translation>
+<translation id="2725492561136085792">ចុច Enter ដើម្បី​បើក​ដំណើរការ​សកម្មភាព​នេះ។</translation>
 <translation id="2726001110728089263">ទម្រចំហៀង</translation>
 <translation id="2728127805433021124">វិញ្ញាបនប័ត្រម៉ាស៊ីនមេត្រូវបានចុះហេត្ថលេខាដោយប្រើនីតិវិធីដោះស្រាយហត្ថលេខាខ្សោយ។</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />កំពុងដំណើរការការវិភាគការតភ្ជាប់<ph name="END_LINK" /></translation>
@@ -829,6 +830,7 @@
 <translation id="299990983510665749">រថយន្ត​ប្រភេទ Hatchback</translation>
 <translation id="3002501248619246229">ពិនិត្យមើល​មេឌៀនៃទម្រ​ធាតុបញ្ចូល</translation>
 <translation id="3005723025932146533">បង្ហាញច្បាប់ចម្លងដែលបានរក្សាទុក</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" /> ចុច Tab ដើម្បី​រុករក​សកម្មភាព​ដែលអាចធ្វើបាន រួច​ចុច Enter ដើម្បី​​ប្រតិបត្តិ​​សកម្មភាព​ដែល​បាន​ជ្រើសរើស។</translation>
 <translation id="3013291976881901233">ឧបករណ៍ MIDI</translation>
 <translation id="301521992641321250">បាន​ទប់ស្កាត់ដោយ​ស្វ័យ​ប្រវត្តិ</translation>
 <translation id="3016780570757425217">ដឹងពីទីតាំងរបស់អ្នក</translation>
@@ -1989,6 +1991,7 @@
 <translation id="5872692522325383488">បាន​រក្សាទុក IBAN</translation>
 <translation id="5873013647450402046">ធនាគារ​របស់អ្នក​ចង់បញ្ជាក់ថា ពិតជាអ្នក។</translation>
 <translation id="5877831137320480913">សម្រស់ និង​សម្បទា</translation>
+<translation id="5879989559903563723">មិន​ត្រូវ​បាន​អនុញ្ញាត​នៅ​ក្នុង​មុខងារភ្ញៀវ​ទេ</translation>
 <translation id="5884465125445718607">ស្រោមសំបុត្រចិន #6</translation>
 <translation id="5887400589839399685">បានរក្សាទុក​កាត</translation>
 <translation id="5887687176710214216">បានចូលមើល​លើកចុងក្រោយ​កាលពីម្សិលមិញ</translation>
@@ -3232,6 +3235,7 @@
 <translation id="8949493680961858543">A1x4</translation>
 <translation id="8951415078585015151">ច្បាប់ និង​រដ្ឋាភិបាល</translation>
 <translation id="8957210676456822347">ការអនុញ្ញាតច្រកចូលគ្រប់គ្រង</translation>
+<translation id="8959282183248574156"><ph name="NICKNAME_COUNT" />/<ph name="NICKNAME_MAX" /></translation>
 <translation id="8963117664422609631">ចូលទៅកាន់​ការកំណត់​គេហទំព័រ</translation>
 <translation id="8963213021028234748"><ph name="MARKUP_1" />ការផ្តល់យោបល់៖<ph name="MARKUP_2" />សូមប្រាកដថាអ្នកមានការតភ្ជាប់ទិន្នន័យ<ph name="MARKUP_3" />ដំណើរការគេហទំព័រនេះឡើងវិញនៅពេលក្រោយ<ph name="MARKUP_4" />ពិនិត្យមើលអាសយដ្ឋានដែលអ្នកបានបញ្ជូល<ph name="MARKUP_5" /></translation>
 <translation id="8968766641738584599">រក្សាទុក​បណ្ណ</translation>

components/strings/components_strings_kn.xtb

diff --git a/components/strings/components_strings_kn.xtb b/components/strings/components_strings_kn.xtb
index e0306b1..d8b04bc4 100644
--- a/components/strings/components_strings_kn.xtb
+++ b/components/strings/components_strings_kn.xtb
@@ -730,6 +730,7 @@
 <translation id="2718207025093645426">ನಿರ್ವಹಿಸಲಾದ ಬಳಕೆದಾರರು ಅಥವಾ ಸಾಧನಕ್ಕಾಗಿ ಯಾವುದೇ ನೀತಿಯನ್ನು ಲೋಡ್ ಮಾಡಲಾಗಿಲ್ಲ.</translation>
 <translation id="2721148159707890343">ವಿನಂತಿಯನ್ನು ಯಶಸ್ವಿಗೊಳಿಸಲಾಗಿದೆ</translation>
 <translation id="2723669454293168317">Chrome ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಸುರಕ್ಷತೆಯ ಪರಿಶೀಲನೆಯನ್ನು ರನ್ ಮಾಡಿ</translation>
+<translation id="2725492561136085792">ಈ ಕ್ರಿಯೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು Enter ಕೀ ಒತ್ತಿರಿ.</translation>
 <translation id="2726001110728089263">ಪಕ್ಕದ ಟ್ರೇ</translation>
 <translation id="2728127805433021124">ಕ್ಷೀಣವಾದ ಸಹಿ ಅಲ್ಗಾರಿದಮ್ ಬಳಸಿಕೊಂಡು ಸರ್ವರ್‌ನ ಪ್ರಮಾಣಪತ್ರಕ್ಕೆ ಸಹಿ ಮಾಡಲಾಗಿದೆ.</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />ಸಂಪರ್ಕ ಡಯಾಗ್ನಾಸ್ಟಿಕ್ಸ್‌ ರನ್ ಆಗುತ್ತಿದೆ<ph name="END_LINK" /></translation>
@@ -826,6 +827,7 @@
 <translation id="299990983510665749">ಹ್ಯಾಚ್‌ಬ್ಯಾಕ್‌ಗಳು</translation>
 <translation id="3002501248619246229">ಇನ್‌ಪುಟ್ ಟ್ರೇ ಮೀಡಿಯಾವನ್ನು ಪರಿಶೀಲಿಸಿ</translation>
 <translation id="3005723025932146533">ಉಳಿಸಲಾದ ನಕಲನ್ನು ತೋರಿಸು</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" />, ಲಭ್ಯವಿರುವ ಕ್ರಿಯೆಗಳನ್ನು ಬ್ರೌಸ್ ಮಾಡಲು ಟ್ಯಾಬ್ ಕೀ ಒತ್ತಿರಿ, ನಂತರ ಆಯ್ಕೆಮಾಡಿದ ಕ್ರಿಯೆಯನ್ನು ಕಾರ್ಯಗತಗೊಳಿಸಲು Enter ಕೀ ಒತ್ತಿರಿ.</translation>
 <translation id="3013291976881901233">MIDI ಸಾಧನಗಳು</translation>
 <translation id="301521992641321250">ಸ್ವಯಂಚಾಲಿತವಾಗಿ ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ</translation>
 <translation id="3016780570757425217">ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ತಿಳಿದುಕೊಳ್ಳಿ</translation>
@@ -1982,6 +1984,7 @@
 <translation id="5872692522325383488">IBAN ಅನ್ನು ಉಳಿಸಲಾಗಿದೆ</translation>
 <translation id="5873013647450402046">ಇದು ನೀವೇ ಎಂದು ದೃಢೀಕರಿಸಲು ನಿಮ್ಮ ಬ್ಯಾಂಕ್ ಬಯಸುತ್ತದೆ.</translation>
 <translation id="5877831137320480913">ಸೌಂದರ್ಯ ಮತ್ತು ಫಿಟ್‌ನೆಸ್</translation>
+<translation id="5879989559903563723">ಅತಿಥಿ ಮೋಡ್‌ನಲ್ಲಿ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ</translation>
 <translation id="5884465125445718607">ಎನ್ವಲಪ್ ಚೈನೀಸ್ #6</translation>
 <translation id="5887400589839399685">ಕಾರ್ಡ್ ಉಳಿಸಲಾಗಿದೆ</translation>
 <translation id="5887687176710214216">ಕೊನೆಯದಾಗಿ ನಿನ್ನೆ ಭೇಟಿ ನೀಡಲಾಗಿದೆ</translation>
@@ -3223,6 +3226,7 @@
 <translation id="8949493680961858543">A1x4</translation>
 <translation id="8951415078585015151">ಕಾನೂನು ಮತ್ತು ಸರ್ಕಾರ</translation>
 <translation id="8957210676456822347">ಕ್ಯಾಪ್ಟಿವ್ ಪೋರ್ಟಲ್ ದೃಢೀಕರಣ</translation>
+<translation id="8959282183248574156"><ph name="NICKNAME_COUNT" />/<ph name="NICKNAME_MAX" /></translation>
 <translation id="8963117664422609631">ಸೈಟ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಹೋಗಿ</translation>
 <translation id="8963213021028234748"><ph name="MARKUP_1" />ಸಲಹೆಗಳು:<ph name="MARKUP_2" />ನೀವು ಡೇಟಾ ಸಂಪರ್ಕ ಹೊಂದಿರುವಿರಾ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ<ph name="MARKUP_3" />ಈ ವೆಬ್ ಪುಟವನ್ನು ನಂತರ ಮರುಲೋಡ್ ಮಾಡಿ<ph name="MARKUP_4" />ನೀವು ನಮೂದಿಸಿದ ವಿಳಾಸವನ್ನು ಪರಿಶೀಲಿಸಿ<ph name="MARKUP_5" /></translation>
 <translation id="8968766641738584599">ಕಾರ್ಡ್‌ ಉಳಿಸಿ</translation>

components/strings/components_strings_lo.xtb

diff --git a/components/strings/components_strings_lo.xtb b/components/strings/components_strings_lo.xtb
index c9263de..223b5be 100644
--- a/components/strings/components_strings_lo.xtb
+++ b/components/strings/components_strings_lo.xtb
@@ -1987,6 +1987,7 @@
 <translation id="5872692522325383488">ບັນທຶກ IBAN ແລ້ວ</translation>
 <translation id="5873013647450402046">ທະນາຄານຂອງທ່ານຕ້ອງການຢືນຢັນວ່າແມ່ນທ່ານແທ້.</translation>
 <translation id="5877831137320480913">ສຸຂະພາບ ແລະ ຄວາມງາມ</translation>
+<translation id="5879989559903563723">ບໍ່ອະນຸຍາດໃນໂໝດແຂກ</translation>
 <translation id="5884465125445718607">Envelope Chinese #6</translation>
 <translation id="5887400589839399685">ບັນທຶກບັດໄວ້ແລ້ວ</translation>
 <translation id="5887687176710214216">ເຂົ້າເບິ່ງຫຼ້າສຸດມື້ວານນີ້</translation>
@@ -3228,6 +3229,7 @@
 <translation id="8949493680961858543">A1x4</translation>
 <translation id="8951415078585015151">ກົດໝາຍ ແລະ ລັດຖະບານ</translation>
 <translation id="8957210676456822347">ການ​ໃຫ້​ສິດ​ທາງ​ເຂົ້າ​ຈັບ​ໜ້າ​ຈໍ</translation>
+<translation id="8959282183248574156"><ph name="NICKNAME_COUNT" />/<ph name="NICKNAME_MAX" /></translation>
 <translation id="8963117664422609631">ໄປຫາການຕັ້ງຄ່າເວັບໄຊ</translation>
 <translation id="8963213021028234748"><ph name="MARKUP_1" />ຄຳ​ແນະ​ນຳ:<ph name="MARKUP_2" />ເບິ່ງ​ໃຫ້​ແນ່​ໃຈ​ວ່າ ທ່ານ​ມີ​ການ​ເຊື່ອມ​ຕໍ່​ຂໍ້​ມູນ​ຖືກ​ຕ້ອງ​ແລ້ວ<ph name="MARKUP_3" />ໂຫຼຼດ​ໜ້າ​ເວັບ​ນີ້​ພາຍ​ຫຼັງ<ph name="MARKUP_4" />ກວດ​ເບິ່ງ​ທີ່​ຢູ່​ທີ່​ທ່ານ​ປ້ອນ​ເຂົ້າ​<ph name="MARKUP_5" /></translation>
 <translation id="8968766641738584599">ບັນທຶກບັດໄວ້</translation>

components/strings/components_strings_ml.xtb

diff --git a/components/strings/components_strings_ml.xtb b/components/strings/components_strings_ml.xtb
index 36849a72..741b368 100644
--- a/components/strings/components_strings_ml.xtb
+++ b/components/strings/components_strings_ml.xtb
@@ -730,6 +730,7 @@
 <translation id="2718207025093645426">മാനേജ് ചെയ്യുന്ന ഉപയോക്താവ് അല്ലെങ്കിൽ ഉപകരണത്തിൽ നയമൊന്നും ലോഡ് ചെയ്‌തിട്ടില്ല.</translation>
 <translation id="2721148159707890343">അഭ്യർത്ഥന വിജയിച്ചു</translation>
 <translation id="2723669454293168317">Chrome ക്രമീകരണത്തിൽ സുരക്ഷാ പരിശോധന റൺ ചെയ്യുക</translation>
+<translation id="2725492561136085792">ഈ പ്രവർത്തനം സജീവമാക്കുന്നതിന് Enter അമർത്തുക.</translation>
 <translation id="2726001110728089263">വശത്തുള്ള ട്രേ</translation>
 <translation id="2728127805433021124">ഒരു ദുർബ്ബല സിഗ്‌നേച്ചർ ആൽഗരിതം ഉപയോഗിച്ച് സെർവറിന്റെ സർട്ടിഫിക്കറ്റ് സൈൻ ചെയ്‌തു.</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />കണക്‌റ്റിവിറ്റി ഡയഗണോസ്‌റ്റിക്‌സ് റൺ ചെയ്യുന്നു<ph name="END_LINK" /></translation>
@@ -826,6 +827,7 @@
 <translation id="299990983510665749">ഹാച്ച്ബാക്കുകൾ</translation>
 <translation id="3002501248619246229">ഇൻപുട്ട് ട്രേ മീഡിയ പരിശോധിക്കുക</translation>
 <translation id="3005723025932146533">സംരക്ഷിച്ച പകർപ്പ് കാണിക്കുക</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" />, ലഭ്യമായ പ്രവർത്തനങ്ങൾ ബ്രൗസ് ചെയ്യാൻ ടാബ് അമർത്തുക, തുടർന്ന് തിരഞ്ഞെടുത്ത പ്രവർത്തനം നടപ്പിലാക്കാൻ Enter അമർത്തുക.</translation>
 <translation id="3013291976881901233">MIDI ഉപകരണങ്ങൾ</translation>
 <translation id="301521992641321250">സ്വയമേവ ബ്ലോക്കുചെയ്‌തു</translation>
 <translation id="3016780570757425217">നിങ്ങളുടെ ലൊക്കേഷൻ അറിയുക</translation>

components/strings/components_strings_mr.xtb

diff --git a/components/strings/components_strings_mr.xtb b/components/strings/components_strings_mr.xtb
index 1d696170..b03a895 100644
--- a/components/strings/components_strings_mr.xtb
+++ b/components/strings/components_strings_mr.xtb
@@ -730,6 +730,7 @@
 <translation id="2718207025093645426">व्यावस्थापित केलेला वापरकर्ता किंवा डिव्हाइसवर कोणतेही धोरण लोड केलेले नाही.</translation>
 <translation id="2721148159707890343">विनंती यशस्वी</translation>
 <translation id="2723669454293168317">Chrome सेटिंग्जमध्ये सुरक्षितता तपासणी रन करा</translation>
+<translation id="2725492561136085792">ही कृती ॲक्टिव्हेट करण्यासाठी एंटर प्रेस करा.</translation>
 <translation id="2726001110728089263">बाजूचा ट्रे</translation>
 <translation id="2728127805433021124">एक कमकुवत स्वाक्षरी अल्गोरिदम वापरून सर्व्हरचे सर्टिफिकेट साइन केले आहे.</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />कनेक्टिव्हिटी निदान चालविणे<ph name="END_LINK" /></translation>
@@ -826,6 +827,7 @@
 <translation id="299990983510665749">हॅचबॅक</translation>
 <translation id="3002501248619246229">इनपुट ट्रे मीडिया तपासा</translation>
 <translation id="3005723025932146533">सेव्ह केलेली प्रत दर्शवा</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" />, उपलब्ध असलेल्या कृती ब्राउझ करण्यासाठी टॅब प्रेस करा, त्यानंतर निवडलेली कृती अमलात आणण्यासाठी एंटर प्रेस करा.</translation>
 <translation id="3013291976881901233">MIDI डिव्हाइस</translation>
 <translation id="301521992641321250">आपोआप ब्लॉक केलेले</translation>
 <translation id="3016780570757425217">तुमचे स्थान जाणून घ्या</translation>

components/strings/components_strings_my.xtb

diff --git a/components/strings/components_strings_my.xtb b/components/strings/components_strings_my.xtb
index eb24aab..acec8a3fb0 100644
--- a/components/strings/components_strings_my.xtb
+++ b/components/strings/components_strings_my.xtb
@@ -735,6 +735,7 @@
 <translation id="2718207025093645426">ကြီးကြပ်ထားသော အသုံးပြုသူ (သို့) စက်တွင် မူဝါဒ ထည့်မထားပါ။</translation>
 <translation id="2721148159707890343">တောင်းဆိုချက် အောင်မြင်ပါသည်</translation>
 <translation id="2723669454293168317">Chrome ဆက်တင်များတွင် လုံခြုံရေး စစ်ဆေးမှု လုပ်ဆောင်ပါ</translation>
+<translation id="2725492561136085792">ဤလုပ်ဆောင်ချက်ဖွင့်ရန် Enter နှိပ်ပါ။</translation>
 <translation id="2726001110728089263">ဘေးဗန်း</translation>
 <translation id="2728127805433021124">ဆာဗာ၏ လက်မှတ်ကို အားနည်းသည့် လက်မှတ် အယ်လ်ဂိုရီသမ်ကို သုံးပြီး ထိုးထားသည်။</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />ချိတ်ဆက်မှုဆိုင်ရာ ပြဿနာရှာဖွေမှု ပြုလုပ်ပါ<ph name="END_LINK" /></translation>
@@ -831,6 +832,7 @@
 <translation id="299990983510665749">နောက်ဖုံးဖွင့်ကားများ</translation>
 <translation id="3002501248619246229">ထည့်သွင်းသည့်ဗန်းရှိ မီဒီယာကို စစ်ဆေးပါ</translation>
 <translation id="3005723025932146533">သိမ်းထားသည့် မိတ္တူကိုပြပါ</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" />၊ ရနိုင်သောလုပ်ဆောင်ချက်များ ကြည့်ရန် ‘တဘ်’ ကိုနှိပ်ပြီး ရွေးထားသောလုပ်ဆောင်ချက်ကို ဆောင်ရွက်ရန် Enter နှိပ်ပါ။</translation>
 <translation id="3013291976881901233">MIDI စက်ပစ္စည်းများ</translation>
 <translation id="301521992641321250">အလိုအလျောက် ပိတ်ထားသည်</translation>
 <translation id="3016780570757425217">သင့်တည်နေရာအား သိလို၏</translation>

components/strings/components_strings_nl.xtb

diff --git a/components/strings/components_strings_nl.xtb b/components/strings/components_strings_nl.xtb
index 7847d81..db30a66 100644
--- a/components/strings/components_strings_nl.xtb
+++ b/components/strings/components_strings_nl.xtb
@@ -730,6 +730,7 @@
 <translation id="2718207025093645426">Er is geen beleid geladen voor een beheerde gebruiker of beheerd apparaat.</translation>
 <translation id="2721148159707890343">Verzoek geslaagd</translation>
 <translation id="2723669454293168317">Voer een veiligheidscheck uit in de Chrome-instellingen</translation>
+<translation id="2725492561136085792">Druk op Enter om deze actie te activeren.</translation>
 <translation id="2726001110728089263">Zijlade</translation>
 <translation id="2728127805433021124">Het certificaat van de server is ondertekend met een zwak ondertekeningsalgoritme.</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />Verbindingsdiagnose uitvoeren<ph name="END_LINK" /></translation>
@@ -826,6 +827,7 @@
 <translation id="299990983510665749">Hatchbacks</translation>
 <translation id="3002501248619246229">Materiaal in de invoerlade controleren</translation>
 <translation id="3005723025932146533">Opgeslagen kopie bekijken</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" />, druk op Tab om door de beschikbare acties te browsen en op Enter om de geselecteerde actie uit te voeren.</translation>
 <translation id="3013291976881901233">MIDI-apparaten</translation>
 <translation id="301521992641321250">Automatisch geblokkeerd</translation>
 <translation id="3016780570757425217">Je locatie weten</translation>
@@ -1980,6 +1982,7 @@
 <translation id="5872692522325383488">IBAN opgeslagen</translation>
 <translation id="5873013647450402046">Je bank wil bevestigen dat jij het bent.</translation>
 <translation id="5877831137320480913">Beauty en fitness</translation>
+<translation id="5879989559903563723">Niet toegestaan in gastmodus</translation>
 <translation id="5884465125445718607">Envelop Chinees #6</translation>
 <translation id="5887400589839399685">Pas opgeslagen</translation>
 <translation id="5887687176710214216">Laatst bezocht: gisteren</translation>
@@ -3220,6 +3223,7 @@
 <translation id="8949493680961858543">A1x4</translation>
 <translation id="8951415078585015151">Wetgeving en overheid</translation>
 <translation id="8957210676456822347">Autorisatie van captive portal</translation>
+<translation id="8959282183248574156"><ph name="NICKNAME_COUNT" />/<ph name="NICKNAME_MAX" /></translation>
 <translation id="8963117664422609631">Naar de site-instellingen</translation>
 <translation id="8963213021028234748"><ph name="MARKUP_1" />Suggesties:<ph name="MARKUP_2" />Controleer of er een gegevensverbinding beschikbaar is<ph name="MARKUP_3" />Laad deze pagina later opnieuw<ph name="MARKUP_4" />Controleer het adres dat je hebt opgegeven<ph name="MARKUP_5" /></translation>
 <translation id="8968766641738584599">Pas opslaan</translation>

components/strings/components_strings_no.xtb

diff --git a/components/strings/components_strings_no.xtb b/components/strings/components_strings_no.xtb
index 087815c38..feea15a 100644
--- a/components/strings/components_strings_no.xtb
+++ b/components/strings/components_strings_no.xtb
@@ -730,6 +730,7 @@
 <translation id="2718207025093645426">Ingen regel er lastet inn for enheten eller den administrerte brukeren.</translation>
 <translation id="2721148159707890343">Forespørselen var vellykket</translation>
 <translation id="2723669454293168317">Kjør en sikkerhetssjekk i Chrome-innstillingene</translation>
+<translation id="2725492561136085792">Trykk på Enter for å aktivere denne handlingen.</translation>
 <translation id="2726001110728089263">Sideskuff</translation>
 <translation id="2728127805433021124">Tjenerens sertifikat er signert med en usikker signaturalgoritme.</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />Kjør Tilkoblingsdiagnostikk<ph name="END_LINK" /></translation>
@@ -826,6 +827,7 @@
 <translation id="299990983510665749">Kombikupeer</translation>
 <translation id="3002501248619246229">Sjekk inndataskuffmedier</translation>
 <translation id="3005723025932146533">Vis lagret kopi</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" /> – trykk på Tab for å bla gjennom tilgjengelige handlinger, og trykk deretter på Enter for å utføre den valgte handlingen.</translation>
 <translation id="3013291976881901233">MIDI-enheter</translation>
 <translation id="301521992641321250">Automatisk blokkert</translation>
 <translation id="3016780570757425217">vite hvor du er</translation>

components/strings/components_strings_pl.xtb

diff --git a/components/strings/components_strings_pl.xtb b/components/strings/components_strings_pl.xtb
index 91af41c..b720e5f 100644
--- a/components/strings/components_strings_pl.xtb
+++ b/components/strings/components_strings_pl.xtb
@@ -730,6 +730,7 @@
 <translation id="2718207025093645426">Zarządzany użytkownik lub zarządzane urządzenie nie ma wczytanych zasad.</translation>
 <translation id="2721148159707890343">Żądanie wykonane pomyślnie</translation>
 <translation id="2723669454293168317">Uruchom kontrolę zabezpieczeń w ustawieniach Chrome</translation>
+<translation id="2725492561136085792">Aby aktywować to działanie, naciśnij Enter.</translation>
 <translation id="2726001110728089263">Taca boczna</translation>
 <translation id="2728127805433021124">Certyfikat serwera został podpisany przy użyciu słabego algorytmu podpisu.</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />Uruchomienie diagnostyki połączeń<ph name="END_LINK" /></translation>
@@ -826,6 +827,7 @@
 <translation id="299990983510665749">Hatchbacki</translation>
 <translation id="3002501248619246229">Sprawdź nośnik na tacy wejściowej</translation>
 <translation id="3005723025932146533">Pokaż zapisaną kopię</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" />; naciśnij Tab, aby przejrzeć dostępne działania, a potem Enter, aby wykonać wybraną czynność.</translation>
 <translation id="3013291976881901233">Urządzenia MIDI</translation>
 <translation id="301521992641321250">Automatycznie zablokowane</translation>
 <translation id="3016780570757425217">Sprawdzanie Twojej lokalizacji</translation>
@@ -1985,6 +1987,7 @@
 <translation id="5872692522325383488">Numer IBAN został zapisany</translation>
 <translation id="5873013647450402046">Bank chce potwierdzić Twoją tożsamość.</translation>
 <translation id="5877831137320480913">Uroda i fitness</translation>
+<translation id="5879989559903563723">Niedozwolone w trybie gościa</translation>
 <translation id="5884465125445718607">Koperta chińska nr 6</translation>
 <translation id="5887400589839399685">Zapisano kartę</translation>
 <translation id="5887687176710214216">Ostatnio używana wczoraj</translation>
@@ -3226,6 +3229,7 @@
 <translation id="8949493680961858543">A1x4</translation>
 <translation id="8951415078585015151">Prawo i administracja</translation>
 <translation id="8957210676456822347">Autoryzacja portalu przechwytującego</translation>
+<translation id="8959282183248574156"><ph name="NICKNAME_COUNT" />/<ph name="NICKNAME_MAX" /></translation>
 <translation id="8963117664422609631">Otwórz ustawienia witryny</translation>
 <translation id="8963213021028234748"><ph name="MARKUP_1" />Sugestie:<ph name="MARKUP_2" />Upewnij się, że działa połączenie transmisji danych.<ph name="MARKUP_3" />Załaduj tę stronę ponownie później.<ph name="MARKUP_4" />Sprawdź wpisany adres.<ph name="MARKUP_5" /></translation>
 <translation id="8968766641738584599">Zapisz kartę</translation>

components/strings/components_strings_pt-BR.xtb

diff --git a/components/strings/components_strings_pt-BR.xtb b/components/strings/components_strings_pt-BR.xtb
index 7a63fe0..5622e0b83 100644
--- a/components/strings/components_strings_pt-BR.xtb
+++ b/components/strings/components_strings_pt-BR.xtb
@@ -1985,6 +1985,7 @@
 <translation id="5872692522325383488">IBAN salvo</translation>
 <translation id="5873013647450402046">O banco precisa confirmar sua identidade.</translation>
 <translation id="5877831137320480913">Beleza e fitness</translation>
+<translation id="5879989559903563723">Não permitido no modo convidado</translation>
 <translation id="5884465125445718607">Envelope chinês 6</translation>
 <translation id="5887400589839399685">Cartão salvo</translation>
 <translation id="5887687176710214216">Última visita: ontem</translation>
@@ -3227,6 +3228,7 @@
 <translation id="8949493680961858543">A1x4</translation>
 <translation id="8951415078585015151">Leis e governo</translation>
 <translation id="8957210676456822347">Autorização de portal cativo</translation>
+<translation id="8959282183248574156"><ph name="NICKNAME_COUNT" />/<ph name="NICKNAME_MAX" /></translation>
 <translation id="8963117664422609631">Acessar configurações do site</translation>
 <translation id="8963213021028234748"><ph name="MARKUP_1" />Sugestões:<ph name="MARKUP_2" />certifique-se de que você tenha uma conexão de dados<ph name="MARKUP_3" />atualize esta página da Web mais tarde<ph name="MARKUP_4" />verifique o endereço que digitou<ph name="MARKUP_5" /></translation>
 <translation id="8968766641738584599">Salvar cartão</translation>

components/strings/components_strings_ru.xtb

diff --git a/components/strings/components_strings_ru.xtb b/components/strings/components_strings_ru.xtb
index e0a9d5f..f97526d 100644
--- a/components/strings/components_strings_ru.xtb
+++ b/components/strings/components_strings_ru.xtb
@@ -1389,7 +1389,7 @@
 <translation id="437040971055499437">Зарегистрировано событие безопасности</translation>
 <translation id="4371591986692297148">неактивно</translation>
 <translation id="4372948949327679948">Ожидаемое значение: <ph name="VALUE_TYPE" />.</translation>
-<translation id="4375864595697821259">Вы можете снова добавить тему в список, который Chrome использует, когда вычисляет ваши интересы.</translation>
+<translation id="4375864595697821259">Вы можете снова добавить тему в список, который Chrome использует для определения ваших интересов.</translation>
 <translation id="4377125064752653719">Вы попытались перейти на сайт <ph name="DOMAIN" />, однако сертификат, предоставленный сервером, был отозван издателем. Это означает, что учетные данные безопасности, предоставленные сервером, не заслуживают доверия. Возможно, вы имеете дело со злоумышленниками.</translation>
 <translation id="4378154925671717803">Телефон</translation>
 <translation id="4384395682990721132">A4x3</translation>
@@ -1984,6 +1984,7 @@
 <translation id="5872692522325383488">Код IBAN сохранен</translation>
 <translation id="5873013647450402046">Банку нужно убедиться, что это действительно вы.</translation>
 <translation id="5877831137320480913">Красота и фитнес</translation>
+<translation id="5879989559903563723">Недоступно в гостевом режиме</translation>
 <translation id="5884465125445718607">Конверт Chinese 6</translation>
 <translation id="5887400589839399685">Карта сохранена</translation>
 <translation id="5887687176710214216">Последнее посещение: вчера</translation>
@@ -3073,7 +3074,7 @@
 <translation id="8533619373899488139">Чтобы посмотреть список заблокированных URL и узнать, какие ещё правила заданы системным администратором, перейдите на страницу &lt;strong&gt;chrome://policy&lt;/strong&gt;.</translation>
 <translation id="8539500321752640291">Предоставить два разрешения?</translation>
 <translation id="8541158209346794904">Устройство Bluetooth</translation>
-<translation id="8541410041357371550">Этот сайт использует темы рекламы из Chrome, чтобы показывать вам более подходящие объявления</translation>
+<translation id="8541410041357371550">Этот сайт использует темы из Chrome, чтобы показывать вам более подходящую рекламу</translation>
 <translation id="8542014550340843547">Три скобы внизу</translation>
 <translation id="8542617028204211143">SRA0</translation>
 <translation id="8543181531796978784"><ph name="BEGIN_ERROR_LINK" />Сообщите о зараженном сайте<ph name="END_ERROR_LINK" />. Если вы готовы подвергнуть риску личные данные, то можете <ph name="BEGIN_LINK" />перейти на страницу<ph name="END_LINK" />.</translation>
@@ -3225,6 +3226,7 @@
 <translation id="8949493680961858543">A1x4</translation>
 <translation id="8951415078585015151">Закон и право</translation>
 <translation id="8957210676456822347">Авторизация через адаптивный портал</translation>
+<translation id="8959282183248574156"><ph name="NICKNAME_COUNT" />/<ph name="NICKNAME_MAX" /></translation>
 <translation id="8963117664422609631">Перейти в настройки сайта</translation>
 <translation id="8963213021028234748"><ph name="MARKUP_1" />Что делать?<ph name="MARKUP_2" />Убедитесь, что вы подключены к Интернету.<ph name="MARKUP_3" />Через некоторое время обновите страницу.<ph name="MARKUP_4" />Проверьте, правильно ли указан веб-адрес.<ph name="MARKUP_5" /></translation>
 <translation id="8968766641738584599">Сохранить карту</translation>

components/strings/components_strings_sr-Latn.xtb

diff --git a/components/strings/components_strings_sr-Latn.xtb b/components/strings/components_strings_sr-Latn.xtb
index dd97435..bc7383e 100644
--- a/components/strings/components_strings_sr-Latn.xtb
+++ b/components/strings/components_strings_sr-Latn.xtb
@@ -730,6 +730,7 @@
 <translation id="2718207025093645426">Korisnik ili uređaj kojim se upravlja nema učitanih smernica.</translation>
 <translation id="2721148159707890343">Zahtev je uspeo</translation>
 <translation id="2723669454293168317">Pokrenite proveru bezbednosti u Chrome podešavanjima</translation>
+<translation id="2725492561136085792">Pritisnite Enter da biste aktivirali ovu radnju.</translation>
 <translation id="2726001110728089263">Bočna fioka</translation>
 <translation id="2728127805433021124">Sertifikat servera je potpisan slabim algoritmom.</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />da pokrenete dijagnostiku veze<ph name="END_LINK" /></translation>
@@ -826,6 +827,7 @@
 <translation id="299990983510665749">Hečbek vozila</translation>
 <translation id="3002501248619246229">Proverite medije ulazne fioke</translation>
 <translation id="3005723025932146533">Prikaži sačuvanu kopiju</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" />, pritisnite Tab da biste pregledali dostupne radnje, pa Enter da biste izvršili izabranu radnju.</translation>
 <translation id="3013291976881901233">MIDI uređaji</translation>
 <translation id="301521992641321250">Automatski je blokirano</translation>
 <translation id="3016780570757425217">zna vašu lokaciju</translation>

components/strings/components_strings_sr.xtb

diff --git a/components/strings/components_strings_sr.xtb b/components/strings/components_strings_sr.xtb
index ce9623f..d91db3b 100644
--- a/components/strings/components_strings_sr.xtb
+++ b/components/strings/components_strings_sr.xtb
@@ -730,6 +730,7 @@
 <translation id="2718207025093645426">Корисник или уређај којим се управља нема учитаних смерница.</translation>
 <translation id="2721148159707890343">Захтев је успео</translation>
 <translation id="2723669454293168317">Покрените проверу безбедности у Chrome подешавањима</translation>
+<translation id="2725492561136085792">Притисните Enter да бисте активирали ову радњу.</translation>
 <translation id="2726001110728089263">Бочна фиока</translation>
 <translation id="2728127805433021124">Сертификат сервера је потписан слабим алгоритмом.</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />да покренете дијагностику везе<ph name="END_LINK" /></translation>
@@ -826,6 +827,7 @@
 <translation id="299990983510665749">Хечбек возила</translation>
 <translation id="3002501248619246229">Проверите медије улазне фиоке</translation>
 <translation id="3005723025932146533">Прикажи сачувану копију</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" />, притисните Tab да бисте прегледали доступне радње, па Enter да бисте извршили изабрану радњу.</translation>
 <translation id="3013291976881901233">MIDI уређаји</translation>
 <translation id="301521992641321250">Аутоматски је блокирано</translation>
 <translation id="3016780570757425217">зна вашу локацију</translation>

components/strings/components_strings_th.xtb

diff --git a/components/strings/components_strings_th.xtb b/components/strings/components_strings_th.xtb
index 767f29e..48bc8c7 100644
--- a/components/strings/components_strings_th.xtb
+++ b/components/strings/components_strings_th.xtb
@@ -1984,6 +1984,7 @@
 <translation id="5872692522325383488">บันทึก IBAN แล้ว</translation>
 <translation id="5873013647450402046">ธนาคารต้องการยืนยันตัวตนของคุณ</translation>
 <translation id="5877831137320480913">สุขภาพและความงาม</translation>
+<translation id="5879989559903563723">ไม่อนุญาตในโหมดผู้มาเยือน</translation>
 <translation id="5884465125445718607">Envelope Chinese #6</translation>
 <translation id="5887400589839399685">บันทึกการ์ดแล้ว</translation>
 <translation id="5887687176710214216">เข้าชมล่าสุดเมื่อวาน</translation>
@@ -2010,7 +2011,7 @@
 <translation id="5938793338444039872">Troy</translation>
 <translation id="5947508410139465809">ไฟล์ที่คุณอัปโหลดหรือแนบจะส่งไปยัง Google Cloud หรือบุคคลที่สามเพื่อทำการวิเคราะห์ เช่น อาจสแกนหาข้อมูลที่ละเอียดอ่อนหรือมัลแวร์ และอาจจัดเก็บตามนโยบายบริษัท</translation>
 <translation id="5951495562196540101">ลงทะเบียนด้วยบัญชีผู้ใช้ทั่วไปไม่ได้ (มีใบอนุญาตแบบแพ็กเกจ)</translation>
-<translation id="5953516610448771166">คำบรรยายสดไม่พร้อมใช้งานกับสื่อนี้ หากต้องการรับคำบรรยาย ให้บล็อก<ph name="CONTENT_SETTINGS" />สำหรับเว็บไซต์นี้</translation>
+<translation id="5953516610448771166">คำบรรยายแทนเสียงแบบสดไม่พร้อมใช้งานกับสื่อนี้ หากต้องการรับคำบรรยายแทนเสียง ให้บล็อก<ph name="CONTENT_SETTINGS" />สำหรับเว็บไซต์นี้</translation>
 <translation id="5955063559762970069">โรงแรมและที่พัก</translation>
 <translation id="5963413905009737549">ส่วน</translation>
 <translation id="5967260682280773804">36 x 48 นิ้ว</translation>
@@ -3226,6 +3227,7 @@
 <translation id="8949493680961858543">A1x4</translation>
 <translation id="8951415078585015151">กฎหมายและการปกครอง</translation>
 <translation id="8957210676456822347">การให้สิทธิ์แคปทีฟพอร์ทัล</translation>
+<translation id="8959282183248574156"><ph name="NICKNAME_COUNT" />/<ph name="NICKNAME_MAX" /></translation>
 <translation id="8963117664422609631">ไปที่การตั้งค่าเว็บไซต์</translation>
 <translation id="8963213021028234748"><ph name="MARKUP_1" />คำแนะนำ:<ph name="MARKUP_2" />ตรวจสอบว่าคุณมีการเชื่อมต่ออินเทอร์เน็ต<ph name="MARKUP_3" />โหลดหน้าเว็บนี้อีกครั้งในภายหลัง<ph name="MARKUP_4" />ตรวจสอบที่อยู่ที่คุณป้อน<ph name="MARKUP_5" /></translation>
 <translation id="8968766641738584599">บันทึกบัตร</translation>

components/strings/components_strings_uz.xtb

diff --git a/components/strings/components_strings_uz.xtb b/components/strings/components_strings_uz.xtb
index 702e303..c7b7018 100644
--- a/components/strings/components_strings_uz.xtb
+++ b/components/strings/components_strings_uz.xtb
@@ -1980,6 +1980,7 @@
 <translation id="5872692522325383488">IBAN saqlandi</translation>
 <translation id="5873013647450402046">Bank shaxsingizni tasdiqlamoqchi.</translation>
 <translation id="5877831137320480913">Goʻzallik va fitnes</translation>
+<translation id="5879989559903563723">Mehmon rejimida ruxsat berilmagan</translation>
 <translation id="5884465125445718607">Envelope Chinese #6</translation>
 <translation id="5887400589839399685">Karta saqlandi</translation>
 <translation id="5887687176710214216">Oxirgi tashrif: kecha</translation>
@@ -3220,6 +3221,7 @@
 <translation id="8949493680961858543">A1x4</translation>
 <translation id="8951415078585015151">Qonun va hukumat</translation>
 <translation id="8957210676456822347">Tegishli portalga kirish</translation>
+<translation id="8959282183248574156"><ph name="NICKNAME_COUNT" />/<ph name="NICKNAME_MAX" /></translation>
 <translation id="8963117664422609631">Sayt sozlamalarini ochish</translation>
 <translation id="8963213021028234748"><ph name="MARKUP_1" />Takliflar:<ph name="MARKUP_2" />Internetga ulanishni tekshirib ko‘ring<ph name="MARKUP_3" />Keyinroq veb-sahifani yangilang<ph name="MARKUP_4" />Kiritlgan manzilni tekshirib ko‘ring<ph name="MARKUP_5" /></translation>
 <translation id="8968766641738584599">Karta eslab qolinsin</translation>

components/strings/components_strings_vi.xtb

diff --git a/components/strings/components_strings_vi.xtb b/components/strings/components_strings_vi.xtb
index 9fc0491..95f7b2b 100644
--- a/components/strings/components_strings_vi.xtb
+++ b/components/strings/components_strings_vi.xtb
@@ -730,6 +730,7 @@
 <translation id="2718207025093645426">Người dùng hoặc thiết bị được quản lý chưa tải chính sách nào.</translation>
 <translation id="2721148159707890343">Yêu cầu đã thành công</translation>
 <translation id="2723669454293168317">Chạy quy trình kiểm tra an toàn trong phần Cài đặt của Chrome</translation>
+<translation id="2725492561136085792">Nhấn phím Enter để kích hoạt thao tác này.</translation>
 <translation id="2726001110728089263">Khay bên</translation>
 <translation id="2728127805433021124">Chứng chỉ của máy chủ đã được ký bằng thuật toán chữ ký yếu.</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />Chạy Chẩn đoán kết nối<ph name="END_LINK" /></translation>
@@ -826,6 +827,7 @@
 <translation id="299990983510665749">Ô tô hatchback</translation>
 <translation id="3002501248619246229">Kiểm tra phương tiện khay nạp giấy</translation>
 <translation id="3005723025932146533">Hiển thị bản sao đã lưu</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" />, nhấn phím Tab để duyệt xem các thao tác có sẵn, sau đó nhấn phím Enter để thực thi thao tác đã chọn.</translation>
 <translation id="3013291976881901233">Thiết bị MIDI</translation>
 <translation id="301521992641321250">Tự động bị chặn</translation>
 <translation id="3016780570757425217">Biết vị trí của bạn</translation>

components/strings/components_strings_zh-CN.xtb

diff --git a/components/strings/components_strings_zh-CN.xtb b/components/strings/components_strings_zh-CN.xtb
index b1020df..cbe5f94 100644
--- a/components/strings/components_strings_zh-CN.xtb
+++ b/components/strings/components_strings_zh-CN.xtb
@@ -730,6 +730,7 @@
 <translation id="2718207025093645426">受管用户或设备未加载任何政策。</translation>
 <translation id="2721148159707890343">请求成功</translation>
 <translation id="2723669454293168317">从 Chrome 设置中运行安全检查</translation>
+<translation id="2725492561136085792">按 Enter 键激活此操作。</translation>
 <translation id="2726001110728089263">侧面纸匣</translation>
 <translation id="2728127805433021124">服务器的证书是使用弱签名算法进行签名的。</translation>
 <translation id="2730326759066348565"><ph name="BEGIN_LINK" />运行网络连接诊断<ph name="END_LINK" /></translation>
@@ -826,6 +827,7 @@
 <translation id="299990983510665749">掀背车</translation>
 <translation id="3002501248619246229">检查进纸匣媒体</translation>
 <translation id="3005723025932146533">显示已保存的版本</translation>
+<translation id="3009036448238594149"><ph name="ACTION_IN_SUGGEST_FOCUSED_FRIENDLY_MATCH_TEXT" />，按 Tab 键浏览可执行的操作，然后按 Enter 键执行选定的操作。</translation>
 <translation id="3013291976881901233">MIDI 设备</translation>
 <translation id="301521992641321250">已被自动禁止</translation>
 <translation id="3016780570757425217">获取您的位置</translation>
@@ -1981,6 +1983,7 @@
 <translation id="5872692522325383488">已保存 IBAN</translation>
 <translation id="5873013647450402046">银行需要确认您的身份。</translation>
 <translation id="5877831137320480913">美容与健身</translation>
+<translation id="5879989559903563723">在访客模式下不支持</translation>
 <translation id="5884465125445718607">中式 #6 信封</translation>
 <translation id="5887400589839399685">已保存卡片</translation>
 <translation id="5887687176710214216">上次访问时间：昨天</translation>
@@ -3222,6 +3225,7 @@
 <translation id="8949493680961858543">A1x4</translation>
 <translation id="8951415078585015151">法律与政府</translation>
 <translation id="8957210676456822347">强制门户授权</translation>
+<translation id="8959282183248574156">已输入 <ph name="NICKNAME_COUNT" /> 个/共 <ph name="NICKNAME_MAX" /> 个</translation>
 <translation id="8963117664422609631">转到网站设置</translation>
 <translation id="8963213021028234748"><ph name="MARKUP_1" />建议：<ph name="MARKUP_2" />确保有数据网络连接<ph name="MARKUP_3" />稍后重新加载此网页<ph name="MARKUP_4" />检查您输入的地址是否正确<ph name="MARKUP_5" /></translation>
 <translation id="8968766641738584599">保存卡片</translation>

components/supervised_user/core/browser/kids_chrome_management_client.cc

diff --git a/components/supervised_user/core/browser/kids_chrome_management_client.cc b/components/supervised_user/core/browser/kids_chrome_management_client.cc
index ec0b99a3..d6f54ccd 100644
--- a/components/supervised_user/core/browser/kids_chrome_management_client.cc
+++ b/components/supervised_user/core/browser/kids_chrome_management_client.cc
@@ -8,6 +8,7 @@
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
+#include "base/metrics/histogram_functions.h"
 #include "base/strings/escape.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
@@ -40,6 +41,9 @@
 constexpr char kClassifyUrlDataContentType[] =
     "application/x-www-form-urlencoded";
 
+constexpr char kClassifyUrlNetOrHttpStatusMetric[] =
+    "ManagedUsers.ClassifyUrlRequest.NetOrHttpStatus";
+
 // Constants for ClassifyURL.
 constexpr char kClassifyUrlOauthConsumerName[] = "kids_url_classifier";
 constexpr char kClassifyUrlDataFormat[] = "url=%s&region_code=%s";
@@ -328,6 +332,7 @@
 
   if (net_error != net::OK) {
     DLOG(WARNING) << "Network error " << net_error;
+    base::UmaHistogramSparse(kClassifyUrlNetOrHttpStatusMetric, net_error);
     DispatchResult(it, std::move(response_proto),
                    KidsChromeManagementClient::ErrorCode::kNetworkError);
     return;
@@ -335,6 +340,7 @@
 
   if (response_code != net::HTTP_OK) {
     DLOG(WARNING) << "Response: " << response_body.get();
+    base::UmaHistogramSparse(kClassifyUrlNetOrHttpStatusMetric, response_code);
     DispatchResult(it, std::move(response_proto),
                    KidsChromeManagementClient::ErrorCode::kHttpError);
     return;

components/update_client/component.cc

diff --git a/components/update_client/component.cc b/components/update_client/component.cc
index f9cb65d..741e864 100644
--- a/components/update_client/component.cc
+++ b/components/update_client/component.cc
@@ -21,6 +21,7 @@
 #include "base/ranges/algorithm.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
+#include "base/task/bind_post_task.h"
 #include "base/task/sequenced_task_runner.h"
 #include "base/task/thread_pool.h"
 #include "base/values.h"
@@ -268,11 +269,13 @@
         base::BindOnce(
             &CrxCache::Put, optional_crx_cache.value(), crx_path, id,
             fingerprint,
-            base::BindOnce(&CrxCachePutCompleteOnCrxCacheBlockingTaskRunner,
-                           main_task_runner, crx_path, result.unpack_path,
-                           result.public_key, fingerprint,
-                           std::move(install_params), installer,
-                           progress_callback, std::move(callback))));
+            base::BindPostTask(
+                base::ThreadPool::CreateSequencedTaskRunner(kTaskTraits),
+                base::BindOnce(&CrxCachePutCompleteOnCrxCacheBlockingTaskRunner,
+                               main_task_runner, crx_path, result.unpack_path,
+                               result.public_key, fingerprint,
+                               std::move(install_params), installer,
+                               progress_callback, std::move(callback)))));
   }
 }
 #else

components/user_manager/BUILD.gn

diff --git a/components/user_manager/BUILD.gn b/components/user_manager/BUILD.gn
index 5dd2aa39..db4d8cb 100644
--- a/components/user_manager/BUILD.gn
+++ b/components/user_manager/BUILD.gn
@@ -36,7 +36,6 @@
       "include_exclude_account_id_filter.h",
       "known_user.cc",
       "known_user.h",
-      "remove_user_delegate.h",
       "scoped_user_manager.cc",
       "scoped_user_manager.h",
       "user.cc",

components/user_manager/fake_user_manager.h

diff --git a/components/user_manager/fake_user_manager.h b/components/user_manager/fake_user_manager.h
index addddb5..738f921a 100644
--- a/components/user_manager/fake_user_manager.h
+++ b/components/user_manager/fake_user_manager.h
@@ -94,8 +94,7 @@
   const AccountId& GetOwnerAccountId() const override;
   void OnSessionStarted() override {}
   void RemoveUser(const AccountId& account_id,
-                  UserRemovalReason reason,
-                  RemoveUserDelegate* delegate) override {}
+                  UserRemovalReason reason) override {}
   void RemoveUserFromList(const AccountId& account_id) override;
   void RemoveUserFromListForRecreation(const AccountId& account_id) override;
   bool IsKnownUser(const AccountId& account_id) const override;

components/user_manager/remove_user_delegate.h

diff --git a/components/user_manager/remove_user_delegate.h b/components/user_manager/remove_user_delegate.h
deleted file mode 100644
index 498cf614..0000000
--- a/components/user_manager/remove_user_delegate.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2014 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef COMPONENTS_USER_MANAGER_REMOVE_USER_DELEGATE_H_
-#define COMPONENTS_USER_MANAGER_REMOVE_USER_DELEGATE_H_
-
-#include "components/user_manager/user_manager_export.h"
-
-class AccountId;
-
-namespace user_manager {
-
-// Delegate to be used with |UserManager::RemoveUser|.
-class USER_MANAGER_EXPORT RemoveUserDelegate {
- public:
-  // Called right before actual user removal process is initiated.
-  virtual void OnBeforeUserRemoved(const AccountId& account_id) = 0;
-
-  // Called right after user removal process has been initiated.
-  virtual void OnUserRemoved(const AccountId& account_id) = 0;
-};
-
-}  // namespace user_manager
-
-#endif  // COMPONENTS_USER_MANAGER_REMOVE_USER_DELEGATE_H_

components/user_manager/user_directory_integrity_manager.cc

diff --git a/components/user_manager/user_directory_integrity_manager.cc b/components/user_manager/user_directory_integrity_manager.cc
index a8c80590..00ed70c 100644
--- a/components/user_manager/user_directory_integrity_manager.cc
+++ b/components/user_manager/user_directory_integrity_manager.cc
@@ -38,8 +38,8 @@
 }
 
 void UserDirectoryIntegrityManager::RemoveUser(const AccountId& account_id) {
-  UserManager::Get()->RemoveUser(
-      account_id, UserRemovalReason::MISCONFIGURED_USER, /*delegate=*/nullptr);
+  UserManager::Get()->RemoveUser(account_id,
+                                 UserRemovalReason::MISCONFIGURED_USER);
 }
 
 void UserDirectoryIntegrityManager::ClearPrefs() {

components/user_manager/user_manager.h

diff --git a/components/user_manager/user_manager.h b/components/user_manager/user_manager.h
index 72a8f211..36a254c 100644
--- a/components/user_manager/user_manager.h
+++ b/components/user_manager/user_manager.h
@@ -20,7 +20,6 @@
 namespace user_manager {
 
 class ScopedUserManager;
-class RemoveUserDelegate;
 
 // A list pref of the the regular users known on this device, arranged in LRU
 // order, stored in local state.
@@ -205,16 +204,14 @@
 
   // Removes the user from the device while providing a reason for enterprise
   // reporting. Note, it will verify that the given user isn't the owner, so
-  // calling this method for the owner will take no effect. Note, |delegate|
-  // can be NULL.
+  // calling this method for the owner will take no effect.
   // This removes the user from the list synchronously, so the following
   // function calls should have updated users. However, actual deletion of
   // a user from a device has more tasks to complete, such as deletion of
   // cryptohome data, which are asynchronous operations. Currently, there's
   // no support to observe the completion of such tasks.
   virtual void RemoveUser(const AccountId& account_id,
-                          UserRemovalReason reason,
-                          RemoveUserDelegate* delegate) = 0;
+                          UserRemovalReason reason) = 0;
 
   // Removes the user from the persistent list only. Also removes the user's
   // picture.

components/user_manager/user_manager_base.cc

diff --git a/components/user_manager/user_manager_base.cc b/components/user_manager/user_manager_base.cc
index cd97667..ae3927c4 100644
--- a/components/user_manager/user_manager_base.cc
+++ b/components/user_manager/user_manager_base.cc
@@ -29,7 +29,6 @@
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/user_manager/known_user.h"
-#include "components/user_manager/remove_user_delegate.h"
 #include "components/user_manager/user_directory_integrity_manager.h"
 #include "components/user_manager/user_type.h"
 #include "google_apis/gaia/gaia_auth_util.h"
@@ -346,8 +345,7 @@
 }
 
 void UserManagerBase::RemoveUser(const AccountId& account_id,
-                                 UserRemovalReason reason,
-                                 RemoveUserDelegate* delegate) {
+                                 UserRemovalReason reason) {
   DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence());
 
   UserDirectoryIntegrityManager integrity_manager(GetLocalState());
@@ -358,20 +356,16 @@
     return;
   }
 
-  RemoveUserInternal(account_id, reason, delegate);
+  RemoveUserInternal(account_id, reason);
 }
 
 void UserManagerBase::RemoveUserInternal(const AccountId& account_id,
-                                         UserRemovalReason reason,
-                                         RemoveUserDelegate* delegate) {
-  RemoveNonOwnerUserInternal(account_id, reason, delegate);
+                                         UserRemovalReason reason) {
+  RemoveNonOwnerUserInternal(account_id, reason);
 }
 
 void UserManagerBase::RemoveNonOwnerUserInternal(AccountId account_id,
-                                                 UserRemovalReason reason,
-                                                 RemoveUserDelegate* delegate) {
-  if (delegate)
-    delegate->OnBeforeUserRemoved(account_id);
+                                                 UserRemovalReason reason) {
   NotifyUserToBeRemoved(account_id);
   AsyncRemoveCryptohome(account_id);
   RemoveUserFromList(account_id);
@@ -379,9 +373,6 @@
   // |account_id_copy| instead if needed.
 
   NotifyUserRemoved(account_id, reason);
-
-  if (delegate)
-    delegate->OnUserRemoved(account_id);
 }
 
 void UserManagerBase::RemoveUserFromList(const AccountId& account_id) {
@@ -1290,8 +1281,7 @@
     // FindUser(account_id) returns nullptr and CanUserBeRemoved() returns
     // false. This is why we call RemoveUserInternal() directly instead of
     // RemoveUser().
-    RemoveUserInternal(account_id, UserRemovalReason::UNKNOWN,
-                       /*delegate=*/nullptr);
+    RemoveUserInternal(account_id, UserRemovalReason::UNKNOWN);
     base::UmaHistogramEnumeration(kLegacySupervisedUsersHistogramName,
                                   LegacySupervisedUserStatus::kLSUDeleted);
   } else {

components/user_manager/user_manager_base.h

diff --git a/components/user_manager/user_manager_base.h b/components/user_manager/user_manager_base.h
index 5027a23..6076c35 100644
--- a/components/user_manager/user_manager_base.h
+++ b/components/user_manager/user_manager_base.h
@@ -20,7 +20,6 @@
 #include "base/time/time.h"
 #include "base/values.h"
 #include "components/account_id/account_id.h"
-#include "components/user_manager/remove_user_delegate.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_manager_export.h"
@@ -94,8 +93,7 @@
   void SwitchToLastActiveUser() override;
   void OnSessionStarted() override;
   void RemoveUser(const AccountId& account_id,
-                  UserRemovalReason reason,
-                  RemoveUserDelegate* delegate) override;
+                  UserRemovalReason reason) override;
   void RemoveUserFromList(const AccountId& account_id) override;
   void RemoveUserFromListForRecreation(const AccountId& account_id) override;
   bool IsKnownUser(const AccountId& account_id) const override;
@@ -227,8 +225,7 @@
   // Pass |account_id| by value here to avoid use-after-free. Original
   // |account_id| could be destroyed during the user removal.
   virtual void RemoveNonOwnerUserInternal(AccountId account_id,
-                                          UserRemovalReason reason,
-                                          RemoveUserDelegate* delegate);
+                                          UserRemovalReason reason);
 
   // Removes a regular or supervised user from the user list.
   // Returns the user if found or NULL otherwise.
@@ -245,8 +242,7 @@
   // method, that verifies that owner will not get deleted, and calls
   // |RemoveNonOwnerUserInternal|.
   virtual void RemoveUserInternal(const AccountId& account_id,
-                                  UserRemovalReason reason,
-                                  RemoveUserDelegate* delegate);
+                                  UserRemovalReason reason);
 
   // Removes data stored or cached outside the user's cryptohome (wallpaper,
   // avatar, OAuth token status, display name, display email).

content/browser/cache_storage/OWNERS

diff --git a/content/browser/cache_storage/OWNERS b/content/browser/cache_storage/OWNERS
index 1b73d82..cb2da6d 100644
--- a/content/browser/cache_storage/OWNERS
+++ b/content/browser/cache_storage/OWNERS
@@ -1,7 +1,7 @@
 # Primary
-wanderview@chromium.org
+ayui@chromium.org
 
 # Secondary
-ayui@chromium.org
+wanderview@chromium.org
 jkarlin@chromium.org
 jsbell@chromium.org

content/browser/child_process_security_policy_impl.cc

diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
index f3b802d3..66008c3 100644
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -898,6 +898,14 @@
   return base::Contains(pseudo_schemes_, scheme);
 }
 
+void ChildProcessSecurityPolicyImpl::ClearRegisteredSchemeForTesting(
+    const std::string& scheme) {
+  base::AutoLock lock(lock_);
+  schemes_okay_to_request_in_any_process_.erase(scheme);
+  schemes_okay_to_commit_in_any_process_.erase(scheme);
+  pseudo_schemes_.erase(scheme);
+}
+
 void ChildProcessSecurityPolicyImpl::GrantCommitURL(int child_id,
                                                     const GURL& url) {
   // Can't grant the capability to commit invalid URLs.

content/browser/child_process_security_policy_impl.h

diff --git a/content/browser/child_process_security_policy_impl.h b/content/browser/child_process_security_policy_impl.h
index 4bd4afd..b2251d1 100644
--- a/content/browser/child_process_security_policy_impl.h
+++ b/content/browser/child_process_security_policy_impl.h
@@ -547,6 +547,8 @@
   // child process.
   size_t BrowsingInstanceIdCountForTesting(int child_id);
 
+  void ClearRegisteredSchemeForTesting(const std::string& scheme);
+
  private:
   friend class ChildProcessSecurityPolicyInProcessBrowserTest;
   friend class ChildProcessSecurityPolicyTest;

content/browser/child_process_security_policy_unittest.cc

diff --git a/content/browser/child_process_security_policy_unittest.cc b/content/browser/child_process_security_policy_unittest.cc
index 64e52fb..4810ec7 100644
--- a/content/browser/child_process_security_policy_unittest.cc
+++ b/content/browser/child_process_security_policy_unittest.cc
@@ -103,11 +103,29 @@
 
 }  // namespace
 
-class ChildProcessSecurityPolicyTest : public testing::Test {
+enum class ChildProcessSecurityPolicyTestCase {
+  kCitadelDisabled,
+  kCitadelEnabled,
+};
+
+class ChildProcessSecurityPolicyTest
+    : public testing::Test,
+      public ::testing::WithParamInterface<ChildProcessSecurityPolicyTestCase> {
  public:
   ChildProcessSecurityPolicyTest()
       : task_environment_(BrowserTaskEnvironment::REAL_IO_THREAD),
-        old_browser_client_(nullptr) {}
+        old_browser_client_(nullptr) {
+    feature_list_.InitWithFeatureState(
+        kSiteIsolationCitadelEnforcement,
+        GetParam() == ChildProcessSecurityPolicyTestCase::kCitadelEnabled);
+  }
+
+  static std::string DescribeParams(
+      const testing::TestParamInfo<ParamType>& info) {
+    return info.param == ChildProcessSecurityPolicyTestCase::kCitadelEnabled
+               ? "CitadelEnabled"
+               : "CitadelDisabled";
+  }
 
   void SetUp() override {
     old_browser_client_ = SetBrowserClientForTesting(&test_browser_client_);
@@ -122,6 +140,15 @@
     // responsible for adding the appropriate ProtocolHandler).
     test_browser_client_.AddScheme(url::kFileScheme);
     SiteIsolationPolicy::DisableFlagCachingForTesting();
+
+    auto* policy = ChildProcessSecurityPolicyImpl::GetInstance();
+    {
+      base::AutoLock lock(policy->lock_);
+      EXPECT_EQ(0u, policy->security_state_.size())
+          << "ChildProcessSecurityPolicy should not be tracking any processes "
+          << "at test startup.  Some other test probably forgot to call "
+          << "Remove() at the end.";
+    }
   }
 
   void TearDown() override {
@@ -295,9 +322,10 @@
   TestBrowserContext browser_context_;
   ChildProcessSecurityPolicyTestBrowserClient test_browser_client_;
   raw_ptr<ContentBrowserClient> old_browser_client_;
+  base::test::ScopedFeatureList feature_list_;
 };
 
-TEST_F(ChildProcessSecurityPolicyTest, ChildID) {
+TEST_P(ChildProcessSecurityPolicyTest, ChildID) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
   p->AddForTesting(kRendererID, browser_context());
@@ -306,7 +334,7 @@
   p->Remove(kRendererID);
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, IsWebSafeSchemeTest) {
+TEST_P(ChildProcessSecurityPolicyTest, IsWebSafeSchemeTest) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -321,9 +349,11 @@
   EXPECT_TRUE(p->IsWebSafeScheme("registered-web-safe-scheme"));
 
   EXPECT_FALSE(p->IsWebSafeScheme(kChromeUIScheme));
+
+  p->ClearRegisteredSchemeForTesting("registered-web-safe-scheme");
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, IsPseudoSchemeTest) {
+TEST_P(ChildProcessSecurityPolicyTest, IsPseudoSchemeTest) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -337,9 +367,11 @@
   EXPECT_TRUE(p->IsPseudoScheme("registered-pseudo-scheme"));
 
   EXPECT_FALSE(p->IsPseudoScheme(kChromeUIScheme));
+
+  p->ClearRegisteredSchemeForTesting("registered-pseudo-scheme");
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, StandardSchemesTest) {
+TEST_P(ChildProcessSecurityPolicyTest, StandardSchemesTest) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -401,7 +433,7 @@
   p->Remove(kRendererID);
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, BlobSchemeTest) {
+TEST_P(ChildProcessSecurityPolicyTest, BlobSchemeTest) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -468,7 +500,7 @@
   p->Remove(kRendererID);
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, AboutTest) {
+TEST_P(ChildProcessSecurityPolicyTest, AboutTest) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -526,7 +558,7 @@
   p->Remove(kRendererID);
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, JavaScriptTest) {
+TEST_P(ChildProcessSecurityPolicyTest, JavaScriptTest) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -543,7 +575,7 @@
   p->Remove(kRendererID);
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, RegisterWebSafeSchemeTest) {
+TEST_P(ChildProcessSecurityPolicyTest, RegisterWebSafeSchemeTest) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -580,9 +612,10 @@
 
   // Cleanup.
   p->Remove(kRendererID);
+  p->ClearRegisteredSchemeForTesting("asdf");
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, CanServiceCommandsTest) {
+TEST_P(ChildProcessSecurityPolicyTest, CanServiceCommandsTest) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -607,7 +640,7 @@
   p->Remove(kRendererID);
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, ViewSource) {
+TEST_P(ChildProcessSecurityPolicyTest, ViewSource) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -651,7 +684,7 @@
   p->Remove(kRendererID);
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, GoogleChromeScheme) {
+TEST_P(ChildProcessSecurityPolicyTest, GoogleChromeScheme) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -666,7 +699,7 @@
   p->Remove(kRendererID);
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, GrantCommitURLToNonStandardScheme) {
+TEST_P(ChildProcessSecurityPolicyTest, GrantCommitURLToNonStandardScheme) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -701,7 +734,7 @@
   p->Remove(kRendererID);
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, SpecificFile) {
+TEST_P(ChildProcessSecurityPolicyTest, SpecificFile) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -737,7 +770,7 @@
   p->Remove(kRendererID);
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, FileSystemGrantsTest) {
+TEST_P(ChildProcessSecurityPolicyTest, FileSystemGrantsTest) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -815,7 +848,7 @@
   storage::IsolatedContext::GetInstance()->RevokeFileSystem(delete_from_id);
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, FilePermissionGrantingAndRevoking) {
+TEST_P(ChildProcessSecurityPolicyTest, FilePermissionGrantingAndRevoking) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -883,7 +916,7 @@
   p->Remove(kRendererID);
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, FilePermissions) {
+TEST_P(ChildProcessSecurityPolicyTest, FilePermissions) {
   base::FilePath granted_file = base::FilePath(TEST_PATH("/home/joe"));
   base::FilePath sibling_file = base::FilePath(TEST_PATH("/home/bob"));
   base::FilePath child_file = base::FilePath(TEST_PATH("/home/joe/file"));
@@ -1011,7 +1044,7 @@
   p->Remove(kRendererID);
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, CanServiceWebUIBindings) {
+TEST_P(ChildProcessSecurityPolicyTest, CanServiceWebUIBindings) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -1137,7 +1170,7 @@
   }
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, RemoveRace) {
+TEST_P(ChildProcessSecurityPolicyTest, RemoveRace) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -1182,7 +1215,7 @@
 // TODO(crbug.com/1286533): Refactor the test to avoid calls to
 // CanAccessDataForOrigin on the IO thread, by checking for the presence of
 // security state instead.
-TEST_F(ChildProcessSecurityPolicyTest, RemoveRace_CanAccessDataForOrigin) {
+TEST_P(ChildProcessSecurityPolicyTest, RemoveRace_CanAccessDataForOrigin) {
   if (ShouldRestrictCanAccessDataForOriginToUIThread()) {
     return;
   }
@@ -1314,7 +1347,7 @@
 // TODO(crbug.com/1286533): Refactor the test to avoid calls to
 // CanAccessDataForOrigin on the IO thread, by checking for the presence of
 // security state instead.
-TEST_F(ChildProcessSecurityPolicyTest, HandleExtendsSecurityStateLifetime) {
+TEST_P(ChildProcessSecurityPolicyTest, HandleExtendsSecurityStateLifetime) {
   if (ShouldRestrictCanAccessDataForOriginToUIThread()) {
     return;
   }
@@ -1408,7 +1441,7 @@
   EXPECT_FALSE(ui_after_handle_invalidation);
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, HandleDuplicate) {
+TEST_P(ChildProcessSecurityPolicyTest, HandleDuplicate) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -1452,7 +1485,7 @@
       duplicate_handle2.CanAccessDataForOrigin(url::Origin::Create(url)));
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, CanAccessDataForOrigin_URL) {
+TEST_P(ChildProcessSecurityPolicyTest, CanAccessDataForOrigin_URL) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -1552,7 +1585,7 @@
   }
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, CanAccessDataForOrigin_Origin) {
+TEST_P(ChildProcessSecurityPolicyTest, CanAccessDataForOrigin_Origin) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -1660,7 +1693,7 @@
 
 // Test the granting of origin permissions, and their interactions with
 // granting scheme permissions.
-TEST_F(ChildProcessSecurityPolicyTest, OriginGranting) {
+TEST_P(ChildProcessSecurityPolicyTest, OriginGranting) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -1728,7 +1761,7 @@
   } while (0);
 
 // Verifies ChildProcessSecurityPolicyImpl::AddFutureIsolatedOrigins method.
-TEST_F(ChildProcessSecurityPolicyTest, AddFutureIsolatedOrigins) {
+TEST_P(ChildProcessSecurityPolicyTest, AddFutureIsolatedOrigins) {
   url::Origin foo = url::Origin::Create(GURL("https://foo.com/"));
   url::Origin bar = url::Origin::Create(GURL("https://bar.com/"));
   url::Origin baz = url::Origin::Create(GURL("https://baz.com/"));
@@ -1825,7 +1858,7 @@
                      testing::IsEmpty());
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, IsolateAllSuborigins) {
+TEST_P(ChildProcessSecurityPolicyTest, IsolateAllSuborigins) {
   url::Origin qux = url::Origin::Create(GURL("https://qux.com/"));
   IsolatedOriginPattern etld1_wild("https://[*.]foo.com");
   IsolatedOriginPattern etld2_wild("https://[*.]bar.foo.com");
@@ -1875,7 +1908,7 @@
 
 // Verify that the isolation behavior for wildcard and non-wildcard origins,
 // singly or in concert, behaves correctly via calls to GetSiteForURL().
-TEST_F(ChildProcessSecurityPolicyTest, WildcardAndNonWildcardOrigins) {
+TEST_P(ChildProcessSecurityPolicyTest, WildcardAndNonWildcardOrigins) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -1940,7 +1973,7 @@
                      testing::IsEmpty());
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, WildcardAndNonWildcardEmbedded) {
+TEST_P(ChildProcessSecurityPolicyTest, WildcardAndNonWildcardEmbedded) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
@@ -2093,7 +2126,7 @@
 }
 
 // Verifies that isolated origins only apply to future BrowsingInstances.
-TEST_F(ChildProcessSecurityPolicyTest, DynamicIsolatedOrigins) {
+TEST_P(ChildProcessSecurityPolicyTest, DynamicIsolatedOrigins) {
   url::Origin foo = url::Origin::Create(GURL("https://foo.com/"));
   url::Origin bar = url::Origin::Create(GURL("https://bar.com/"));
   url::Origin baz = url::Origin::Create(GURL("https://baz.com/"));
@@ -2211,7 +2244,7 @@
 
 // Check that an unsuccessful isolated origin lookup for a URL with an empty
 // host doesn't crash. See https://crbug.com/882686.
-TEST_F(ChildProcessSecurityPolicyTest, IsIsolatedOriginWithEmptyHost) {
+TEST_P(ChildProcessSecurityPolicyTest, IsIsolatedOriginWithEmptyHost) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
   TestBrowserContext context;
@@ -2229,7 +2262,7 @@
 // cutoffs.  Attempts to re-add an origin for the same profile should be
 // ignored.  Also, once an isolated origin is added globally for all profiles,
 // future attempts to re-add it (for any profile) should also be ignored.
-TEST_F(ChildProcessSecurityPolicyTest,
+TEST_P(ChildProcessSecurityPolicyTest,
        IsolatedOriginsForSpecificBrowserContexts) {
   url::Origin foo = url::Origin::Create(GURL("https://foo.com/"));
   url::Origin bar = url::Origin::Create(GURL("https://bar.com/"));
@@ -2331,7 +2364,7 @@
 
 // This test ensures that isolated origins associated with a specific
 // BrowserContext are removed when that BrowserContext is destroyed.
-TEST_F(ChildProcessSecurityPolicyTest,
+TEST_P(ChildProcessSecurityPolicyTest,
        IsolatedOriginsRemovedWhenBrowserContextDestroyed) {
   url::Origin foo = url::Origin::Create(GURL("https://foo.com/"));
   url::Origin sub_foo = url::Origin::Create(GURL("https://sub.foo.com/"));
@@ -2400,7 +2433,7 @@
                      testing::IsEmpty());
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, IsolatedOriginPattern) {
+TEST_P(ChildProcessSecurityPolicyTest, IsolatedOriginPattern) {
   const base::StringPiece etld1_wild("https://[*.]foo.com");
   url::Origin etld1_wild_origin = url::Origin::Create(GURL("https://foo.com"));
   IsolatedOriginPattern p(etld1_wild);
@@ -2479,7 +2512,7 @@
 
 // This test adds isolated origins from various sources and verifies that
 // GetIsolatedOrigins() properly restricts lookups by source.
-TEST_F(ChildProcessSecurityPolicyTest, GetIsolatedOrigins) {
+TEST_P(ChildProcessSecurityPolicyTest, GetIsolatedOrigins) {
   url::Origin foo = url::Origin::Create(GURL("https://foo.com/"));
   url::Origin bar = url::Origin::Create(GURL("https://bar.com/"));
   url::Origin baz = url::Origin::Create(GURL("https://baz.com/"));
@@ -2525,7 +2558,7 @@
 // This test adds isolated origins from various sources as well as restricted
 // to particular profiles, and verifies that GetIsolatedOrigins() properly
 // restricts lookups by both source and profile.
-TEST_F(ChildProcessSecurityPolicyTest, GetIsolatedOriginsWithProfile) {
+TEST_P(ChildProcessSecurityPolicyTest, GetIsolatedOriginsWithProfile) {
   url::Origin foo = url::Origin::Create(GURL("https://foo.com/"));
   url::Origin bar = url::Origin::Create(GURL("https://bar.com/"));
   url::Origin baz = url::Origin::Create(GURL("https://baz.com/"));
@@ -2582,7 +2615,7 @@
   EXPECT_THAT(p->GetIsolatedOrigins(), testing::IsEmpty());
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, IsolatedOriginPatternEquality) {
+TEST_P(ChildProcessSecurityPolicyTest, IsolatedOriginPatternEquality) {
   std::string foo("https://foo.com");
   std::string foo_port("https://foo.com:8000");
   std::string foo_path("https://foo.com/some/path");
@@ -2603,7 +2636,7 @@
 }
 
 // Verifies parsing logic in SiteIsolationPolicy::ParseIsolatedOrigins.
-TEST_F(ChildProcessSecurityPolicyTest, ParseIsolatedOrigins) {
+TEST_P(ChildProcessSecurityPolicyTest, ParseIsolatedOrigins) {
   EXPECT_THAT(ChildProcessSecurityPolicyImpl::ParseIsolatedOrigins(""),
               testing::IsEmpty());
 
@@ -2646,7 +2679,7 @@
 
 // Verify that the default port for an isolated origin's scheme is returned
 // during a lookup, not the port of the origin requested.
-TEST_F(ChildProcessSecurityPolicyTest, WildcardDefaultPort) {
+TEST_P(ChildProcessSecurityPolicyTest, WildcardDefaultPort) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
   EXPECT_THAT(p->GetIsolatedOrigins(), testing::IsEmpty());
@@ -2697,7 +2730,7 @@
   EXPECT_THAT(p->GetIsolatedOrigins(), testing::IsEmpty());
 }
 
-TEST_F(ChildProcessSecurityPolicyTest, ProcessLockMatching) {
+TEST_P(ChildProcessSecurityPolicyTest, ProcessLockMatching) {
   GURL nonapp_url("https://bar.com/");
   GURL app_url("https://some.app.foo.com/");
   GURL app_effective_url("https://app.com/");
@@ -2766,7 +2799,7 @@
 
 // Verify the mechanism that allows non-origin-keyed isolated origins to be
 // associated with a single BrowsingInstance.
-TEST_F(ChildProcessSecurityPolicyTest,
+TEST_P(ChildProcessSecurityPolicyTest,
        IsolatedOriginsForSpecificBrowsingInstances) {
   url::Origin foo = url::Origin::Create(GURL("https://foo.com/"));
   url::Origin bar = url::Origin::Create(GURL("https://bar.com/"));
@@ -2918,7 +2951,7 @@
 
 // Verify isolated origins associated with a single BrowsingInstance can be
 // combined with isolated origins that apply to future BrowsingInstances.
-TEST_F(ChildProcessSecurityPolicyTest,
+TEST_P(ChildProcessSecurityPolicyTest,
        IsolatedOriginsForCurrentAndFutureBrowsingInstances) {
   url::Origin foo = url::Origin::Create(GURL("https://foo.com/"));
   url::Origin bar = url::Origin::Create(GURL("https://bar.com/"));
@@ -3024,7 +3057,7 @@
 // even if all BrowsingInstanceIDs for that process have been deleted, so long
 // as the request matches the process' lock. This test sets an origin-keyed
 // lock.
-TEST_F(ChildProcessSecurityPolicyTest, NoBrowsingInstanceIDs_OriginKeyed) {
+TEST_P(ChildProcessSecurityPolicyTest, NoBrowsingInstanceIDs_OriginKeyed) {
   url::Origin foo = url::Origin::Create(GURL("https://sub.foo.com/"));
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
@@ -3080,7 +3113,7 @@
 // This test verifies that CanAccessDataForOrigin returns true for a process id
 // even if all BrowsingInstanceIDs for that process have been deleted, so long
 // as the request matches the process' lock. This test sets a site-keyed lock.
-TEST_F(ChildProcessSecurityPolicyTest, NoBrowsingInstanceIDs_SiteKeyed) {
+TEST_P(ChildProcessSecurityPolicyTest, NoBrowsingInstanceIDs_SiteKeyed) {
   url::Origin foo = url::Origin::Create(GURL("https://sub.foo.com/"));
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
@@ -3137,7 +3170,7 @@
 // This test verifies that CanAccessDataForOrigin returns false for a process id
 // when all BrowsingInstanceIDs for that process have been deleted, and the
 // ProcessLock has is_locked_to_site() = false, regardless of the url requested.
-TEST_F(ChildProcessSecurityPolicyTest, NoBrowsingInstanceIDs_UnlockedProcess) {
+TEST_P(ChildProcessSecurityPolicyTest, NoBrowsingInstanceIDs_UnlockedProcess) {
   GURL foo_url = GURL("https://foo.com/");
   url::Origin foo = url::Origin::Create(foo_url);
 
@@ -3211,7 +3244,7 @@
 }
 
 // Regression test for https://crbug.com/1324407.
-TEST_F(ChildProcessSecurityPolicyTest, CannotLockUsedProcessToSite) {
+TEST_P(ChildProcessSecurityPolicyTest, CannotLockUsedProcessToSite) {
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
   TestBrowserContext context;
@@ -3245,4 +3278,11 @@
   p->Remove(kRendererID);
 }
 
+INSTANTIATE_TEST_SUITE_P(
+    ,
+    ChildProcessSecurityPolicyTest,
+    ::testing::Values(ChildProcessSecurityPolicyTestCase::kCitadelDisabled,
+                      ChildProcessSecurityPolicyTestCase::kCitadelEnabled),
+    &ChildProcessSecurityPolicyTest::DescribeParams);
+
 }  // namespace content

content/browser/dom_storage/dom_storage_context_wrapper_unittest.cc

diff --git a/content/browser/dom_storage/dom_storage_context_wrapper_unittest.cc b/content/browser/dom_storage/dom_storage_context_wrapper_unittest.cc
index 24b9e6a..b7d53579 100644
--- a/content/browser/dom_storage/dom_storage_context_wrapper_unittest.cc
+++ b/content/browser/dom_storage/dom_storage_context_wrapper_unittest.cc
@@ -57,6 +57,7 @@
     auto* security_policy = ChildProcessSecurityPolicyImpl::GetInstance();
     security_policy->Remove(kTestProcessIdOrigin1);
     security_policy->Remove(kTestProcessIdOrigin2);
+    security_policy->ClearIsolatedOriginsForTesting();
   }
 
  protected:

content/browser/media/frameless_media_interface_proxy.cc

diff --git a/content/browser/media/frameless_media_interface_proxy.cc b/content/browser/media/frameless_media_interface_proxy.cc
index bbf7373..ebf6301 100644
--- a/content/browser/media/frameless_media_interface_proxy.cc
+++ b/content/browser/media/frameless_media_interface_proxy.cc
@@ -16,10 +16,10 @@
 #include "media/mojo/mojom/renderer_extensions.mojom.h"
 #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h"
 
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
 #include "content/public/browser/stable_video_decoder_factory.h"
 #include "media/base/media_switches.h"
-#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
 
 namespace content {
 
@@ -67,8 +67,8 @@
 
   mojo::PendingRemote<media::stable::mojom::StableVideoDecoder>
       oop_video_decoder;
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-  if (base::FeatureList::IsEnabled(media::kUseOutOfProcessVideoDecoding)) {
+#if BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
+  if (media::IsOutOfProcessVideoDecodingEnabled()) {
     if (!render_process_host_) {
       if (!stable_vd_factory_remote_.is_bound()) {
         LaunchStableVideoDecoderFactory(
@@ -86,7 +86,7 @@
           oop_video_decoder.InitWithNewPipeAndPassReceiver());
     }
   }
-#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
   factory->CreateVideoDecoder(std::move(receiver),
                               std::move(oop_video_decoder));
 }

content/browser/media/media_interface_proxy.cc

diff --git a/content/browser/media/media_interface_proxy.cc b/content/browser/media/media_interface_proxy.cc
index 22dbee9c..66e661d1 100644
--- a/content/browser/media/media_interface_proxy.cc
+++ b/content/browser/media/media_interface_proxy.cc
@@ -73,10 +73,10 @@
 #include "media/mojo/services/mojo_renderer_service.h"  // nogncheck
 #endif
 
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
 #include "content/public/browser/stable_video_decoder_factory.h"
 #include "media/base/media_switches.h"
-#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
 
 namespace content {
 
@@ -286,12 +286,12 @@
 
   mojo::PendingRemote<media::stable::mojom::StableVideoDecoder>
       oop_video_decoder;
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-  if (base::FeatureList::IsEnabled(media::kUseOutOfProcessVideoDecoding)) {
+#if BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
+  if (media::IsOutOfProcessVideoDecodingEnabled()) {
     render_frame_host().GetProcess()->CreateStableVideoDecoder(
         oop_video_decoder.InitWithNewPipeAndPassReceiver());
   }
-#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
   factory->CreateVideoDecoder(std::move(receiver),
                               std::move(oop_video_decoder));
 }

content/browser/renderer_host/navigation_request.cc

diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index 6e47ee4..1173ecd 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -9343,8 +9343,7 @@
   return GetParentFrame()->GetIsThirdPartyCookiesUserBypassEnabled();
 }
 
-std::unique_ptr<WebUIImpl> NavigationRequest::CreateWebUIIfNeeded(
-    RenderFrameHostImpl* frame_host) {
+bool NavigationRequest::CreateWebUIIfNeeded(RenderFrameHostImpl* frame_host) {
   TRACE_EVENT2("content", "NavigationRequest::CreateWebUI", "frame_host",
                frame_host, "url", GetURL());
   WebUI::TypeID new_web_ui_type =
@@ -9352,8 +9351,9 @@
           frame_host->GetSiteInstance()->GetBrowserContext(), GetURL());
   if (new_web_ui_type == WebUI::kNoWebUI) {
     // The navigation doesn't need a WebUI.
-    return nullptr;
+    return false;
   }
+  CHECK(!web_ui_);
 
   // We reuse WebUI on navigations with the same WebUI type where we use the
   // same RFH, so don't create a new one if there is already an existing WebUI
@@ -9362,15 +9362,17 @@
   // if the WebUI type differs.
   if (frame_host->web_ui()) {
     CHECK_EQ(new_web_ui_type, frame_host->web_ui_type());
-    return nullptr;
+    return false;
   }
 
-  std::unique_ptr<WebUIImpl> web_ui = std::make_unique<WebUIImpl>(frame_host);
+  web_ui_ = std::make_unique<WebUIImpl>(frame_host);
+
   std::unique_ptr<WebUIController> controller(
       WebUIControllerFactoryRegistry::GetInstance()
-          ->CreateWebUIControllerForURL(web_ui.get(), GetURL()));
+          ->CreateWebUIControllerForURL(web_ui_.get(), GetURL()));
   if (!controller) {
-    return nullptr;
+    // TODO(https://crbug.com/1220337): Make this a CHECK instead.
+    return false;
   }
 
   // If we have assigned (zero or more) bindings to the NavigationEntry in
@@ -9378,20 +9380,20 @@
   // had before. If so, note it and don't give it any bindings, to avoid a
   // potential privilege escalation.
   if (bindings() != FrameNavigationEntry::kInvalidBindings &&
-      bindings() != web_ui->GetBindings()) {
+      bindings() != web_ui_->GetBindings()) {
     RecordAction(base::UserMetricsAction("ProcessSwapBindingsMismatch_RVHM"));
     base::WeakPtr<NavigationRequest> self = GetWeakPtr();
-    web_ui.reset();
+    web_ui_.reset();
     // Resetting the WebUI may indirectly call content's embedders and delete
     // `this`. There are no known occurrences of it, so we assume this never
     // happen and crash immediately if it does, because there are no easy ways
     // to recover.
     CHECK(self);
-    return nullptr;
+    return false;
   }
 
-  web_ui->SetController(std::move(controller));
-  return web_ui;
+  web_ui_->SetController(std::move(controller));
+  return true;
 }
 
 }  // namespace content

content/browser/renderer_host/navigation_request.h

diff --git a/content/browser/renderer_host/navigation_request.h b/content/browser/renderer_host/navigation_request.h
index 5cdf8f1..a49476c 100644
--- a/content/browser/renderer_host/navigation_request.h
+++ b/content/browser/renderer_host/navigation_request.h
@@ -1174,10 +1174,17 @@
     resume_commit_closure_ = std::move(closure);
   }
 
-  // Creates a WebUI object for this navigation which will later be saved in
-  // `frame_host`. If no WebUI applies, returns null.
-  std::unique_ptr<WebUIImpl> CreateWebUIIfNeeded(
-      RenderFrameHostImpl* frame_host);
+  // Creates a WebUI object for this navigation and saves it in `web_ui_`. Later
+  // on, the WebUI created will be moved to `frame_host`. Returns true if and
+  // only if a WebUI object is successfully created and saved.
+  bool CreateWebUIIfNeeded(RenderFrameHostImpl* frame_host);
+
+  bool HasWebUI() { return !!web_ui_; }
+
+  std::unique_ptr<WebUIImpl> TakeWebUI() {
+    CHECK(HasWebUI());
+    return std::move(web_ui_);
+  }
 
  private:
   friend class NavigationRequestTest;
@@ -2543,6 +2550,11 @@
   std::unique_ptr<RenderFrameHostImpl::CookieChangeListener>
       cookie_change_listener_;
 
+  // The WebUI object to be used for this navigation. When a RenderFrameHost has
+  // been picked for the navigation, the WebUI object will be moved to be owned
+  // by the RenderFrameHost.
+  std::unique_ptr<WebUIImpl> web_ui_;
+
   base::WeakPtrFactory<NavigationRequest> weak_factory_{this};
 };
 

content/browser/renderer_host/render_frame_host_manager.cc

diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
index ed47835..61fc3c9 100644
--- a/content/browser/renderer_host/render_frame_host_manager.cc
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
@@ -1344,18 +1344,10 @@
         // and at ReadyToCommit time. The first call would have created the
         // WebUI instance and since the initial about:blank has not committed
         // a navigation, the else branch would be taken. Explicit check for
-        // web_ui_ is required, otherwise we will allocate a new instance
+        // `web_ui()` is required, otherwise we will allocate a new instance
         // unnecessarily here.
-        std::unique_ptr<WebUIImpl> web_ui =
+        notify_webui_of_rf_creation =
             request->CreateWebUIIfNeeded(render_frame_host_.get());
-        if (web_ui) {
-          render_frame_host_->SetWebUI(*request, std::move(web_ui));
-          CHECK(render_frame_host_->web_ui());
-        }
-        if (render_frame_host_->IsRenderFrameLive()) {
-          render_frame_host_->web_ui()->WebUIRenderFrameCreated(
-              render_frame_host_.get());
-        }
       }
     }
 
@@ -1432,13 +1424,8 @@
     if (WebUIControllerFactoryRegistry::GetInstance()->UseWebUIForURL(
             browser_context, request->common_params().url) &&
         request->state() < NavigationRequest::CANCELING) {
-      std::unique_ptr<WebUIImpl> web_ui =
+      notify_webui_of_rf_creation =
           request->CreateWebUIIfNeeded(speculative_render_frame_host_.get());
-      if (web_ui) {
-        notify_webui_of_rf_creation = true;
-        speculative_render_frame_host_->SetWebUI(*request, std::move(web_ui));
-        CHECK(speculative_render_frame_host_->web_ui());
-      }
     }
 
     navigation_rfh = speculative_render_frame_host_.get();
@@ -1494,6 +1481,17 @@
       navigation_rfh->SetPolicyContainerForEarlyCommitAfterCrash(
           current_frame_host()->policy_container_host()->Clone());
 
+      if (request->HasWebUI()) {
+        // If a WebUI has been created for the NavigationRequest, set it on the
+        // RenderFrameHost picked for the navigation. Note that there is a
+        // similar WebUI handling near the end of this function to cover the
+        // non-early commit cases, which won't run if we already run this code
+        // because `HasWebUI()` will return false after we take the WebUI from
+        // the NavigationRequest here.
+        navigation_rfh->SetWebUI(*request, request->TakeWebUI());
+        CHECK(navigation_rfh->web_ui());
+      }
+
       CommitPending(
           std::move(speculative_render_frame_host_), nullptr,
           request->browsing_context_group_swap().ShouldClearProxiesOnCommit());
@@ -1539,10 +1537,17 @@
     }
   }
 
-  // If a WebUI was created in a speculative RenderFrameHost or a new
-  // RenderFrame was created then the WebUI never interacted with the
-  // RenderFrame. Notify using WebUIRenderFrameCreated.
+  if (request->HasWebUI()) {
+    // If a WebUI has been created for the NavigationRequest, set it on the
+    // RenderFrameHost picked for the navigation.
+    navigation_rfh->SetWebUI(*request, request->TakeWebUI());
+    CHECK(navigation_rfh->web_ui());
+  }
   if (notify_webui_of_rf_creation && navigation_rfh->web_ui()) {
+    CHECK(navigation_rfh->IsRenderFrameLive());
+    // If a WebUI was created in a speculative RenderFrameHost, or a new
+    // RenderFrame was created for an existing WebUI, then the WebUI never
+    // interacted with the RenderFrame. Notify using WebUIRenderFrameCreated.
     navigation_rfh->web_ui()->WebUIRenderFrameCreated(navigation_rfh);
   }
 

content/browser/renderer_host/render_widget_host_view_android_unittest.cc

diff --git a/content/browser/renderer_host/render_widget_host_view_android_unittest.cc b/content/browser/renderer_host/render_widget_host_view_android_unittest.cc
index bc4d010..12dcc02 100644
--- a/content/browser/renderer_host/render_widget_host_view_android_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android_unittest.cc
@@ -84,7 +84,7 @@
 
 }  // namespace
 
-class RenderWidgetHostViewAndroidTest : public testing::Test {
+class RenderWidgetHostViewAndroidTest : public RenderViewHostImplTestHarness {
  public:
   RenderWidgetHostViewAndroidTest();
 
@@ -129,10 +129,6 @@
   std::unique_ptr<TestViewAndroidDelegate> test_view_android_delegate_;
 
  private:
-  std::unique_ptr<TestBrowserContext> browser_context_;
-  scoped_refptr<SiteInstanceImpl> site_instance_;
-  std::unique_ptr<TestWebContents> web_contents_;
-  std::unique_ptr<FrameTree> frame_tree_;
   std::unique_ptr<MockRenderProcessHost> process_;
   scoped_refptr<SiteInstanceGroup> site_instance_group_;
   std::unique_ptr<MockRenderWidgetHostDelegate> delegate_;
@@ -145,8 +141,6 @@
   // Owned by `render_view_host_`.
   raw_ptr<MockRenderWidgetHost> host_;
   raw_ptr<RenderWidgetHostViewAndroid> render_widget_host_view_android_;
-
-  BrowserTaskEnvironment task_environment_;
 };
 
 RenderWidgetHostViewAndroidTest::RenderWidgetHostViewAndroidTest()
@@ -193,31 +187,22 @@
 }
 
 void RenderWidgetHostViewAndroidTest::SetUp() {
-  browser_context_ = std::make_unique<TestBrowserContext>();
-  site_instance_ = SiteInstanceImpl::Create(browser_context_.get());
-  web_contents_ =
-      TestWebContents::Create(browser_context_.get(), site_instance_);
-  frame_tree_ = std::make_unique<FrameTree>(
-      browser_context_.get(), web_contents_.get(), web_contents_.get(),
-      web_contents_.get(), web_contents_.get(), web_contents_.get(),
-      web_contents_.get(), web_contents_.get(), web_contents_.get(),
-      FrameTree::Type::kPrimary);
+  RenderViewHostImplTestHarness::SetUp();
 
   delegate_ = std::make_unique<MockRenderWidgetHostDelegate>();
-  process_ = std::make_unique<MockRenderProcessHost>(browser_context_.get());
-  site_instance_group_ =
-      base::WrapRefCounted(SiteInstanceGroup::CreateForTesting(
-          browser_context_.get(), process_.get()));
+  process_ = std::make_unique<MockRenderProcessHost>(browser_context());
+  site_instance_group_ = base::WrapRefCounted(
+      SiteInstanceGroup::CreateForTesting(browser_context(), process_.get()));
   // Initialized before ownership is given to `render_view_host_`.
   std::unique_ptr<MockRenderWidgetHost> mock_host =
-      MockRenderWidgetHost::Create(frame_tree_.get(), delegate_.get(),
-                                   site_instance_group_->GetSafeRef(),
-                                   process_->GetNextRoutingID());
+      MockRenderWidgetHost::Create(
+          &contents()->GetPrimaryFrameTree(), delegate_.get(),
+          site_instance_group_->GetSafeRef(), process_->GetNextRoutingID());
   host_ = mock_host.get();
   render_view_host_ = new TestRenderViewHost(
-      frame_tree_.get(), site_instance_group_.get(),
-      site_instance_->GetStoragePartitionConfig(), std::move(mock_host),
-      web_contents_.get(), process_->GetNextRoutingID(),
+      &contents()->GetPrimaryFrameTree(), site_instance_group_.get(),
+      contents()->GetSiteInstance()->GetStoragePartitionConfig(),
+      std::move(mock_host), contents(), process_->GetNextRoutingID(),
       process_->GetNextRoutingID(), nullptr,
       CreateRenderViewHostCase::kDefault);
   parent_layer_ = cc::slim::Layer::Create();
@@ -234,16 +219,13 @@
 void RenderWidgetHostViewAndroidTest::TearDown() {
   render_widget_host_view_android_->Destroy();
   render_view_host_.reset();
-  frame_tree_->Shutdown();
-  frame_tree_.reset();
-  web_contents_.reset();
-  site_instance_.reset();
 
   delegate_.reset();
   process_->Cleanup();
   site_instance_group_.reset();
   process_ = nullptr;
-  browser_context_.reset();
+
+  RenderViewHostImplTestHarness::TearDown();
 }
 
 // Tests that when a child responds to a Surface Synchronization message, while

content/browser/renderer_host/render_widget_host_view_child_frame_unittest.cc

diff --git a/content/browser/renderer_host/render_widget_host_view_child_frame_unittest.cc b/content/browser/renderer_host/render_widget_host_view_child_frame_unittest.cc
index ccea636..8c8fbbc6 100644
--- a/content/browser/renderer_host/render_widget_host_view_child_frame_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_child_frame_unittest.cc
@@ -33,6 +33,7 @@
 #include "content/public/test/fake_frame_widget.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
+#include "content/public/test/test_web_contents_factory.h"
 #include "content/test/mock_render_widget_host_delegate.h"
 #include "content/test/mock_widget.h"
 #include "content/test/test_render_view_host.h"
@@ -106,33 +107,26 @@
   bool can_bubble_ = true;
 };
 
-class RenderWidgetHostViewChildFrameTest : public testing::Test {
+class RenderWidgetHostViewChildFrameTest
+    : public RenderViewHostImplTestHarness {
  public:
   RenderWidgetHostViewChildFrameTest() {}
 
   void SetUp() override {
-    browser_context_ = std::make_unique<TestBrowserContext>();
+    RenderViewHostImplTestHarness::SetUp();
 
-// ImageTransportFactory doesn't exist on Android.
-#if !BUILDFLAG(IS_ANDROID)
-    ImageTransportFactory::SetFactory(
-        std::make_unique<TestImageTransportFactory>());
-#endif
-
-    process_host_ =
-        std::make_unique<MockRenderProcessHost>(browser_context_.get());
+    process_host_ = std::make_unique<MockRenderProcessHost>(browser_context());
     site_instance_group_ =
         base::WrapRefCounted(SiteInstanceGroup::CreateForTesting(
-            browser_context_.get(), process_host_.get()));
+            browser_context(), process_host_.get()));
     int32_t routing_id = process_host_->GetNextRoutingID();
     sink_ = &process_host_->sink();
 
-    web_contents_ = TestWebContents::Create(
-        browser_context_.get(),
-        SiteInstanceImpl::Create(browser_context_.get()));
-
+    // Create a RenderWidgetHostImpl which will be associated with an
+    // RenderWidgetHostViewChildFrame, to simulate what would be done for an
+    // OOPIF.
     widget_host_ = RenderWidgetHostImpl::Create(
-        /*frame_tree=*/&web_contents_->GetPrimaryFrameTree(), &delegate_,
+        /*frame_tree=*/&contents()->GetPrimaryFrameTree(), &delegate_,
         site_instance_group_->GetSafeRef(), routing_id,
         /*hidden=*/false, /*renderer_initiated_creation=*/false,
         std::make_unique<FrameTokenMessageQueue>());
@@ -165,21 +159,13 @@
     if (view_)
       view_->Destroy();
     widget_host_.reset();
-    web_contents_.reset();
     site_instance_group_.reset();
     process_host_->Cleanup();
     delete test_frame_connector_;
 
     process_host_.reset();
 
-    browser_context_.reset();
-
-    base::SingleThreadTaskRunner::GetCurrentDefault()->DeleteSoon(
-        FROM_HERE, browser_context_.release());
-    base::RunLoop().RunUntilIdle();
-#if !BUILDFLAG(IS_ANDROID)
-    ImageTransportFactory::Terminate();
-#endif
+    RenderViewHostImplTestHarness::TearDown();
   }
 
   viz::SurfaceId GetSurfaceId() const {
@@ -191,12 +177,8 @@
   }
 
  protected:
-  BrowserTaskEnvironment task_environment_;
-
-  std::unique_ptr<BrowserContext> browser_context_;
   std::unique_ptr<MockRenderProcessHost> process_host_;
   scoped_refptr<SiteInstanceGroup> site_instance_group_;
-  std::unique_ptr<WebContentsImpl> web_contents_;
   raw_ptr<IPC::TestSink> sink_ = nullptr;
   MockRenderWidgetHostDelegate delegate_;
   MockWidget widget_;

content/browser/web_database/web_database_host_impl_unittest.cc

diff --git a/content/browser/web_database/web_database_host_impl_unittest.cc b/content/browser/web_database/web_database_host_impl_unittest.cc
index ef3d652b5..e785848 100644
--- a/content/browser/web_database/web_database_host_impl_unittest.cc
+++ b/content/browser/web_database/web_database_host_impl_unittest.cc
@@ -202,6 +202,8 @@
   EXPECT_EQ(result->storage_key,
             blink::StorageKey::CreateFromStringForTesting(example_url));
   EXPECT_GT(result->id.value(), 0);
+
+  security_policy->ClearIsolatedOriginsForTesting();
 }
 
 TEST_F(WebDatabaseHostImplTest, GetOrCreateBucketError) {
@@ -233,6 +235,8 @@
                          }));
       }));
   run_loop.Run();
+
+  security_policy->ClearIsolatedOriginsForTesting();
 }
 
 TEST_F(WebDatabaseHostImplTest, BadMessagesUnauthorized) {
@@ -290,6 +294,8 @@
   CheckUnauthorizedOrigin([&]() {
     host()->HandleSqliteError(incorrect_origin, db_name, /*error=*/0);
   });
+
+  security_policy->ClearIsolatedOriginsForTesting();
 }
 
 TEST_F(WebDatabaseHostImplTest, BadMessagesInvalid) {
@@ -380,6 +386,7 @@
   }
 
   mojo::SetDefaultProcessErrorHandler(base::NullCallback());
+  security_policy->ClearIsolatedOriginsForTesting();
 }
 
 }  // namespace

content/gpu/gpu_main.cc

diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 7bf09dd..7af9fa0 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -84,8 +84,8 @@
 #include "base/win/scoped_com_initializer.h"
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
+#include "media/base/win/mf_initializer.h"
 #include "media/gpu/windows/dxva_video_decode_accelerator_win.h"
-#include "media/gpu/windows/media_foundation_video_encode_accelerator_win.h"
 #include "sandbox/win/src/sandbox.h"
 #endif
 
@@ -153,8 +153,9 @@
 #endif
 #endif  // BUILDFLAG(USE_VAAPI)
 #if BUILDFLAG(IS_WIN)
-    media::DXVAVideoDecodeAccelerator::PreSandboxInitialization();
-    media::MediaFoundationVideoEncodeAccelerator::PreSandboxInitialization();
+    if (media::PreSandboxMediaFoundationInitialization()) {
+      media::DXVAVideoDecodeAccelerator::PreSandboxInitialization();
+    }
 #endif
 
 #if BUILDFLAG(IS_MAC)

content/shell/app/ios-Info.plist

diff --git a/content/shell/app/ios-Info.plist b/content/shell/app/ios-Info.plist
index e05a25c..5e14f3a 100644
--- a/content/shell/app/ios-Info.plist
+++ b/content/shell/app/ios-Info.plist
@@ -50,5 +50,7 @@
 	<string>LaunchScreen</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Allow content_shell access to microphone</string>
+	<key>NSCameraUsageDescription</key>
+	<string>Allow content_shell access to camera</string>
 </dict>
 </plist>

content/test/data/gpu/webcodecs/copyTo.html

diff --git a/content/test/data/gpu/webcodecs/copyTo.html b/content/test/data/gpu/webcodecs/copyTo.html
index 14eb6f415..628b891e 100644
--- a/content/test/data/gpu/webcodecs/copyTo.html
+++ b/content/test/data/gpu/webcodecs/copyTo.html
@@ -157,5 +157,5 @@
     source.close();
     TEST.log('Test completed');
   }
-  addManualTestButton({'source_type': 'offscreen'});
+  addManualTestButton([{'source_type': 'offscreen'}]);
 </script>
\ No newline at end of file

content/test/data/gpu/webcodecs/draw-image.html

diff --git a/content/test/data/gpu/webcodecs/draw-image.html b/content/test/data/gpu/webcodecs/draw-image.html
index 5a160734..5b2356d 100644
--- a/content/test/data/gpu/webcodecs/draw-image.html
+++ b/content/test/data/gpu/webcodecs/draw-image.html
@@ -53,7 +53,7 @@
       source.close();
       TEST.log('Test completed');
     }
-    addManualTestButton({'source_type': 'offscreen'});
+    addManualTestButton([{'source_type': 'offscreen'}]);
   </script>
 </head>
 

content/test/data/gpu/webcodecs/encode-color-space.html

diff --git a/content/test/data/gpu/webcodecs/encode-color-space.html b/content/test/data/gpu/webcodecs/encode-color-space.html
index 75d7d94..4ff25ed0 100644
--- a/content/test/data/gpu/webcodecs/encode-color-space.html
+++ b/content/test/data/gpu/webcodecs/encode-color-space.html
@@ -247,10 +247,10 @@
       }
       TEST.log('Test completed');
     }
-    addManualTestButton({
-      'codec': 'avc1.42001E',
-      'acceleration':'prefer-software'
-    });
+    addManualTestButton([
+      {'codec': 'avc1.42001E', 'acceleration':'prefer-software'},
+      {'codec': 'avc1.42001E', 'acceleration':'prefer-hardware'},
+    ]);
   </script>
 </head>
 

content/test/data/gpu/webcodecs/encode-decode.html

diff --git a/content/test/data/gpu/webcodecs/encode-decode.html b/content/test/data/gpu/webcodecs/encode-decode.html
index 398f22a..3cf813d 100644
--- a/content/test/data/gpu/webcodecs/encode-decode.html
+++ b/content/test/data/gpu/webcodecs/encode-decode.html
@@ -120,11 +120,11 @@
         errors == 0, 'Decoding or encoding errors occurred during the test');
       TEST.log('Test completed');
     }
-    addManualTestButton({
+    addManualTestButton([{
       'source_type': 'offscreen',
       'codec': 'avc1.42001E',
       'acceleration':'prefer-software'
-    });
+    }]);
   </script>
 </head>
 

content/test/data/gpu/webcodecs/encode.html

diff --git a/content/test/data/gpu/webcodecs/encode.html b/content/test/data/gpu/webcodecs/encode.html
index 6964be029..b985756c 100644
--- a/content/test/data/gpu/webcodecs/encode.html
+++ b/content/test/data/gpu/webcodecs/encode.html
@@ -99,11 +99,11 @@
       TEST.assert(errors == 0, 'Encoding errors occurred during the test');
       TEST.log('Test completed');
     }
-    addManualTestButton({
+    addManualTestButton([{
       'source_type': 'offscreen',
       'codec': 'avc1.42001E',
       'acceleration':'prefer-software'
-    });
+    }]);
   </script>
 </head>
 

content/test/data/gpu/webcodecs/encoding-modes.html

diff --git a/content/test/data/gpu/webcodecs/encoding-modes.html b/content/test/data/gpu/webcodecs/encoding-modes.html
index 574f61f..ad80b3b 100644
--- a/content/test/data/gpu/webcodecs/encoding-modes.html
+++ b/content/test/data/gpu/webcodecs/encoding-modes.html
@@ -80,13 +80,13 @@
       TEST.assert(errors == 0, 'Encoding errors occurred during the test');
       TEST.log('Test completed');
     }
-    addManualTestButton({
+    addManualTestButton([{
       'source_type': 'offscreen',
       'codec': 'avc1.42001E',
       'acceleration':'prefer-software',
       'bitrate_mode': 'constant',
       'latency_mode': 'realtime'
-    });
+    }]);
   </script>
 </head>
 

content/test/data/gpu/webcodecs/encoding-rate-control.html

diff --git a/content/test/data/gpu/webcodecs/encoding-rate-control.html b/content/test/data/gpu/webcodecs/encoding-rate-control.html
index 24009ec..e9dd7af 100644
--- a/content/test/data/gpu/webcodecs/encoding-rate-control.html
+++ b/content/test/data/gpu/webcodecs/encoding-rate-control.html
@@ -15,12 +15,12 @@
   <script src="webcodecs_common.js"></script>
   <script src="encoding-rate-control.js"></script>
   <script type="text/javascript">
-    addManualTestButton({
+    addManualTestButton([{
       'codec': 'avc1.420034',
       'acceleration':'prefer-software',
       'bitrate_mode': 'constant',
       'bitrate': 2000000
-    });
+    }]);
   </script>
 
 </head>

content/test/data/gpu/webcodecs/svc.html

diff --git a/content/test/data/gpu/webcodecs/svc.html b/content/test/data/gpu/webcodecs/svc.html
index 7ec9ca1..7c1f349 100644
--- a/content/test/data/gpu/webcodecs/svc.html
+++ b/content/test/data/gpu/webcodecs/svc.html
@@ -109,11 +109,11 @@
         errors == 0, 'Decoding or encoding errors occurred during the test');
       TEST.log('Test completed');
     }
-    addManualTestButton({
+    addManualTestButton([{
       'codec': 'avc1.42001E',
       'acceleration':'prefer-software',
       'layers': 2
-    });
+    }]);
   </script>
 </head>
 

content/test/data/gpu/webcodecs/tex-image-2d.html

diff --git a/content/test/data/gpu/webcodecs/tex-image-2d.html b/content/test/data/gpu/webcodecs/tex-image-2d.html
index 77cfd372..8492f2e 100644
--- a/content/test/data/gpu/webcodecs/tex-image-2d.html
+++ b/content/test/data/gpu/webcodecs/tex-image-2d.html
@@ -116,7 +116,7 @@
       source.close();
       TEST.log('Test completed');
     }
-    addManualTestButton({'source_type': 'offscreen'});
+    addManualTestButton([{'source_type': 'offscreen'}]);
   </script>
 </head>
 

content/test/data/gpu/webcodecs/webcodecs_common.js

diff --git a/content/test/data/gpu/webcodecs/webcodecs_common.js b/content/test/data/gpu/webcodecs/webcodecs_common.js
index b34532a2..496bc3b 100644
--- a/content/test/data/gpu/webcodecs/webcodecs_common.js
+++ b/content/test/data/gpu/webcodecs/webcodecs_common.js
@@ -446,15 +446,18 @@
   }
 }
 
-function addManualTestButton(config) {
-  window.onload = function() {
-    const btn = document.createElement('button');
-    const label = document.createTextNode(
-        'Run test with config: ' + JSON.stringify(config));
-    btn.onclick = function() {
-      main(config);
-    };
-    btn.appendChild(label);
-    document.body.appendChild(btn);
-  }
+function addManualTestButton(configs) {
+  document.addEventListener('DOMContentLoaded', _ => {
+    configs.forEach(config => {
+      const btn = document.createElement('button');
+      const label = document.createTextNode(
+          'Run test with config: ' + JSON.stringify(config));
+      btn.onclick = function() {
+        main(config);
+      };
+      btn.appendChild(label);
+      btn.style.margin = '5px';
+      document.body.appendChild(btn);
+    });
+  }, true);
 }

docs/speed/metrics_changelog/2023_04_lcp.md

diff --git a/docs/speed/metrics_changelog/2023_04_lcp.md b/docs/speed/metrics_changelog/2023_04_lcp.md
index 4e3e2085..faa66ed 100644
--- a/docs/speed/metrics_changelog/2023_04_lcp.md
+++ b/docs/speed/metrics_changelog/2023_04_lcp.md
@@ -5,7 +5,7 @@
 
 LCP has historically ignored full screen background images, as well as solid
 or simple gradient backgrounds when implemented through CSS. That heuristic
-discounts paints which are not contenful, but just serve as backgrounds or
+discounts paints which are not contentful, but just serve as backgrounds or
 placeholders for other content.
 
 This change extends that heuristic to other images as well, when those images
@@ -18,9 +18,9 @@
 
 ## How does this affect a site's metrics?
 By ignoring ver low-content images, Chrome will instead report the first paint
-with either text or a more contenful image as LCP. This may result in LCP times
+with either text or a more contentful image as LCP. This may result in LCP times
 increasing, if a low-content background was being painted very early, or if a
-low-content placeholder was being used to reserve space for a more contenful
+low-content placeholder was being used to reserve space for a more contentful
 image which loaded later. This may also improve LCP in cases where a low-content
 background or viewport overlay was being added to the page after other content.
 

fuchsia_web/runners/cast/api_bindings_client.h

diff --git a/fuchsia_web/runners/cast/api_bindings_client.h b/fuchsia_web/runners/cast/api_bindings_client.h
index 50653e4..3bffa7d 100644
--- a/fuchsia_web/runners/cast/api_bindings_client.h
+++ b/fuchsia_web/runners/cast/api_bindings_client.h
@@ -5,13 +5,13 @@
 #ifndef FUCHSIA_WEB_RUNNERS_CAST_API_BINDINGS_CLIENT_H_
 #define FUCHSIA_WEB_RUNNERS_CAST_API_BINDINGS_CLIENT_H_
 
+#include <chromium/cast/cpp/fidl.h>
 #include <fuchsia/web/cpp/fidl.h>
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
 #include "components/cast/message_port/message_port.h"
 #include "components/cast/named_message_port_connector/named_message_port_connector.h"
-#include "fuchsia_web/runners/cast/fidl/fidl/hlcpp/chromium/cast/cpp/fidl.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 // Injects scripts received from the ApiBindings service, and provides connected

fuchsia_web/runners/cast/application_controller_impl.h

diff --git a/fuchsia_web/runners/cast/application_controller_impl.h b/fuchsia_web/runners/cast/application_controller_impl.h
index 7a9aaea..a98047871 100644
--- a/fuchsia_web/runners/cast/application_controller_impl.h
+++ b/fuchsia_web/runners/cast/application_controller_impl.h
@@ -5,14 +5,13 @@
 #ifndef FUCHSIA_WEB_RUNNERS_CAST_APPLICATION_CONTROLLER_IMPL_H_
 #define FUCHSIA_WEB_RUNNERS_CAST_APPLICATION_CONTROLLER_IMPL_H_
 
+#include <chromium/cast/cpp/fidl.h>
 #include <fuchsia/diagnostics/cpp/fidl.h>
 #include <fuchsia/media/sessions2/cpp/fidl.h>
 #include <fuchsia/web/cpp/fidl.h>
 #include <lib/fidl/cpp/binding.h>
 #include <lib/fidl/cpp/interface_request.h>
 
-#include "fuchsia_web/runners/cast/fidl/fidl/hlcpp/chromium/cast/cpp/fidl.h"
-
 class ApplicationControllerImpl final
     : public chromium::cast::ApplicationController {
  public:

fuchsia_web/runners/cast/application_controller_impl_unittest.cc

diff --git a/fuchsia_web/runners/cast/application_controller_impl_unittest.cc b/fuchsia_web/runners/cast/application_controller_impl_unittest.cc
index 0056f406..f0f53ef 100644
--- a/fuchsia_web/runners/cast/application_controller_impl_unittest.cc
+++ b/fuchsia_web/runners/cast/application_controller_impl_unittest.cc
@@ -2,9 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <chromium/cast/cpp/fidl.h>
 #include <fuchsia/web/cpp/fidl.h>
 #include <fuchsia/web/cpp/fidl_test_base.h>
 #include <lib/fidl/cpp/binding.h>
+
 #include <string>
 #include <utility>
 
@@ -13,7 +15,6 @@
 #include "base/test/test_future.h"
 #include "fuchsia_web/common/test/fit_adapter.h"
 #include "fuchsia_web/runners/cast/application_controller_impl.h"
-#include "fuchsia_web/runners/cast/fidl/fidl/hlcpp/chromium/cast/cpp/fidl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

fuchsia_web/runners/cast/cast_component.cc

diff --git a/fuchsia_web/runners/cast/cast_component.cc b/fuchsia_web/runners/cast/cast_component.cc
index 69f9a54..a3995b9 100644
--- a/fuchsia_web/runners/cast/cast_component.cc
+++ b/fuchsia_web/runners/cast/cast_component.cc
@@ -4,8 +4,10 @@
 
 #include "fuchsia_web/runners/cast/cast_component.h"
 
+#include <chromium/cast/cpp/fidl.h>
 #include <lib/fidl/cpp/binding.h>
 #include <lib/ui/scenic/cpp/view_ref_pair.h>
+
 #include <algorithm>
 #include <string>
 #include <utility>
@@ -21,7 +23,6 @@
 #include "components/cast/message_port/platform_message_port.h"
 #include "fuchsia_web/runners/cast/cast_runner.h"
 #include "fuchsia_web/runners/cast/cast_streaming.h"
-#include "fuchsia_web/runners/cast/fidl/fidl/hlcpp/chromium/cast/cpp/fidl.h"
 #include "fuchsia_web/runners/common/web_component.h"
 
 namespace {

fuchsia_web/runners/cast/cast_component.h

diff --git a/fuchsia_web/runners/cast/cast_component.h b/fuchsia_web/runners/cast/cast_component.h
index cbb5b63..11eba0f 100644
--- a/fuchsia_web/runners/cast/cast_component.h
+++ b/fuchsia_web/runners/cast/cast_component.h
@@ -5,6 +5,7 @@
 #ifndef FUCHSIA_WEB_RUNNERS_CAST_CAST_COMPONENT_H_
 #define FUCHSIA_WEB_RUNNERS_CAST_CAST_COMPONENT_H_
 
+#include <chromium/cast/cpp/fidl.h>
 #include <fuchsia/web/cpp/fidl.h>
 
 #include <memory>
@@ -18,7 +19,6 @@
 #include "base/message_loop/message_pump_fuchsia.h"
 #include "fuchsia_web/runners/cast/api_bindings_client.h"
 #include "fuchsia_web/runners/cast/application_controller_impl.h"
-#include "fuchsia_web/runners/cast/fidl/fidl/hlcpp/chromium/cast/cpp/fidl.h"
 #include "fuchsia_web/runners/cast/named_message_port_connector_fuchsia.h"
 #include "fuchsia_web/runners/common/web_component.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"

fuchsia_web/runners/cast/cast_runner.h

diff --git a/fuchsia_web/runners/cast/cast_runner.h b/fuchsia_web/runners/cast/cast_runner.h
index ad3ebbd..abc8631 100644
--- a/fuchsia_web/runners/cast/cast_runner.h
+++ b/fuchsia_web/runners/cast/cast_runner.h
@@ -5,8 +5,10 @@
 #ifndef FUCHSIA_WEB_RUNNERS_CAST_CAST_RUNNER_H_
 #define FUCHSIA_WEB_RUNNERS_CAST_CAST_RUNNER_H_
 
+#include <chromium/cast/cpp/fidl.h>
 #include <fuchsia/component/runner/cpp/fidl.h>
 #include <fuchsia/web/cpp/fidl.h>
+
 #include <memory>
 #include <set>
 #include <vector>
@@ -16,7 +18,6 @@
 #include "base/fuchsia/startup_context.h"
 #include "base/functional/callback.h"
 #include "fuchsia_web/runners/cast/cast_component.h"
-#include "fuchsia_web/runners/cast/fidl/fidl/hlcpp/chromium/cast/cpp/fidl.h"
 #include "fuchsia_web/runners/cast/pending_cast_component.h"
 #include "fuchsia_web/runners/common/web_content_runner.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"

fuchsia_web/runners/cast/cast_runner_integration_test.cc

diff --git a/fuchsia_web/runners/cast/cast_runner_integration_test.cc b/fuchsia_web/runners/cast/cast_runner_integration_test.cc
index e5e1f62..02ef1ef 100644
--- a/fuchsia_web/runners/cast/cast_runner_integration_test.cc
+++ b/fuchsia_web/runners/cast/cast_runner_integration_test.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <chromium/cast/cpp/fidl.h>
 #include <fuchsia/camera3/cpp/fidl.h>
 #include <fuchsia/legacymetrics/cpp/fidl.h>
 #include <fuchsia/media/cpp/fidl.h>
@@ -45,7 +46,6 @@
 #include "fuchsia_web/common/test/url_request_rewrite_test_util.h"
 #include "fuchsia_web/runners/cast/cast_runner.h"
 #include "fuchsia_web/runners/cast/cast_runner_switches.h"
-#include "fuchsia_web/runners/cast/fidl/fidl/hlcpp/chromium/cast/cpp/fidl.h"
 #include "fuchsia_web/runners/cast/test/cast_runner_features.h"
 #include "fuchsia_web/runners/cast/test/cast_runner_launcher.h"
 #include "fuchsia_web/runners/cast/test/fake_api_bindings.h"

fuchsia_web/runners/cast/cast_streaming.h

diff --git a/fuchsia_web/runners/cast/cast_streaming.h b/fuchsia_web/runners/cast/cast_streaming.h
index 49160cb..f267775 100644
--- a/fuchsia_web/runners/cast/cast_streaming.h
+++ b/fuchsia_web/runners/cast/cast_streaming.h
@@ -5,10 +5,9 @@
 #ifndef FUCHSIA_WEB_RUNNERS_CAST_CAST_STREAMING_H_
 #define FUCHSIA_WEB_RUNNERS_CAST_CAST_STREAMING_H_
 
+#include <chromium/cast/cpp/fidl.h>
 #include <fuchsia/web/cpp/fidl.h>
 
-#include "fuchsia_web/runners/cast/fidl/fidl/hlcpp/chromium/cast/cpp/fidl.h"
-
 // TODO(crbug.com/1082821): Remove unused methods here once the
 // Cast Streaming Receiver component has been implemented.
 

fuchsia_web/runners/cast/pending_cast_component.h

diff --git a/fuchsia_web/runners/cast/pending_cast_component.h b/fuchsia_web/runners/cast/pending_cast_component.h
index 3d716ea..f3090e8 100644
--- a/fuchsia_web/runners/cast/pending_cast_component.h
+++ b/fuchsia_web/runners/cast/pending_cast_component.h
@@ -5,13 +5,14 @@
 #ifndef FUCHSIA_WEB_RUNNERS_CAST_PENDING_CAST_COMPONENT_H_
 #define FUCHSIA_WEB_RUNNERS_CAST_PENDING_CAST_COMPONENT_H_
 
+#include <chromium/cast/cpp/fidl.h>
 #include <fuchsia/component/runner/cpp/fidl.h>
 #include <lib/fidl/cpp/interface_request.h>
+
 #include <memory>
 
 #include "base/strings/string_piece.h"
 #include "fuchsia_web/runners/cast/cast_component.h"
-#include "fuchsia_web/runners/cast/fidl/fidl/hlcpp/chromium/cast/cpp/fidl.h"
 
 namespace base {
 class StartupContext;

fuchsia_web/runners/cast/test/cast_runner_launcher.cc

diff --git a/fuchsia_web/runners/cast/test/cast_runner_launcher.cc b/fuchsia_web/runners/cast/test/cast_runner_launcher.cc
index 7d027a6..5621156 100644
--- a/fuchsia_web/runners/cast/test/cast_runner_launcher.cc
+++ b/fuchsia_web/runners/cast/test/cast_runner_launcher.cc
@@ -4,6 +4,7 @@
 
 #include "fuchsia_web/runners/cast/test/cast_runner_launcher.h"
 
+#include <chromium/cast/cpp/fidl.h>
 #include <fuchsia/buildinfo/cpp/fidl.h>
 #include <fuchsia/camera3/cpp/fidl.h>
 #include <fuchsia/component/decl/cpp/fidl.h>
@@ -30,7 +31,6 @@
 #include "base/fuchsia/process_context.h"
 #include "base/run_loop.h"
 #include "fuchsia_web/common/test/test_realm_support.h"
-#include "fuchsia_web/runners/cast/fidl/fidl/hlcpp/chromium/cast/cpp/fidl.h"
 #include "media/fuchsia/audio/fake_audio_device_enumerator_local_component.h"
 
 using ::component_testing::ChildRef;

fuchsia_web/runners/cast/test/fake_api_bindings.h

diff --git a/fuchsia_web/runners/cast/test/fake_api_bindings.h b/fuchsia_web/runners/cast/test/fake_api_bindings.h
index 31c9889..8a6850a 100644
--- a/fuchsia_web/runners/cast/test/fake_api_bindings.h
+++ b/fuchsia_web/runners/cast/test/fake_api_bindings.h
@@ -5,6 +5,8 @@
 #ifndef FUCHSIA_WEB_RUNNERS_CAST_TEST_FAKE_API_BINDINGS_H_
 #define FUCHSIA_WEB_RUNNERS_CAST_TEST_FAKE_API_BINDINGS_H_
 
+#include <chromium/cast/cpp/fidl.h>
+
 #include <string>
 #include <utility>
 #include <vector>
@@ -12,7 +14,6 @@
 #include "base/containers/flat_map.h"
 #include "base/functional/callback.h"
 #include "base/strings/string_piece.h"
-#include "fuchsia_web/runners/cast/fidl/fidl/hlcpp/chromium/cast/cpp/fidl.h"
 
 // Simple implementation of the ApiBindings service, for use by tests.
 class FakeApiBindingsImpl : public chromium::cast::ApiBindings {

fuchsia_web/runners/cast/test/fake_application_config_manager.h

diff --git a/fuchsia_web/runners/cast/test/fake_application_config_manager.h b/fuchsia_web/runners/cast/test/fake_application_config_manager.h
index a4a69bc69..72d4e326 100644
--- a/fuchsia_web/runners/cast/test/fake_application_config_manager.h
+++ b/fuchsia_web/runners/cast/test/fake_application_config_manager.h
@@ -5,11 +5,12 @@
 #ifndef FUCHSIA_WEB_RUNNERS_CAST_TEST_FAKE_APPLICATION_CONFIG_MANAGER_H_
 #define FUCHSIA_WEB_RUNNERS_CAST_TEST_FAKE_APPLICATION_CONFIG_MANAGER_H_
 
+#include <chromium/cast/cpp/fidl.h>
+
 #include <map>
 #include <string>
 #include <vector>
 
-#include "fuchsia_web/runners/cast/fidl/fidl/hlcpp/chromium/cast/cpp/fidl.h"
 #include "url/gurl.h"
 
 // Test cast.ApplicationConfigManager implementation which maps a test Cast

fuchsia_web/runners/cast/test/fake_cast_agent.h

diff --git a/fuchsia_web/runners/cast/test/fake_cast_agent.h b/fuchsia_web/runners/cast/test/fake_cast_agent.h
index bc91d3e..cf012440 100644
--- a/fuchsia_web/runners/cast/test/fake_cast_agent.h
+++ b/fuchsia_web/runners/cast/test/fake_cast_agent.h
@@ -5,6 +5,7 @@
 #ifndef FUCHSIA_WEB_RUNNERS_CAST_TEST_FAKE_CAST_AGENT_H_
 #define FUCHSIA_WEB_RUNNERS_CAST_TEST_FAKE_CAST_AGENT_H_
 
+#include <chromium/cast/cpp/fidl.h>
 #include <fuchsia/legacymetrics/cpp/fidl.h>
 #include <lib/fidl/cpp/binding_set.h>
 #include <lib/sys/component/cpp/testing/realm_builder.h>
@@ -14,7 +15,6 @@
 #include "base/containers/flat_map.h"
 #include "base/functional/callback.h"
 #include "base/strings/string_piece.h"
-#include "fuchsia_web/runners/cast/fidl/fidl/hlcpp/chromium/cast/cpp/fidl.h"
 #include "fuchsia_web/runners/cast/test/fake_application_config_manager.h"
 
 namespace test {

gpu/command_buffer/service/raster_decoder.cc

diff --git a/gpu/command_buffer/service/raster_decoder.cc b/gpu/command_buffer/service/raster_decoder.cc
index 0ab63d4..2b693fe 100644
--- a/gpu/command_buffer/service/raster_decoder.cc
+++ b/gpu/command_buffer/service/raster_decoder.cc
@@ -20,6 +20,7 @@
 #include "base/memory/raw_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "base/metrics/histogram_functions.h"
 #include "base/numerics/checked_math.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
@@ -714,6 +715,8 @@
   void DoClearPaintCacheINTERNAL();
 
   void FlushSurface(SkiaImageRepresentation::ScopedWriteAccess* access) {
+    static int flush_count = 0;
+    const base::TimeTicks start = base::TimeTicks::Now();
     int num_planes = access->representation()->format().NumberOfPlanes();
     auto end_state = access->TakeEndState();
     for (int plane_index = 0; plane_index < num_planes; plane_index++) {
@@ -721,6 +724,12 @@
       DCHECK(surface);
       surface->flush({}, end_state.get());
     }
+    if (flush_count < 100) {
+      ++flush_count;
+      base::UmaHistogramCustomMicrosecondsTimes(
+          "GPU.RasterDecoder.TimeToFlush", base::TimeTicks::Now() - start,
+          base::Microseconds(1), base::Seconds(1), 100);
+    }
   }
 
   void SubmitIfNecessary(std::vector<GrBackendSemaphore> signal_semaphores) {

infra/config/console-header.star

diff --git a/infra/config/console-header.star b/infra/config/console-header.star
index 66cd342..8580c227 100644
--- a/infra/config/console-header.star
+++ b/infra/config/console-header.star
@@ -197,6 +197,11 @@
                     alt = "Chromium GPU console",
                 ),
                 headers.link(
+                    text = "memory.fyi",
+                    url = "/p/{}/g/chromium.memory.fyi".format(settings.project),
+                    alt = "Chromium Memory FYI console",
+                ),
+                headers.link(
                     text = "packager",
                     url = "/p/{}/g/chromium.packager".format(settings.project),
                     alt = "Chromium Packager console",

infra/config/generated/luci/cr-buildbucket.cfg

diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index 15a4947d..1a2e030a 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -75529,7 +75529,7 @@
       dimensions: "builder:linux-rel"
       dimensions: "cores:2"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-18.04"
+      dimensions: "os:Ubuntu-22.04"
       dimensions: "pool:luci.chromium.try"
       exe {
         cipd_package: "infra/chromium/bootstrapper/${platform}"
@@ -78903,7 +78903,7 @@
       dimensions: "builder:linux_chromium_tsan_rel_ng"
       dimensions: "cores:2"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-18.04"
+      dimensions: "os:Ubuntu-22.04"
       dimensions: "pool:luci.chromium.try"
       exe {
         cipd_package: "infra/chromium/bootstrapper/${platform}"

infra/config/generated/luci/luci-milo.cfg

diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg
index a3da2231..80d9110 100644
--- a/infra/config/generated/luci/luci-milo.cfg
+++ b/infra/config/generated/luci/luci-milo.cfg
@@ -214,6 +214,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -1176,6 +1181,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -1921,6 +1931,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -2393,6 +2408,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -2747,6 +2767,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -3352,6 +3377,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -3691,6 +3721,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -4135,6 +4170,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -4475,6 +4515,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -5023,6 +5068,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -5411,6 +5461,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -5815,6 +5870,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -6156,6 +6216,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -6608,6 +6673,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -7167,6 +7237,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -7636,6 +7711,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -8012,6 +8092,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -8386,6 +8471,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -8874,6 +8964,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -9688,6 +9783,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -10114,6 +10214,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -10514,6 +10619,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -10904,6 +11014,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -11528,6 +11643,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -11937,6 +12057,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -12356,6 +12481,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -12795,6 +12925,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -13134,6 +13269,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -13493,6 +13633,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -13962,6 +14107,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -14332,6 +14482,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -14706,6 +14861,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -15235,6 +15395,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -15604,6 +15769,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -16014,6 +16184,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -16388,6 +16563,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -16796,6 +16976,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"
@@ -17143,6 +17328,11 @@
         alt: "Chromium GPU console"
       }
       links {
+        text: "memory.fyi"
+        url: "/p/chromium/g/chromium.memory.fyi"
+        alt: "Chromium Memory FYI console"
+      }
+      links {
         text: "packager"
         url: "/p/chromium/g/chromium.packager"
         alt: "Chromium Packager console"

infra/config/generated/luci/project.cfg

diff --git a/infra/config/generated/luci/project.cfg b/infra/config/generated/luci/project.cfg
index 7d6535a..0103773e 100644
--- a/infra/config/generated/luci/project.cfg
+++ b/infra/config/generated/luci/project.cfg
@@ -7,7 +7,7 @@
 name: "chromium"
 access: "group:all"
 lucicfg {
-  version: "1.39.2"
+  version: "1.39.3"
   package_dir: "../.."
   config_dir: "generated/luci"
   entry_point: "main.star"

infra/config/lib/linux-default.json

diff --git a/infra/config/lib/linux-default.json b/infra/config/lib/linux-default.json
index 2c63c08..1fe063a 100644
--- a/infra/config/lib/linux-default.json
+++ b/infra/config/lib/linux-default.json
@@ -1,2 +1,6 @@
 {
+  "try": {
+    "linux-rel": "Ubuntu-22.04",
+    "linux_chromium_tsan_rel_ng": "Ubuntu-22.04"
+  }
 }

ios/chrome/app/strings/ios_strings.grd

diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios_strings.grd
index 77d1100..0fd594d3 100644
--- a/ios/chrome/app/strings/ios_strings.grd
+++ b/ios/chrome/app/strings/ios_strings.grd
@@ -1847,7 +1847,9 @@
         Never Move
       </message>
       <message name="IDS_IOS_OPTIONS_INACTIVE_TABS_THRESHOLD" desc="Current chosen threshold for the inactive tabs option. (Title case)">
-        After <ph name="THRESHOLD">$1<ex>14</ex></ph> Days
+        {COUNT, plural,
+          =1 {After 1 Day}
+          other {After {COUNT} Days}}
       </message>
       <message name="IDS_IOS_OPTIONS_MOVE_INACTIVE_TABS" desc="Title for opening the setting for when tabs should be considered inactive. (Title case)">
         Move Inactive Tabs

ios/chrome/app/strings/ios_strings_grd/IDS_IOS_OPTIONS_INACTIVE_TABS_THRESHOLD.png.sha1

diff --git a/ios/chrome/app/strings/ios_strings_grd/IDS_IOS_OPTIONS_INACTIVE_TABS_THRESHOLD.png.sha1 b/ios/chrome/app/strings/ios_strings_grd/IDS_IOS_OPTIONS_INACTIVE_TABS_THRESHOLD.png.sha1
index b6302db..a4779f9 100644
--- a/ios/chrome/app/strings/ios_strings_grd/IDS_IOS_OPTIONS_INACTIVE_TABS_THRESHOLD.png.sha1
+++ b/ios/chrome/app/strings/ios_strings_grd/IDS_IOS_OPTIONS_INACTIVE_TABS_THRESHOLD.png.sha1
@@ -1 +1 @@
-503e06fe3703455f0da48330caab87fb8ff9f655
\ No newline at end of file
+ab328f6217e1abb0c86b886234c4a31103f071d0
\ No newline at end of file

ios/chrome/app/strings/resources/ios_strings_af.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_af.xtb b/ios/chrome/app/strings/resources/ios_strings_af.xtb
index b4d85f6..21d0050 100644
--- a/ios/chrome/app/strings/resources/ios_strings_af.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_af.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Net met Wi-Fi</translation>
 <translation id="2747003861858887689">Vorige veld</translation>
 <translation id="2749231692441336879">Volg <ph name="CHANNEL_NAME" /> tans</translation>
-<translation id="2764831210418622012">sopas</translation>
 <translation id="2772667768515195373">Jy kan gestoorde adresse in alle Google-produkte gebruik. Hierdie adres is in jou Google-rekening, <ph name="USER_EMAIL" />, gestoor.</translation>
 <translation id="2773292004659987824">Incognitosoektog</translation>
 <translation id="277771892408211951">Kies taal</translation>

ios/chrome/app/strings/resources/ios_strings_am.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_am.xtb b/ios/chrome/app/strings/resources/ios_strings_am.xtb
index 6538a03..8cd80c5 100644
--- a/ios/chrome/app/strings/resources/ios_strings_am.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_am.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">በWi-Fi ላይ ብቻ</translation>
 <translation id="2747003861858887689">ቀዳሚ መስክ</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" />ን በመከተል ላይ</translation>
-<translation id="2764831210418622012">አሁን</translation>
 <translation id="2772667768515195373">በመላው Google ምርቶች ላይ የተቀመጡ አድራሻዎችን መጠቀም ይችላሉ። ይህ አድራሻ በእርስዎ Google መለያ፣ <ph name="USER_EMAIL" /> ውስጥ ተቀምጧል።</translation>
 <translation id="2773292004659987824">ማንነት የማያሳውቅ ፍለጋ</translation>
 <translation id="277771892408211951">ቋንቋ ይምረጡ</translation>

ios/chrome/app/strings/resources/ios_strings_ar.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_ar.xtb b/ios/chrome/app/strings/resources/ios_strings_ar.xtb
index e1fcd86..fd9c0a1 100644
--- a/ios/chrome/app/strings/resources/ios_strings_ar.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_ar.xtb
@@ -258,7 +258,6 @@
 <translation id="2718352093833049315">‏باستخدام شبكة Wi-Fi فقط</translation>
 <translation id="2747003861858887689">الحقل السابق</translation>
 <translation id="2749231692441336879">تتم متابعة <ph name="CHANNEL_NAME" /> حاليًا.</translation>
-<translation id="2764831210418622012">الآن</translation>
 <translation id="2772667768515195373">‏يمكنك استخدام العناوين المحفوظة مع جميع منتجات Google. تم حفظ هذا العنوان في حسابك على Google، <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">البحث في وضع التصفُّح المتخفي</translation>
 <translation id="277771892408211951">اختيار لغة</translation>

ios/chrome/app/strings/resources/ios_strings_as.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_as.xtb b/ios/chrome/app/strings/resources/ios_strings_as.xtb
index 18732df..ee52626 100644
--- a/ios/chrome/app/strings/resources/ios_strings_as.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_as.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">কেৱল ৱাই-ফাইত</translation>
 <translation id="2747003861858887689">আগৰ ক্ষেত্ৰ</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> ফ’ল’ কৰি থকা হৈছে</translation>
-<translation id="2764831210418622012">এইমাত্ৰ</translation>
 <translation id="2772667768515195373">ছেভ হৈ থকা ঠিকনাসমূহ আপুনি সমগ্ৰ Google প্ৰ’ডাক্টত ব্যৱহাৰ কৰিব পাৰে। এই ঠিকনাটো আপোনাৰ Google একাউণ্ট, <ph name="USER_EMAIL" />ত ছেভ কৰা হৈছে।</translation>
 <translation id="2773292004659987824">ইনক’গনিট’ ম’ডত সন্ধান কৰক</translation>
 <translation id="277771892408211951">ভাষা বাছনি কৰক</translation>

ios/chrome/app/strings/resources/ios_strings_az.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_az.xtb b/ios/chrome/app/strings/resources/ios_strings_az.xtb
index f4fc582..658473c 100644
--- a/ios/chrome/app/strings/resources/ios_strings_az.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_az.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Yalnız Wi-Fi üzərindən</translation>
 <translation id="2747003861858887689">Əvvəlki sahə</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> izlənilir</translation>
-<translation id="2764831210418622012">indicə</translation>
 <translation id="2772667768515195373">Google məhsullarında yadda saxlanmış ünvanlardan istifadə edə bilərsiniz. Ünvan Google Hesabında (<ph name="USER_EMAIL" />) yadda saxlanıb.</translation>
 <translation id="2773292004659987824">Anonim Axtarış</translation>
 <translation id="277771892408211951">Dil seçin</translation>

ios/chrome/app/strings/resources/ios_strings_be.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_be.xtb b/ios/chrome/app/strings/resources/ios_strings_be.xtb
index 13f2f39..fc7e240 100644
--- a/ios/chrome/app/strings/resources/ios_strings_be.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_be.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Толькі па Wi-Fi</translation>
 <translation id="2747003861858887689">Папярэдняе поле</translation>
 <translation id="2749231692441336879">Вы падпісаліся на канал "<ph name="CHANNEL_NAME" />"</translation>
-<translation id="2764831210418622012">толькі што</translation>
 <translation id="2772667768515195373">Вы можаце выкарыстоўваць захаваныя адрасы ў розных прадуктах Google. Гэты адрас захоўваецца ў вашым Уліковым запісе Google (<ph name="USER_EMAIL" />).</translation>
 <translation id="2773292004659987824">Пошук у рэжыме інкогніта</translation>
 <translation id="277771892408211951">Выберыце мову</translation>

ios/chrome/app/strings/resources/ios_strings_bg.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_bg.xtb b/ios/chrome/app/strings/resources/ios_strings_bg.xtb
index a45853b..1e4cddb 100644
--- a/ios/chrome/app/strings/resources/ios_strings_bg.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_bg.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Само при Wi-Fi</translation>
 <translation id="2747003861858887689">Предишното поле</translation>
 <translation id="2749231692441336879">Следите <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">току-що</translation>
 <translation id="2772667768515195373">Можете да използвате запазените адреси в различни продукти на Google. Този адрес е запазен в профила ви в Google (<ph name="USER_EMAIL" />).</translation>
 <translation id="2773292004659987824">Търсене в режим „инкогнито“</translation>
 <translation id="277771892408211951">Избиране на език</translation>

ios/chrome/app/strings/resources/ios_strings_bn.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_bn.xtb b/ios/chrome/app/strings/resources/ios_strings_bn.xtb
index 940143a..414f99a5 100644
--- a/ios/chrome/app/strings/resources/ios_strings_bn.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_bn.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">শুধুমাত্র ওয়াই-ফাই এ</translation>
 <translation id="2747003861858887689">পূর্ববর্তী ফিল্ড</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> ফলো করা হচ্ছে</translation>
-<translation id="2764831210418622012">এইমাত্র</translation>
 <translation id="2772667768515195373">Google প্রোডাক্ট জুড়ে সেভ করা ঠিকানা আপনি ব্যবহার করতে পারবেন। এই ঠিকানাটি আপনার Google অ্যাকাউন্ট <ph name="USER_EMAIL" />-এ সেভ করা আছে।</translation>
 <translation id="2773292004659987824">ছদ্মবেশী সার্চ</translation>
 <translation id="277771892408211951">ভাষা বেছে নিন</translation>

ios/chrome/app/strings/resources/ios_strings_bs.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_bs.xtb b/ios/chrome/app/strings/resources/ios_strings_bs.xtb
index 34489c1..e7a2aaa 100644
--- a/ios/chrome/app/strings/resources/ios_strings_bs.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_bs.xtb
@@ -217,6 +217,7 @@
 <translation id="2482878487686419369">Obavještenja</translation>
 <translation id="2496626742194544812">Odlazak na prvu karticu</translation>
 <translation id="2500374554657206846">Opcije čuvanja lozinki</translation>
+<translation id="2502415369140591438">Već korištene lozinke: <ph name="COUNT" /></translation>
 <translation id="2523363575747517183">Ova web lokacija neprestano pokušava otvoriti drugu aplikaciju.</translation>
 <translation id="2529021024822217800">Otvori sve</translation>
 <translation id="2547458583188611426">Sinhronizacija ne funkcionira. Da pokrenete sinhronizaciju, unesite pristupni izraz.</translation>
@@ -226,6 +227,7 @@
 <translation id="2576499762020411840">Koristite lozinke s Google računa i pohranjujte ih na njemu</translation>
 <translation id="2578571896248130439">Pošalji web stranicu</translation>
 <translation id="2584132361465095047">Dodaj račun…</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{Otvorene kartice koje ne koristite jedan ili više dana se premještaju u Neaktivne kartice da se možete lako fokusirati na kartice koje najviše koristite. Ovo možete promijeniti bilo kada u postavkama.}one{Otvorene kartice koje ne koristite {COUNT} ili više dana se premještaju u Neaktivne kartice da se možete lako fokusirati na kartice koje najviše koristite. Ovo možete promijeniti bilo kada u postavkama.}few{Otvorene kartice koje ne koristite {COUNT} ili više dana se premještaju u Neaktivne kartice da se možete lako fokusirati na kartice koje najviše koristite. Ovo možete promijeniti bilo kada u postavkama.}other{Otvorene kartice koje ne koristite {COUNT} ili više dana se premještaju u Neaktivne kartice da se možete lako fokusirati na kartice koje najviše koristite. Ovo možete promijeniti bilo kada u postavkama.}}</translation>
 <translation id="2600682495497606169">Obriši kolačiće web lokacije</translation>
 <translation id="2609008503159898744">Zatvoriti sve kartice?</translation>
 <translation id="2625189173221582860">Lozinka je kopirana</translation>
@@ -256,7 +258,6 @@
 <translation id="2718352093833049315">Samo na WiFi mreži</translation>
 <translation id="2747003861858887689">Prethodno polje</translation>
 <translation id="2749231692441336879">Pratite kanal <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">maloprije</translation>
 <translation id="2772667768515195373">Možete koristiti sačuvane adrese na Googleovim proizvodima. Ova adresa je sačuvana na vašem Google računu <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Pretraživanje u anonimnom načinu rada</translation>
 <translation id="277771892408211951">Odabir jezika</translation>
@@ -294,6 +295,7 @@
 <translation id="2932085390869194046">Predloži lozinku…</translation>
 <translation id="2932765531295814441">Ručno dodajte lozinke</translation>
 <translation id="2952581218264071393">1. Otvorite postavke Chromea</translation>
+<translation id="2953871438216280742">Prijavite se da otvorite i sačuvate listu za čitanje na Google računu.</translation>
 <translation id="2958718410589002129">Lozinke</translation>
 <translation id="2961210776189273067">Titula</translation>
 <translation id="2964349545761222050">Blokiraj kolačiće trećih strana</translation>
@@ -387,6 +389,7 @@
 <translation id="3581564640715911333">Ponudi prevođenje stranica na drugim jezicima</translation>
 <translation id="3588820906588687999">Otvori sliku na novoj kartici</translation>
 <translation id="3595252146048399851">U <ph name="BEGIN_LINK" />postavkama<ph name="END_LINK" /> uvijek možete odabrati šta želite sinhronizirati. Google može personalizirati Pretraživanje i druge usluge na osnovu vaše historije.</translation>
+<translation id="3595588371156514964">{COUNT,plural, =1{{COUNT} slaba lozinka}one{{COUNT} slaba lozinka}few{{COUNT} slabe lozinke}other{{COUNT} slabih lozinki}}</translation>
 <translation id="3603009562372709545">Kopiraj URL linka</translation>
 <translation id="3607167657931203000">Podaci automatskog popunjavanja</translation>
 <translation id="3608008480985212611">Prijavite se da upravljate postavkama.</translation>
@@ -573,6 +576,7 @@
 <translation id="4844899002472726590">Pogledajte i uredite teme koje vas zanimaju</translation>
 <translation id="4848999860252535517">Izbrisati lozinku za <ph name="WEBSITE" />?</translation>
 <translation id="4854345657858711387">Postavite šifru</translation>
+<translation id="4856498338299082007">Na vašem Google računu</translation>
 <translation id="4858786880085262208">Nadogradi na HTTPS, kada je moguće. Sigurne web lokacije mogu ugraditi sadržaj koji nije siguran.</translation>
 <translation id="4860895144060829044">Pozovi</translation>
 <translation id="4872323082491632254">Provjerite lozinke</translation>
@@ -624,6 +628,7 @@
 <translation id="5197255632782567636">Internet</translation>
 <translation id="5211488077761630279">Dozvoliti web lokaciji "<ph name="SITE_NAME" />" da koristi <ph name="PERMISSION" />?</translation>
 <translation id="5219295696240154694">Pomozite nam da poboljšamo sigurnost na webu za sve</translation>
+<translation id="5221339005270097309">Provjera lozinki…</translation>
 <translation id="5228579091201413441">Omogući sinhronizaciju</translation>
 <translation id="5232485538978018676">Prijavite se pomoću upravljanog računa</translation>
 <translation id="5234764350956374838">Odbaci</translation>
@@ -663,6 +668,7 @@
 Također, Handoff mora biti omogućen u odjeljku Opće u Postavkama, a vaši uređaji moraju koristiti isti račun za iCloud.</translation>
 <translation id="5551897871312988470">Ponudi prijevod</translation>
 <translation id="5556459405103347317">Učitaj ponovo</translation>
+<translation id="555749644339804659">Provjera lozinki…</translation>
 <translation id="556042886152191864">Dugme</translation>
 <translation id="5597915316964418992">Otvorite rešetku kartica</translation>
 <translation id="560322036295180549">Isključila je vaša organizacija</translation>
@@ -1089,6 +1095,7 @@
 <translation id="821809831108207540">Da personalizirate sažetak sadržaja Discovera i Chrome, prijavite se i uključite sinhronizaciju.</translation>
 <translation id="8225985093977202398">Slike i fajlovi u keš memoriji</translation>
 <translation id="8237382152611443140">Otvorite postavke za automatsko popunjavanje lozinki</translation>
+<translation id="8248969482078657578">Neaktivne kartice vam pomažu da se fokusirate</translation>
 <translation id="8261506727792406068">Izbriši</translation>
 <translation id="8264966119170358612">Neke vaše sačuvane lozinke su bile izložene prilikom narušavanja podataka koji nisu Googleovi. <ph name="BEGIN_LINK" />Saznajte više<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">Samo na ovaj uređaj</translation>

ios/chrome/app/strings/resources/ios_strings_ca.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_ca.xtb b/ios/chrome/app/strings/resources/ios_strings_ca.xtb
index f8b893b4..1e82ade 100644
--- a/ios/chrome/app/strings/resources/ios_strings_ca.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_ca.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Només amb Wi-Fi</translation>
 <translation id="2747003861858887689">Camp anterior</translation>
 <translation id="2749231692441336879">Segueixes <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">ara mateix</translation>
 <translation id="2772667768515195373">Pots utilitzar les adreces desades en tots els productes de Google. Aquesta adreça s'ha desat al teu Compte de Google, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Cerca d'incògnit</translation>
 <translation id="277771892408211951">Selecciona l'idioma</translation>

ios/chrome/app/strings/resources/ios_strings_cs.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_cs.xtb b/ios/chrome/app/strings/resources/ios_strings_cs.xtb
index 3a09a6e..5b9718e9 100644
--- a/ios/chrome/app/strings/resources/ios_strings_cs.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_cs.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Pouze v sítích Wi-Fi</translation>
 <translation id="2747003861858887689">Předchozí pole</translation>
 <translation id="2749231692441336879">Sledujete kanál <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">právě teď</translation>
 <translation id="2772667768515195373">Uložené adresy můžete používat ve službách Google. Tato adresa je uložena ve vašem účtu Google <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Anonymní vyhledávání</translation>
 <translation id="277771892408211951">Vyberte jazyk</translation>

ios/chrome/app/strings/resources/ios_strings_cy.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_cy.xtb b/ios/chrome/app/strings/resources/ios_strings_cy.xtb
index 4324273..759a3b2 100644
--- a/ios/chrome/app/strings/resources/ios_strings_cy.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_cy.xtb
@@ -226,6 +226,7 @@
 <translation id="2576499762020411840">Defnyddio a Chadw Cyfrineiriau yn eich Cyfrif Google</translation>
 <translation id="2578571896248130439">Anfon Tudalen We</translation>
 <translation id="2584132361465095047">Ychwanegu cyfrif…</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{Mae tabiau sydd ar agor a heb eu defnyddio am un diwrnod neu fwy yn cael eu symud i Tabiau Anweithredol fel y gallwch ganolbwyntio'n hawdd ar y tabiau rydych yn eu defnyddio fwyaf. Gallwch newid hyn unrhyw bryd yn y gosodiadau.}zero{Mae tabiau sydd ar agor a heb eu defnyddio am {COUNT} diwrnod neu fwy yn cael eu symud i Tabiau Anweithredol fel y gallwch ganolbwyntio'n hawdd ar y tabiau rydych yn eu defnyddio fwyaf. Gallwch newid hyn unrhyw bryd yn y gosodiadau.}two{Mae tabiau sydd ar agor a heb eu defnyddio am {COUNT} ddiwrnod neu fwy yn cael eu symud i Tabiau Anweithredol fel y gallwch ganolbwyntio'n hawdd ar y tabiau rydych yn eu defnyddio fwyaf. Gallwch newid hyn unrhyw bryd yn y gosodiadau.}few{Mae tabiau sydd ar agor a heb eu defnyddio am {COUNT} diwrnod neu fwy yn cael eu symud i Tabiau Anweithredol fel y gallwch ganolbwyntio'n hawdd ar y tabiau rydych yn eu defnyddio fwyaf. Gallwch newid hyn unrhyw bryd yn y gosodiadau.}many{Mae tabiau sydd ar agor a heb eu defnyddio am {COUNT} diwrnod neu fwy yn cael eu symud i Tabiau Anweithredol fel y gallwch ganolbwyntio'n hawdd ar y tabiau rydych yn eu defnyddio fwyaf. Gallwch newid hyn unrhyw bryd yn y gosodiadau.}other{Mae tabiau sydd ar agor a heb eu defnyddio am {COUNT} diwrnod neu fwy yn cael eu symud i Tabiau Anweithredol fel y gallwch ganolbwyntio'n hawdd ar y tabiau rydych yn eu defnyddio fwyaf. Gallwch newid hyn unrhyw bryd yn y gosodiadau.}}</translation>
 <translation id="2600682495497606169">Clirio Cwcis y Wefan</translation>
 <translation id="2609008503159898744">Cau Pob Tab?</translation>
 <translation id="2625189173221582860">Copïwyd cyfrinair</translation>
@@ -256,7 +257,6 @@
 <translation id="2718352093833049315">Dim ond ar Wi-Fi</translation>
 <translation id="2747003861858887689">Maes blaenorol</translation>
 <translation id="2749231692441336879">Yn dilyn <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">newydd ddigwydd</translation>
 <translation id="2772667768515195373">Gallwch ddefnyddio cyfeiriadau sydd wedi'u cadw ar draws cynhyrchion Google. Mae'r cyfeiriad hwn wedi'i gadw yn eich Cyfrif Google <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Chwiliad Anhysbys</translation>
 <translation id="277771892408211951">Dewis Iaith</translation>
@@ -573,6 +573,7 @@
 <translation id="4844899002472726590">Gweld a golygu pynciau y mae gennych ddiddordeb ynddynt</translation>
 <translation id="4848999860252535517">Dileu Cyfrinair ar gyfer <ph name="WEBSITE" />?</translation>
 <translation id="4854345657858711387">Gosod Cod Pas</translation>
+<translation id="4856498338299082007">Yn eich Cyfrif Google</translation>
 <translation id="4858786880085262208">Uwchraddiwch i HTTPS, pan fo modd. Mae'n bosib y bydd gwefannau diogel yn ymgorffori cynnwys nad yw'n ddiogel.</translation>
 <translation id="4860895144060829044">Galw</translation>
 <translation id="4872323082491632254">Gwirio Cyfrineiriau</translation>
@@ -1089,6 +1090,7 @@
 <translation id="821809831108207540">I bersonoleiddio eich ffrwd Discover a Chrome, mewngofnodwch a throwch cysoni ymlaen.</translation>
 <translation id="8225985093977202398">Lluniau a Ffeiliau sydd wedi'u Storio</translation>
 <translation id="8237382152611443140">Agorwch y Gosodiadau Awtolenwi Cyfrinair</translation>
+<translation id="8248969482078657578">Mae Tabiau Anweithredol yn Eich Helpu i Ganolbwyntio</translation>
 <translation id="8261506727792406068">Dileu</translation>
 <translation id="8264966119170358612">Cafodd rhai o'ch cyfrineiriau a gadwyd eu datgelu mewn achos o dor diogelwch data y tu allan i Google. <ph name="BEGIN_LINK" />Dysgu rhagor<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">Ar y ddyfais hon yn unig</translation>

ios/chrome/app/strings/resources/ios_strings_da.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_da.xtb b/ios/chrome/app/strings/resources/ios_strings_da.xtb
index 9f26125a..cda0376 100644
--- a/ios/chrome/app/strings/resources/ios_strings_da.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_da.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Kun på Wi-Fi</translation>
 <translation id="2747003861858887689">Forrige felt</translation>
 <translation id="2749231692441336879">Følger <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">lige nu</translation>
 <translation id="2772667768515195373">Du kan bruge gemte adresser i alle Google-produkter. Denne adresse er gemt på din Google-konto (<ph name="USER_EMAIL" />).</translation>
 <translation id="2773292004659987824">Søgning i inkognitotilstand</translation>
 <translation id="277771892408211951">Vælg sprog</translation>

ios/chrome/app/strings/resources/ios_strings_de.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_de.xtb b/ios/chrome/app/strings/resources/ios_strings_de.xtb
index 3d05d03..67764636 100644
--- a/ios/chrome/app/strings/resources/ios_strings_de.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_de.xtb
@@ -217,6 +217,7 @@
 <translation id="2482878487686419369">Benachrichtigungen</translation>
 <translation id="2496626742194544812">Zum ersten Tab</translation>
 <translation id="2500374554657206846">Optionen zum Speichern von Passwörtern</translation>
+<translation id="2502415369140591438"><ph name="COUNT" /> wiederverwendete Passwörter</translation>
 <translation id="2523363575747517183">Diese Website versucht wiederholt, eine andere App zu öffnen.</translation>
 <translation id="2529021024822217800">Alle öffnen</translation>
 <translation id="2547458583188611426">Synchronisierung funktioniert nicht. Gib deine Passphrase ein, um die Synchronisierung zu starten.</translation>
@@ -256,7 +257,6 @@
 <translation id="2718352093833049315">Nur bei WLAN</translation>
 <translation id="2747003861858887689">Vorheriges Feld</translation>
 <translation id="2749231692441336879">Du folgst <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">gerade eben</translation>
 <translation id="2772667768515195373">Du kannst gespeicherte Adressen in allen Google-Produkten verwenden. Diese Adresse ist in deinem Google-Konto (<ph name="USER_EMAIL" />) gespeichert.</translation>
 <translation id="2773292004659987824">Inkognitosuche</translation>
 <translation id="277771892408211951">Sprache wählen</translation>
@@ -294,6 +294,7 @@
 <translation id="2932085390869194046">Passwort vorschlagen…</translation>
 <translation id="2932765531295814441">Passwörter manuell hinzufügen</translation>
 <translation id="2952581218264071393">1. Öffne die Chrome-Einstellungen</translation>
+<translation id="2953871438216280742">Melde dich an, um deine Leseliste in deinem Google-Konto zu öffnen und zu speichern.</translation>
 <translation id="2958718410589002129">Passwörter</translation>
 <translation id="2961210776189273067">Anrede</translation>
 <translation id="2964349545761222050">Drittanbieter-Cookies blockieren</translation>
@@ -387,6 +388,7 @@
 <translation id="3581564640715911333">Übersetzung für Seiten in andere Sprachen anbieten</translation>
 <translation id="3588820906588687999">Bild in neuem Tab öffnen</translation>
 <translation id="3595252146048399851">In den <ph name="BEGIN_LINK" />Einstellungen<ph name="END_LINK" /> kannst du auswählen, was synchronisiert werden soll. Google kann die Google Suche und andere Dienste auf der Grundlage deines Verlaufs personalisieren.</translation>
+<translation id="3595588371156514964">{COUNT,plural, =1{{COUNT} schwaches Passwort}other{{COUNT} schwache Passwörter}}</translation>
 <translation id="3603009562372709545">Link-URL kopieren</translation>
 <translation id="3607167657931203000">Autofill-Daten</translation>
 <translation id="3608008480985212611">Anmelden, um Einstellungen zu verwalten.</translation>
@@ -624,6 +626,7 @@
 <translation id="5197255632782567636">Internet</translation>
 <translation id="5211488077761630279">Zulassen, dass „<ph name="SITE_NAME" />“ <ph name="PERMISSION" /> verwendet?</translation>
 <translation id="5219295696240154694">Dabei helfen, das Web für alle sicherer zu machen</translation>
+<translation id="5221339005270097309">Passwörter werden geprüft…</translation>
 <translation id="5228579091201413441">Synchronisierung aktivieren</translation>
 <translation id="5232485538978018676">Mit verwaltetem Konto anmelden</translation>
 <translation id="5234764350956374838">Schließen</translation>
@@ -663,6 +666,7 @@
 Handoff muss auch im Abschnitt "Allgemein" deiner Einstellungen aktiviert sein und deine Geräte müssen dasselbe iCloud-Konto verwenden.</translation>
 <translation id="5551897871312988470">Übersetzung anbieten</translation>
 <translation id="5556459405103347317">Neu laden</translation>
+<translation id="555749644339804659">Passwörter werden geprüft…</translation>
 <translation id="556042886152191864">Schaltfläche</translation>
 <translation id="5597915316964418992">Tab-Raster öffnen</translation>
 <translation id="560322036295180549">Von deiner Organisation deaktiviert</translation>

ios/chrome/app/strings/resources/ios_strings_el.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_el.xtb b/ios/chrome/app/strings/resources/ios_strings_el.xtb
index 6c7697f..514a4881 100644
--- a/ios/chrome/app/strings/resources/ios_strings_el.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_el.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Μόνο σε Wi-Fi</translation>
 <translation id="2747003861858887689">Προηγούμενο πεδίο</translation>
 <translation id="2749231692441336879">Παρακολουθείτε το κανάλι <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">μόλις τώρα</translation>
 <translation id="2772667768515195373">Μπορείτε να χρησιμοποιήσετε τις αποθηκευμένες διευθύνσεις σε όλα τα προϊόντα Google. Αυτή η διεύθυνση έχει αποθηκευτεί στον Λογαριασμό σας Google, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Ανώνυμη αναζήτηση</translation>
 <translation id="277771892408211951">Επιλογή γλώσσας</translation>

ios/chrome/app/strings/resources/ios_strings_en-GB.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb b/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb
index b687e4f..887bb85a 100644
--- a/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb
@@ -226,6 +226,7 @@
 <translation id="2576499762020411840">Use and save passwords in Your Google Account</translation>
 <translation id="2578571896248130439">Send Web Page</translation>
 <translation id="2584132361465095047">Add Account…</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{Open tabs not used for one day or more get moved to Inactive Tabs so you can easily focus on the tabs you use the most. You can change this at any time in settings.}other{Open tabs not used for {COUNT} days or more get moved to Inactive Tabs so you can easily focus on the tabs you use the most. You can change this at any time in settings.}}</translation>
 <translation id="2600682495497606169">Clear site cookies</translation>
 <translation id="2609008503159898744">Close all tabs?</translation>
 <translation id="2625189173221582860">Password copied</translation>
@@ -256,7 +257,6 @@
 <translation id="2718352093833049315">Only on Wi-Fi</translation>
 <translation id="2747003861858887689">Previous field</translation>
 <translation id="2749231692441336879">Following <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">just now</translation>
 <translation id="2772667768515195373">You can use saved addresses across Google products. This address is saved in your Google Account, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Incognito Search</translation>
 <translation id="277771892408211951">Select language</translation>
@@ -573,6 +573,7 @@
 <translation id="4844899002472726590">See and edit the topics that you're interested in</translation>
 <translation id="4848999860252535517">Delete password for <ph name="WEBSITE" />?</translation>
 <translation id="4854345657858711387">Set A Passcode</translation>
+<translation id="4856498338299082007">In your Google Account</translation>
 <translation id="4858786880085262208">Upgrade to HTTPS, when possible. Secure sites might embed content that isn't secure.</translation>
 <translation id="4860895144060829044">Call</translation>
 <translation id="4872323082491632254">Check passwords</translation>
@@ -1089,6 +1090,7 @@
 <translation id="821809831108207540">To personalise your Discover feed and Chrome, sign in and turn on sync.</translation>
 <translation id="8225985093977202398">Cached Images and Files</translation>
 <translation id="8237382152611443140">Open auto-fill password settings</translation>
+<translation id="8248969482078657578">Inactive Tabs helps you to stay focused</translation>
 <translation id="8261506727792406068">Delete</translation>
 <translation id="8264966119170358612">Some of your saved passwords were exposed in a non-Google data breach. <ph name="BEGIN_LINK" />Learn more<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">Only on this device</translation>

ios/chrome/app/strings/resources/ios_strings_es-419.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_es-419.xtb b/ios/chrome/app/strings/resources/ios_strings_es-419.xtb
index b37063d..c46ca67 100644
--- a/ios/chrome/app/strings/resources/ios_strings_es-419.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_es-419.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Solo en Wi-Fi</translation>
 <translation id="2747003861858887689">Campo anterior</translation>
 <translation id="2749231692441336879">Siguiendo <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">recién</translation>
 <translation id="2772667768515195373">Puedes usar las direcciones guardadas en todos los productos de Google. Esta dirección está guardada en tu Cuenta de Google, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Búsqueda en el modo incógnito</translation>
 <translation id="277771892408211951">Seleccionar idioma</translation>

ios/chrome/app/strings/resources/ios_strings_es.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_es.xtb b/ios/chrome/app/strings/resources/ios_strings_es.xtb
index 8c29829..e9dacb1 100644
--- a/ios/chrome/app/strings/resources/ios_strings_es.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_es.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Solo en Wi-Fi</translation>
 <translation id="2747003861858887689">Campo anterior</translation>
 <translation id="2749231692441336879">Ahora sigues a <ph name="CHANNEL_NAME" />.</translation>
-<translation id="2764831210418622012">justo ahora</translation>
 <translation id="2772667768515195373">Puedes usar las direcciones guardadas en todos los productos de Google. Esta dirección está guardada en tu cuenta de Google, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Búsqueda en modo Incógnito</translation>
 <translation id="277771892408211951">Seleccionar idioma</translation>

ios/chrome/app/strings/resources/ios_strings_et.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_et.xtb b/ios/chrome/app/strings/resources/ios_strings_et.xtb
index 12bb7bd8..a9bd5b4 100644
--- a/ios/chrome/app/strings/resources/ios_strings_et.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_et.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Ainult WiFi-ga</translation>
 <translation id="2747003861858887689">Eelmine väli</translation>
 <translation id="2749231692441336879">Jälgitakse kanalit <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">just praegu</translation>
 <translation id="2772667768515195373">Salvestatud aadresse saate kasutada kõigis Google'i teenustes. See aadress salvestatakse teie Google'i kontole <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Inkognito režiimis otsing</translation>
 <translation id="277771892408211951">Valige keel</translation>

ios/chrome/app/strings/resources/ios_strings_eu.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_eu.xtb b/ios/chrome/app/strings/resources/ios_strings_eu.xtb
index 9b8303c..4d967b3 100644
--- a/ios/chrome/app/strings/resources/ios_strings_eu.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_eu.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Wifi bidez soilik</translation>
 <translation id="2747003861858887689">Aurreko eremua</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> kanalari jarraitzen</translation>
-<translation id="2764831210418622012">oraintxe</translation>
 <translation id="2772667768515195373">Gordetako helbideak Google-ren produktu guztietan erabil ditzakezu. Helbide hau Google-ko kontuan (<ph name="USER_EMAIL" />) gorde da.</translation>
 <translation id="2773292004659987824">Ezkutuko moduko bilaketa</translation>
 <translation id="277771892408211951">Hautatu hizkuntza</translation>

ios/chrome/app/strings/resources/ios_strings_fa.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_fa.xtb b/ios/chrome/app/strings/resources/ios_strings_fa.xtb
index d1560bb6..aa277d1 100644
--- a/ios/chrome/app/strings/resources/ios_strings_fa.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_fa.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">‏فقط در Wi-Fi</translation>
 <translation id="2747003861858887689">فیلد قبلی</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> را دنبال می‌کنید</translation>
-<translation id="2764831210418622012">همین حالا</translation>
 <translation id="2772667768515195373">‏می‌توانید از نشانی‌های ذخیره‌شده در محصولات Google استفاده کنید. این نشانی در «حساب Google» شما (<ph name="USER_EMAIL" />) ذخیره شده است.</translation>
 <translation id="2773292004659987824">جستجوی ناشناس</translation>
 <translation id="277771892408211951">انتخاب زبان</translation>

ios/chrome/app/strings/resources/ios_strings_fi.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_fi.xtb b/ios/chrome/app/strings/resources/ios_strings_fi.xtb
index 9c305677..53689a3 100644
--- a/ios/chrome/app/strings/resources/ios_strings_fi.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_fi.xtb
@@ -226,6 +226,7 @@
 <translation id="2576499762020411840">Käytä ja tallenna Google-tilisi salasanoja</translation>
 <translation id="2578571896248130439">Lähetä verkkosivu</translation>
 <translation id="2584132361465095047">Lisää tili…</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{Avoimet välilehdet, joita ei ole käytetty vähintään päivään, siirretään ei-aktiivisille välilehdille, jotta voit keskittyä useimmin käyttämiisi välilehtiin. Voit muuttaa valintasi milloin tahansa asetuksista.}other{Avoimet välilehdet, joita ei ole käytetty vähintään {COUNT} päivään, siirretään ei-aktiivisille välilehdille, jotta voit keskittyä useimmin käyttämiisi välilehtiin. Voit muuttaa valintasi milloin tahansa asetuksista.}}</translation>
 <translation id="2600682495497606169">Poista sivuston evästeet</translation>
 <translation id="2609008503159898744">Suljetaanko kaikki välilehdet?</translation>
 <translation id="2625189173221582860">Salasana kopioitu</translation>
@@ -256,7 +257,6 @@
 <translation id="2718352093833049315">Vain Wi-Fillä</translation>
 <translation id="2747003861858887689">Edellinen kenttä</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> seurannassa</translation>
-<translation id="2764831210418622012">äsken</translation>
 <translation id="2772667768515195373">Voit käyttää tallennettuja osoitteita kaikissa Google-tuotteissa. Osoite on tallennettu Google-tilillesi, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Incognito-haku</translation>
 <translation id="277771892408211951">Valitse kieli</translation>
@@ -573,6 +573,7 @@
 <translation id="4844899002472726590">Katso ja muokkaa aiheita, jotka kiinnostavat sinua</translation>
 <translation id="4848999860252535517">Poistetaanko salasana: <ph name="WEBSITE" />?</translation>
 <translation id="4854345657858711387">Määritä tunnuskoodi</translation>
+<translation id="4856498338299082007">Google-tililläsi</translation>
 <translation id="4858786880085262208">Päivitä HTTPS:ään kun mahdollista Turvalliset sivustot voivat upottaa sisältöä, joka ei ole turvallista.</translation>
 <translation id="4860895144060829044">Soita</translation>
 <translation id="4872323082491632254">Tarkista salasanat</translation>
@@ -1089,6 +1090,7 @@
 <translation id="821809831108207540">Jos haluat personoida Discover-fiidiä ja Chromea, kirjaudu sisään ja laita synkronointi päälle.</translation>
 <translation id="8225985093977202398">Välimuistissa olevat kuvat ja tiedostot</translation>
 <translation id="8237382152611443140">Avaa automaattisen täytön salasana-asetukset</translation>
+<translation id="8248969482078657578">Ei-aktiiviset välilehdet auttavat keskittymään</translation>
 <translation id="8261506727792406068">Poista</translation>
 <translation id="8264966119170358612">Osa tallennetuista salasanoistasi on paljastunut Googlen ulkopuolisen tietosuojaloukkauksen yhteydessä. <ph name="BEGIN_LINK" />Lue lisää<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">Vain tälle laitteelle</translation>

ios/chrome/app/strings/resources/ios_strings_fil.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_fil.xtb b/ios/chrome/app/strings/resources/ios_strings_fil.xtb
index 4cea593..74126fd 100644
--- a/ios/chrome/app/strings/resources/ios_strings_fil.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_fil.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Sa Wi-Fi lang</translation>
 <translation id="2747003861858887689">Nakaraang field</translation>
 <translation id="2749231692441336879">Sinusubaybayan ang <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">ngayon lang</translation>
 <translation id="2772667768515195373">Puwede kang gumamit ng mga naka-save na address sa lahat ng produkto ng Google. Naka-save ang address na ito sa iyong Google Account na <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Paghahanap sa Incognito</translation>
 <translation id="277771892408211951">Pumili ng Wika</translation>

ios/chrome/app/strings/resources/ios_strings_fr-CA.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_fr-CA.xtb b/ios/chrome/app/strings/resources/ios_strings_fr-CA.xtb
index 89b81508..37f17d64 100644
--- a/ios/chrome/app/strings/resources/ios_strings_fr-CA.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_fr-CA.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Wi-Fi uniquement</translation>
 <translation id="2747003861858887689">Champ précédent</translation>
 <translation id="2749231692441336879">Vous suivez <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">à l'instant</translation>
 <translation id="2772667768515195373">Vous pouvez utiliser les adresses enregistrées avec tous les produits Google. Cette adresse est enregistrée dans votre compte Google (<ph name="USER_EMAIL" />).</translation>
 <translation id="2773292004659987824">Recherche en mode de navigation privée</translation>
 <translation id="277771892408211951">Sélectionner la langue</translation>

ios/chrome/app/strings/resources/ios_strings_fr.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_fr.xtb b/ios/chrome/app/strings/resources/ios_strings_fr.xtb
index c9d4f8de..54b5f33d 100644
--- a/ios/chrome/app/strings/resources/ios_strings_fr.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_fr.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Wi-Fi uniquement</translation>
 <translation id="2747003861858887689">Champ précédent</translation>
 <translation id="2749231692441336879">Vous suivez <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">à l'instant</translation>
 <translation id="2772667768515195373">Vous pouvez utiliser les adresses enregistrées dans l'ensemble des produits Google. Celle-ci est enregistrée dans votre compte Google (<ph name="USER_EMAIL" />).</translation>
 <translation id="2773292004659987824">Recherche en mode navigation privée</translation>
 <translation id="277771892408211951">Sélectionner la langue</translation>

ios/chrome/app/strings/resources/ios_strings_gl.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_gl.xtb b/ios/chrome/app/strings/resources/ios_strings_gl.xtb
index ff58bfc..2fc74cf 100644
--- a/ios/chrome/app/strings/resources/ios_strings_gl.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_gl.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Só con wifi</translation>
 <translation id="2747003861858887689">Campo anterior</translation>
 <translation id="2749231692441336879">Comezaches a seguir a canle <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">agora mesmo</translation>
 <translation id="2772667768515195373">Podes usar nos produtos de Google os enderezos gardados. Este enderezo está gardado na túa Conta de Google (<ph name="USER_EMAIL" />).</translation>
 <translation id="2773292004659987824">Busca do modo de incógnito</translation>
 <translation id="277771892408211951">Seleccionar idioma</translation>

ios/chrome/app/strings/resources/ios_strings_gu.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_gu.xtb b/ios/chrome/app/strings/resources/ios_strings_gu.xtb
index 26e646a..3b01674 100644
--- a/ios/chrome/app/strings/resources/ios_strings_gu.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_gu.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">ફક્ત વાઇ-ફાઇ પર</translation>
 <translation id="2747003861858887689">પાછલી ફીલ્ડ</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> ફૉલો કરી રહ્યાં છીએ</translation>
-<translation id="2764831210418622012">હમણાં જ</translation>
 <translation id="2772667768515195373">તમે Googleની સમગ્ર પ્રોડક્ટ પર સાચવેલા સરનામાનો ઉપયોગ કરી શકો છો. આ સરનામાને તમારા Google એકાઉન્ટમાં સાચવવામાં આવ્યું છે, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">છૂપી શોધ</translation>
 <translation id="277771892408211951">ભાષા પસંદ કરો</translation>
@@ -503,6 +502,7 @@
 <translation id="4476574785019001431">સેટિંગ</translation>
 <translation id="448433063499977729">સિંક કરવાની સુવિધા બંદ કરવામાં આવી છે</translation>
 <translation id="4488754974567924717">જો તમારા પાસવર્ડ સાથે ચેડાં કરવામાં આવ્યા હોય, તો અમે તમને જણાવીશું</translation>
+<translation id="4489536976005181779">{count,plural, =1{તમારા એકાઉન્ટ, {email}માં તમારી વાંચન સૂચિમાં પેજ ઉમેરાયું}one{તમારા એકાઉન્ટ, {email}માં તમારી વાંચન સૂચિમાં પેજ ઉમેરાયું}other{તમારા એકાઉન્ટ, {email}માં તમારી વાંચન સૂચિમાં પેજ ઉમેરાયા}}</translation>
 <translation id="4496373720959965247">ટૅબ ઉમેરો અને પેજ વચ્ચે સ્વિચ કરો</translation>
 <translation id="4502566650163919158">હમણાં ચેક કરો</translation>
 <translation id="4505980578794259603">છેલ્લે <ph name="TIME" /> તપાસ્યું.</translation>

ios/chrome/app/strings/resources/ios_strings_hi.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_hi.xtb b/ios/chrome/app/strings/resources/ios_strings_hi.xtb
index 98e8a15a..ff003cd 100644
--- a/ios/chrome/app/strings/resources/ios_strings_hi.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_hi.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">केवल वाई-फ़ाई पर</translation>
 <translation id="2747003861858887689">पिछला फ़ील्‍ड</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> को फ़ॉलो किया जा रहा है</translation>
-<translation id="2764831210418622012">अभी-अभी</translation>
 <translation id="2772667768515195373">सेव किए गए पतों का इस्तेमाल, Google के सभी प्रॉडक्ट के लिए किया जा सकता है. यह पता आपके Google खाते <ph name="USER_EMAIL" /> में सेव किया गया है.</translation>
 <translation id="2773292004659987824">गुप्त मोड में खोज</translation>
 <translation id="277771892408211951">भाषा चुनें</translation>

ios/chrome/app/strings/resources/ios_strings_hr.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_hr.xtb b/ios/chrome/app/strings/resources/ios_strings_hr.xtb
index cf9c83c..1499407 100644
--- a/ios/chrome/app/strings/resources/ios_strings_hr.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_hr.xtb
@@ -217,6 +217,7 @@
 <translation id="2482878487686419369">Obavijesti</translation>
 <translation id="2496626742194544812">Idi na prvu karticu</translation>
 <translation id="2500374554657206846">Opcije za spremanje zaporki</translation>
+<translation id="2502415369140591438">Višestruko korištene zaporke: <ph name="COUNT" /></translation>
 <translation id="2523363575747517183">Ova web-lokacija opetovano pokušava otvoriti neku drugu aplikaciju.</translation>
 <translation id="2529021024822217800">Otvori sve</translation>
 <translation id="2547458583188611426">Sinkronizacija ne funkcionira. Unesite šifru da biste pokrenuli sinkronizaciju.</translation>
@@ -226,6 +227,7 @@
 <translation id="2576499762020411840">Koristite i spremajte zaporke sa svojeg Google računa</translation>
 <translation id="2578571896248130439">Pošalji web-stranicu</translation>
 <translation id="2584132361465095047">Dodaj račun…</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{Otvorene kartice koje se ne koriste jedan ili više dana premještaju se u Neaktivne kartice kako biste se lako usredotočili na kartice koje najčešće koristite. To uvijek možete promijeniti u postavkama.}one{Otvorene kartice koje se ne koriste {COUNT} ili više dana premještaju se u Neaktivne kartice kako biste se lako usredotočili na kartice koje najčešće koristite. To uvijek možete promijeniti u postavkama.}few{Otvorene kartice koje se ne koriste {COUNT} ili više dana premještaju se u Neaktivne kartice kako biste se lako usredotočili na kartice koje najčešće koristite. To uvijek možete promijeniti u postavkama.}other{Otvorene kartice koje se ne koriste {COUNT} ili više dana premještaju se u Neaktivne kartice kako biste se lako usredotočili na kartice koje najčešće koristite. To uvijek možete promijeniti u postavkama.}}</translation>
 <translation id="2600682495497606169">Izbriši kolačiće web-lokacija</translation>
 <translation id="2609008503159898744">Zatvoriti sve kartice?</translation>
 <translation id="2625189173221582860">Zaporka je kopirana</translation>
@@ -256,7 +258,6 @@
 <translation id="2718352093833049315">Samo na Wi-Fiju</translation>
 <translation id="2747003861858887689">Prethodno polje</translation>
 <translation id="2749231692441336879">Praćenje web-lokacije <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">upravo sada</translation>
 <translation id="2772667768515195373">Spremljene adrese možete upotrijebiti na Googleovim proizvodima. Adresa je spremljena na vašem Google računu (<ph name="USER_EMAIL" />).</translation>
 <translation id="2773292004659987824">Anonimno pretraživanje</translation>
 <translation id="277771892408211951">Odaberite jezik</translation>
@@ -294,6 +295,7 @@
 <translation id="2932085390869194046">Predloži zaporku…</translation>
 <translation id="2932765531295814441">Dodajte zaporke ručno</translation>
 <translation id="2952581218264071393">1. Otvorite postavke Chromea</translation>
+<translation id="2953871438216280742">Prijavite se da biste otvorili i spremili popis za čitanje na Google računu.</translation>
 <translation id="2958718410589002129">Zaporke</translation>
 <translation id="2961210776189273067">Titula</translation>
 <translation id="2964349545761222050">Blokiraj kolačiće trećih strana</translation>
@@ -387,6 +389,7 @@
 <translation id="3581564640715911333">Ponudi prevođenje stranica na druge jezike</translation>
 <translation id="3588820906588687999">Otvori sliku u novoj kartici</translation>
 <translation id="3595252146048399851">U <ph name="BEGIN_LINK" />postavkama<ph name="END_LINK" /> možete odabrati što će se sinkronizirati. Google može prilagoditi Pretraživanje i druge usluge na temelju vaše povijesti.</translation>
+<translation id="3595588371156514964">{COUNT,plural, =1{{COUNT} slaba zaporka}one{{COUNT} slaba zaporka}few{{COUNT} slabe zaporke}other{{COUNT} slabih zaporki}}</translation>
 <translation id="3603009562372709545">Kopiraj URL veze</translation>
 <translation id="3607167657931203000">Podaci automatskog popunjavanja</translation>
 <translation id="3608008480985212611">Prijavite se da biste upravljali svojim preferencijama.</translation>
@@ -573,6 +576,7 @@
 <translation id="4844899002472726590">Pregled i uređivanje tema koje vas zanimaju</translation>
 <translation id="4848999860252535517">Želite li izbrisati zaporku za <ph name="WEBSITE" />?</translation>
 <translation id="4854345657858711387">Postavite šifru zaporke</translation>
+<translation id="4856498338299082007">Na vašem Google računu</translation>
 <translation id="4858786880085262208">Nadogradite na HTTPS, kad je moguće. Sigurne web-lokacije mogu ugraditi sadržaj koji nije siguran.</translation>
 <translation id="4860895144060829044">Poziv</translation>
 <translation id="4872323082491632254">Provjera zaporki</translation>
@@ -624,6 +628,7 @@
 <translation id="5197255632782567636">Internet</translation>
 <translation id="5211488077761630279">Želite li dopustiti web-lokaciji <ph name="SITE_NAME" /> da upotrebljava vašu <ph name="PERMISSION" />?</translation>
 <translation id="5219295696240154694">Pomozite poboljšati sigurnost na webu za sve korisnike</translation>
+<translation id="5221339005270097309">Provjera zaporki…</translation>
 <translation id="5228579091201413441">Omogući sinkronizaciju</translation>
 <translation id="5232485538978018676">Prijavite se upravljanim računom</translation>
 <translation id="5234764350956374838">Odbaci</translation>
@@ -663,6 +668,7 @@
 Handoff mora biti omogućen i u odjeljku Općenito u Postavkama, a vaši uređaji moraju upotrebljavati isti iCloud račun.</translation>
 <translation id="5551897871312988470">Ponudi prijevod</translation>
 <translation id="5556459405103347317">Ponovno učitaj</translation>
+<translation id="555749644339804659">Provjera zaporki…</translation>
 <translation id="556042886152191864">Gumb</translation>
 <translation id="5597915316964418992">Otvorite rešetku kartica</translation>
 <translation id="560322036295180549">Isključila vaša organizacija</translation>
@@ -1089,6 +1095,7 @@
 <translation id="821809831108207540">Da biste prilagodili svoj feed Discovera i Chrome, prijavite se i uključite sinkronizaciju.</translation>
 <translation id="8225985093977202398">Predmemorirane slike i datoteke</translation>
 <translation id="8237382152611443140">Otvorite postavke automatskog popunjavanja zaporki</translation>
+<translation id="8248969482078657578">Neaktivne kartice pomažu vam da ostanete usredotočeni</translation>
 <translation id="8261506727792406068">Izbriši</translation>
 <translation id="8264966119170358612">Neke od vaših spremljenih zaporki otkrivene su u neovlaštenom pristupu podacima izvan Googlea. <ph name="BEGIN_LINK" />Saznajte više<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">Samo na ovom uređaju</translation>

ios/chrome/app/strings/resources/ios_strings_hu.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_hu.xtb b/ios/chrome/app/strings/resources/ios_strings_hu.xtb
index f489f84a..2d53b95 100644
--- a/ios/chrome/app/strings/resources/ios_strings_hu.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_hu.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Csak Wi-Fi-n</translation>
 <translation id="2747003861858887689">Előző mező</translation>
 <translation id="2749231692441336879">A(z) <ph name="CHANNEL_NAME" /> követve van</translation>
-<translation id="2764831210418622012">éppen most</translation>
 <translation id="2772667768515195373">A mentett címeket több Google-termékben is használhatja. Ezt a címet a Google-fiókjába (<ph name="USER_EMAIL" />) mentette a rendszer.</translation>
 <translation id="2773292004659987824">Keresés inkognitó módban</translation>
 <translation id="277771892408211951">Nyelv kiválasztása</translation>

ios/chrome/app/strings/resources/ios_strings_hy.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_hy.xtb b/ios/chrome/app/strings/resources/ios_strings_hy.xtb
index 7331ec3..cd23622 100644
--- a/ios/chrome/app/strings/resources/ios_strings_hy.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_hy.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Միայն Wi-Fi-ով</translation>
 <translation id="2747003861858887689">Նախորդ դաշտը</translation>
 <translation id="2749231692441336879">Դուք բաժանորդագրվեցիք «<ph name="CHANNEL_NAME" />» ալիքին</translation>
-<translation id="2764831210418622012">հենց նոր</translation>
 <translation id="2772667768515195373">Դուք կարող եք օգտագործել պահված հասցեները Google-ի արտադրանքներում։ Այս հասցեն պահվում է ձեր Google հաշվում (<ph name="USER_EMAIL" />)։</translation>
 <translation id="2773292004659987824">Որոնում ինկոգնիտո ռեժիմում</translation>
 <translation id="277771892408211951">Ընտրեք լեզուն</translation>

ios/chrome/app/strings/resources/ios_strings_id.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_id.xtb b/ios/chrome/app/strings/resources/ios_strings_id.xtb
index 18d5409..27e16eb 100644
--- a/ios/chrome/app/strings/resources/ios_strings_id.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_id.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Hanya melalui Wi-Fi</translation>
 <translation id="2747003861858887689">Bidang sebelumnya</translation>
 <translation id="2749231692441336879">Mengikuti <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">baru saja</translation>
 <translation id="2772667768515195373">Anda dapat menggunakan alamat tersimpan di seluruh produk Google. Alamat ini disimpan di Akun Google Anda, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Penelusuran Samaran</translation>
 <translation id="277771892408211951">Pilih Bahasa</translation>

ios/chrome/app/strings/resources/ios_strings_is.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_is.xtb b/ios/chrome/app/strings/resources/ios_strings_is.xtb
index 872a1a70..23d083d4 100644
--- a/ios/chrome/app/strings/resources/ios_strings_is.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_is.xtb
@@ -226,6 +226,7 @@
 <translation id="2576499762020411840">Nota og vista aðgangsorð á Google-reikningnum þínum</translation>
 <translation id="2578571896248130439">Senda vefsíðu</translation>
 <translation id="2584132361465095047">Bæta við reikningi…</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{Opnir flipar sem ekki eru notaðir í sólarhring eða lengur verða færðir í „Óvirkir flipar“ svo þú getir einbeitt þér betur að flipunum sem þú notar mest. Þú getur breytt þessu hvenær sem er í stillingunum.}one{Opnir flipar sem ekki eru notaðir í {COUNT} dag eða lengur verða færðir í „Óvirkir flipar“ svo þú getir einbeitt þér betur að flipunum sem þú notar mest. Þú getur breytt þessu hvenær sem er í stillingunum.}other{Opnir flipar sem ekki eru notaðir í {COUNT} daga eða lengur verða færðir í „Óvirkir flipar“ svo þú getir einbeitt þér betur að flipunum sem þú notar mest. Þú getur breytt þessu hvenær sem er í stillingunum.}}</translation>
 <translation id="2600682495497606169">Hreinsa fótspor síðu</translation>
 <translation id="2609008503159898744">Loka öllum flipum?</translation>
 <translation id="2625189173221582860">Aðgangsorð afritað</translation>
@@ -256,7 +257,6 @@
 <translation id="2718352093833049315">Aðeins um Wi-Fi</translation>
 <translation id="2747003861858887689">Fyrri reitur</translation>
 <translation id="2749231692441336879">Fylgir <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">rétt í þessu</translation>
 <translation id="2772667768515195373">Þú getur notað vistuð heimilisföng í Google-vörum. Þetta heimilisfang er vistað á Google-reikningnum þínum, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Leit í huliðsstillingu</translation>
 <translation id="277771892408211951">Velja tungumál</translation>
@@ -573,6 +573,7 @@
 <translation id="4844899002472726590">Skoðaðu og breyttu umfjöllunarefnum sem þú hefur áhuga á</translation>
 <translation id="4848999860252535517">Eyða aðgangsorði fyrir <ph name="WEBSITE" />?</translation>
 <translation id="4854345657858711387">Veldu aðgangskóða</translation>
+<translation id="4856498338299082007">Á Google-reikningnum þínum</translation>
 <translation id="4858786880085262208">Uppfæra í HTTPS þegar það er hægt. Örugg vefsvæði gætu fellt inn óöruggt efni.</translation>
 <translation id="4860895144060829044">Hringja</translation>
 <translation id="4872323082491632254">Yfirfara aðgangsorð</translation>
@@ -1089,6 +1090,7 @@
 <translation id="821809831108207540">Til að sérsníða Chrome og strauminn „Tillögur“ skaltu skrá þig inn og kveikja á samstillingu.</translation>
 <translation id="8225985093977202398">Myndir/skrár í skyndiminni</translation>
 <translation id="8237382152611443140">Opnaðu stillingar sjálfvirkrar útfyllingar aðgangsorða</translation>
+<translation id="8248969482078657578">Óvirkir flipar hjálpa þér að halda einbeitingu</translation>
 <translation id="8261506727792406068">Eyða</translation>
 <translation id="8264966119170358612">Sum vistuðu aðgangsorðin þín voru afhjúpuð í öryggisbroti utan Google. <ph name="BEGIN_LINK" />Nánar<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">Aðeins í þessu tæki</translation>

ios/chrome/app/strings/resources/ios_strings_it.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_it.xtb b/ios/chrome/app/strings/resources/ios_strings_it.xtb
index 2094a35..771e7b0 100644
--- a/ios/chrome/app/strings/resources/ios_strings_it.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_it.xtb
@@ -217,6 +217,7 @@
 <translation id="2482878487686419369">Notifiche</translation>
 <translation id="2496626742194544812">Vai alla prima scheda</translation>
 <translation id="2500374554657206846">Opzioni per salvare la password</translation>
+<translation id="2502415369140591438"><ph name="COUNT" /> password riutilizzate</translation>
 <translation id="2523363575747517183">Questo sito web sta cercando ripetutamente di aprire un'altra applicazione.</translation>
 <translation id="2529021024822217800">Apri tutto</translation>
 <translation id="2547458583188611426">La sincronizzazione non funziona. Per avviare la sincronizzazione devi inserire la tua passphrase.</translation>
@@ -226,6 +227,7 @@
 <translation id="2576499762020411840">Usa e salva le password nel tuo Account Google</translation>
 <translation id="2578571896248130439">Invia pagina web</translation>
 <translation id="2584132361465095047">Aggiungi account…</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{Le schede aperte che non vengono usate per uno o più giorni vengono spostate nella sezione Schede non attive in modo da poterti concentrare facilmente sulle schede che utilizzi di più. Puoi modificare questa preferenza in qualsiasi momento nelle impostazioni.}other{Le schede aperte che non vengono usate per {COUNT} o più giorni vengono spostate nella sezione Schede non attive in modo da poterti concentrare facilmente sulle schede che utilizzi di più. Puoi modificare questa preferenza in qualsiasi momento nelle impostazioni.}}</translation>
 <translation id="2600682495497606169">Cancella cookie del sito</translation>
 <translation id="2609008503159898744">Chiudere tutte le schede?</translation>
 <translation id="2625189173221582860">Password copiata</translation>
@@ -256,7 +258,6 @@
 <translation id="2718352093833049315">Solo su Wi-Fi</translation>
 <translation id="2747003861858887689">Campo precedente</translation>
 <translation id="2749231692441336879">Segui <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">un attimo fa</translation>
 <translation id="2772667768515195373">Puoi usare gli indirizzi salvati in tutti i prodotti Google. Questo indirizzo viene salvato nel tuo Account Google, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Ricerca in incognito</translation>
 <translation id="277771892408211951">Seleziona lingua</translation>
@@ -294,6 +295,7 @@
 <translation id="2932085390869194046">Suggerisci password...</translation>
 <translation id="2932765531295814441">Aggiungi password manualmente</translation>
 <translation id="2952581218264071393">1. Apri le Impostazioni di Chrome</translation>
+<translation id="2953871438216280742">Accedi per aprire e salvare il tuo elenco di lettura nel tuo Account Google.</translation>
 <translation id="2958718410589002129">Password</translation>
 <translation id="2961210776189273067">Titolo</translation>
 <translation id="2964349545761222050">Blocca cookie di terze parti</translation>
@@ -387,6 +389,7 @@
 <translation id="3581564640715911333">Proponi di tradurre le pagine in altre lingue</translation>
 <translation id="3588820906588687999">Apri immagine in un'altra scheda</translation>
 <translation id="3595252146048399851">Puoi scegliere in qualsiasi momento i dati da sincronizzare nelle <ph name="BEGIN_LINK" />impostazioni<ph name="END_LINK" />. Google potrebbe personalizzare la Ricerca e altri servizi in base alla tua cronologia.</translation>
+<translation id="3595588371156514964">{COUNT,plural, =1{{COUNT} password inefficace}other{{COUNT} password inefficaci}}</translation>
 <translation id="3603009562372709545">Copia URL link</translation>
 <translation id="3607167657931203000">Dati della Compilazione automatica</translation>
 <translation id="3608008480985212611">Accedi per gestire le tue preferenze.</translation>
@@ -573,6 +576,7 @@
 <translation id="4844899002472726590">Visualizza e modifica gli argomenti che ti interessano</translation>
 <translation id="4848999860252535517">Vuoi eliminare la password di <ph name="WEBSITE" />?</translation>
 <translation id="4854345657858711387">Imposta un passcode</translation>
+<translation id="4856498338299082007">Nel tuo Account Google</translation>
 <translation id="4858786880085262208">Passa a HTTPS, quando è possibile. I siti sicuri potrebbero incorporare contenuti non sicuri.</translation>
 <translation id="4860895144060829044">Chiama</translation>
 <translation id="4872323082491632254">Controlla password</translation>
@@ -624,6 +628,7 @@
 <translation id="5197255632782567636">Internet</translation>
 <translation id="5211488077761630279">Vuoi consentire a "<ph name="SITE_NAME" />" di usare <ph name="PERMISSION" />?</translation>
 <translation id="5219295696240154694">Contribuisci a migliorare la sicurezza sul Web per tutti</translation>
+<translation id="5221339005270097309">Controllo delle password…</translation>
 <translation id="5228579091201413441">Abilita sincronizzazione</translation>
 <translation id="5232485538978018676">Accesso con account gestito</translation>
 <translation id="5234764350956374838">Ignora</translation>
@@ -663,6 +668,7 @@
 La funzione Handoff deve anche essere attivata nella sezione Generali di Impostazioni e sui dispositivi deve essere in uso lo stesso account iCloud.</translation>
 <translation id="5551897871312988470">Proponi di tradurre</translation>
 <translation id="5556459405103347317">Ricarica</translation>
+<translation id="555749644339804659">Controllo delle password…</translation>
 <translation id="556042886152191864">Pulsante</translation>
 <translation id="5597915316964418992">Apri la griglia delle schede</translation>
 <translation id="560322036295180549">Opzione disattivata dall'organizzazione</translation>
@@ -1089,6 +1095,7 @@
 <translation id="821809831108207540">Per personalizzare il tuo feed di Discover e Chrome, accedi e attiva la sincronizzazione.</translation>
 <translation id="8225985093977202398">Immagini e file memorizzati nella cache</translation>
 <translation id="8237382152611443140">Apri le Impostazioni Riempimento automatico password</translation>
+<translation id="8248969482078657578">La funzionalità Schede non attive ti aiuta a mantenere la concentrazione</translation>
 <translation id="8261506727792406068">Elimina</translation>
 <translation id="8264966119170358612">Alcune delle password che hai salvato sono state compromesse nell'ambito di una violazione dei dati non di Google. <ph name="BEGIN_LINK" />Scopri di più<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">Solo su questo dispositivo</translation>

ios/chrome/app/strings/resources/ios_strings_iw.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_iw.xtb b/ios/chrome/app/strings/resources/ios_strings_iw.xtb
index 5caf8535..fd7b563 100644
--- a/ios/chrome/app/strings/resources/ios_strings_iw.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_iw.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">‏רק ב-Wi-Fi</translation>
 <translation id="2747003861858887689">השדה הקודם</translation>
 <translation id="2749231692441336879">האתר <ph name="CHANNEL_NAME" /> נמצא במעקב</translation>
-<translation id="2764831210418622012">ממש עכשיו</translation>
 <translation id="2772667768515195373">‏אפשר להשתמש בכתובות שמורות במוצרי Google. הכתובת הזו שמורה בחשבון Google שלך, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">חיפוש במצב אנונימי</translation>
 <translation id="277771892408211951">בחירת שפה</translation>

ios/chrome/app/strings/resources/ios_strings_ja.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_ja.xtb b/ios/chrome/app/strings/resources/ios_strings_ja.xtb
index eed3744f..41d54c6 100644
--- a/ios/chrome/app/strings/resources/ios_strings_ja.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_ja.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Wi-Fi接続時のみ</translation>
 <translation id="2747003861858887689">前の項目</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> をフォローしました</translation>
-<translation id="2764831210418622012">たった今</translation>
 <translation id="2772667768515195373">保存した住所は Google サービス全体で使用できます。この住所は Google アカウント（<ph name="USER_EMAIL" />）に保存されます。</translation>
 <translation id="2773292004659987824">シークレット検索</translation>
 <translation id="277771892408211951">言語を選択</translation>

ios/chrome/app/strings/resources/ios_strings_ka.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_ka.xtb b/ios/chrome/app/strings/resources/ios_strings_ka.xtb
index 9738a50..abedb69 100644
--- a/ios/chrome/app/strings/resources/ios_strings_ka.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_ka.xtb
@@ -226,6 +226,7 @@
 <translation id="2576499762020411840">პაროლების გამოყენება და შენახვა თქვენი Google ანგარიშიდან</translation>
 <translation id="2578571896248130439">ვებგვერდის გაგზავნა</translation>
 <translation id="2584132361465095047">ანგარიშის დამატება…</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{გახსნილი ჩანართები, რომლებიც არ გამოყენებულა მინიმუმ ერთი დღის განმავლობაში, გადავა არააქტიურ ჩანართებში, რომ მარტივად კონცენტრირდეთ ყველაზე ხშირად გამოყენებულ ჩანართებზე. ამის შეცვლა ნებისმიერ დროს შეგიძლიათ პარამეტრებიდან.}other{გახსნილი ჩანართები, რომლებიც არ გამოყენებულა მინიმუმ {COUNT} დღის განმავლობაში, გადავა არააქტიურ ჩანართებში, რომ მარტივად კონცენტრირდეთ ყველაზე ხშირად გამოყენებულ ჩანართებზე. ამის შეცვლა ნებისმიერ დროს შეგიძლიათ პარამეტრებიდან.}}</translation>
 <translation id="2600682495497606169">საიტის ქუქი-ჩანაწერების გასუფთავება</translation>
 <translation id="2609008503159898744">გსურთ ყველა ჩანართის დახურვა?</translation>
 <translation id="2625189173221582860">პაროლი დაკოპირდა</translation>
@@ -256,7 +257,6 @@
 <translation id="2718352093833049315">მხოლოდ Wi-Fi-ით</translation>
 <translation id="2747003861858887689">წინა ველი</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> თვალმიდევნებულია</translation>
-<translation id="2764831210418622012">ახლახან</translation>
 <translation id="2772667768515195373">შენახული მისამართების გამოყენება Google-ის სხვადასხვა პროდუქტში შეგიძლიათ. ეს მისამართი შეინახება თქვენს Google ანგარიშში (<ph name="USER_EMAIL" />).</translation>
 <translation id="2773292004659987824">ინკოგნიტო ძიება</translation>
 <translation id="277771892408211951">აირჩიეთ ენა</translation>
@@ -573,6 +573,7 @@
 <translation id="4844899002472726590">ნახეთ და დაარედაქტირეთ თემები, რომლებიც გაინტერესებთ</translation>
 <translation id="4848999860252535517">გსურთ <ph name="WEBSITE" />-ის პაროლის წაშლა?</translation>
 <translation id="4854345657858711387">დააყენეთ საიდუმლო კოდი</translation>
+<translation id="4856498338299082007">თქვენს Google ანგარიშში</translation>
 <translation id="4858786880085262208">შეძლებისდაგვარად, HTTPS-ზე გადასვლა. დაცულ საიტებში შეიძლება ჩაშენებული იყოს დაუცველი კონტენტი.</translation>
 <translation id="4860895144060829044">დარეკვა</translation>
 <translation id="4872323082491632254">პაროლების შემოწმება</translation>
@@ -1089,6 +1090,7 @@
 <translation id="821809831108207540">თქვენი Discover არხისა და Chrome-ის პერსონალიზებისთვის შედით სისტემაში და ჩართეთ სინქრონიზაცია.</translation>
 <translation id="8225985093977202398">ქეშირებული სურათები და ფაილები</translation>
 <translation id="8237382152611443140">გახსენით პაროლების ავტომატური შევსების პარამეტრები</translation>
+<translation id="8248969482078657578">არააქტიური ჩანართები უკეთ კონცენტრირებაში გეხმარებათ</translation>
 <translation id="8261506727792406068">წაშლა</translation>
 <translation id="8264966119170358612">თქვენი ზოგიერთი შენახული პაროლი გამჟღავნდა Google-ის მიღმა პერსონალურ მონაცემთა გაჟონვის დროს. <ph name="BEGIN_LINK" />შეიტყვეთ მეტი<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">მხოლოდ ამ მოწყობილობაზე</translation>

ios/chrome/app/strings/resources/ios_strings_kk.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_kk.xtb b/ios/chrome/app/strings/resources/ios_strings_kk.xtb
index 723dd9e..296ff24 100644
--- a/ios/chrome/app/strings/resources/ios_strings_kk.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_kk.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Тек Wi-Fi</translation>
 <translation id="2747003861858887689">Алдыңғы өріс</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> арнасына жазылғансыз.</translation>
-<translation id="2764831210418622012">жаңа ғана</translation>
 <translation id="2772667768515195373">Google өнімдерінде сақталған мекенжайларды пайдалана аласыз. Бұл мекенжай Google аккаунтыңызда (<ph name="USER_EMAIL" />) сақталады.</translation>
 <translation id="2773292004659987824">Инкогнито режимінде іздеу</translation>
 <translation id="277771892408211951">Тілді таңдау</translation>

ios/chrome/app/strings/resources/ios_strings_km.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_km.xtb b/ios/chrome/app/strings/resources/ios_strings_km.xtb
index fdbe44a..3df8eb2b 100644
--- a/ios/chrome/app/strings/resources/ios_strings_km.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_km.xtb
@@ -217,6 +217,7 @@
 <translation id="2482878487686419369">ការជូនដំណឹង</translation>
 <translation id="2496626742194544812">ចូលទៅ​ផ្ទាំង​ដំបូង</translation>
 <translation id="2500374554657206846">ជម្រើស​សម្រាប់​រក្សាទុក​ពាក្យសម្ងាត់</translation>
+<translation id="2502415369140591438">ពាក្យសម្ងាត់​ដែលប្រើ​ឡើងវិញ <ph name="COUNT" /></translation>
 <translation id="2523363575747517183">គេហទំព័រ​នេះកំពុង​ព្យាយាម​បើកកម្មវិធី​ផ្សេងទៀត​ម្តង​ហើយ​ម្តងទៀត។</translation>
 <translation id="2529021024822217800">បើកទាំងអស់</translation>
 <translation id="2547458583188611426">សមកាលកម្មមិនដំណើរការទេ។ ដើម្បី​ចាប់ផ្ដើម​ធ្វើសមកាលកម្ម សូមបញ្ចូល​ឃ្លាសម្ងាត់​របស់អ្នក។</translation>
@@ -226,6 +227,7 @@
 <translation id="2576499762020411840">ប្រើប្រាស់​ និង​រក្សាទុក​ពាក្យសម្ងាត់នៅ​ក្នុង​គណនី Google របស់​អ្នក</translation>
 <translation id="2578571896248130439">ផ្ញើទំព័រ​បណ្ដាញ</translation>
 <translation id="2584132361465095047">បន្ថែមគណនី…</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{ផ្ទាំង​ដែលបើកដែលមិនបានប្រើរយៈពេលមួយថ្ងៃឡើងទៅ ត្រូវបាន​ផ្លាស់​ទី​ទៅ​ផ្ទាំង​អសកម្ម​ ដូច្នេះ​អ្នក​អាច​ផ្ដោត​លើ​ផ្ទាំង​ដែល​អ្នក​ប្រើ​ញឹកញាប់បំផុតបានយ៉ាងងាយស្រួល​។ អ្នកអាច​ផ្លាស់ប្ដូរ​លក្ខណៈ​នេះ​បានគ្រប់ពេល​នៅក្នុង​ការកំណត់។}other{ផ្ទាំង​ដែលបើកដែលមិនបានប្រើរយៈពេល {COUNT} ថ្ងៃឡើងទៅ ត្រូវបាន​ផ្លាស់​ទី​ទៅ​ផ្ទាំង​អសកម្ម​ ដូច្នេះ​អ្នក​អាច​ផ្ដោត​លើ​ផ្ទាំង​ដែល​អ្នក​ប្រើ​ញឹកញាប់បំផុតបានយ៉ាងងាយស្រួល​។ អ្នកអាច​ផ្លាស់ប្ដូរ​លក្ខណៈ​នេះ​បានគ្រប់ពេល​នៅក្នុង​ការកំណត់។}}</translation>
 <translation id="2600682495497606169">សម្អាត​ខូគីរបស់គេហទំព័រ</translation>
 <translation id="2609008503159898744">បិទផ្ទាំងទាំងអស់ឬ?</translation>
 <translation id="2625189173221582860">បានចម្លង​ពាក្យសម្ងាត់</translation>
@@ -256,7 +258,6 @@
 <translation id="2718352093833049315">នៅលើ Wi-Fi តែប៉ុណ្ណោះ</translation>
 <translation id="2747003861858887689">ប្រអប់បំពេញពីមុន</translation>
 <translation id="2749231692441336879">កំពុងតាមដាន <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">អម្បាញ់មិញ</translation>
 <translation id="2772667768515195373">អ្នកអាចប្រើអាសយដ្ឋានដែលបានរក្សាទុកនៅលើផលិតផល Google។ អាសយដ្ឋាននេះត្រូវបានរក្សាទុកនៅក្នុងគណនី Google (<ph name="USER_EMAIL" />) របស់អ្នក។</translation>
 <translation id="2773292004659987824">ការ​ស្វែងរក​លក្ខណៈឯកជន</translation>
 <translation id="277771892408211951">ជ្រើសរើស​ភាសា</translation>
@@ -294,6 +295,7 @@
 <translation id="2932085390869194046">ណែនាំ​ពាក្យសម្ងាត់...</translation>
 <translation id="2932765531295814441">បញ្ចូលពាក្យសម្ងាត់ដោយផ្ទាល់ដៃ</translation>
 <translation id="2952581218264071393">1. បើក​ការកំណត់ Chrome</translation>
+<translation id="2953871438216280742">ចូលគណនី​ដើម្បី​បើក និង​រក្សាទុក​បញ្ជី​អាន​​របស់អ្នក​នៅ​ក្នុង​គណនី Google របស់​អ្នក។</translation>
 <translation id="2958718410589002129">ពាក្យ​សម្ងាត់</translation>
 <translation id="2961210776189273067">ចំណងជើង</translation>
 <translation id="2964349545761222050">ទប់ស្កាត់​ខូគី​ភាគី​ទីបី</translation>
@@ -387,6 +389,7 @@
 <translation id="3581564640715911333">ផ្តល់ជូន​ការ​បកប្រែ​ទំព័រ​ជាភាសា​ផ្សេងទៀត</translation>
 <translation id="3588820906588687999">បើករូបភាពនៅក្នុងផ្ទាំងថ្មី</translation>
 <translation id="3595252146048399851">អ្នកអាចជ្រើសរើស​អ្វីដែលត្រូវធ្វើសមកាលកម្ម​នៅក្នុង​<ph name="BEGIN_LINK" />ការកំណត់<ph name="END_LINK" />បានជានិច្ច។ Google អាច​កំណត់​ម៉ាស៊ីន​​ស្វែងរក និង​សេវាកម្ម​ផ្សេង​ទៀតឱ្យមាន​លក្ខណៈ​ផ្ទាល់​ខ្លួន​ ផ្អែក​តាម​ប្រវត្តិ​របស់​អ្នក។</translation>
+<translation id="3595588371156514964">{COUNT,plural, =1{ពាក្យសម្ងាត់ខ្សោយ {COUNT}}other{ពាក្យសម្ងាត់ខ្សោយ {COUNT}}}</translation>
 <translation id="3603009562372709545">ចម្លងតំណ URL</translation>
 <translation id="3607167657931203000">ទិន្នន័យបំពេញស្វ័យប្រវត្តិ</translation>
 <translation id="3608008480985212611">ចូលគណនី​ដើម្បីគ្រប់គ្រង​ចំណូលចិត្ត​របស់​អ្នក។</translation>
@@ -573,6 +576,7 @@
 <translation id="4844899002472726590">មើល និងកែប្រធានបទ​ដែលអ្នកចាប់អារម្មណ៍</translation>
 <translation id="4848999860252535517">លុប​ពាក្យ​សម្ងាត់​សម្រាប់ <ph name="WEBSITE" /> ឬ?</translation>
 <translation id="4854345657858711387">កំណត់​លេខ​កូដ​សម្ងាត់</translation>
+<translation id="4856498338299082007">នៅ​ក្នុង​គណនី Google របស់​អ្នក</translation>
 <translation id="4858786880085262208">នៅពេលដែលអាច សូមប្ដូរ​ទៅ HTTPS។ គេហទំព័រដែលមានសុវត្ថិភាពប្រហែលជាបង្កប់ខ្លឹមសារដែលគ្មានសុវត្ថិភាព។</translation>
 <translation id="4860895144060829044">ហៅ</translation>
 <translation id="4872323082491632254">ពិនិត្យពាក្យសម្ងាត់</translation>
@@ -624,6 +628,7 @@
 <translation id="5197255632782567636">អ៊ីនធឺណិត</translation>
 <translation id="5211488077761630279">អនុញ្ញាត​ឱ្យ "<ph name="SITE_NAME" />" ប្រើប្រាស់<ph name="PERMISSION" />របស់​អ្នកឬ?</translation>
 <translation id="5219295696240154694">ជួយ​កែលម្អ​សុវត្ថិភាព​នៅលើ​បណ្ដាញ​សម្រាប់​អ្នកគ្រប់គ្នា</translation>
+<translation id="5221339005270097309">កំពុងពិនិត្យពាក្យសម្ងាត់…</translation>
 <translation id="5228579091201413441">បើកដំណើរការធ្វើសមកាលកម្ម</translation>
 <translation id="5232485538978018676">ចូលដោយប្រើ​គណនីដែលស្ថិតក្រោមការគ្រប់គ្រង</translation>
 <translation id="5234764350956374838">ច្រានចោល</translation>
@@ -663,6 +668,7 @@
 Handoff ត្រូវបើកដំណើរការនៅក្នុងផ្នែកទូទៅនៃការកំណត់ ហើយឧបករណ៍របស់អ្នកត្រួវតែប្រើគណនី iCloud តែមួយ។</translation>
 <translation id="5551897871312988470">ផ្តល់ជូន​ការ​បកប្រែ</translation>
 <translation id="5556459405103347317">ដំណើរការឡើងវិញ</translation>
+<translation id="555749644339804659">កំពុងពិនិត្យពាក្យសម្ងាត់…</translation>
 <translation id="556042886152191864">ប៊ូតុង</translation>
 <translation id="5597915316964418992">បើកក្រឡាផ្ទាំង</translation>
 <translation id="560322036295180549">បានបិទ​ដោយស្ថាប័ន​របស់អ្នក</translation>
@@ -1089,6 +1095,7 @@
 <translation id="821809831108207540">ដើម្បីកំណត់ព័ត៌មាន Discover និង Chrome ​របស់អ្នកឱ្យ​មានលក្ខណៈផ្ទាល់ខ្លួន សូម​ចូល​គណនី រួច​បើក​ការ​ធ្វើ​សមកាលកម្ម។</translation>
 <translation id="8225985093977202398">រូបភាព និងឯកសារដែលផ្ទុកក្នុងឃ្លាំងសម្ងាត់</translation>
 <translation id="8237382152611443140">បើក​ការកំណត់​ការបំពេញ​ពាក្យសម្ងាត់ស្វ័យប្រវត្តិ</translation>
+<translation id="8248969482078657578">ផ្ទាំង​អសកម្ម​ជួយ​ឱ្យ​អ្នក​បន្តផ្ដោត​អារម្មណ៍</translation>
 <translation id="8261506727792406068">លុប</translation>
 <translation id="8264966119170358612">ពាក្យសម្ងាត់មួយចំនួន​ដែលអ្នកបានរក្សាទុក​ត្រូវបានបញ្ចេញនៅក្នុង​ការបែកធ្លាយ​ទិន្នន័យដែលមិនមែនជារបស់ Google។ <ph name="BEGIN_LINK" />ស្វែងយល់បន្ថែម<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">តែ​នៅ​លើ​ឧបករណ៍​នេះ​ប៉ុណ្ណោះ</translation>

ios/chrome/app/strings/resources/ios_strings_kn.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_kn.xtb b/ios/chrome/app/strings/resources/ios_strings_kn.xtb
index 580b1a8..63bb898 100644
--- a/ios/chrome/app/strings/resources/ios_strings_kn.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_kn.xtb
@@ -217,6 +217,7 @@
 <translation id="2482878487686419369">ಸೂಚನೆಗಳು</translation>
 <translation id="2496626742194544812">ಮೊದಲ ಟ್ಯಾನ್‌ಗೆ ಹೋಗಿ</translation>
 <translation id="2500374554657206846">ಪಾಸ್‌ವರ್ಡ್ ಉಳಿಸಲು ಆಯ್ಕೆಗಳು</translation>
+<translation id="2502415369140591438"><ph name="COUNT" /> ಮರುಬಳಕೆ ಮಾಡಲಾದ ಪಾಸ್‌ವರ್ಡ್‌ಗಳು</translation>
 <translation id="2523363575747517183">ಈ ವೆಬ್‌ಸೈಟ್‌ ಪದೇ ಪದೇ ಇನ್ನೊಂದು ಅಪ್ಲಿಕೇಶನ್ ತೆರೆಯಲು ಪ್ರಯತ್ನಿಸುತ್ತಿದೆ.</translation>
 <translation id="2529021024822217800">ಎಲ್ಲವನ್ನೂ ತೆರೆಯಿರಿ</translation>
 <translation id="2547458583188611426">ಸಿಂಕ್ ಕೆಲಸ ಮಾಡುತ್ತಿಲ್ಲ. ಸಿಂಕ್ ಪ್ರಾರಂಭಿಸಲು, ನಿಮ್ಮ ಪಾಸ್‌ಫ್ರೇಸ್ ನಮೂದಿಸಿ.</translation>
@@ -226,6 +227,7 @@
 <translation id="2576499762020411840">ನಿಮ್ಮ Google ಖಾತೆಯಲ್ಲಿರುವ ಪಾಸ್‌ವರ್ಡ್‌ಗಳನ್ನು ಬಳಸಿ ಮತ್ತು ಉಳಿಸಿ</translation>
 <translation id="2578571896248130439">ವೆಬ್‌ಪುಟವನ್ನು ಕಳುಹಿಸಿ</translation>
 <translation id="2584132361465095047">ಖಾತೆ ಸೇರಿಸಿ...</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{ಒಂದು ದಿನ ಅಥವಾ ಅದಕ್ಕಿಂತ ಹೆಚ್ಚು ಕಾಲ ಬಳಸದಿರುವ ತೆರೆದ ಟ್ಯಾಬ್‌ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯ ಟ್ಯಾಬ್‌ಗಳಿಗೆ ಸರಿಸಲಾಗುತ್ತದೆ, ಇದರಿಂದ ನೀವು ಹೆಚ್ಚಾಗಿ ಬಳಸುವ ಟ್ಯಾಬ್‌ಗಳ ಮೇಲೆ ಸುಲಭವಾಗಿ ಗಮನಹರಿಸಬಹುದು. ನೀವು ಇದನ್ನು ಯಾವಾಗ ಬೇಕಾದರೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು.}one{{COUNT} ದಿನಗಳು ಅಥವಾ ಅದಕ್ಕಿಂತ ಹೆಚ್ಚು ಕಾಲ ಬಳಸದಿರುವ ತೆರೆದ ಟ್ಯಾಬ್‌ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯ ಟ್ಯಾಬ್‌ಗಳಿಗೆ ಸರಿಸಲಾಗುತ್ತದೆ, ಇದರಿಂದ ನೀವು ಹೆಚ್ಚಾಗಿ ಬಳಸುವ ಟ್ಯಾಬ್‌ಗಳ ಮೇಲೆ ಸುಲಭವಾಗಿ ಗಮನಹರಿಸಬಹುದು. ನೀವು ಇದನ್ನು ಯಾವಾಗ ಬೇಕಾದರೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು.}other{{COUNT} ದಿನಗಳು ಅಥವಾ ಅದಕ್ಕಿಂತ ಹೆಚ್ಚು ಕಾಲ ಬಳಸದಿರುವ ತೆರೆದ ಟ್ಯಾಬ್‌ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯ ಟ್ಯಾಬ್‌ಗಳಿಗೆ ಸರಿಸಲಾಗುತ್ತದೆ, ಇದರಿಂದ ನೀವು ಹೆಚ್ಚಾಗಿ ಬಳಸುವ ಟ್ಯಾಬ್‌ಗಳ ಮೇಲೆ ಸುಲಭವಾಗಿ ಗಮನಹರಿಸಬಹುದು. ನೀವು ಇದನ್ನು ಯಾವಾಗ ಬೇಕಾದರೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು.}}</translation>
 <translation id="2600682495497606169">ಸೈಟ್ ಕುಕೀಗಳನ್ನು ತೆರವುಗೊಳಿಸಿ</translation>
 <translation id="2609008503159898744">ಎಲ್ಲಾ ಟ್ಯಾಬ್‌ಗಳನ್ನು ಮುಚ್ಚಬೇಕೆ?</translation>
 <translation id="2625189173221582860">ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ನಕಲಿಸಲಾಗಿದೆ</translation>
@@ -256,7 +258,6 @@
 <translation id="2718352093833049315">ಕೇವಲ ವೈ-ಫೈ ಮಾತ್ರ</translation>
 <translation id="2747003861858887689">ಹಿಂದಿನ ಕ್ಷೇತ್ರ</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> ಅನ್ನು ಫಾಲೋ ಮಾಡಲಾಗುತ್ತಿದೆ</translation>
-<translation id="2764831210418622012">ಈಗಷ್ಟೇ</translation>
 <translation id="2772667768515195373">ಉಳಿಸಿದ ವಿಳಾಸಗಳನ್ನು ನೀವು Google ಉತ್ಪನ್ನಗಳಾದ್ಯಂತ ಬಳಸಬಹುದು. ಈ ವಿಳಾಸವನ್ನು ನಿಮ್ಮ Google ಖಾತೆಯಲ್ಲಿ <ph name="USER_EMAIL" /> ಉಳಿಸಲಾಗಿದೆ.</translation>
 <translation id="2773292004659987824">ಅಜ್ಞಾತ ಹುಡುಕಾಟ</translation>
 <translation id="277771892408211951">ಭಾಷೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ</translation>
@@ -294,6 +295,7 @@
 <translation id="2932085390869194046">ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಸೂಚಿಸಿ...</translation>
 <translation id="2932765531295814441">ಪಾಸ್‌ವರ್ಡ್‌ಗಳನ್ನು ಹಸ್ತಚಾಲಿತವಾಗಿ ಸೇರಿಸಿ</translation>
 <translation id="2952581218264071393">1. Chrome ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ತೆರೆಯಿರಿ</translation>
+<translation id="2953871438216280742">ನಿಮ್ಮ Google ಖಾತೆಯಲ್ಲಿ ನಿಮ್ಮ ಓದುವ ಪಟ್ಟಿಯನ್ನು ತೆರೆಯಲು ಹಾಗೂ ಉಳಿಸಲು ಸೈನ್ ಇನ್ ಮಾಡಿ.</translation>
 <translation id="2958718410589002129">ಪಾಸ್‌ವರ್ಡ್‌ಗಳು</translation>
 <translation id="2961210776189273067">ಶೀರ್ಷಿಕೆ</translation>
 <translation id="2964349545761222050">ಥರ್ಡ್ ಪಾರ್ಟಿ ಕುಕೀಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ</translation>
@@ -387,6 +389,7 @@
 <translation id="3581564640715911333">ಪುಟಗಳನ್ನು ಇತರ ಭಾಷೆಗಳಲ್ಲಿ ಅನುವಾದಿಸಲು ಅವಕಾಶ ನೀಡಿ</translation>
 <translation id="3588820906588687999">ಚಿತ್ರವನ್ನು ಹೊಸ ಟ್ಯಾಬ್‌ನಲ್ಲಿ ತೆರೆಯಿರಿ</translation>
 <translation id="3595252146048399851">ಏನನ್ನು ಸಿಂಕ್ ಮಾಡಬೇಕು ಎಂಬುದನ್ನು <ph name="BEGIN_LINK" />ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ<ph name="END_LINK" /> ಯಾವಾಗ ಬೇಕಾದರೂ ನೀವು ಆಯ್ಕೆ ಮಾಡಬಹುದು. Google, ನಿಮ್ಮ ಇತಿಹಾಸವನ್ನು ಆಧರಿಸಿ, Search ಮತ್ತು ಇತರ ಸೇವೆಗಳನ್ನು ವೈಯಕ್ತೀಕರಿಸಬಹುದು.</translation>
+<translation id="3595588371156514964">{COUNT,plural, =1{{COUNT} ದುರ್ಬಲ ಪಾಸ್‌ವರ್ಡ್}one{{COUNT} ದುರ್ಬಲ ಪಾಸ್‌ವರ್ಡ್‌ಗಳು}other{{COUNT} ದುರ್ಬಲ ಪಾಸ್‌ವರ್ಡ್‌ಗಳು}}</translation>
 <translation id="3603009562372709545">ಲಿಂಕ್ URL ನಕಲಿಸಿ</translation>
 <translation id="3607167657931203000">ಸ್ವಯಂಭರ್ತಿ ಡೇಟಾ</translation>
 <translation id="3608008480985212611">ನಿಮ್ಮ ಆದ್ಯತೆಗಳನ್ನು ನಿರ್ವಹಿಸಲು ಸೈನ್ ಇನ್ ಮಾಡಿ.</translation>
@@ -573,6 +576,7 @@
 <translation id="4844899002472726590">ನೀವು ಆಸಕ್ತಿ ಹೊಂದಿರುವ ವಿಷಯಗಳನ್ನು ನೋಡಿ ಮತ್ತು ಎಡಿಟ್ ಮಾಡಿ</translation>
 <translation id="4848999860252535517"><ph name="WEBSITE" /> ನ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಅಳಿಸಬೇಕೆ?</translation>
 <translation id="4854345657858711387">ಪಾಸ್‌ಕೋಡ್‌ ಅನ್ನು ಹೊಂದಿಸಿ</translation>
+<translation id="4856498338299082007">ನಿಮ್ಮ Google ಖಾತೆಯಲ್ಲಿರುವುದು</translation>
 <translation id="4858786880085262208">ಸಾಧ್ಯವಾದರೆ HTTPS ಗೆ ಅಪ್‌ಗ್ರೇಡ್ ಮಾಡಿ. ಸುರಕ್ಷಿತವಲ್ಲದ ಕಂಟೆಂಟ್ ಅನ್ನು ಸುರಕ್ಷಿತ ಸೈಟ್‌ಗಳು ಎಂಬೆಡ್ ಮಾಡಬಹುದು.</translation>
 <translation id="4860895144060829044">ಕರೆ</translation>
 <translation id="4872323082491632254">ಪಾಸ್‌ವರ್ಡ್‌ಗಳನ್ನು ಪರಿಶೀಲಿಸಿ</translation>
@@ -624,6 +628,7 @@
 <translation id="5197255632782567636">ಇಂಟರ್ನೆಟ್</translation>
 <translation id="5211488077761630279">ನಿಮ್ಮ <ph name="PERMISSION" /> ಅನ್ನು ಬಳಸಲು "<ph name="SITE_NAME" />" ಗೆ ಅನುಮತಿಸಬೇಕೆ?</translation>
 <translation id="5219295696240154694">ಎಲ್ಲರಿಗಾಗಿ ವೆಬ್‌ನ ಸುರಕ್ಷತೆಯನ್ನು ಸುಧಾರಿಸಲು ಸಹಾಯಮಾಡಿ</translation>
+<translation id="5221339005270097309">ಪಾಸ್‌ವರ್ಡ್‌ಗಳನ್ನು ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ…</translation>
 <translation id="5228579091201413441">ಸಿಂಕ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ</translation>
 <translation id="5232485538978018676">ನಿರ್ವಹಿಸಲಾದ ಖಾತೆಯ ಮೂಲಕ ಸೈನ್ ಇನ್ ಮಾಡಿ</translation>
 <translation id="5234764350956374838">ವಜಾಗೊಳಿಸಿ</translation>
@@ -663,6 +668,7 @@
 ಹ್ಯಾಂಡ್ಆಫ್ ಆನ್ನು ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿನ ಸಾಮಾನ್ಯ ವಿಭಾಗದಲ್ಲಿ ಸಹ ಸಕ್ರಿಯಗೊಳಿಸಬೇಕಾದ ಅಗತ್ಯವಿದೆ, ಹಾಗೂ ನಿಮ್ಮ ಸಾಧನಗಳು ಒಂದೇ iCloud ಖಾತೆಯನ್ನು ಬಳಸಬೇಕು.</translation>
 <translation id="5551897871312988470">ಅನುವಾದಿಸಲು ಅವಕಾಶ ನೀಡಿ</translation>
 <translation id="5556459405103347317">ಮರುಲೋಡ್‌</translation>
+<translation id="555749644339804659">ಪಾಸ್‌ವರ್ಡ್‌ಗಳನ್ನು ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ…</translation>
 <translation id="556042886152191864">ಬಟನ್</translation>
 <translation id="5597915316964418992">ಟ್ಯಾಬ್ ಗ್ರಿಡ್ ಅನ್ನು ತೆರೆಯಿರಿ</translation>
 <translation id="560322036295180549">ನಿಮ್ಮ ಸಂಸ್ಥೆಯವರು ಆಫ್ ಮಾಡಿದ್ದಾರೆ.</translation>
@@ -1089,6 +1095,7 @@
 <translation id="821809831108207540">ನಿಮ್ಮ Discover ಫೀಡ್ ಮತ್ತು Chrome ಅನ್ನು ವೈಯಕ್ತೀಕರಿಸಲು, ಸೈನ್ ಇನ್ ಮಾಡಿ ಮತ್ತು ಸಿಂಕ್ ಅನ್ನು ಆನ್ ಮಾಡಿ.</translation>
 <translation id="8225985093977202398">ಸಂಗ್ರಹಿಸಲಾಗಿರುವ ಚಿತ್ರಗಳು ಮತ್ತು ಫೈಲ್‌ಗಳು</translation>
 <translation id="8237382152611443140">ಸ್ವಯಂ ಭರ್ತಿ ಪಾಸ್‌ವರ್ಡ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ತೆರೆಯಿರಿ</translation>
+<translation id="8248969482078657578">ನಿಷ್ಕ್ರಿಯ ಟ್ಯಾಬ್‌ಗಳು ಗಮನ ಕೇಂದ್ರೀಕರಿಸಲು ನಿಮಗೆ ನೆರವಾಗುತ್ತವೆ</translation>
 <translation id="8261506727792406068">ಅಳಿಸಿ</translation>
 <translation id="8264966119170358612">Google ಅಲ್ಲದ ಡೇಟಾ ಉಲ್ಲಂಘನೆಯಲ್ಲಿ ನೀವು ಉಳಿಸಿದ ಕೆಲವು ಪಾಸ್‌ವರ್ಡ್‌ಗಳು ಬಹಿರಂಗವಾಗಿವೆ. <ph name="BEGIN_LINK" />ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">ಈ ಸಾಧನದಲ್ಲಿ ಮಾತ್ರ</translation>

ios/chrome/app/strings/resources/ios_strings_ko.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_ko.xtb b/ios/chrome/app/strings/resources/ios_strings_ko.xtb
index 8eeff544..f569e83 100644
--- a/ios/chrome/app/strings/resources/ios_strings_ko.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_ko.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Wi-Fi 연결 시</translation>
 <translation id="2747003861858887689">이전 필드</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> 사이트를 팔로우했습니다.</translation>
-<translation id="2764831210418622012">방금 전</translation>
 <translation id="2772667768515195373">Google 제품 전반에서 저장된 주소를 사용할 수 있습니다. Google 계정(<ph name="USER_EMAIL" />)에 저장된 주소입니다.</translation>
 <translation id="2773292004659987824">시크릿 검색</translation>
 <translation id="277771892408211951">언어 선택</translation>

ios/chrome/app/strings/resources/ios_strings_ky.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_ky.xtb b/ios/chrome/app/strings/resources/ios_strings_ky.xtb
index be627478..6d1e5ec 100644
--- a/ios/chrome/app/strings/resources/ios_strings_ky.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_ky.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Wi-Fi'да гана</translation>
 <translation id="2747003861858887689">Мурунку талаа</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> каналына жазылдыңыз</translation>
-<translation id="2764831210418622012">жаңы эле</translation>
 <translation id="2772667768515195373">Сакталган даректериңизди Google кызматтарында колдоно аласыз. Бул дарек <ph name="USER_EMAIL" /> Google аккаунтуңузга сакталды.</translation>
 <translation id="2773292004659987824">Жашыруун издөө</translation>
 <translation id="277771892408211951">Тил тандоо</translation>

ios/chrome/app/strings/resources/ios_strings_lo.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_lo.xtb b/ios/chrome/app/strings/resources/ios_strings_lo.xtb
index 7918180..cc3305ff 100644
--- a/ios/chrome/app/strings/resources/ios_strings_lo.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_lo.xtb
@@ -217,6 +217,7 @@
 <translation id="2482878487686419369">ການແຈ້ງເຕືອນ</translation>
 <translation id="2496626742194544812">ເຂົ້າໄປແຖບທຳອິດ</translation>
 <translation id="2500374554657206846">ຕົວເລືອກເພື່ອບັນທຶກລະຫັດຜ່ານ</translation>
+<translation id="2502415369140591438">ມີລະຫັດຜ່ານທີ່ໃຊ້ຊ້ຳ <ph name="COUNT" /> ລາຍການ</translation>
 <translation id="2523363575747517183">ເວັບໄຊກຳລັງພະຍາຍາມເປີດແອັບພລິເຄຊັນອື່ນຊໍ້າໄປມາຫຼາຍເທື່ອ.</translation>
 <translation id="2529021024822217800">ເປີດທັງຫມົດ</translation>
 <translation id="2547458583188611426">ຊິ້ງບໍ່ເຮັດວຽກ. ເພື່ອເລີ່ມຊິ້ງຂໍ້ມູນ, ໃຫ້ໃສ່ລະຫັດຜ່ານຂອງທ່ານ.</translation>
@@ -257,7 +258,6 @@
 <translation id="2718352093833049315">​ສະເພາະ Wi​-Fi ເທົ່ານັ້ນ</translation>
 <translation id="2747003861858887689">ຫ້ອງ​ໃສ່​ຂໍ້​ມູນ​ຜ່ານ​ມາ</translation>
 <translation id="2749231692441336879">ກຳລັງຕິດຕາມ <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">ຕອນນີ້</translation>
 <translation id="2772667768515195373">ທ່ານສາມາດໃຊ້ທີ່ຢູ່ທີ່ບັນທຶກໄວ້ໃນຜະລິດຕະພັນຕ່າງໆຂອງ Google ໄດ້. ໂດຍທີ່ຢູ່ນີ້ຈະຖືກບັນທຶກໄວ້ໃນບັນຊີ Google ຂອງທ່ານທີ່ຊື່ວ່າ, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">ການຊອກຫາແບບບໍ່ເປີດເຜີຍຕົວຕົນ</translation>
 <translation id="277771892408211951">ເລືອກພາສາ</translation>
@@ -295,6 +295,7 @@
 <translation id="2932085390869194046">ແນະນຳລະຫັດຜ່ານ...</translation>
 <translation id="2932765531295814441">ເພີ່ມລະຫັດດ້ວຍຕົວເອງ</translation>
 <translation id="2952581218264071393">1. ເປີດການຕັ້ງຄ່າ Chrome</translation>
+<translation id="2953871438216280742">ເຂົ້າສູ່ລະບົບເພື່ອເປີດ ແລະ ບັນທຶກລາຍຊື່ການອ່ານຂອງທ່ານໃນບັນຊີ Google ຂອງທ່ານ.</translation>
 <translation id="2958718410589002129">ລະຫັດຜ່ານ</translation>
 <translation id="2961210776189273067">ຊື່</translation>
 <translation id="2964349545761222050">ບລັອກຄຸກກີ້ພາກສ່ວນທີສາມ</translation>
@@ -388,6 +389,7 @@
 <translation id="3581564640715911333">ໃຫ້ການແປໜ້າຕ່າງໆເປັນພາສາອື່ນ</translation>
 <translation id="3588820906588687999">ຮູບເປີດຢູ່ໃນແຖບໃໝ່</translation>
 <translation id="3595252146048399851">ທ່ານສາມາດເລືອກສິ່ງທີ່ຈະຊິ້ງຂໍ້ມູນໄດ້ໃນ <ph name="BEGIN_LINK" />ການຕັ້ງຄ່າ<ph name="END_LINK" />. Google ອາດປັບແຕ່ງການຊອກຫາ ແລະ ບໍລິການອື່ນໆຂອງ Google ໃຫ້ເປັນແບບສ່ວນຕົວໂດຍອ້າງອີງໃສ່ປະຫວັດຂອງທ່ານ.</translation>
+<translation id="3595588371156514964">{COUNT,plural, =1{ມີລະຫັດຜ່ານງ່າຍ {COUNT} ລາຍການ}other{ມີລະຫັດຜ່ານງ່າຍ {COUNT} ລາຍການ}}</translation>
 <translation id="3603009562372709545">ອັດ​ສຳ​ເນົາ URL ຂອງ​ລິ້ງ</translation>
 <translation id="3607167657931203000">ຕື່ມຂໍ້ມູນອັດຕະໂນມັດ</translation>
 <translation id="3608008480985212611">ເຂົ້າສູ່ລະບົບເພື່ອຈັດການການຕັ້ງຄ່າຂອງທ່ານ.</translation>
@@ -626,6 +628,7 @@
 <translation id="5197255632782567636">ອິນ​ເຕີ​ເນັດ</translation>
 <translation id="5211488077761630279">ອະນຸຍາດໃຫ້ "<ph name="SITE_NAME" />" ໃຊ້ <ph name="PERMISSION" /> ຂອງທ່ານບໍ?</translation>
 <translation id="5219295696240154694">ຊ່ວຍປັບປຸງຄວາມປອດໄພຢູ່ເວັັບສຳລັບທຸກຄົນ</translation>
+<translation id="5221339005270097309">ກຳລັງກວດສອບລະຫັດຜ່ານ…</translation>
 <translation id="5228579091201413441">ເປີດໃຊ້ງານຊິງຄ໌</translation>
 <translation id="5232485538978018676">ເຂົ້າສູ່ລະບົບດ້ວຍບັນຊີທີ່ມີການຈັດການ</translation>
 <translation id="5234764350956374838">ປ່ອຍໄປ</translation>
@@ -665,6 +668,7 @@
 Handoff ຍັງ​ຕ້ອງ​ໄດ້​ເປີດ​ໃຊ້​ງານ​ຢູ່​ໃນ​ພາກ​ທົ່ວ​ໄປ​ຂອງ​ການ​ຕັ້ງ​ຄ່າ​ນຳ​ອີກ, ແລະ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ຕ້ອງ​ໃຊ້​ບັນ​ຊີ iCloud ດຽວ​ກັນ​ນຳ.</translation>
 <translation id="5551897871312988470">ໃຫ້ການແປພາສາ</translation>
 <translation id="5556459405103347317">ໂຫຼດຄືນໃໝ່</translation>
+<translation id="555749644339804659">ກຳລັງກວດສອບລະຫັດຜ່ານ…</translation>
 <translation id="556042886152191864">ປຸ່ມ</translation>
 <translation id="5597915316964418992">ເປີດຊ່ອງແຖບ</translation>
 <translation id="560322036295180549">ຖືກປິດໄວ້ໂດຍອົງການຂອງທ່ານ</translation>

ios/chrome/app/strings/resources/ios_strings_lt.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_lt.xtb b/ios/chrome/app/strings/resources/ios_strings_lt.xtb
index 7f18508..b1322113 100644
--- a/ios/chrome/app/strings/resources/ios_strings_lt.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_lt.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Tik su „Wi–Fi“</translation>
 <translation id="2747003861858887689">Ankstesnis laukas</translation>
 <translation id="2749231692441336879">Stebima: <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">ką tik</translation>
 <translation id="2772667768515195373">Išsaugotus adresus galite naudoti „Google“ produktuose. Šis adresas išsaugomas jūsų „Google“ paskyroje (<ph name="USER_EMAIL" />).</translation>
 <translation id="2773292004659987824">Paieška inkognito režimu</translation>
 <translation id="277771892408211951">Kalbos pasirinkimas</translation>

ios/chrome/app/strings/resources/ios_strings_lv.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_lv.xtb b/ios/chrome/app/strings/resources/ios_strings_lv.xtb
index 4665065..615f9d64 100644
--- a/ios/chrome/app/strings/resources/ios_strings_lv.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_lv.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Tikai Wi-Fi</translation>
 <translation id="2747003861858887689">Iepriekšējais lauks</translation>
 <translation id="2749231692441336879">Jūs sekojat kanālam <ph name="CHANNEL_NAME" />.</translation>
-<translation id="2764831210418622012">tikko</translation>
 <translation id="2772667768515195373">Saglabātās adreses varat izmantot dažādos Google produktos. Šī adrese ir saglabāta jūsu Google kontā (<ph name="USER_EMAIL" />).</translation>
 <translation id="2773292004659987824">Meklēt inkognito režīmā</translation>
 <translation id="277771892408211951">Atlasiet valodu</translation>

ios/chrome/app/strings/resources/ios_strings_mk.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_mk.xtb b/ios/chrome/app/strings/resources/ios_strings_mk.xtb
index cdfe39b..197d7d3 100644
--- a/ios/chrome/app/strings/resources/ios_strings_mk.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_mk.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Само преку Wi-Fi</translation>
 <translation id="2747003861858887689">Претходно поле</translation>
 <translation id="2749231692441336879">Се следи <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">пред малку</translation>
 <translation id="2772667768515195373">Може да ги користите зачуваните адреси на производите на Google. Адресава ќе се зачува во вашата сметка на Google, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Пребарување во режимот „Инкогнито“</translation>
 <translation id="277771892408211951">Изберете јазик</translation>

ios/chrome/app/strings/resources/ios_strings_ml.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_ml.xtb b/ios/chrome/app/strings/resources/ios_strings_ml.xtb
index 1191be09..027622c 100644
--- a/ios/chrome/app/strings/resources/ios_strings_ml.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_ml.xtb
@@ -226,6 +226,7 @@
 <translation id="2576499762020411840">നിങ്ങളുടെ Google അക്കൗണ്ടിൽ പാസ്‌വേഡുകൾ സംരക്ഷിക്കുകയും അവ ഉപയോഗിക്കുകയും ചെയ്യുക</translation>
 <translation id="2578571896248130439">വെബ്‌പേജ് അയയ്‌ക്കുക</translation>
 <translation id="2584132361465095047">അക്കൗണ്ട് ചേർക്കുക...</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{ഒരു ദിവസമോ അതിൽ കൂടുതലോ ഉപയോഗിക്കാത്ത തുറന്നിരിക്കുന്ന ടാബുകൾ നിഷ്‌ക്രിയമായ ടാബുകളിലേക്ക് മാറ്റുന്നു, അതിനാൽ ഏറ്റവും കൂടുതൽ ഉപയോഗിക്കുന്ന ടാബുകളിൽ നിങ്ങൾക്ക് എളുപ്പത്തിൽ ഫോക്കസ് ചെയ്യാനാകും. ക്രമീകരണത്തിൽ ഏതുസമയത്തും നിങ്ങൾക്കിത് മാറ്റാം.}other{{COUNT} ദിവസമോ അതിൽ കൂടുതലോ ഉപയോഗിക്കാത്ത തുറന്നിരിക്കുന്ന ടാബുകൾ നിഷ്‌ക്രിയമായ ടാബുകളിലേക്ക് മാറ്റുന്നു, അതിനാൽ ഏറ്റവും കൂടുതൽ ഉപയോഗിക്കുന്ന ടാബുകളിൽ നിങ്ങൾക്ക് എളുപ്പത്തിൽ ഫോക്കസ് ചെയ്യാനാകും. ക്രമീകരണത്തിൽ ഏതുസമയത്തും നിങ്ങൾക്കിത് മാറ്റാം.}}</translation>
 <translation id="2600682495497606169">സൈറ്റ് കുക്കികൾ മായ്‌ക്കുക</translation>
 <translation id="2609008503159898744">എല്ലാ ടാബുകളും അടയ്‌ക്കണോ?</translation>
 <translation id="2625189173221582860">പാസ്‌വേഡ് പകർത്തി</translation>
@@ -256,7 +257,6 @@
 <translation id="2718352093833049315">Wi-Fi യിൽ മാത്രം</translation>
 <translation id="2747003861858887689">മുൻ ഫീൽഡ്</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> പിന്തുടരുന്നു</translation>
-<translation id="2764831210418622012">ഇപ്പോൾ</translation>
 <translation id="2772667768515195373">സംരക്ഷിച്ച വിലാസങ്ങൾ നിങ്ങൾക്ക് Google ഉൽപ്പന്നങ്ങളിലുടനീളം ഉപയോഗിക്കാം. ഈ വിലാസം നിങ്ങളുടെ Google അക്കൗണ്ടിൽ <ph name="USER_EMAIL" /> സംരക്ഷിച്ചിരിക്കുന്നു.</translation>
 <translation id="2773292004659987824">അദൃശ്യ തിരയൽ</translation>
 <translation id="277771892408211951">ഭാഷ തിരഞ്ഞെടുക്കുക</translation>
@@ -573,6 +573,7 @@
 <translation id="4844899002472726590">നിങ്ങൾക്ക് താൽപ്പര്യമുള്ള വിഷയങ്ങൾ കാണുക, എഡിറ്റ് ചെയ്യുക</translation>
 <translation id="4848999860252535517"><ph name="WEBSITE" /> എന്നതിന്റെ പാസ്‌വേഡ് ഇല്ലാതാക്കണോ?</translation>
 <translation id="4854345657858711387">പാസ്‌കോഡ് സജ്ജമാക്കുക</translation>
+<translation id="4856498338299082007">നിങ്ങളുടെ Google അക്കൗണ്ടിൽ</translation>
 <translation id="4858786880085262208">സാധ്യമാകുമ്പോൾ HTTPS-ലേക്ക് അപ്ഗ്രേഡ് ചെയ്യുക. സുരക്ഷിത സൈറ്റുകൾ, സുരക്ഷിതമല്ലാത്ത ഉള്ളടക്കം ഉൾച്ചേർത്തേക്കാം.</translation>
 <translation id="4860895144060829044">വിളിക്കുക</translation>
 <translation id="4872323082491632254">പാസ്‌വേഡുകൾ പരിശോധിക്കുക</translation>
@@ -1089,6 +1090,7 @@
 <translation id="821809831108207540">നിങ്ങളുടെ ഡിസ്ക്കവർ ഫീഡും Chrome-ഉം വ്യക്തിപരമാക്കാൻ, സൈൻ ഇൻ ചെയ്‌ത് സമന്വയം ഓണാക്കുക.</translation>
 <translation id="8225985093977202398">കാഷെ ചെയ്‌ത ചിത്രങ്ങളും ഫയലുകളും</translation>
 <translation id="8237382152611443140">'പാസ്‌വേഡ് സ്വയമേവ പൂരിപ്പിക്കൽ' ക്രമീകരണം തുറക്കുക</translation>
+<translation id="8248969482078657578">ഫോക്കസ് ചെയ്‌ത നിലയിൽ തുടരാൻ നിഷ്‌ക്രിയമായ ടാബുകൾ നിങ്ങളെ സഹായിക്കുന്നു</translation>
 <translation id="8261506727792406068">ഇല്ലാതാക്കുക</translation>
 <translation id="8264966119170358612">നിങ്ങളുടെ സംരക്ഷിച്ച പാസ്‌വേഡുകളിൽ ചിലത് Google ഇതര ഡാറ്റാ ലംഘനത്തെ തുടർന്ന് വെളിപ്പെട്ടു. <ph name="BEGIN_LINK" />കൂടുതലറിയുക<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">ഈ ഉപകരണത്തിൽ മാത്രം</translation>

ios/chrome/app/strings/resources/ios_strings_mn.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_mn.xtb b/ios/chrome/app/strings/resources/ios_strings_mn.xtb
index e471069..7731759 100644
--- a/ios/chrome/app/strings/resources/ios_strings_mn.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_mn.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Зөвхөн Wi-Fi-аар</translation>
 <translation id="2747003861858887689">Өмнөх талбар</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" />-г дагаж байна</translation>
-<translation id="2764831210418622012">дөнгөж сая</translation>
 <translation id="2772667768515195373">Та Google-н бүтээгдэхүүнүүд дээр хадгалсан хаягуудыг ашиглах боломжтой. Энэ хаягийг таны <ph name="USER_EMAIL" /> Google Бүртгэлд хадгалсан.</translation>
 <translation id="2773292004659987824">Нууцлалтай хайлт</translation>
 <translation id="277771892408211951">Хэл сонгоно уу</translation>

ios/chrome/app/strings/resources/ios_strings_mr.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_mr.xtb b/ios/chrome/app/strings/resources/ios_strings_mr.xtb
index 15491f4..b6f31f08 100644
--- a/ios/chrome/app/strings/resources/ios_strings_mr.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_mr.xtb
@@ -226,6 +226,7 @@
 <translation id="2576499762020411840">तुमच्या Google खाते मधील पासवर्ड वापरा आणि त्यामध्ये ते सेव्ह करा</translation>
 <translation id="2578571896248130439">वेबपेज पाठवा</translation>
 <translation id="2584132361465095047">खाते जोडा...</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{एक दिवस किंवा त्यापेक्षा जास्त काळापासून न वापरलेले उघडे असलेले टॅब इनॅक्टिव्ह टॅबमध्ये हलवले जातात, जेणेकरून तुम्हाला तुम्ही सर्वात जास्त वापरत असलेल्या टॅबवर सहजपणे लक्ष केंद्रित करता येईल. तुम्ही हे सेटिंग्जमध्ये कधीही बदलू शकता.}other{{COUNT} दिवस किंवा त्यापेक्षा जास्त काळापासून न वापरलेले उघडे असलेले टॅब इनॅक्टिव्ह टॅबमध्ये हलवले जातात, जेणेकरून तुम्हाला तुम्ही सर्वात जास्त वापरत असलेल्या टॅबवर सहजपणे लक्ष केंद्रित करता येईल. तुम्ही हे सेटिंग्जमध्ये कधीही बदलू शकता.}}</translation>
 <translation id="2600682495497606169">साइट कुकी साफ करा</translation>
 <translation id="2609008503159898744">सर्व टॅब बंद करायचे आहेत का?</translation>
 <translation id="2625189173221582860">पासवर्ड कॉपी केला</translation>
@@ -256,7 +257,6 @@
 <translation id="2718352093833049315">केवळ वाय-फाय वर</translation>
 <translation id="2747003861858887689">मागील फील्ड</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> ला फॉलो करत आहे</translation>
-<translation id="2764831210418622012">आत्ताच</translation>
 <translation id="2772667768515195373">तुम्ही संपूर्ण Google उत्पादनांवर सेव्ह केलेले पत्ते वापरू शकता. हा अ‍ॅड्रेस तुमच्या Google खाते (<ph name="USER_EMAIL" />) मध्ये सेव्ह केला आहे.</translation>
 <translation id="2773292004659987824">गुप्त शोध</translation>
 <translation id="277771892408211951">भाषा निवडा</translation>
@@ -573,6 +573,7 @@
 <translation id="4844899002472726590">तुम्हाला स्वारस्य असलेले विषय पहा आणि ते संपादित करा</translation>
 <translation id="4848999860252535517"><ph name="WEBSITE" /> चा पासवर्ड हटवायचा आहे का?</translation>
 <translation id="4854345657858711387">पासकोड सेट करा</translation>
+<translation id="4856498338299082007">तुमच्या Google खाते मध्ये</translation>
 <translation id="4858786880085262208">शक्य असेल, तेव्हा HTTPS वर अपग्रेड करा. सुरक्षित साइट कदाचित सुरक्षित नसलेला आशय एम्बेड करू शकतात.</translation>
 <translation id="4860895144060829044">कॉल करा</translation>
 <translation id="4872323082491632254">पासवर्ड तपासा</translation>
@@ -1090,6 +1091,7 @@
 <translation id="821809831108207540">तुमचे Discover फीड आणि Chrome पर्सनलाइझ करण्यासाठी, साइन इन करा व सिंक सुरू करा.</translation>
 <translation id="8225985093977202398">कॅशे   इमेज आणि फाइल</translation>
 <translation id="8237382152611443140">AutoFill पासवर्ड सेटिंग्ज उघडा</translation>
+<translation id="8248969482078657578">इनॅक्टिव्ह टॅब तुम्हाला लक्ष केंद्रित करण्यात मदत करतात</translation>
 <translation id="8261506727792406068">हटवा</translation>
 <translation id="8264966119170358612">तुमचे सेव्ह केलेले काही पासवर्ड हे Google ऐवजी तृतीय पक्षाच्या डेटा भंगामध्ये उघड झाले होते. <ph name="BEGIN_LINK" />अधिक जाणून घ्या<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">फक्त या डिव्हाइसवर</translation>

ios/chrome/app/strings/resources/ios_strings_ms.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_ms.xtb b/ios/chrome/app/strings/resources/ios_strings_ms.xtb
index b7179ce..08631ea 100644
--- a/ios/chrome/app/strings/resources/ios_strings_ms.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_ms.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Hanya pada Wi-Fi</translation>
 <translation id="2747003861858887689">Medan sebelumnya</translation>
 <translation id="2749231692441336879">Mengikuti <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">sebentar tadi</translation>
 <translation id="2772667768515195373">Anda boleh menggunakan alamat yang disimpan merentas produk Google. Alamat ini disimpan dalam Google Account anda, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Carian Inkognito</translation>
 <translation id="277771892408211951">Pilih Bahasa</translation>

ios/chrome/app/strings/resources/ios_strings_my.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_my.xtb b/ios/chrome/app/strings/resources/ios_strings_my.xtb
index da3efa6..57690790 100644
--- a/ios/chrome/app/strings/resources/ios_strings_my.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_my.xtb
@@ -226,6 +226,7 @@
 <translation id="2576499762020411840">သင့် Google Account တွင် စကားဝှက်များ သုံးရန်နှင့် သိမ်းရန်</translation>
 <translation id="2578571896248130439">ဝဘ်စာမျက်နှာ ပို့ရန်</translation>
 <translation id="2584132361465095047">အကောင့် ထည့်သွင်းပါ…</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{သင်အသုံးအများဆုံး တဘ်များအပေါ် လွယ်ကူစွာ အာရုံစိုက်နိုင်စေရန် တစ်ရက်နှင့်အထက် အသုံးမပြုသော ဖွင့်ထားသည့်တဘ်များကို ‘အသုံးမပြုသည့် တဘ်များ’ သို့ ရွှေ့ထားသည်။ ၎င်းကို ဆက်တင်များတွင် အချိန်မရွေး ပြောင်းနိုင်သည်။}other{သင်အသုံးအများဆုံး တဘ်များအပေါ် လွယ်ကူစွာ အာရုံစိုက်နိုင်စေရန် {COUNT} ရက်နှင့်အထက် အသုံးမပြုသော ဖွင့်ထားသည့်တဘ်များကို ‘အသုံးမပြုသည့် တဘ်များ’ သို့ ရွှေ့ထားသည်။ ၎င်းကို ဆက်တင်များတွင် အချိန်မရွေး ပြောင်းနိုင်သည်။}}</translation>
 <translation id="2600682495497606169">ဝဘ်ဆိုက်ကွတ်ကီးများ ရှင်းထုတ်ခြင်း</translation>
 <translation id="2609008503159898744">တဘ်အားလုံး ပိတ်မလား။</translation>
 <translation id="2625189173221582860">စကားဝှက်ကို ကူးပြီးပါပြီ</translation>
@@ -256,7 +257,6 @@
 <translation id="2718352093833049315">ဝိုင်ဖိုင်တွင်သာ</translation>
 <translation id="2747003861858887689">အရင် အကွက်</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> ကို လိုက်ကြည့်နေသည်</translation>
-<translation id="2764831210418622012">အခုလေးတင်</translation>
 <translation id="2772667768515195373">သိမ်းထားသောလိပ်စာများကို Google ထုတ်ကုန်များအနှံ့တွင် သုံးနိုင်သည်။ ဤလိပ်စာကို သင့် Google Account <ph name="USER_EMAIL" /> တွင် သိမ်းထားသည်။</translation>
 <translation id="2773292004659987824">ရုပ်ဖျက်မုဒ်ဖြင့် ရှာရန်</translation>
 <translation id="277771892408211951">ဘာသာစကား ရွေးချယ်ခြင်း</translation>
@@ -573,6 +573,7 @@
 <translation id="4844899002472726590">သင်စိတ်ဝင်စားသော အကြောင်းအရာများကို ကြည့်နိုင်၊ တည်းဖြတ်နိုင်သည်</translation>
 <translation id="4848999860252535517"><ph name="WEBSITE" /> အတွက် စကားဝှက်ကို ဖျက်မလား။</translation>
 <translation id="4854345657858711387">လျှို့ဝှက်ကုဒ်တစ်ခု သတ်မှတ်ပါ</translation>
+<translation id="4856498338299082007">သင့် Google Account တွင်</translation>
 <translation id="4858786880085262208">အဆင်ပြေပါက HTTPS သို့ အဆင့်မြှင့်ပါ။ လုံခြုံသောဝဘ်ဆိုက်များသည် ဘေးကင်းမှုမရှိသော အကြောင်းအရာများကို မြှုပ်သွင်းထားနိုင်သည်။</translation>
 <translation id="4860895144060829044">ဖုန်းခေါ်ရန်</translation>
 <translation id="4872323082491632254">စကားဝှက်များ စစ်ဆေးခြင်း</translation>
@@ -1088,6 +1089,7 @@
 <translation id="821809831108207540">Discover ဖိဒ်နှင့် Chrome တို့ကို ပုဂ္ဂိုလ်ရေးသီးသန့်ပြုလုပ်ရန် လက်မှတ်ထိုးဝင်ပြီး စင့်ခ်လုပ်ခြင်း ဖွင့်ပါ။</translation>
 <translation id="8225985093977202398">ကက်ရှ်ပြုလုပ်ထားသည့် ပုံများနှင့် ဖိုင်များ</translation>
 <translation id="8237382152611443140">‘စကားဝှက် အော်တိုဖြည့်ဆက်တင်များ’ ဖွင့်ပါ</translation>
+<translation id="8248969482078657578">မသုံးသောတဘ်များက သင့်ကို အာရုံစိုက်နိုင်ရန် ကူညီသည်</translation>
 <translation id="8261506727792406068">ဖျက်ရန်</translation>
 <translation id="8264966119170358612">Google မဟုတ်သည့် ဒေတာကျိုးပေါက်မှုတွင် သင်၏ သိမ်းထားသည့်စကားဝှက်အချို့ ဖော်ထုတ်ခံထားရသည်။ <ph name="BEGIN_LINK" />ပိုမိုလေ့လာရန်<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">ဤစက်တွင်သာ</translation>

ios/chrome/app/strings/resources/ios_strings_ne.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_ne.xtb b/ios/chrome/app/strings/resources/ios_strings_ne.xtb
index b5992be..5b22f5dc 100644
--- a/ios/chrome/app/strings/resources/ios_strings_ne.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_ne.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Wi-Fi मा मात्र</translation>
 <translation id="2747003861858887689">अघिल्लो क्षेत्र</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> फलो गरिँदै छ</translation>
-<translation id="2764831210418622012">भर्खरै</translation>
 <translation id="2772667768515195373">तपाईं सेभ गरिएका ठेगानाहरू Google का विभिन्न उत्पादनमा प्रयोग गर्न सक्नुहुन्छ। यो ठेगाना तपाईंको Google खाता (<ph name="USER_EMAIL" />) मा सेभ गरिन्छ।</translation>
 <translation id="2773292004659987824">इन्कोग्निटो खोज</translation>
 <translation id="277771892408211951">भाषा चयन गर्नुहोस्</translation>

ios/chrome/app/strings/resources/ios_strings_nl.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_nl.xtb b/ios/chrome/app/strings/resources/ios_strings_nl.xtb
index 1abf198..9bb58310 100644
--- a/ios/chrome/app/strings/resources/ios_strings_nl.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_nl.xtb
@@ -217,6 +217,7 @@
 <translation id="2482878487686419369">Meldingen</translation>
 <translation id="2496626742194544812">Naar het eerste tabblad gaan</translation>
 <translation id="2500374554657206846">Opties voor 'Wachtwoord opslaan'</translation>
+<translation id="2502415369140591438"><ph name="COUNT" /> hergebruikte wachtwoorden</translation>
 <translation id="2523363575747517183">Deze website probeert herhaaldelijk een andere app te openen.</translation>
 <translation id="2529021024822217800">Alles openen</translation>
 <translation id="2547458583188611426">Synchronisatie werkt niet. Geef je wachtwoordzin op om de synchronisatie te starten.</translation>
@@ -226,6 +227,7 @@
 <translation id="2576499762020411840">Wachtwoorden in je Google-account gebruiken en opslaan</translation>
 <translation id="2578571896248130439">Webpagina verzenden</translation>
 <translation id="2584132361465095047">Account toevoegen…</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{Geopende tabbladen die een dag of langer niet zijn gebruikt, worden verplaatst naar Inactieve tabbladen. Zo kun je je makkelijk focussen op de tabbladen die je het meest gebruikt. Je kunt dit altijd wijzigen in de instellingen.}other{Geopende tabbladen die {COUNT} dagen of langer niet zijn gebruikt, worden verplaatst naar Inactieve tabbladen. Zo kun je je makkelijk focussen op de tabbladen die je het meest gebruikt. Je kunt dit altijd wijzigen in de instellingen.}}</translation>
 <translation id="2600682495497606169">Sitecookies wissen</translation>
 <translation id="2609008503159898744">Alle tabbladen sluiten?</translation>
 <translation id="2625189173221582860">Wachtwoord gekopieerd</translation>
@@ -256,7 +258,6 @@
 <translation id="2718352093833049315">Alleen via wifi</translation>
 <translation id="2747003861858887689">Vorig veld</translation>
 <translation id="2749231692441336879">Je volgt <ph name="CHANNEL_NAME" /> nu</translation>
-<translation id="2764831210418622012">zojuist</translation>
 <translation id="2772667768515195373">Je kunt opgeslagen adressen gebruiken in meerdere Google-producten. Dit adres is opgeslagen in je Google-account <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Incognito zoeken</translation>
 <translation id="277771892408211951">Taal selecteren</translation>
@@ -294,6 +295,7 @@
 <translation id="2932085390869194046">Wachtwoord voorstellen…</translation>
 <translation id="2932765531295814441">Wachtwoorden handmatig toevoegen</translation>
 <translation id="2952581218264071393">1. Open de Chrome-instellingen</translation>
+<translation id="2953871438216280742">Log in om je leeslijst te openen en op te slaan in je Google-account.</translation>
 <translation id="2958718410589002129">Wachtwoorden</translation>
 <translation id="2961210776189273067">Titel</translation>
 <translation id="2964349545761222050">Cookies van derden blokkeren</translation>
@@ -387,6 +389,7 @@
 <translation id="3581564640715911333">Aanbieden pagina's in andere talen te vertalen</translation>
 <translation id="3588820906588687999">Afbeelding openen op nieuw tabblad</translation>
 <translation id="3595252146048399851">Je kunt altijd in de <ph name="BEGIN_LINK" />instellingen<ph name="END_LINK" /> bepalen wat je wilt synchroniseren. Google kan Zoeken en andere services personaliseren op basis van je geschiedenis.</translation>
+<translation id="3595588371156514964">{COUNT,plural, =1{{COUNT} zwak wachtwoord}other{{COUNT} zwakke wachtwoorden}}</translation>
 <translation id="3603009562372709545">Link-URL kopiëren</translation>
 <translation id="3607167657931203000">Gegevens van Automatisch invullen</translation>
 <translation id="3608008480985212611">Log in om je voorkeuren te beheren.</translation>
@@ -573,6 +576,7 @@
 <translation id="4844899002472726590">De onderwerpen bekijken en bewerken waarin je bent geïnteresseerd</translation>
 <translation id="4848999860252535517">Wachtwoord voor <ph name="WEBSITE" /> verwijderen?</translation>
 <translation id="4854345657858711387">Een toegangscode instellen</translation>
+<translation id="4856498338299082007">In je Google-account</translation>
 <translation id="4858786880085262208">Upgrade naar HTTPS als dat mogelijk is. Beveiligde sites hebben misschien ingesloten content die niet beveiligd is.</translation>
 <translation id="4860895144060829044">Bellen</translation>
 <translation id="4872323082491632254">Wachtwoorden checken</translation>
@@ -624,6 +628,7 @@
 <translation id="5197255632782567636">Internet</translation>
 <translation id="5211488077761630279">Toestaan dat <ph name="SITE_NAME" /> je <ph name="PERMISSION" /> gebruikt?</translation>
 <translation id="5219295696240154694">Helpen om het internet voor iedereen veiliger te maken</translation>
+<translation id="5221339005270097309">Wachtwoorden checken…</translation>
 <translation id="5228579091201413441">Synchronisatie aanzetten</translation>
 <translation id="5232485538978018676">Inloggen met een beheerd account</translation>
 <translation id="5234764350956374838">Sluiten</translation>
@@ -663,6 +668,7 @@
 Handoff moet ook aanstaan in het gedeelte Algemeen van Instellingen en je apparaten moeten hetzelfde iCloud-account gebruiken.</translation>
 <translation id="5551897871312988470">Aanbieden om te vertalen</translation>
 <translation id="5556459405103347317">Opnieuw laden</translation>
+<translation id="555749644339804659">Wachtwoorden checken…</translation>
 <translation id="556042886152191864">Knop</translation>
 <translation id="5597915316964418992">Open het tabbladraster</translation>
 <translation id="560322036295180549">Uitgezet door je organisatie</translation>
@@ -1089,6 +1095,7 @@
 <translation id="821809831108207540">Log in en zet synchronisatie aan om je Discover-feed en Chrome te personaliseren.</translation>
 <translation id="8225985093977202398">Gecachete afbeeldingen en bestanden</translation>
 <translation id="8237382152611443140">Open de instellingen voor het automatisch invullen van wachtwoorden</translation>
+<translation id="8248969482078657578">Met Inactieve tabbladen blijf je gefocust</translation>
 <translation id="8261506727792406068">Verwijderen</translation>
 <translation id="8264966119170358612">Sommige van je opgeslagen wachtwoorden zijn openbaar gemaakt bij een gegevenslek van derden. <ph name="BEGIN_LINK" />Meer informatie<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">Alleen op dit apparaat</translation>

ios/chrome/app/strings/resources/ios_strings_no.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_no.xtb b/ios/chrome/app/strings/resources/ios_strings_no.xtb
index c8f94ec..ef4a87d 100644
--- a/ios/chrome/app/strings/resources/ios_strings_no.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_no.xtb
@@ -226,6 +226,7 @@
 <translation id="2576499762020411840">Bruk og lagre passord i Google-kontoen din</translation>
 <translation id="2578571896248130439">Send nettside</translation>
 <translation id="2584132361465095047">Legg til en konto …</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{Åpne faner som ikke har vært i bruk den siste dagen, flyttes til inaktive faner, slik at du enkelt kan fokusere på fanene du bruker mest. Du kan når som helst endre dette i innstillingene.}other{Åpne faner som ikke har vært i bruk de siste {COUNT} dagene, flyttes til inaktive faner, slik at du enkelt kan fokusere på fanene du bruker mest. Du kan når som helst endre dette i innstillingene.}}</translation>
 <translation id="2600682495497606169">Slett informasjonskapsler for nettstedet</translation>
 <translation id="2609008503159898744">Vil du lukke alle faner?</translation>
 <translation id="2625189173221582860">Passordet er kopiert</translation>
@@ -256,7 +257,6 @@
 <translation id="2718352093833049315">Bare når Wifi er på</translation>
 <translation id="2747003861858887689">Forrige felt</translation>
 <translation id="2749231692441336879">Følger <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">nå nettopp</translation>
 <translation id="2772667768515195373">Du kan bruke lagrede adresser i flere Google-produkter. Denne adressen er lagret i Google-kontoen din <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Inkognitosøk</translation>
 <translation id="277771892408211951">Velg språk</translation>
@@ -573,6 +573,7 @@
 <translation id="4844899002472726590">Se og rediger emnene du er interessert i</translation>
 <translation id="4848999860252535517">Vil du slette passordet for <ph name="WEBSITE" />?</translation>
 <translation id="4854345657858711387">Angi en adgangskode</translation>
+<translation id="4856498338299082007">I Google-kontoen din</translation>
 <translation id="4858786880085262208">Oppgrader til HTTPS når det er mulig. Sikre nettsteder kan bygge inn innhold som ikke er sikkert.</translation>
 <translation id="4860895144060829044">Ring</translation>
 <translation id="4872323082491632254">Kontroller passordene</translation>
@@ -1089,6 +1090,7 @@
 <translation id="821809831108207540">For å gi Discover-feeden og Chrome et personlig preg, logg på og slå på synkronisering.</translation>
 <translation id="8225985093977202398">Bufrede bilder og filer</translation>
 <translation id="8237382152611443140">Åpne innstillinger for autofylling av passord</translation>
+<translation id="8248969482078657578">Inaktive faner gjør det lettere å holde fokus</translation>
 <translation id="8261506727792406068">Slett</translation>
 <translation id="8264966119170358612">Noen av de lagrede passordene dine ble avdekket i et databrudd utenfor Google. <ph name="BEGIN_LINK" />Finn ut mer<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">Bare på denne enheten</translation>

ios/chrome/app/strings/resources/ios_strings_or.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_or.xtb b/ios/chrome/app/strings/resources/ios_strings_or.xtb
index 443226c..8e51207 100644
--- a/ios/chrome/app/strings/resources/ios_strings_or.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_or.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">କେବଳ ୱାଇ-ଫାଇରେ</translation>
 <translation id="2747003861858887689">ପୂର୍ବବର୍ତ୍ତୀ ଫିଲ୍ଡ</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" />କୁ ଅନୁସରଣ କରାଯାଉଛି</translation>
-<translation id="2764831210418622012">ଏହିକ୍ଷଣି</translation>
 <translation id="2772667768515195373">ସେଭ କରାଯାଇଥିବା ଠିକଣାଗୁଡ଼ିକୁ ଆପଣ ସମଗ୍ର Google ପ୍ରଡକ୍ଟରେ ବ୍ୟବହାର କରିପାରିବେ। ଏହି ଠିକଣାକୁ ଆପଣଙ୍କ Google ଆକାଉଣ୍ଟ, <ph name="USER_EMAIL" />ରେ ସେଭ କରାଯାଏ।</translation>
 <translation id="2773292004659987824">ଇନ୍‌କଗ୍ନିଟୋ ସର୍ଚ୍ଚ</translation>
 <translation id="277771892408211951">ଭାଷା ଚୟନ କରନ୍ତୁ</translation>

ios/chrome/app/strings/resources/ios_strings_pa.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_pa.xtb b/ios/chrome/app/strings/resources/ios_strings_pa.xtb
index a6c1390..81161dd 100644
--- a/ios/chrome/app/strings/resources/ios_strings_pa.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_pa.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">ਕੇਵਲ ਵਾਈ-ਫਾਈ 'ਤੇ</translation>
 <translation id="2747003861858887689">ਪਿਛਲਾ ਖੇਤਰ</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> ਦਾ ਅਨੁਸਰਣ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</translation>
-<translation id="2764831210418622012">ਹੁਣੇ ਹੀ</translation>
 <translation id="2772667768515195373">ਤੁਸੀਂ Google ਉਤਪਾਦਾਂ ਵਿੱਚ ਰੱਖਿਅਤ ਕੀਤੇ ਪਤੇ ਵਰਤ ਸਕਦੇ ਹੋ। ਇਹ ਪਤਾ ਤੁਹਾਡੇ Google ਖਾਤੇ <ph name="USER_EMAIL" /> ਵਿੱਚ ਰੱਖਿਅਤ ਕੀਤਾ ਗਿਆ ਹੈ।</translation>
 <translation id="2773292004659987824">ਇਨਕੋਗਨਿਟੋ ਖੋਜ</translation>
 <translation id="277771892408211951">ਭਾਸ਼ਾ ਚੁਣੋ</translation>

ios/chrome/app/strings/resources/ios_strings_pl.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_pl.xtb b/ios/chrome/app/strings/resources/ios_strings_pl.xtb
index 7e8b780..4f794e7 100644
--- a/ios/chrome/app/strings/resources/ios_strings_pl.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_pl.xtb
@@ -217,6 +217,7 @@
 <translation id="2482878487686419369">Powiadomienia</translation>
 <translation id="2496626742194544812">Przejdź do pierwszej karty</translation>
 <translation id="2500374554657206846">Opcje zapisania hasła</translation>
+<translation id="2502415369140591438">Ponownie użyte hasła: <ph name="COUNT" /></translation>
 <translation id="2523363575747517183">Ta strona internetowa wielokrotnie próbuje otworzyć inną aplikację.</translation>
 <translation id="2529021024822217800">Otwórz wszystkie</translation>
 <translation id="2547458583188611426">Synchronizacja nie działa. Aby ją rozpocząć, wpisz hasło.</translation>
@@ -226,6 +227,7 @@
 <translation id="2576499762020411840">Używaj haseł na swoim koncie Google i je zapisuj</translation>
 <translation id="2578571896248130439">Wyślij stronę internetową</translation>
 <translation id="2584132361465095047">Dodaj konto…</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{Otwarte karty, które nie były używane przez co najmniej 1 dzień, są przenoszone do sekcji Nieaktywne karty, dzięki czemu możesz się skupić na tych, których używasz najczęściej. Możesz to zmienić w dowolnym momencie w ustawieniach.}few{Otwarte karty, które nie były używane przez co najmniej {COUNT} dni, są przenoszone do sekcji Nieaktywne karty, dzięki czemu możesz się skupić na tych, których używasz najczęściej. Możesz to zmienić w dowolnym momencie w ustawieniach.}many{Otwarte karty, które nie były używane przez co najmniej {COUNT} dni, są przenoszone do sekcji Nieaktywne karty, dzięki czemu możesz się skupić na tych, których używasz najczęściej. Możesz to zmienić w dowolnym momencie w ustawieniach.}other{Otwarte karty, które nie były używane przez co najmniej {COUNT} dnia, są przenoszone do sekcji Nieaktywne karty, dzięki czemu możesz się skupić na tych, których używasz najczęściej. Możesz to zmienić w dowolnym momencie w ustawieniach.}}</translation>
 <translation id="2600682495497606169">Wyczyść pliki cookie witryny</translation>
 <translation id="2609008503159898744">Zamknąć wszystkie karty?</translation>
 <translation id="2625189173221582860">Hasło zostało skopiowane</translation>
@@ -256,7 +258,6 @@
 <translation id="2718352093833049315">Tylko przez Wi-Fi</translation>
 <translation id="2747003861858887689">Poprzednie pole</translation>
 <translation id="2749231692441336879">Obserwujesz: <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">przed chwilą</translation>
 <translation id="2772667768515195373">Zapisanych adresów możesz używać w różnych usługach Google. Ten adres jest zapisany na Twoim koncie Google <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Wyszukiwanie incognito</translation>
 <translation id="277771892408211951">Wybierz język</translation>
@@ -294,6 +295,7 @@
 <translation id="2932085390869194046">Zaproponuj hasło...</translation>
 <translation id="2932765531295814441">Ręczne dodawanie haseł</translation>
 <translation id="2952581218264071393">1. Otwórz ustawienia Chrome.</translation>
+<translation id="2953871438216280742">Zaloguj się, aby otworzyć i zapisać listę Do przeczytania na koncie Google.</translation>
 <translation id="2958718410589002129">Hasła</translation>
 <translation id="2961210776189273067">Tytuł</translation>
 <translation id="2964349545761222050">Blokowanie plików cookie innych firm</translation>
@@ -387,6 +389,7 @@
 <translation id="3581564640715911333">Proponuj tłumaczenie stron w innych językach</translation>
 <translation id="3588820906588687999">Otwórz grafikę w nowej karcie</translation>
 <translation id="3595252146048399851">W <ph name="BEGIN_LINK" />ustawieniach<ph name="END_LINK" /> możesz wybrać, co chcesz synchronizować. Google może korzystać z Twojej historii, aby dostosowywać działanie wyszukiwarki i innych usług.</translation>
+<translation id="3595588371156514964">{COUNT,plural, =1{{COUNT} słabe hasło}few{{COUNT} słabe hasła}many{{COUNT} słabych haseł}other{{COUNT} słabego hasła}}</translation>
 <translation id="3603009562372709545">Kopiuj URL linku</translation>
 <translation id="3607167657931203000">Autouzupełnianie</translation>
 <translation id="3608008480985212611">Zaloguj się, aby zarządzać ustawieniami.</translation>
@@ -573,6 +576,7 @@
 <translation id="4844899002472726590">Wyświetl tematy, które Cię interesują, i wprowadź w nich zmiany</translation>
 <translation id="4848999860252535517">Usunąć hasło do strony <ph name="WEBSITE" />?</translation>
 <translation id="4854345657858711387">Ustaw kod dostępu</translation>
+<translation id="4856498338299082007">Na Twoim koncie Google</translation>
 <translation id="4858786880085262208">Jeśli to możliwe, przełączaj się na HTTPS. Bezpieczne witryny mogą umieszczać treści, które nie są bezpieczne.</translation>
 <translation id="4860895144060829044">Zadzwoń</translation>
 <translation id="4872323082491632254">Sprawdź hasła</translation>
@@ -624,6 +628,7 @@
 <translation id="5197255632782567636">Internet</translation>
 <translation id="5211488077761630279">Zezwolić witrynie „<ph name="SITE_NAME" />” na korzystanie z <ph name="PERMISSION" />?</translation>
 <translation id="5219295696240154694">Pomóż poprawić bezpieczeństwo wszystkich użytkowników internetu</translation>
+<translation id="5221339005270097309">Sprawdzam hasła…</translation>
 <translation id="5228579091201413441">Włącz synchronizację</translation>
 <translation id="5232485538978018676">Zaloguj się na konto zarządzane</translation>
 <translation id="5234764350956374838">Zamknij</translation>
@@ -663,6 +668,7 @@
 Funkcja Handoff musi być też włączona w sekcji Ogólne w Ustawieniach, a urządzenie musi używać tego samego konta iCloud.</translation>
 <translation id="5551897871312988470">Proponuj tłumaczenie</translation>
 <translation id="5556459405103347317">Odśwież</translation>
+<translation id="555749644339804659">Sprawdzam hasła…</translation>
 <translation id="556042886152191864">Przycisk</translation>
 <translation id="5597915316964418992">Otwieranie siatki kart</translation>
 <translation id="560322036295180549">Wyłączone przez organizację</translation>
@@ -1089,6 +1095,7 @@
 <translation id="821809831108207540">Aby spersonalizować karty Discover i Chrome, zaloguj się i włącz synchronizację.</translation>
 <translation id="8225985093977202398">Obrazy i pliki w pamięci podręcznej</translation>
 <translation id="8237382152611443140">Otwórz Automatyczne wypełnianie haseł w Ustawieniach.</translation>
+<translation id="8248969482078657578">Sekcja Nieaktywne karty pomaga Ci się skupić</translation>
 <translation id="8261506727792406068">Usuń</translation>
 <translation id="8264966119170358612">Niektóre z Twoich zapisanych haseł zostały ujawnione w wyniku naruszenia bezpieczeństwa danych poza firmą Google. <ph name="BEGIN_LINK" />Więcej informacji<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">Tylko na tym urządzeniu</translation>

ios/chrome/app/strings/resources/ios_strings_pt-BR.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_pt-BR.xtb b/ios/chrome/app/strings/resources/ios_strings_pt-BR.xtb
index b0d5240..2d2fc45 100644
--- a/ios/chrome/app/strings/resources/ios_strings_pt-BR.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_pt-BR.xtb
@@ -217,6 +217,7 @@
 <translation id="2482878487686419369">Notificações</translation>
 <translation id="2496626742194544812">Ir para a primeira guia</translation>
 <translation id="2500374554657206846">Opções para salvar senha</translation>
+<translation id="2502415369140591438"><ph name="COUNT" /> senhas reutilizadas</translation>
 <translation id="2523363575747517183">Este site está tentando repetidamente abrir outro aplicativo.</translation>
 <translation id="2529021024822217800">Abrir todos</translation>
 <translation id="2547458583188611426">A sincronização não está funcionando. Para iniciar a sincronização, digite a senha longa.</translation>
@@ -256,7 +257,6 @@
 <translation id="2718352093833049315">Apenas com Wi-Fi</translation>
 <translation id="2747003861858887689">Campo anterior</translation>
 <translation id="2749231692441336879">Seguindo <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">agora mesmo</translation>
 <translation id="2772667768515195373">Os endereços salvos podem ser usados em vários produtos do Google. Esse endereço foi salvo na sua conta <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Pesquisa anônima</translation>
 <translation id="277771892408211951">Selecionar idioma</translation>
@@ -294,6 +294,7 @@
 <translation id="2932085390869194046">Sugerir senha…</translation>
 <translation id="2932765531295814441">Adicionar senhas manualmente</translation>
 <translation id="2952581218264071393">1. Abrir configurações do Chrome</translation>
+<translation id="2953871438216280742">Faça login para abrir e salvar sua lista de leitura na Conta do Google.</translation>
 <translation id="2958718410589002129">Senhas</translation>
 <translation id="2961210776189273067">Título</translation>
 <translation id="2964349545761222050">Bloquear cookies de terceiros</translation>
@@ -387,6 +388,7 @@
 <translation id="3581564640715911333">Oferecer para traduzir páginas em outros idiomas</translation>
 <translation id="3588820906588687999">Abrir imagem em "Nova guia"</translation>
 <translation id="3595252146048399851">Nas <ph name="BEGIN_LINK" />configurações<ph name="END_LINK" />, é possível escolher a qualquer momento o que é sincronizado. O Google pode personalizar a Pesquisa e outros serviços com base no seu histórico.</translation>
+<translation id="3595588371156514964">{COUNT,plural, =1{{COUNT} senha fraca}one{{COUNT} senha fraca}other{{COUNT} senhas fracas}}</translation>
 <translation id="3603009562372709545">Copiar URL do link</translation>
 <translation id="3607167657931203000">Dados de preenchimento automático</translation>
 <translation id="3608008480985212611">Faça login para gerenciar suas preferências.</translation>
@@ -624,6 +626,7 @@
 <translation id="5197255632782567636">Internet</translation>
 <translation id="5211488077761630279">Permitir que o site <ph name="SITE_NAME" /> use <ph name="PERMISSION" />?</translation>
 <translation id="5219295696240154694">Ajude a melhorar a segurança para todos na Web</translation>
+<translation id="5221339005270097309">Verificando senhas…</translation>
 <translation id="5228579091201413441">Ativar sincronização</translation>
 <translation id="5232485538978018676">Fazer login com uma conta gerenciada</translation>
 <translation id="5234764350956374838">Dispensar</translation>
@@ -663,6 +666,7 @@
 A "Transição" também deve ser ativada na seção "Geral" das configurações. Seus dispositivos devem usar a mesma conta do iCloud.</translation>
 <translation id="5551897871312988470">Oferecer para traduzir</translation>
 <translation id="5556459405103347317">Recarregar</translation>
+<translation id="555749644339804659">Verificando senhas…</translation>
 <translation id="556042886152191864">Botão</translation>
 <translation id="5597915316964418992">Abrir a grade de guias</translation>
 <translation id="560322036295180549">Desativado pela organização</translation>

ios/chrome/app/strings/resources/ios_strings_pt-PT.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_pt-PT.xtb b/ios/chrome/app/strings/resources/ios_strings_pt-PT.xtb
index 0ec0c0c..72a9faa 100644
--- a/ios/chrome/app/strings/resources/ios_strings_pt-PT.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_pt-PT.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Apenas em Wi-Fi</translation>
 <translation id="2747003861858887689">Campo anterior</translation>
 <translation id="2749231692441336879">A seguir o canal <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">agora mesmo</translation>
 <translation id="2772667768515195373">Pode usar moradas guardadas entre produtos Google. Esta morada está guardada na sua Conta Google, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Pesquisa anónima</translation>
 <translation id="277771892408211951">Selecionar idioma</translation>

ios/chrome/app/strings/resources/ios_strings_ro.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_ro.xtb b/ios/chrome/app/strings/resources/ios_strings_ro.xtb
index ed6ef5e..e7f31afa 100644
--- a/ios/chrome/app/strings/resources/ios_strings_ro.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_ro.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Numai prin Wi-Fi</translation>
 <translation id="2747003861858887689">Câmpul anterior</translation>
 <translation id="2749231692441336879">Urmărești <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">adineauri</translation>
 <translation id="2772667768515195373">Poți folosi adresele salvate în toate produsele Google. Această adresă se salvează în Contul tău Google (<ph name="USER_EMAIL" />).</translation>
 <translation id="2773292004659987824">Căutare incognito</translation>
 <translation id="277771892408211951">Selectează limba</translation>

ios/chrome/app/strings/resources/ios_strings_ru.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_ru.xtb b/ios/chrome/app/strings/resources/ios_strings_ru.xtb
index 1229eb2..6b6731f1 100644
--- a/ios/chrome/app/strings/resources/ios_strings_ru.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_ru.xtb
@@ -217,6 +217,7 @@
 <translation id="2482878487686419369">Уведомления</translation>
 <translation id="2496626742194544812">Перейти к первой вкладке</translation>
 <translation id="2500374554657206846">Параметры сохранения пароля</translation>
+<translation id="2502415369140591438">Повторяющихся паролей: <ph name="COUNT" /></translation>
 <translation id="2523363575747517183">Этот сайт часто пытается открыть другое приложение.</translation>
 <translation id="2529021024822217800">Открыть все</translation>
 <translation id="2547458583188611426">Синхронизация не выполняется. Чтобы запустить ее, введите кодовую фразу.</translation>
@@ -256,7 +257,6 @@
 <translation id="2718352093833049315">Только Wi-Fi</translation>
 <translation id="2747003861858887689">Предыдущее поле</translation>
 <translation id="2749231692441336879">Вы подписались на "<ph name="CHANNEL_NAME" />".</translation>
-<translation id="2764831210418622012">только что</translation>
 <translation id="2772667768515195373">Этот адрес сохранен в вашем аккаунте Google (<ph name="USER_EMAIL" />). Сохраненные адреса можно использовать в разных продуктах Google.</translation>
 <translation id="2773292004659987824">Поиск в режиме инкогнито</translation>
 <translation id="277771892408211951">Выберите язык</translation>
@@ -294,6 +294,7 @@
 <translation id="2932085390869194046">Сгенерировать пароль…</translation>
 <translation id="2932765531295814441">Добавляйте пароли вручную</translation>
 <translation id="2952581218264071393">1. Откройте настройки Chrome.</translation>
+<translation id="2953871438216280742">Войдите, чтобы открыть и сохранить список для чтения в аккаунте Google.</translation>
 <translation id="2958718410589002129">Пароли</translation>
 <translation id="2961210776189273067">Обращение</translation>
 <translation id="2964349545761222050">Блокировать сторонние файлы cookie</translation>
@@ -387,6 +388,7 @@
 <translation id="3581564640715911333">Предлагать перевести страницы на других языках.</translation>
 <translation id="3588820906588687999">Открыть изображение в новой вкладке</translation>
 <translation id="3595252146048399851">Вы всегда можете выбрать, что синхронизировать, в <ph name="BEGIN_LINK" />настройках<ph name="END_LINK" />. Google может персонально настраивать Поиск и другие сервисы на основе вашей истории.</translation>
+<translation id="3595588371156514964">{COUNT,plural, =1{{COUNT} простой пароль}one{{COUNT} простой пароль}few{{COUNT} простых пароля}many{{COUNT} простых паролей}other{{COUNT} простого пароля}}</translation>
 <translation id="3603009562372709545">Копировать URL</translation>
 <translation id="3607167657931203000">Данные автозаполнения</translation>
 <translation id="3608008480985212611">Войдите в аккаунт, чтобы задать настройки.</translation>
@@ -624,6 +626,7 @@
 <translation id="5197255632782567636">Интернет</translation>
 <translation id="5211488077761630279">Разрешить сайту <ph name="SITE_NAME" /> использовать разрешения <ph name="PERMISSION" />?</translation>
 <translation id="5219295696240154694">Помочь сделать интернет безопаснее для всех</translation>
+<translation id="5221339005270097309">Проверка паролей…</translation>
 <translation id="5228579091201413441">Включить синхронизацию</translation>
 <translation id="5232485538978018676">Вход в управляемый аккаунт</translation>
 <translation id="5234764350956374838">Закрыть</translation>
@@ -663,6 +666,7 @@
 Функцию Handoff нужно включить не только в Chrome, но и в настройках устройства (см. раздел "Общие"). Все ваши устройства должны синхронизироваться с одним и тем же аккаунтом iCloud.</translation>
 <translation id="5551897871312988470">Предлагать перевести</translation>
 <translation id="5556459405103347317">Перезагрузить</translation>
+<translation id="555749644339804659">Проверка паролей…</translation>
 <translation id="556042886152191864">Кнопка</translation>
 <translation id="5597915316964418992">Откройте сетку таблицы.</translation>
 <translation id="560322036295180549">Функция отключена вашей организацией</translation>

ios/chrome/app/strings/resources/ios_strings_si.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_si.xtb b/ios/chrome/app/strings/resources/ios_strings_si.xtb
index 9b5ae51..88f255c 100644
--- a/ios/chrome/app/strings/resources/ios_strings_si.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_si.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Wi-Fi මත පමනි</translation>
 <translation id="2747003861858887689">පෙර ක්ෂේත්‍රය</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> අනුගමනය කරමින්</translation>
-<translation id="2764831210418622012">මේ දැන්</translation>
 <translation id="2772667768515195373">ඔබට Google නිෂ්පාදන හරහා සුරැකි ලිපින භාවිතා කළ හැක. මෙම ලිපිනය ඔබේ Google ගිණුමේ, <ph name="USER_EMAIL" /> සුරකිනු ලැබේ.</translation>
 <translation id="2773292004659987824">අප්‍රසිද්ධ සෙවීම</translation>
 <translation id="277771892408211951">භාෂාව තෝරන්න</translation>

ios/chrome/app/strings/resources/ios_strings_sk.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_sk.xtb b/ios/chrome/app/strings/resources/ios_strings_sk.xtb
index 148b0ec..3e3a2455 100644
--- a/ios/chrome/app/strings/resources/ios_strings_sk.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_sk.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Len s Wi‑Fi</translation>
 <translation id="2747003861858887689">Predchádzajúce pole</translation>
 <translation id="2749231692441336879">Sledujete <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">práve teraz</translation>
 <translation id="2772667768515195373">V službách Googlu môžete používať uložené adresy. Táto adresa je uložená vo vašom účte Google <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Anonymné vyhľadávanie</translation>
 <translation id="277771892408211951">Výber jazyka</translation>

ios/chrome/app/strings/resources/ios_strings_sl.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_sl.xtb b/ios/chrome/app/strings/resources/ios_strings_sl.xtb
index 536af5a..e8a70dd3 100644
--- a/ios/chrome/app/strings/resources/ios_strings_sl.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_sl.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Samo v omrežju Wi-Fi</translation>
 <translation id="2747003861858887689">Prejšnje polje</translation>
 <translation id="2749231692441336879">Spremljate <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">pravkar</translation>
 <translation id="2772667768515195373">Shranjene naslove lahko uporabite v Googlovih izdelkih. Ta naslov je shranjen v računu Google, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Anonimno iskanje</translation>
 <translation id="277771892408211951">Izbira jezika</translation>

ios/chrome/app/strings/resources/ios_strings_sq.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_sq.xtb b/ios/chrome/app/strings/resources/ios_strings_sq.xtb
index ff6c03605..15eec16 100644
--- a/ios/chrome/app/strings/resources/ios_strings_sq.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_sq.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Vetëm me Wi-Fi</translation>
 <translation id="2747003861858887689">Fusha e mëparshme</translation>
 <translation id="2749231692441336879">Po ndjek <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">pikërisht tani</translation>
 <translation id="2772667768515195373">Adresat e ruajtura mund t'i përdorësh nëpër produktet e Google. Kjo adresë ruhet në "Llogarinë tënde të Google", <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Kërkimi "i fshehtë"</translation>
 <translation id="277771892408211951">Zgjidh gjuhën</translation>

ios/chrome/app/strings/resources/ios_strings_sr-Latn.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_sr-Latn.xtb b/ios/chrome/app/strings/resources/ios_strings_sr-Latn.xtb
index 239c215..767cba3 100644
--- a/ios/chrome/app/strings/resources/ios_strings_sr-Latn.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_sr-Latn.xtb
@@ -226,6 +226,7 @@
 <translation id="2576499762020411840">Koristite i sačuvajte lozinke na Google nalogu</translation>
 <translation id="2578571896248130439">Pošaljite veb-stranicu</translation>
 <translation id="2584132361465095047">Dodaj nalog…</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{Otvorene kartice koje se ne koriste jedan dan ili duže premeštaju se na neaktivne kartice da biste lako mogli da se fokusirate na kartice koje najčešće koristite. Ovo možete da promenite u svakom trenutku u podešavanjima.}one{Otvorene kartice koje se ne koriste {COUNT} dan ili duže premeštaju se na neaktivne kartice da biste lako mogli da se fokusirate na kartice koje najčešće koristite. Ovo možete da promenite u svakom trenutku u podešavanjima.}few{Otvorene kartice koje se ne koriste {COUNT} dana ili duže premeštaju se na neaktivne kartice da biste lako mogli da se fokusirate na kartice koje najčešće koristite. Ovo možete da promenite u svakom trenutku u podešavanjima.}other{Otvorene kartice koje se ne koriste {COUNT} dana ili duže premeštaju se na neaktivne kartice da biste lako mogli da se fokusirate na kartice koje najčešće koristite. Ovo možete da promenite u svakom trenutku u podešavanjima.}}</translation>
 <translation id="2600682495497606169">Obriši kolačiće za sajt</translation>
 <translation id="2609008503159898744">Želite da zatvorite sve kartice?</translation>
 <translation id="2625189173221582860">Lozinka je kopirana</translation>
@@ -256,7 +257,6 @@
 <translation id="2718352093833049315">Samo na WiFi-ju</translation>
 <translation id="2747003861858887689">Prethodno polje</translation>
 <translation id="2749231692441336879">Pratite kanal <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">malopre</translation>
 <translation id="2772667768515195373">Možete da koristite sačuvane adrese u svim Google proizvodima. Ova adresa je sačuvana na Google nalogu, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Pretraga bez arhiviranja</translation>
 <translation id="277771892408211951">Izaberite jezik</translation>
@@ -573,6 +573,7 @@
 <translation id="4844899002472726590">Pregledajte i menjajte teme koje vas interesuju</translation>
 <translation id="4848999860252535517">Želite da izbrišete lozinku za <ph name="WEBSITE" />?</translation>
 <translation id="4854345657858711387">Podesite šifru</translation>
+<translation id="4856498338299082007">Na Google nalogu</translation>
 <translation id="4858786880085262208">Nadogradite na HTTPS kada je to moguće. Bezbedni sajtovi mogu da ugrade sadržaj koji nije bezbedan.</translation>
 <translation id="4860895144060829044">Pozovite</translation>
 <translation id="4872323082491632254">Proverite lozinke</translation>
@@ -1089,6 +1090,7 @@
 <translation id="821809831108207540">Da biste personalizovali Discover fid i Chrome, prijavite se i uključite sinhronizaciju.</translation>
 <translation id="8225985093977202398">Keširane slike i fajlovi</translation>
 <translation id="8237382152611443140">Otvorite podešavanja za automatsko popunjavanje lozinke</translation>
+<translation id="8248969482078657578">Neaktivne kartice vam pomažu da ostanete fokusirani</translation>
 <translation id="8261506727792406068">Izbriši</translation>
 <translation id="8264966119170358612">Neke od vaših sačuvanih lozinki su otkrivene tokom povrede podataka koji nisu Google podaci. <ph name="BEGIN_LINK" />Saznajte više<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">Samo na ovom uređaju</translation>

ios/chrome/app/strings/resources/ios_strings_sr.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_sr.xtb b/ios/chrome/app/strings/resources/ios_strings_sr.xtb
index 43923dc..bcf3f2b 100644
--- a/ios/chrome/app/strings/resources/ios_strings_sr.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_sr.xtb
@@ -226,6 +226,7 @@
 <translation id="2576499762020411840">Користите и сачувајте лозинке на Google налогу</translation>
 <translation id="2578571896248130439">Пошаљите веб-страницу</translation>
 <translation id="2584132361465095047">Додај налог…</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{Отворене картице које се не користе један дан или дуже премештају се на неактивне картице да бисте лако могли да се фокусирате на картице које најчешће користите. Ово можете да промените у сваком тренутку у подешавањима.}one{Отворене картице које се не користе {COUNT} дан или дуже премештају се на неактивне картице да бисте лако могли да се фокусирате на картице које најчешће користите. Ово можете да промените у сваком тренутку у подешавањима.}few{Отворене картице које се не користе {COUNT} дана или дуже премештају се на неактивне картице да бисте лако могли да се фокусирате на картице које најчешће користите. Ово можете да промените у сваком тренутку у подешавањима.}other{Отворене картице које се не користе {COUNT} дана или дуже премештају се на неактивне картице да бисте лако могли да се фокусирате на картице које најчешће користите. Ово можете да промените у сваком тренутку у подешавањима.}}</translation>
 <translation id="2600682495497606169">Обриши колачиће за сајт</translation>
 <translation id="2609008503159898744">Желите да затворите све картице?</translation>
 <translation id="2625189173221582860">Лозинка је копирана</translation>
@@ -256,7 +257,6 @@
 <translation id="2718352093833049315">Само на WiFi-ју</translation>
 <translation id="2747003861858887689">Претходно поље</translation>
 <translation id="2749231692441336879">Пратите канал <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">малопре</translation>
 <translation id="2772667768515195373">Можете да користите сачуване адресе у свим Google производима. Ова адреса је сачувана на Google налогу, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Претрага без архивирања</translation>
 <translation id="277771892408211951">Изаберите језик</translation>
@@ -573,6 +573,7 @@
 <translation id="4844899002472726590">Прегледајте и мењајте теме које вас интересују</translation>
 <translation id="4848999860252535517">Желите да избришете лозинку за <ph name="WEBSITE" />?</translation>
 <translation id="4854345657858711387">Подесите шифру</translation>
+<translation id="4856498338299082007">На Google налогу</translation>
 <translation id="4858786880085262208">Надоградите на HTTPS када је то могуће. Безбедни сајтови могу да уграде садржај који није безбедан.</translation>
 <translation id="4860895144060829044">Позовите</translation>
 <translation id="4872323082491632254">Проверите лозинке</translation>
@@ -1089,6 +1090,7 @@
 <translation id="821809831108207540">Да бисте персонализовали Discover фид и Chrome, пријавите се и укључите синхронизацију.</translation>
 <translation id="8225985093977202398">Кеширане слике и фајлови</translation>
 <translation id="8237382152611443140">Отворите подешавања за аутоматско попуњавање лозинке</translation>
+<translation id="8248969482078657578">Неактивне картице вам помажу да останете фокусирани</translation>
 <translation id="8261506727792406068">Избриши</translation>
 <translation id="8264966119170358612">Неке од ваших сачуваних лозинки су откривене током повреде података који нису Google подаци. <ph name="BEGIN_LINK" />Сазнајте више<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">Само на овом уређају</translation>

ios/chrome/app/strings/resources/ios_strings_sv.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_sv.xtb b/ios/chrome/app/strings/resources/ios_strings_sv.xtb
index 62041d2..a99c07a 100644
--- a/ios/chrome/app/strings/resources/ios_strings_sv.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_sv.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Endast på wifi</translation>
 <translation id="2747003861858887689">Föregående fält</translation>
 <translation id="2749231692441336879">Följer <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">nyss</translation>
 <translation id="2772667768515195373">Du kan använda sparade adresser i Googles produkter. Adressen har sparats i ditt Google-konto, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Inkognitosökning</translation>
 <translation id="277771892408211951">Välj språk</translation>

ios/chrome/app/strings/resources/ios_strings_sw.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_sw.xtb b/ios/chrome/app/strings/resources/ios_strings_sw.xtb
index 60052163..ff2345a 100644
--- a/ios/chrome/app/strings/resources/ios_strings_sw.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_sw.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Kwenye Wi-Fi pekee</translation>
 <translation id="2747003861858887689">Sehemu iliyotangulia</translation>
 <translation id="2749231692441336879">Unafuatilia <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">sasa hivi</translation>
 <translation id="2772667768515195373">Unaweza kutumia anwani zilizohifadhiwa kwenye bidhaa zote za Google. Anwani hii imehifadhiwa kwenye Akaunti yako ya Google, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Utafutaji Fiche</translation>
 <translation id="277771892408211951">Chagua Lugha</translation>

ios/chrome/app/strings/resources/ios_strings_ta.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_ta.xtb b/ios/chrome/app/strings/resources/ios_strings_ta.xtb
index 7ebd8fe0..6461f68 100644
--- a/ios/chrome/app/strings/resources/ios_strings_ta.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_ta.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">வைஃபையில் மட்டும்</translation>
 <translation id="2747003861858887689">முந்தைய புலம்</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> ஐப் பின்தொடர்கிறீர்கள்</translation>
-<translation id="2764831210418622012">சற்றுமுன்</translation>
 <translation id="2772667768515195373">சேமிக்கப்படும் முகவரிகளை Google தயாரிப்புகள் முழுவதிலும் பயன்படுத்தலாம். இந்த முகவரி உங்கள் Google கணக்கில் (<ph name="USER_EMAIL" />) சேமிக்கப்பட்டது.</translation>
 <translation id="2773292004659987824">மறைநிலைத் தேடல்</translation>
 <translation id="277771892408211951">மொழியைத் தேர்வுசெய்யுங்கள்</translation>

ios/chrome/app/strings/resources/ios_strings_te.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_te.xtb b/ios/chrome/app/strings/resources/ios_strings_te.xtb
index 271076b..97b5cd77 100644
--- a/ios/chrome/app/strings/resources/ios_strings_te.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_te.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Wi-Fiలో మాత్రమే</translation>
 <translation id="2747003861858887689">మునుపటి ఫీల్డ్</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" />‌ను ఫాలో అవుతున్నారు</translation>
-<translation id="2764831210418622012">ఇప్పుడే</translation>
 <translation id="2772667768515195373">మీరు Google ప్రోడక్ట్‌లలో సేవ్ చేసిన అడ్రస్‌లను ఉపయోగించవచ్చు. ఈ అడ్రస్ మీ Google ఖాతా <ph name="USER_EMAIL" />లో సేవ్ చేయబడింది.</translation>
 <translation id="2773292004659987824">అజ్ఞాత శోధన</translation>
 <translation id="277771892408211951">భాషను ఎంచుకోండి</translation>

ios/chrome/app/strings/resources/ios_strings_th.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_th.xtb b/ios/chrome/app/strings/resources/ios_strings_th.xtb
index 3eef56a2..fd0764d 100644
--- a/ios/chrome/app/strings/resources/ios_strings_th.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_th.xtb
@@ -217,6 +217,7 @@
 <translation id="2482878487686419369">การแจ้งเตือน</translation>
 <translation id="2496626742194544812">ไปที่แท็บแรก</translation>
 <translation id="2500374554657206846">ตัวเลือกในการบันทึกรหัสผ่าน</translation>
+<translation id="2502415369140591438">มีรหัสผ่านที่ใช้ซ้ำ <ph name="COUNT" /> รายการ</translation>
 <translation id="2523363575747517183">เว็บไซต์นี้พยายามเปิดแอปพลิเคชันอื่นอยู่เรื่อยๆ</translation>
 <translation id="2529021024822217800">เปิดทั้งหมด</translation>
 <translation id="2547458583188611426">การซิงค์ไม่ทำงาน หากต้องการเริ่มการซิงค์ ให้ป้อนรหัสผ่าน</translation>
@@ -256,7 +257,6 @@
 <translation id="2718352093833049315">Wi-Fi เท่านั้น</translation>
 <translation id="2747003861858887689">ช่องก่อนหน้า</translation>
 <translation id="2749231692441336879">กำลังติดตาม <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">เมื่อสักครู่</translation>
 <translation id="2772667768515195373">คุณใช้ที่อยู่ที่บันทึกไว้ในผลิตภัณฑ์ต่างๆ ของ Google ได้ โดยที่อยู่นี้จะบันทึกอยู่ในบัญชี Google ชื่อ <ph name="USER_EMAIL" /></translation>
 <translation id="2773292004659987824">ค้นหาในโหมดไม่ระบุตัวตน</translation>
 <translation id="277771892408211951">เลือกภาษา</translation>
@@ -294,6 +294,7 @@
 <translation id="2932085390869194046">แนะนำรหัสผ่าน...</translation>
 <translation id="2932765531295814441">เพิ่มรหัสผ่านด้วยตนเอง</translation>
 <translation id="2952581218264071393">1. เปิดการตั้งค่า Chrome</translation>
+<translation id="2953871438216280742">ลงชื่อเข้าใช้เพื่อเปิดและบันทึกเรื่องรออ่านในบัญชี Google</translation>
 <translation id="2958718410589002129">รหัสผ่าน</translation>
 <translation id="2961210776189273067">คำนำหน้าชื่อ</translation>
 <translation id="2964349545761222050">บล็อกคุกกี้ของบุคคลที่สาม</translation>
@@ -387,6 +388,7 @@
 <translation id="3581564640715911333">เสนอที่จะแปลหน้าเว็บในภาษาอื่นๆ</translation>
 <translation id="3588820906588687999">เปิดภาพในแท็บใหม่</translation>
 <translation id="3595252146048399851">คุณเลือกสิ่งที่ต้องการซิงค์ได้เสมอใน<ph name="BEGIN_LINK" />การตั้งค่า<ph name="END_LINK" /> Google อาจปรับเปลี่ยน Search และบริการอื่นๆ ให้เหมาะกับคุณโดยอิงจากประวัติการเข้าชม</translation>
+<translation id="3595588371156514964">{COUNT,plural, =1{มีรหัสผ่านที่ไม่รัดกุม {COUNT} รายการ}other{มีรหัสผ่านที่ไม่รัดกุม {COUNT} รายการ}}</translation>
 <translation id="3603009562372709545">คัดลอก URL ของลิงก์</translation>
 <translation id="3607167657931203000">ป้อนข้อมูลอัตโนมัติ</translation>
 <translation id="3608008480985212611">ลงชื่อเข้าใช้เพื่อจัดการค่ากำหนด</translation>
@@ -624,6 +626,7 @@
 <translation id="5197255632782567636">อินเทอร์เน็ต</translation>
 <translation id="5211488077761630279">อนุญาตให้ "<ph name="SITE_NAME" />" ใช้<ph name="PERMISSION" />ไหม</translation>
 <translation id="5219295696240154694">ช่วยปรับปรุงความปลอดภัยในอินเทอร์เน็ตให้กับทุกคน</translation>
+<translation id="5221339005270097309">กำลังตรวจสอบรหัสผ่าน…</translation>
 <translation id="5228579091201413441">เปิดใช้การซิงค์</translation>
 <translation id="5232485538978018676">ลงชื่อเข้าใช้ด้วยบัญชีที่จัดการ</translation>
 <translation id="5234764350956374838">ปิด</translation>
@@ -663,6 +666,7 @@
 โดยต้องเปิดใช้ Handoff ในส่วน "ทั่วไป" ของการตั้งค่าและอุปกรณ์ของคุณต้องใช้บัญชี iCloud เดียวกัน</translation>
 <translation id="5551897871312988470">เสนอการแปล</translation>
 <translation id="5556459405103347317">โหลดใหม่</translation>
+<translation id="555749644339804659">กำลังตรวจสอบรหัสผ่าน…</translation>
 <translation id="556042886152191864">ปุ่ม</translation>
 <translation id="5597915316964418992">เปิดตารางกริดของแท็บ</translation>
 <translation id="560322036295180549">ปิดโดยองค์กรของคุณ</translation>

ios/chrome/app/strings/resources/ios_strings_tr.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_tr.xtb b/ios/chrome/app/strings/resources/ios_strings_tr.xtb
index 4431269..8f647087 100644
--- a/ios/chrome/app/strings/resources/ios_strings_tr.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_tr.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Yaln. Kablosuzda</translation>
 <translation id="2747003861858887689">Önceki alan</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> takip ediliyor</translation>
-<translation id="2764831210418622012">az önce</translation>
 <translation id="2772667768515195373">Kayıtlı adresleri tüm Google ürünlerinde kullanabilirsiniz. Bu adres Google Hesabınıza (<ph name="USER_EMAIL" />) kaydedilir.</translation>
 <translation id="2773292004659987824">Gizli Arama</translation>
 <translation id="277771892408211951">Dil Seçin</translation>

ios/chrome/app/strings/resources/ios_strings_uk.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_uk.xtb b/ios/chrome/app/strings/resources/ios_strings_uk.xtb
index dc90ee4..a0cdf227 100644
--- a/ios/chrome/app/strings/resources/ios_strings_uk.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_uk.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Лише у Wi-Fi</translation>
 <translation id="2747003861858887689">Попереднє поле</translation>
 <translation id="2749231692441336879">Ви підписалися на канал <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">щойно</translation>
 <translation id="2772667768515195373">Ви можете використовувати збережені адреси в усіх продуктах Google. Цю адресу збережено у вашому обліковому записі Google (<ph name="USER_EMAIL" />).</translation>
 <translation id="2773292004659987824">Пошук у режимі інкогніто</translation>
 <translation id="277771892408211951">Виберіть мову</translation>

ios/chrome/app/strings/resources/ios_strings_ur.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_ur.xtb b/ios/chrome/app/strings/resources/ios_strings_ur.xtb
index cc4767b..a098c1b4 100644
--- a/ios/chrome/app/strings/resources/ios_strings_ur.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_ur.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">‏صرف Wi-Fi پر</translation>
 <translation id="2747003861858887689">پچھلا فیلڈ</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> کی پیروی کی جا رہی ہے</translation>
-<translation id="2764831210418622012">ابھی ابھی</translation>
 <translation id="2772667768515195373">‏آپ پورے Google پروڈکٹس میں محفوظ کردہ پتے استعمال کر سکتے ہیں۔ یہ پتہ آپ کے Google اکاؤنٹ میں محفوظ ہے، <ph name="USER_EMAIL" />۔</translation>
 <translation id="2773292004659987824">پوشیدگی وضع میں تلاش کریں</translation>
 <translation id="277771892408211951">زبان منتخب کریں</translation>

ios/chrome/app/strings/resources/ios_strings_uz.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_uz.xtb b/ios/chrome/app/strings/resources/ios_strings_uz.xtb
index 609aa0f..62126a0 100644
--- a/ios/chrome/app/strings/resources/ios_strings_uz.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_uz.xtb
@@ -217,6 +217,7 @@
 <translation id="2482878487686419369">Bildirishnomalar</translation>
 <translation id="2496626742194544812">Birinchi varaqni ochish</translation>
 <translation id="2500374554657206846">Parollarni saqlash taklif qilinishi</translation>
+<translation id="2502415369140591438"><ph name="COUNT" /> ta parol qayta ishlatilgan</translation>
 <translation id="2523363575747517183">Bu sayt tinimsiz boshqa ilovani ochishga urinmoqda.</translation>
 <translation id="2529021024822217800">Hammasini ochish</translation>
 <translation id="2547458583188611426">Sinxronlash ishlamayapti. Sinxronlashni boshlash uchun kodli iborani kiriting.</translation>
@@ -256,7 +257,6 @@
 <translation id="2718352093833049315">Faqat Wi-Fi orqali</translation>
 <translation id="2747003861858887689">Avvalgi maydoncha</translation>
 <translation id="2749231692441336879"><ph name="CHANNEL_NAME" /> endi kuzatuvingizda</translation>
-<translation id="2764831210418622012">hozirgina</translation>
 <translation id="2772667768515195373">Saqlangan manzillardan Google xizmatlarida foydalanish mumkin. Bu manzil Google hisobingizga (<ph name="USER_EMAIL" />) saqlandi.</translation>
 <translation id="2773292004659987824">Inkognito qidiruv</translation>
 <translation id="277771892408211951">Tilni tanlang</translation>
@@ -294,6 +294,7 @@
 <translation id="2932085390869194046">Parol yaratish...</translation>
 <translation id="2932765531295814441">Parollarni mustaqil kiritish</translation>
 <translation id="2952581218264071393">1. Chrome sozlamalarini oching</translation>
+<translation id="2953871438216280742">Saqlangan sahifalarni ochish va Google hisobingizga saqlash uchun tizimga kiring.</translation>
 <translation id="2958718410589002129">Parollar</translation>
 <translation id="2961210776189273067">Nomi</translation>
 <translation id="2964349545761222050">Tashqi cookie fayllarni bloklash</translation>
@@ -387,6 +388,7 @@
 <translation id="3581564640715911333">Boshqa tildagi sahifalarni tarjima qilish taklif qilinsin</translation>
 <translation id="3588820906588687999">Tasvirni yangi tabda ochish</translation>
 <translation id="3595252146048399851">Nimani sinxronlashni istalgan vaqtda <ph name="BEGIN_LINK" />sozlamalar<ph name="END_LINK" /> orqali tanlash mumkin. Brauzer tarixi asosida Google Qidiruv va boshqa xizmatlarni moslashtirishi mumkin.</translation>
+<translation id="3595588371156514964">{COUNT,plural, =1{{COUNT} ta kuchsiz parol aniqlandi}other{{COUNT} ta kuchsiz parol aniqlandi}}</translation>
 <translation id="3603009562372709545">URLdan nusxa olish</translation>
 <translation id="3607167657931203000">Avto-to‘ldirish ma’l-ri</translation>
 <translation id="3608008480985212611">Sozlamalarni belgilash uchun hisobga kiring.</translation>
@@ -624,6 +626,7 @@
 <translation id="5197255632782567636">Internet</translation>
 <translation id="5211488077761630279">“<ph name="SITE_NAME" />” saytiga <ph name="PERMISSION" /> ruxsati berilsinmi?</translation>
 <translation id="5219295696240154694">Internetni hamma uchun xavfsiz boʻlishiga yordam bering</translation>
+<translation id="5221339005270097309">Parollar tekshirilmoqda…</translation>
 <translation id="5228579091201413441">Sinxronlashni yoqish</translation>
 <translation id="5232485538978018676">Boshqariladigan hisobga kirish</translation>
 <translation id="5234764350956374838">Yopish</translation>
@@ -663,6 +666,7 @@
 Handoff funksiyasini faqatgina Chrome sozlamalarida emas, balki qurilma sozlamalarida (“Umumiy” bo‘limida) ham yoqish kerak. Barcha qurilmalaringiz umumiy iCloud hisobida sinxronlanishi zarur.</translation>
 <translation id="5551897871312988470">Tarjima qilishni taklif qilish</translation>
 <translation id="5556459405103347317">Qayta yuklash</translation>
+<translation id="555749644339804659">Parollar tekshirilmoqda…</translation>
 <translation id="556042886152191864">Tugma</translation>
 <translation id="5597915316964418992">Varaqlar jadvalida ochish</translation>
 <translation id="560322036295180549">Tashkilotingiz tomonidan faolsizlantirilgan</translation>

ios/chrome/app/strings/resources/ios_strings_vi.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_vi.xtb b/ios/chrome/app/strings/resources/ios_strings_vi.xtb
index b9646ca..c9d9d97 100644
--- a/ios/chrome/app/strings/resources/ios_strings_vi.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_vi.xtb
@@ -226,6 +226,7 @@
 <translation id="2576499762020411840">Sử dụng và lưu mật khẩu trong Tài khoản Google của bạn</translation>
 <translation id="2578571896248130439">Gửi trang web</translation>
 <translation id="2584132361465095047">Thêm tài khoản...</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{Các thẻ đang mở mà bạn đã không sử dụng trong một hoặc nhiều ngày sẽ được chuyển đến Thẻ không hoạt động để bạn có thể dễ dàng tập trung vào các thẻ mà bạn sử dụng nhiều nhất. Bạn có thể thay đổi tuỳ chọn này bất kỳ lúc nào trong phần cài đặt.}other{Các thẻ đang mở mà bạn đã không sử dụng trong {COUNT} ngày trở lên sẽ được chuyển đến Thẻ không hoạt động để bạn có thể dễ dàng tập trung vào các thẻ mà bạn sử dụng nhiều nhất. Bạn có thể thay đổi tuỳ chọn này bất kỳ lúc nào trong phần cài đặt.}}</translation>
 <translation id="2600682495497606169">Xóa cookie của trang web</translation>
 <translation id="2609008503159898744">Đóng tất cả thẻ?</translation>
 <translation id="2625189173221582860">Đã sao chép mật khẩu</translation>
@@ -256,7 +257,6 @@
 <translation id="2718352093833049315">Chỉ qua Wi-Fi</translation>
 <translation id="2747003861858887689">Trường trước</translation>
 <translation id="2749231692441336879">Đang theo dõi <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">vừa xong</translation>
 <translation id="2772667768515195373">Bạn có thể sử dụng địa chỉ đã lưu trên các sản phẩm của Google. Địa chỉ này được lưu trong Tài khoản Google <ph name="USER_EMAIL" /> của bạn.</translation>
 <translation id="2773292004659987824">Lượt tìm kiếm ẩn danh</translation>
 <translation id="277771892408211951">Chọn ngôn ngữ</translation>
@@ -573,6 +573,7 @@
 <translation id="4844899002472726590">Xem và chỉnh sửa những chủ đề bạn quan tâm</translation>
 <translation id="4848999860252535517">Xoá mật khẩu dùng cho <ph name="WEBSITE" />?</translation>
 <translation id="4854345657858711387">Đặt mật mã</translation>
+<translation id="4856498338299082007">Trong Tài khoản Google của bạn</translation>
 <translation id="4858786880085262208">Nâng cấp lên HTTPS (khi có thể). Các trang web an toàn có thể nhúng nội dung không an toàn.</translation>
 <translation id="4860895144060829044">Gọi</translation>
 <translation id="4872323082491632254">Kiểm tra mật khẩu</translation>
@@ -1089,6 +1090,7 @@
 <translation id="821809831108207540">Để cá nhân hoá trang Khám phá và Chrome, hãy đăng nhập và bật tính năng đồng bộ hoá.</translation>
 <translation id="8225985093977202398">Tệp và hình ảnh được lưu vào bộ nhớ đệm</translation>
 <translation id="8237382152611443140">Mở chế độ Cài đặt tự động điền mật khẩu</translation>
+<translation id="8248969482078657578">Thẻ không hoạt động giúp bạn giữ tập trung</translation>
 <translation id="8261506727792406068">Xoá</translation>
 <translation id="8264966119170358612">Một số mật khẩu bạn lưu đã bị lộ trong một sự cố rò rỉ dữ liệu xảy ra ngoài Google. <ph name="BEGIN_LINK" />Tìm hiểu thêm<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">Chỉ trên thiết bị này</translation>

ios/chrome/app/strings/resources/ios_strings_zh-CN.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_zh-CN.xtb b/ios/chrome/app/strings/resources/ios_strings_zh-CN.xtb
index 2814356c..1ee65de 100644
--- a/ios/chrome/app/strings/resources/ios_strings_zh-CN.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_zh-CN.xtb
@@ -217,6 +217,7 @@
 <translation id="2482878487686419369">通知</translation>
 <translation id="2496626742194544812">转到第一个标签页</translation>
 <translation id="2500374554657206846">保存密码的选项</translation>
+<translation id="2502415369140591438">有 <ph name="COUNT" /> 个重复使用的密码</translation>
 <translation id="2523363575747517183">该网站屡次尝试打开其他应用。</translation>
 <translation id="2529021024822217800">全部打开</translation>
 <translation id="2547458583188611426">同步功能无法正常运行。若要开始同步，请输入您的口令。</translation>
@@ -226,6 +227,7 @@
 <translation id="2576499762020411840">将密码保存到您的 Google 帐号并自动填充</translation>
 <translation id="2578571896248130439">发送网页</translation>
 <translation id="2584132361465095047">添加帐号…</translation>
+<translation id="2595587704210555261">{COUNT,plural, =1{如果打开的标签页未使用的时间达到或超过 1 天，则会移至“闲置标签页”部分，以便您能轻松地专注于最常使用的标签页。您随时可以在“设置”中更改此设置。}other{如果打开的标签页未使用的时间达到或超过 {COUNT} 天，则会移至“闲置标签页”部分，以便您能轻松地专注于最常使用的标签页。您随时可以在“设置”中更改此设置。}}</translation>
 <translation id="2600682495497606169">清除网站 Cookie</translation>
 <translation id="2609008503159898744">关闭所有标签页？</translation>
 <translation id="2625189173221582860">已复制密码</translation>
@@ -256,7 +258,6 @@
 <translation id="2718352093833049315">仅限使用 Wi-Fi 时</translation>
 <translation id="2747003861858887689">上一个字段</translation>
 <translation id="2749231692441336879">已关注“<ph name="CHANNEL_NAME" />”</translation>
-<translation id="2764831210418622012">刚刚</translation>
 <translation id="2772667768515195373">您可在各种 Google 产品中使用已保存的地址。这个地址已保存到您的 Google 帐号 (<ph name="USER_EMAIL" />)。</translation>
 <translation id="2773292004659987824">无痕搜索</translation>
 <translation id="277771892408211951">选择语言</translation>
@@ -294,6 +295,7 @@
 <translation id="2932085390869194046">建议密码…</translation>
 <translation id="2932765531295814441">手动添加密码</translation>
 <translation id="2952581218264071393">1. 打开 Chrome 设置</translation>
+<translation id="2953871438216280742">登录 Google 帐号，即可在您的帐号下打开或保存阅读清单。</translation>
 <translation id="2958718410589002129">密码</translation>
 <translation id="2961210776189273067">称谓</translation>
 <translation id="2964349545761222050">阻止第三方 Cookie</translation>
@@ -387,6 +389,7 @@
 <translation id="3581564640715911333">询问是否翻译其他语言版本的网页</translation>
 <translation id="3588820906588687999">在新标签页中打开图片</translation>
 <translation id="3595252146048399851">您随时可在<ph name="BEGIN_LINK" />设置<ph name="END_LINK" />中选择要同步的内容。Google 可能会根据您的历史记录在 Google 搜索及其他服务中为您提供个性化的体验。</translation>
+<translation id="3595588371156514964">{COUNT,plural, =1{有 {COUNT} 个安全系数低的密码}other{有 {COUNT} 个安全系数低的密码}}</translation>
 <translation id="3603009562372709545">复制链接网址</translation>
 <translation id="3607167657931203000">自动填充数据</translation>
 <translation id="3608008480985212611">登录后即可管理您的偏好设置。</translation>
@@ -573,6 +576,7 @@
 <translation id="4844899002472726590">查看和修改您感兴趣的主题</translation>
 <translation id="4848999860252535517">要删除用于登录 <ph name="WEBSITE" /> 的密码吗？</translation>
 <translation id="4854345657858711387">设置密码</translation>
+<translation id="4856498338299082007">保存在您的 Google 帐号中</translation>
 <translation id="4858786880085262208">尽可能升级到 HTTPS。安全网站可能会内嵌不安全的内容。</translation>
 <translation id="4860895144060829044">拨打</translation>
 <translation id="4872323082491632254">检查密码</translation>
@@ -624,6 +628,7 @@
 <translation id="5197255632782567636">互联网</translation>
 <translation id="5211488077761630279">允许“<ph name="SITE_NAME" />”使用您的<ph name="PERMISSION" />？</translation>
 <translation id="5219295696240154694">帮助我们为所有人改善网络安全环境</translation>
+<translation id="5221339005270097309">正在检查密码…</translation>
 <translation id="5228579091201413441">启用同步功能</translation>
 <translation id="5232485538978018676">使用受管理的帐号登录</translation>
 <translation id="5234764350956374838">关闭</translation>
@@ -663,6 +668,7 @@
 另外，您必须在“设置”的“常规”部分启用 Handoff 功能，并且您的设备必须使用同一个 iCloud 帐号。</translation>
 <translation id="5551897871312988470">询问是否翻译</translation>
 <translation id="5556459405103347317">重新加载</translation>
+<translation id="555749644339804659">正在检查密码…</translation>
 <translation id="556042886152191864">按钮</translation>
 <translation id="5597915316964418992">打开标签页网格</translation>
 <translation id="560322036295180549">已被贵组织关闭</translation>
@@ -1089,6 +1095,7 @@
 <translation id="821809831108207540">如要对“探索”信息流和 Chrome 进行个性化设置，请登录帐号并开启同步功能。</translation>
 <translation id="8225985093977202398">缓存的图片和文件</translation>
 <translation id="8237382152611443140">打开用于自动填充密码的设置</translation>
+<translation id="8248969482078657578">“闲置标签页”功能可帮助您保持专注</translation>
 <translation id="8261506727792406068">删除</translation>
 <translation id="8264966119170358612">您保存的密码中有一些已在非 Google 数据泄露事件中外泄。<ph name="BEGIN_LINK" />了解详情<ph name="END_LINK" /></translation>
 <translation id="8265018477030547118">仅在该设备上</translation>

ios/chrome/app/strings/resources/ios_strings_zh-HK.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_zh-HK.xtb b/ios/chrome/app/strings/resources/ios_strings_zh-HK.xtb
index d293309..84bd1405 100644
--- a/ios/chrome/app/strings/resources/ios_strings_zh-HK.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_zh-HK.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">僅限 Wi-Fi 連線時</translation>
 <translation id="2747003861858887689">上一個欄位</translation>
 <translation id="2749231692441336879">正在追蹤 <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">剛剛</translation>
 <translation id="2772667768515195373">您可在不同的 Google 產品中使用已儲存的地址。此地址已儲存在您的 Google 帳戶 (<ph name="USER_EMAIL" />)。</translation>
 <translation id="2773292004659987824">無痕搜尋</translation>
 <translation id="277771892408211951">選取語言</translation>

ios/chrome/app/strings/resources/ios_strings_zh-TW.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_zh-TW.xtb b/ios/chrome/app/strings/resources/ios_strings_zh-TW.xtb
index fe9389a0..88293d7 100644
--- a/ios/chrome/app/strings/resources/ios_strings_zh-TW.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_zh-TW.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">僅限連上 Wi-Fi 網路時</translation>
 <translation id="2747003861858887689">上一個欄位</translation>
 <translation id="2749231692441336879">正在追蹤「<ph name="CHANNEL_NAME" />」</translation>
-<translation id="2764831210418622012">剛剛</translation>
 <translation id="2772667768515195373">你可以在各項 Google 產品中使用已儲存的地址。系統會將這個地址儲存到 Google 帳戶 (<ph name="USER_EMAIL" />) 中。</translation>
 <translation id="2773292004659987824">無痕搜尋</translation>
 <translation id="277771892408211951">選取語言</translation>

ios/chrome/app/strings/resources/ios_strings_zu.xtb

diff --git a/ios/chrome/app/strings/resources/ios_strings_zu.xtb b/ios/chrome/app/strings/resources/ios_strings_zu.xtb
index c73f8a7..e65e902 100644
--- a/ios/chrome/app/strings/resources/ios_strings_zu.xtb
+++ b/ios/chrome/app/strings/resources/ios_strings_zu.xtb
@@ -256,7 +256,6 @@
 <translation id="2718352093833049315">Ku-Wi-Fi kuphela</translation>
 <translation id="2747003861858887689">Inkambu edlule</translation>
 <translation id="2749231692441336879">Ukulandela <ph name="CHANNEL_NAME" /></translation>
-<translation id="2764831210418622012">khona manje</translation>
 <translation id="2772667768515195373">Ungasebenzisa amakheli alondoloziwe kuyo yonke imikhiqizo ye-Google. Leli kheli lilondolozwe ku-Google Account yakho, <ph name="USER_EMAIL" />.</translation>
 <translation id="2773292004659987824">Usesho lwe-Incognito</translation>
 <translation id="277771892408211951">Khetha ulimi</translation>

ios/chrome/browser/crash_report/BUILD.gn

diff --git a/ios/chrome/browser/crash_report/BUILD.gn b/ios/chrome/browser/crash_report/BUILD.gn
index f210165..44c819c8 100644
--- a/ios/chrome/browser/crash_report/BUILD.gn
+++ b/ios/chrome/browser/crash_report/BUILD.gn
@@ -73,7 +73,7 @@
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/paths",
     "//ios/chrome/browser/shared/public/features",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/web_state_list",
     "//ios/web",

ios/chrome/browser/shared/ui/symbols/BUILD.gn

diff --git a/ios/chrome/browser/shared/ui/symbols/BUILD.gn b/ios/chrome/browser/shared/ui/symbols/BUILD.gn
index c146bbd..8cada1e 100644
--- a/ios/chrome/browser/shared/ui/symbols/BUILD.gn
+++ b/ios/chrome/browser/shared/ui/symbols/BUILD.gn
@@ -1,9 +1,148 @@
-# Copyright 2023 The Chromium Authors
+# Copyright 2016 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/buildflag_header.gni")
+import("//build/config/ios/ios_sdk.gni")
+
+declare_args() {
+  # This defines targets to include branded icons.
+  ios_branded_icons = ":branded"
+}
+
+_use_branded_symbols = get_label_info(":branded", "label_no_toolchain") !=
+                       get_label_info(ios_branded_icons, "label_no_toolchain")
+
+buildflag_header("buildflags") {
+  header = "buildflags.h"
+  flags = [ "IOS_USE_BRANDED_SYMBOLS=$_use_branded_symbols" ]
+}
+
+source_set("icons") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "chrome_icon.h",
+    "chrome_icon.mm",
+  ]
+  deps = [
+    "//base",
+    "//ios/chrome/app/strings",
+    "//third_party/material_design_icons:ic_arrow_back",
+    "//third_party/material_design_icons:ic_chevron_right",
+    "//third_party/material_design_icons:ic_close",
+    "//third_party/material_design_icons:ic_info",
+    "//third_party/material_design_icons:ic_search",
+    "//ui/base",
+  ]
+  frameworks = [
+    "CoreGraphics.framework",
+    "UIKit.framework",
+  ]
+}
+
 source_set("symbols") {
   configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [ "symbols.h" ]
-  deps = [ "//ios/chrome/browser/ui/icons:symbols" ]
+  public = [ "symbols.h" ]
+  sources = [
+    "symbol_configurations.h",
+    "symbol_configurations.mm",
+    "symbol_helpers.h",
+    "symbol_helpers.mm",
+    "symbol_names.h",
+    "symbol_names.mm",
+  ]
+  deps = [
+    ":buildflags",
+    "//base",
+    "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols/resources:arrow_clockwise",
+    "//ios/chrome/browser/shared/ui/symbols/resources:arrow_triangle_slash_circlepath",
+    "//ios/chrome/browser/shared/ui/symbols/resources:camera",
+    "//ios/chrome/browser/shared/ui/symbols/resources:camera_fill",
+    "//ios/chrome/browser/shared/ui/symbols/resources:camera_lens",
+    "//ios/chrome/browser/shared/ui/symbols/resources:checkerboard_shield",
+    "//ios/chrome/browser/shared/ui/symbols/resources:checkermark_shield",
+    "//ios/chrome/browser/shared/ui/symbols/resources:chrome_product",
+    "//ios/chrome/browser/shared/ui/symbols/resources:cloud_and_arrow_up",
+    "//ios/chrome/browser/shared/ui/symbols/resources:cloud_slash",
+    "//ios/chrome/browser/shared/ui/symbols/resources:dino",
+    "//ios/chrome/browser/shared/ui/symbols/resources:incognito",
+    "//ios/chrome/browser/shared/ui/symbols/resources:incognito_circle_fill",
+    "//ios/chrome/browser/shared/ui/symbols/resources:incognito_circle_fill_ios14",
+    "//ios/chrome/browser/shared/ui/symbols/resources:language",
+    "//ios/chrome/browser/shared/ui/symbols/resources:laptopcomputer_and_phone",
+    "//ios/chrome/browser/shared/ui/symbols/resources:legacy_cloud_and_arrow_up",
+    "//ios/chrome/browser/shared/ui/symbols/resources:legacy_cloud_slash",
+    "//ios/chrome/browser/shared/ui/symbols/resources:legacy_plus_circle_fill",
+    "//ios/chrome/browser/shared/ui/symbols/resources:line_downtrend",
+    "//ios/chrome/browser/shared/ui/symbols/resources:location",
+    "//ios/chrome/browser/shared/ui/symbols/resources:location.fill",
+    "//ios/chrome/browser/shared/ui/symbols/resources:password",
+    "//ios/chrome/browser/shared/ui/symbols/resources:password_manager",
+    "//ios/chrome/browser/shared/ui/symbols/resources:photo_badge_magnifyingglass",
+    "//ios/chrome/browser/shared/ui/symbols/resources:photo_badge_plus",
+    "//ios/chrome/browser/shared/ui/symbols/resources:plus_circle_fill",
+    "//ios/chrome/browser/shared/ui/symbols/resources:plus_circle_fill_ios14",
+    "//ios/chrome/browser/shared/ui/symbols/resources:popup_badge_minus",
+    "//ios/chrome/browser/shared/ui/symbols/resources:shield",
+    "//ios/chrome/browser/shared/ui/symbols/resources:square_bullet_square",
+    "//ios/chrome/browser/shared/ui/symbols/resources:square_number",
+    "//ios/chrome/browser/shared/ui/symbols/resources:tab_grid_new_tab_button_incognito_ios14",
+    "//ios/chrome/browser/shared/ui/symbols/resources:tab_grid_new_tab_button_ios14",
+    "//ios/chrome/browser/shared/ui/symbols/resources:tab_grid_new_tab_floating_button_incognito_ios14",
+    "//ios/chrome/browser/shared/ui/symbols/resources:tab_grid_new_tab_floating_button_ios14",
+    "//ios/chrome/browser/shared/ui/symbols/resources:translate",
+    "//ios/chrome/browser/shared/ui/symbols/resources:tuner",
+    "//ios/chrome/common/ui/colors",
+    ios_branded_icons,
+  ]
+
+  # This icon uses template format version 4 but catalyst only currently supports version 3. See details in crbug.com/1392708#c28.
+  if (target_environment != "catalyst") {
+    deps += [
+      "//ios/chrome/browser/shared/ui/symbols/resources:multicolor_password",
+    ]
+  }
+}
+
+source_set("symbols_views") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "colorful_background_symbol_view.h",
+    "colorful_background_symbol_view.mm",
+  ]
+  deps = [
+    ":symbols",
+    "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/table_view:cells_constants",
+    "//ios/chrome/common/ui/util",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [ "chrome_icon_unittest.mm" ]
+  deps = [
+    ":icons",
+    "//testing/gtest",
+    "//third_party/ocmock",
+    "//ui/base",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+# TODO(crbug.com/734054): remove this target when the downstream repository
+# has been fixed to directly depends on the individual targets.
+group("assets") {
+  deps = [
+    "//third_party/material_design_icons:ic_arrow_back",
+    "//third_party/material_design_icons:ic_chevron_right",
+    "//third_party/material_design_icons:ic_close",
+    "//third_party/material_design_icons:ic_info",
+    "//third_party/material_design_icons:ic_search",
+  ]
+}
+
+group("branded") {
+  # Empty in the non-branded repo.
 }

ios/chrome/browser/shared/ui/symbols/OWNERS

diff --git a/ios/chrome/browser/ui/icons/OWNERS b/ios/chrome/browser/shared/ui/symbols/OWNERS
similarity index 100%
rename from ios/chrome/browser/ui/icons/OWNERS
rename to ios/chrome/browser/shared/ui/symbols/OWNERS

ios/chrome/browser/shared/ui/symbols/chrome_icon.h

diff --git a/ios/chrome/browser/ui/icons/chrome_icon.h b/ios/chrome/browser/shared/ui/symbols/chrome_icon.h
similarity index 82%
rename from ios/chrome/browser/ui/icons/chrome_icon.h
rename to ios/chrome/browser/shared/ui/symbols/chrome_icon.h
index af15422..ed64a1a 100644
--- a/ios/chrome/browser/ui/icons/chrome_icon.h
+++ b/ios/chrome/browser/shared/ui/symbols/chrome_icon.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_UI_ICONS_CHROME_ICON_H_
-#define IOS_CHROME_BROWSER_UI_ICONS_CHROME_ICON_H_
+#ifndef IOS_CHROME_BROWSER_SHARED_UI_SYMBOLS_CHROME_ICON_H_
+#define IOS_CHROME_BROWSER_SHARED_UI_SYMBOLS_CHROME_ICON_H_
 
 #import <UIKit/UIKit.h>
 
@@ -28,4 +28,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_ICONS_CHROME_ICON_H_
+#endif  // IOS_CHROME_BROWSER_SHARED_UI_SYMBOLS_CHROME_ICON_H_

ios/chrome/browser/shared/ui/symbols/chrome_icon.mm

diff --git a/ios/chrome/browser/ui/icons/chrome_icon.mm b/ios/chrome/browser/shared/ui/symbols/chrome_icon.mm
similarity index 90%
rename from ios/chrome/browser/ui/icons/chrome_icon.mm
rename to ios/chrome/browser/shared/ui/symbols/chrome_icon.mm
index a96d2514..66072aca 100644
--- a/ios/chrome/browser/ui/icons/chrome_icon.mm
+++ b/ios/chrome/browser/shared/ui/symbols/chrome_icon.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/icons/chrome_icon.h"
+#import "ios/chrome/browser/shared/ui/symbols/chrome_icon.h"
 
 #import <CoreGraphics/CoreGraphics.h>
 
@@ -17,14 +17,18 @@
 namespace {
 
 NSString* AccessibilityLabelForIconNamed(NSString* name) {
-  if ([name isEqualToString:@"ic_arrow_back"])
+  if ([name isEqualToString:@"ic_arrow_back"]) {
     return l10n_util::GetNSString(IDS_IOS_ICON_ARROW_BACK);
-  if ([name isEqualToString:@"ic_close"])
+  }
+  if ([name isEqualToString:@"ic_close"]) {
     return l10n_util::GetNSString(IDS_IOS_ICON_CLOSE);
-  if ([name isEqualToString:@"ic_info"])
+  }
+  if ([name isEqualToString:@"ic_info"]) {
     return l10n_util::GetNSString(IDS_IOS_ICON_INFO);
-  if ([name isEqualToString:@"ic_search"])
+  }
+  if ([name isEqualToString:@"ic_search"]) {
     return l10n_util::GetNSString(IDS_IOS_ICON_SEARCH);
+  }
   return nil;
 }
 

ios/chrome/browser/shared/ui/symbols/chrome_icon_unittest.mm

diff --git a/ios/chrome/browser/ui/icons/chrome_icon_unittest.mm b/ios/chrome/browser/shared/ui/symbols/chrome_icon_unittest.mm
similarity index 97%
rename from ios/chrome/browser/ui/icons/chrome_icon_unittest.mm
rename to ios/chrome/browser/shared/ui/symbols/chrome_icon_unittest.mm
index f298daa..cc5224b 100644
--- a/ios/chrome/browser/ui/icons/chrome_icon_unittest.mm
+++ b/ios/chrome/browser/shared/ui/symbols/chrome_icon_unittest.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/icons/chrome_icon.h"
+#import "ios/chrome/browser/shared/ui/symbols/chrome_icon.h"
 
 #import "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"

ios/chrome/browser/shared/ui/symbols/colorful_background_symbol_view.h

diff --git a/ios/chrome/browser/ui/icons/colorful_background_symbol_view.h b/ios/chrome/browser/shared/ui/symbols/colorful_background_symbol_view.h
similarity index 83%
rename from ios/chrome/browser/ui/icons/colorful_background_symbol_view.h
rename to ios/chrome/browser/shared/ui/symbols/colorful_background_symbol_view.h
index 8c49eea..f283937 100644
--- a/ios/chrome/browser/ui/icons/colorful_background_symbol_view.h
+++ b/ios/chrome/browser/shared/ui/symbols/colorful_background_symbol_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_UI_ICONS_COLORFUL_BACKGROUND_SYMBOL_VIEW_H_
-#define IOS_CHROME_BROWSER_UI_ICONS_COLORFUL_BACKGROUND_SYMBOL_VIEW_H_
+#ifndef IOS_CHROME_BROWSER_SHARED_UI_SYMBOLS_COLORFUL_BACKGROUND_SYMBOL_VIEW_H_
+#define IOS_CHROME_BROWSER_SHARED_UI_SYMBOLS_COLORFUL_BACKGROUND_SYMBOL_VIEW_H_
 
 #import <UIKit/UIKit.h>
 
@@ -37,4 +37,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_ICONS_COLORFUL_BACKGROUND_SYMBOL_VIEW_H_
+#endif  // IOS_CHROME_BROWSER_SHARED_UI_SYMBOLS_COLORFUL_BACKGROUND_SYMBOL_VIEW_H_

ios/chrome/browser/shared/ui/symbols/colorful_background_symbol_view.mm

diff --git a/ios/chrome/browser/ui/icons/colorful_background_symbol_view.mm b/ios/chrome/browser/shared/ui/symbols/colorful_background_symbol_view.mm
similarity index 93%
rename from ios/chrome/browser/ui/icons/colorful_background_symbol_view.mm
rename to ios/chrome/browser/shared/ui/symbols/colorful_background_symbol_view.mm
index f4ea63f..6f7e086 100644
--- a/ios/chrome/browser/ui/icons/colorful_background_symbol_view.mm
+++ b/ios/chrome/browser/shared/ui/symbols/colorful_background_symbol_view.mm
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/icons/colorful_background_symbol_view.h"
+#import "ios/chrome/browser/shared/ui/symbols/colorful_background_symbol_view.h"
 
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/table_view/table_view_cells_constants.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"

ios/chrome/browser/shared/ui/symbols/resources/BUILD.gn

diff --git a/ios/chrome/browser/ui/icons/resources/BUILD.gn b/ios/chrome/browser/shared/ui/symbols/resources/BUILD.gn
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/BUILD.gn
rename to ios/chrome/browser/shared/ui/symbols/resources/BUILD.gn

ios/chrome/browser/shared/ui/symbols/resources/arrow_clockwise.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/arrow_clockwise.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/arrow_clockwise.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/arrow_clockwise.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/arrow_clockwise.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/arrow_clockwise.symbolset/arrow.clockwise.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/arrow_clockwise.symbolset/arrow.clockwise.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/arrow_clockwise.symbolset/arrow.clockwise.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/arrow_clockwise.symbolset/arrow.clockwise.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/arrow_clockwise.symbolset/arrow.clockwise.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/arrow_triangle_slash_circlepath.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/arrow_triangle_slash_circlepath.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/arrow_triangle_slash_circlepath.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/arrow_triangle_slash_circlepath.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/arrow_triangle_slash_circlepath.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/arrow_triangle_slash_circlepath.symbolset/arrow.triangle.slash.circlepath.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/arrow_triangle_slash_circlepath.symbolset/arrow.triangle.slash.circlepath.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/arrow_triangle_slash_circlepath.symbolset/arrow.triangle.slash.circlepath.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/arrow_triangle_slash_circlepath.symbolset/arrow.triangle.slash.circlepath.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/arrow_triangle_slash_circlepath.symbolset/arrow.triangle.slash.circlepath.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/camera.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/camera.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/camera.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/camera.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/camera.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/camera.symbolset/camera.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/camera.symbolset/camera.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/camera.symbolset/camera.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/camera.symbolset/camera.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/camera.symbolset/camera.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/camera_fill.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/camera_fill.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/camera_fill.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/camera_fill.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/camera_fill.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/camera_fill.symbolset/camera.fill.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/camera_fill.symbolset/camera.fill.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/camera_fill.symbolset/camera.fill.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/camera_fill.symbolset/camera.fill.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/camera_fill.symbolset/camera.fill.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/camera_lens.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/camera_lens.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/camera_lens.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/camera_lens.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/camera_lens.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/camera_lens.symbolset/camera.lens.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/camera_lens.symbolset/camera.lens.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/camera_lens.symbolset/camera.lens.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/camera_lens.symbolset/camera.lens.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/camera_lens.symbolset/camera.lens.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/checkerboard_shield.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/checkerboard_shield.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/checkerboard_shield.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/checkerboard_shield.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/checkerboard_shield.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/checkerboard_shield.symbolset/checkerboard.shield.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/checkerboard_shield.symbolset/checkerboard.shield.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/checkerboard_shield.symbolset/checkerboard.shield.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/checkerboard_shield.symbolset/checkerboard.shield.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/checkerboard_shield.symbolset/checkerboard.shield.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/checkermark_shield.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/checkermark_shield.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/checkermark_shield.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/checkermark_shield.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/checkermark_shield.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/checkermark_shield.symbolset/checkermark.shield.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/checkermark_shield.symbolset/checkermark.shield.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/checkermark_shield.symbolset/checkermark.shield.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/checkermark_shield.symbolset/checkermark.shield.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/checkermark_shield.symbolset/checkermark.shield.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/chrome_product.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/chrome_product.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/chrome_product.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/chrome_product.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/chrome_product.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/chrome_product.symbolset/chrome.product.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/chrome_product.symbolset/chrome.product.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/chrome_product.symbolset/chrome.product.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/chrome_product.symbolset/chrome.product.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/chrome_product.symbolset/chrome.product.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/cloud_and_arrow_up.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/cloud_and_arrow_up.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/cloud_and_arrow_up.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/cloud_and_arrow_up.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/cloud_and_arrow_up.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/cloud_and_arrow_up.symbolset/cloud.and.arrow.up.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/cloud_and_arrow_up.symbolset/cloud.and.arrow.up.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/cloud_and_arrow_up.symbolset/cloud.and.arrow.up.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/cloud_and_arrow_up.symbolset/cloud.and.arrow.up.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/cloud_and_arrow_up.symbolset/cloud.and.arrow.up.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/cloud_slash.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/cloud_slash.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/cloud_slash.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/cloud_slash.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/cloud_slash.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/cloud_slash.symbolset/cloud.slash.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/cloud_slash.symbolset/cloud.slash.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/cloud_slash.symbolset/cloud.slash.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/cloud_slash.symbolset/cloud.slash.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/cloud_slash.symbolset/cloud.slash.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/dino.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/dino.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/dino.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/dino.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/dino.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/dino.symbolset/dino.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/dino.symbolset/dino.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/dino.symbolset/dino.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/dino.symbolset/dino.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/dino.symbolset/dino.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/incognito.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/incognito.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/incognito.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/incognito.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/incognito.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/incognito.symbolset/incognito.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/incognito.symbolset/incognito.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/incognito.symbolset/incognito.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/incognito.symbolset/incognito.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/incognito.symbolset/incognito.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/incognito_circle_fill.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/incognito_circle_fill.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/incognito_circle_fill.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/incognito_circle_fill.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/incognito_circle_fill.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/incognito_circle_fill.symbolset/incognito.circle.fill.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/incognito_circle_fill.symbolset/incognito.circle.fill.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/incognito_circle_fill.symbolset/incognito.circle.fill.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/incognito_circle_fill.symbolset/incognito.circle.fill.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/incognito_circle_fill.symbolset/incognito.circle.fill.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/incognito_circle_fill_ios14.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/incognito_circle_fill_ios14.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/incognito_circle_fill_ios14.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/incognito_circle_fill_ios14.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/incognito_circle_fill_ios14.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/incognito_circle_fill_ios14.symbolset/incognito.circle.fill.ios14.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/incognito_circle_fill_ios14.symbolset/incognito.circle.fill.ios14.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/incognito_circle_fill_ios14.symbolset/incognito.circle.fill.ios14.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/incognito_circle_fill_ios14.symbolset/incognito.circle.fill.ios14.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/incognito_circle_fill_ios14.symbolset/incognito.circle.fill.ios14.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/language.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/language.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/language.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/language.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/language.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/language.symbolset/language.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/language.symbolset/language.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/language.symbolset/language.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/language.symbolset/language.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/language.symbolset/language.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/laptopcomputer_and_phone.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/laptopcomputer_and_phone.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/laptopcomputer_and_phone.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/laptopcomputer_and_phone.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/laptopcomputer_and_phone.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/laptopcomputer_and_phone.symbolset/laptopcomputer.and.phone.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/laptopcomputer_and_phone.symbolset/laptopcomputer.and.phone.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/laptopcomputer_and_phone.symbolset/laptopcomputer.and.phone.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/laptopcomputer_and_phone.symbolset/laptopcomputer.and.phone.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/laptopcomputer_and_phone.symbolset/laptopcomputer.and.phone.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/legacy_cloud_and_arrow_up.imageset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/legacy_cloud_and_arrow_up.imageset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/legacy_cloud_and_arrow_up.imageset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/legacy_cloud_and_arrow_up.imageset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/legacy_cloud_and_arrow_up.imageset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/legacy_cloud_and_arrow_up.imageset/legacy_cloud_and_arrow_up@2x.png

diff --git a/ios/chrome/browser/ui/icons/resources/legacy_cloud_and_arrow_up.imageset/legacy_cloud_and_arrow_up@2x.png b/ios/chrome/browser/shared/ui/symbols/resources/legacy_cloud_and_arrow_up.imageset/legacy_cloud_and_arrow_up@2x.png
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/legacy_cloud_and_arrow_up.imageset/legacy_cloud_and_arrow_up@2x.png
rename to ios/chrome/browser/shared/ui/symbols/resources/legacy_cloud_and_arrow_up.imageset/legacy_cloud_and_arrow_up@2x.png
Binary files differ

ios/chrome/browser/shared/ui/symbols/resources/legacy_cloud_and_arrow_up.imageset/legacy_cloud_and_arrow_up@3x.png

diff --git a/ios/chrome/browser/ui/icons/resources/legacy_cloud_and_arrow_up.imageset/legacy_cloud_and_arrow_up@3x.png b/ios/chrome/browser/shared/ui/symbols/resources/legacy_cloud_and_arrow_up.imageset/legacy_cloud_and_arrow_up@3x.png
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/legacy_cloud_and_arrow_up.imageset/legacy_cloud_and_arrow_up@3x.png
rename to ios/chrome/browser/shared/ui/symbols/resources/legacy_cloud_and_arrow_up.imageset/legacy_cloud_and_arrow_up@3x.png
Binary files differ

ios/chrome/browser/shared/ui/symbols/resources/legacy_cloud_slash.imageset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/legacy_cloud_slash.imageset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/legacy_cloud_slash.imageset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/legacy_cloud_slash.imageset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/legacy_cloud_slash.imageset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/legacy_cloud_slash.imageset/legacy_cloud_slash@2x.png

diff --git a/ios/chrome/browser/ui/icons/resources/legacy_cloud_slash.imageset/legacy_cloud_slash@2x.png b/ios/chrome/browser/shared/ui/symbols/resources/legacy_cloud_slash.imageset/legacy_cloud_slash@2x.png
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/legacy_cloud_slash.imageset/legacy_cloud_slash@2x.png
rename to ios/chrome/browser/shared/ui/symbols/resources/legacy_cloud_slash.imageset/legacy_cloud_slash@2x.png
Binary files differ

ios/chrome/browser/shared/ui/symbols/resources/legacy_cloud_slash.imageset/legacy_cloud_slash@3x.png

diff --git a/ios/chrome/browser/ui/icons/resources/legacy_cloud_slash.imageset/legacy_cloud_slash@3x.png b/ios/chrome/browser/shared/ui/symbols/resources/legacy_cloud_slash.imageset/legacy_cloud_slash@3x.png
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/legacy_cloud_slash.imageset/legacy_cloud_slash@3x.png
rename to ios/chrome/browser/shared/ui/symbols/resources/legacy_cloud_slash.imageset/legacy_cloud_slash@3x.png
Binary files differ

ios/chrome/browser/shared/ui/symbols/resources/legacy_plus_circle_fill.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/legacy_plus_circle_fill.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/legacy_plus_circle_fill.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/legacy_plus_circle_fill.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/legacy_plus_circle_fill.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/legacy_plus_circle_fill.symbolset/legacy.plus.circle.fill.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/legacy_plus_circle_fill.symbolset/legacy.plus.circle.fill.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/legacy_plus_circle_fill.symbolset/legacy.plus.circle.fill.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/legacy_plus_circle_fill.symbolset/legacy.plus.circle.fill.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/legacy_plus_circle_fill.symbolset/legacy.plus.circle.fill.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/line_downtrend.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/line_downtrend.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/line_downtrend.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/line_downtrend.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/line_downtrend.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/line_downtrend.symbolset/line.downtrend.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/line_downtrend.symbolset/line.downtrend.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/line_downtrend.symbolset/line.downtrend.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/line_downtrend.symbolset/line.downtrend.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/line_downtrend.symbolset/line.downtrend.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/location.fill.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/location.fill.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/location.fill.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/location.fill.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/location.fill.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/location.fill.symbolset/location.fill.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/location.fill.symbolset/location.fill.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/location.fill.symbolset/location.fill.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/location.fill.symbolset/location.fill.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/location.fill.symbolset/location.fill.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/location.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/location.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/location.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/location.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/location.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/location.symbolset/location.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/location.symbolset/location.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/location.symbolset/location.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/location.symbolset/location.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/location.symbolset/location.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/multicolor_password.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/multicolor_password.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/multicolor_password.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/multicolor_password.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/multicolor_password.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/multicolor_password.symbolset/multicolor.password.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/multicolor_password.symbolset/multicolor.password.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/multicolor_password.symbolset/multicolor.password.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/multicolor_password.symbolset/multicolor.password.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/multicolor_password.symbolset/multicolor.password.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/password.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/password.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/password.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/password.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/password.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/password.symbolset/password.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/password.symbolset/password.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/password.symbolset/password.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/password.symbolset/password.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/password.symbolset/password.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/password_manager.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/password_manager.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/password_manager.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/password_manager.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/password_manager.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/password_manager.symbolset/password.manager.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/password_manager.symbolset/password.manager.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/password_manager.symbolset/password.manager.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/password_manager.symbolset/password.manager.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/password_manager.symbolset/password.manager.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/photo_badge_magnifyingglass.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/photo_badge_magnifyingglass.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/photo_badge_magnifyingglass.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/photo_badge_magnifyingglass.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/photo_badge_magnifyingglass.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/photo_badge_magnifyingglass.symbolset/photo.badge.magnifyingglass.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/photo_badge_magnifyingglass.symbolset/photo.badge.magnifyingglass.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/photo_badge_magnifyingglass.symbolset/photo.badge.magnifyingglass.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/photo_badge_magnifyingglass.symbolset/photo.badge.magnifyingglass.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/photo_badge_magnifyingglass.symbolset/photo.badge.magnifyingglass.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/photo_badge_plus.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/photo_badge_plus.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/photo_badge_plus.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/photo_badge_plus.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/photo_badge_plus.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/photo_badge_plus.symbolset/photo.badge.plus.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/photo_badge_plus.symbolset/photo.badge.plus.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/photo_badge_plus.symbolset/photo.badge.plus.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/photo_badge_plus.symbolset/photo.badge.plus.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/photo_badge_plus.symbolset/photo.badge.plus.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/plus_circle_fill.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/plus_circle_fill.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill.symbolset/plus.circle.fill.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/plus_circle_fill.symbolset/plus.circle.fill.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill.symbolset/plus.circle.fill.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/plus_circle_fill.symbolset/plus.circle.fill.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill.symbolset/plus.circle.fill.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill_ios14.imageset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/plus_circle_fill_ios14.imageset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill_ios14.imageset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/plus_circle_fill_ios14.imageset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill_ios14.imageset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14@2x.png

diff --git a/ios/chrome/browser/ui/icons/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14@2x.png b/ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14@2x.png
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14@2x.png
rename to ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14@2x.png
Binary files differ

ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14@3x.png

diff --git a/ios/chrome/browser/ui/icons/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14@3x.png b/ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14@3x.png
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14@3x.png
rename to ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14@3x.png
Binary files differ

ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14_dark@2x.png

diff --git a/ios/chrome/browser/ui/icons/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14_dark@2x.png b/ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14_dark@2x.png
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14_dark@2x.png
rename to ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14_dark@2x.png
Binary files differ

ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14_dark@3x.png

diff --git a/ios/chrome/browser/ui/icons/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14_dark@3x.png b/ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14_dark@3x.png
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14_dark@3x.png
rename to ios/chrome/browser/shared/ui/symbols/resources/plus_circle_fill_ios14.imageset/plus_circle_fill_ios14_dark@3x.png
Binary files differ

ios/chrome/browser/shared/ui/symbols/resources/popup_badge_minus.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/popup_badge_minus.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/popup_badge_minus.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/popup_badge_minus.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/popup_badge_minus.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/popup_badge_minus.symbolset/popup.badge.minus.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/popup_badge_minus.symbolset/popup.badge.minus.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/popup_badge_minus.symbolset/popup.badge.minus.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/popup_badge_minus.symbolset/popup.badge.minus.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/popup_badge_minus.symbolset/popup.badge.minus.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/shield.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/shield.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/shield.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/shield.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/shield.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/shield.symbolset/shield.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/shield.symbolset/shield.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/shield.symbolset/shield.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/shield.symbolset/shield.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/shield.symbolset/shield.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/square_bullet_square.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/square_bullet_square.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/square_bullet_square.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/square_bullet_square.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/square_bullet_square.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/square_bullet_square.symbolset/square.bullet.square.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/square_bullet_square.symbolset/square.bullet.square.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/square_bullet_square.symbolset/square.bullet.square.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/square_bullet_square.symbolset/square.bullet.square.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/square_bullet_square.symbolset/square.bullet.square.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/square_number.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/square_number.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/square_number.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/square_number.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/square_number.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/square_number.symbolset/square.number.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/square_number.symbolset/square.number.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/square_number.symbolset/square.number.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/square_number.symbolset/square.number.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/square_number.symbolset/square.number.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_button_incognito_ios14.imageset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_button_incognito_ios14.imageset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_button_incognito_ios14.imageset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_button_incognito_ios14.imageset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_button_incognito_ios14.imageset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_button_incognito_ios14.imageset/tab_grid_new_tab_button_incognito_ios14@2x.png

diff --git a/ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_button_incognito_ios14.imageset/tab_grid_new_tab_button_incognito_ios14@2x.png b/ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_button_incognito_ios14.imageset/tab_grid_new_tab_button_incognito_ios14@2x.png
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_button_incognito_ios14.imageset/tab_grid_new_tab_button_incognito_ios14@2x.png
rename to ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_button_incognito_ios14.imageset/tab_grid_new_tab_button_incognito_ios14@2x.png
Binary files differ

ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_button_incognito_ios14.imageset/tab_grid_new_tab_button_incognito_ios14@3x.png

diff --git a/ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_button_incognito_ios14.imageset/tab_grid_new_tab_button_incognito_ios14@3x.png b/ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_button_incognito_ios14.imageset/tab_grid_new_tab_button_incognito_ios14@3x.png
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_button_incognito_ios14.imageset/tab_grid_new_tab_button_incognito_ios14@3x.png
rename to ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_button_incognito_ios14.imageset/tab_grid_new_tab_button_incognito_ios14@3x.png
Binary files differ

ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_button_ios14.imageset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_button_ios14.imageset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_button_ios14.imageset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_button_ios14.imageset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_button_ios14.imageset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_button_ios14.imageset/tab_grid_new_tab_button_ios14@2x.png

diff --git a/ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_button_ios14.imageset/tab_grid_new_tab_button_ios14@2x.png b/ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_button_ios14.imageset/tab_grid_new_tab_button_ios14@2x.png
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_button_ios14.imageset/tab_grid_new_tab_button_ios14@2x.png
rename to ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_button_ios14.imageset/tab_grid_new_tab_button_ios14@2x.png
Binary files differ

ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_button_ios14.imageset/tab_grid_new_tab_button_ios14@3x.png

diff --git a/ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_button_ios14.imageset/tab_grid_new_tab_button_ios14@3x.png b/ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_button_ios14.imageset/tab_grid_new_tab_button_ios14@3x.png
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_button_ios14.imageset/tab_grid_new_tab_button_ios14@3x.png
rename to ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_button_ios14.imageset/tab_grid_new_tab_button_ios14@3x.png
Binary files differ

ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_floating_button_incognito_ios14.imageset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_floating_button_incognito_ios14.imageset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_floating_button_incognito_ios14.imageset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_floating_button_incognito_ios14.imageset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_floating_button_incognito_ios14.imageset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_floating_button_incognito_ios14.imageset/tab_grid_new_tab_floating_button_incognito_ios14@2x.png

diff --git a/ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_floating_button_incognito_ios14.imageset/tab_grid_new_tab_floating_button_incognito_ios14@2x.png b/ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_floating_button_incognito_ios14.imageset/tab_grid_new_tab_floating_button_incognito_ios14@2x.png
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_floating_button_incognito_ios14.imageset/tab_grid_new_tab_floating_button_incognito_ios14@2x.png
rename to ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_floating_button_incognito_ios14.imageset/tab_grid_new_tab_floating_button_incognito_ios14@2x.png
Binary files differ

ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_floating_button_incognito_ios14.imageset/tab_grid_new_tab_floating_button_incognito_ios14@3x.png

diff --git a/ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_floating_button_incognito_ios14.imageset/tab_grid_new_tab_floating_button_incognito_ios14@3x.png b/ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_floating_button_incognito_ios14.imageset/tab_grid_new_tab_floating_button_incognito_ios14@3x.png
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_floating_button_incognito_ios14.imageset/tab_grid_new_tab_floating_button_incognito_ios14@3x.png
rename to ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_floating_button_incognito_ios14.imageset/tab_grid_new_tab_floating_button_incognito_ios14@3x.png
Binary files differ

ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_floating_button_ios14.imageset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_floating_button_ios14.imageset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_floating_button_ios14.imageset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_floating_button_ios14.imageset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_floating_button_ios14.imageset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_floating_button_ios14.imageset/tab_grid_new_tab_floating_button_ios14@2x.png

diff --git a/ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_floating_button_ios14.imageset/tab_grid_new_tab_floating_button_ios14@2x.png b/ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_floating_button_ios14.imageset/tab_grid_new_tab_floating_button_ios14@2x.png
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_floating_button_ios14.imageset/tab_grid_new_tab_floating_button_ios14@2x.png
rename to ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_floating_button_ios14.imageset/tab_grid_new_tab_floating_button_ios14@2x.png
Binary files differ

ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_floating_button_ios14.imageset/tab_grid_new_tab_floating_button_ios14@3x.png

diff --git a/ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_floating_button_ios14.imageset/tab_grid_new_tab_floating_button_ios14@3x.png b/ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_floating_button_ios14.imageset/tab_grid_new_tab_floating_button_ios14@3x.png
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/tab_grid_new_tab_floating_button_ios14.imageset/tab_grid_new_tab_floating_button_ios14@3x.png
rename to ios/chrome/browser/shared/ui/symbols/resources/tab_grid_new_tab_floating_button_ios14.imageset/tab_grid_new_tab_floating_button_ios14@3x.png
Binary files differ

ios/chrome/browser/shared/ui/symbols/resources/translate.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/translate.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/translate.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/translate.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/translate.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/translate.symbolset/translate.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/translate.symbolset/translate.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/translate.symbolset/translate.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/translate.symbolset/translate.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/translate.symbolset/translate.cr.svg

ios/chrome/browser/shared/ui/symbols/resources/tuner.symbolset/Contents.json

diff --git a/ios/chrome/browser/ui/icons/resources/tuner.symbolset/Contents.json b/ios/chrome/browser/shared/ui/symbols/resources/tuner.symbolset/Contents.json
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/tuner.symbolset/Contents.json
rename to ios/chrome/browser/shared/ui/symbols/resources/tuner.symbolset/Contents.json

ios/chrome/browser/shared/ui/symbols/resources/tuner.symbolset/tuner.cr.svg

diff --git a/ios/chrome/browser/ui/icons/resources/tuner.symbolset/tuner.cr.svg b/ios/chrome/browser/shared/ui/symbols/resources/tuner.symbolset/tuner.cr.svg
similarity index 100%
rename from ios/chrome/browser/ui/icons/resources/tuner.symbolset/tuner.cr.svg
rename to ios/chrome/browser/shared/ui/symbols/resources/tuner.symbolset/tuner.cr.svg

ios/chrome/browser/shared/ui/symbols/symbol_configurations.h

diff --git a/ios/chrome/browser/ui/icons/symbol_configurations.h b/ios/chrome/browser/shared/ui/symbols/symbol_configurations.h
similarity index 86%
rename from ios/chrome/browser/ui/icons/symbol_configurations.h
rename to ios/chrome/browser/shared/ui/symbols/symbol_configurations.h
index 1101bd48..a7229c7 100644
--- a/ios/chrome/browser/ui/icons/symbol_configurations.h
+++ b/ios/chrome/browser/shared/ui/symbols/symbol_configurations.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_UI_ICONS_SYMBOL_CONFIGURATIONS_H_
-#define IOS_CHROME_BROWSER_UI_ICONS_SYMBOL_CONFIGURATIONS_H_
+#ifndef IOS_CHROME_BROWSER_SHARED_UI_SYMBOLS_SYMBOL_CONFIGURATIONS_H_
+#define IOS_CHROME_BROWSER_SHARED_UI_SYMBOLS_SYMBOL_CONFIGURATIONS_H_
 
 #import <UIKit/UIKit.h>
 
@@ -42,4 +42,4 @@
 // Returns the cloud slash tint color.
 UIColor* CloudSlashTintColor();
 
-#endif  // IOS_CHROME_BROWSER_UI_ICONS_SYMBOL_CONFIGURATIONS_H_
+#endif  // IOS_CHROME_BROWSER_SHARED_UI_SYMBOLS_SYMBOL_CONFIGURATIONS_H_

ios/chrome/browser/shared/ui/symbols/symbol_configurations.mm

diff --git a/ios/chrome/browser/ui/icons/symbol_configurations.mm b/ios/chrome/browser/shared/ui/symbols/symbol_configurations.mm
similarity index 93%
rename from ios/chrome/browser/ui/icons/symbol_configurations.mm
rename to ios/chrome/browser/shared/ui/symbols/symbol_configurations.mm
index 9a93ea02..6169c7f 100644
--- a/ios/chrome/browser/ui/icons/symbol_configurations.mm
+++ b/ios/chrome/browser/shared/ui/symbols/symbol_configurations.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/icons/symbol_configurations.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbol_configurations.h"
 
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 

ios/chrome/browser/shared/ui/symbols/symbol_helpers.h

diff --git a/ios/chrome/browser/ui/icons/symbol_helpers.h b/ios/chrome/browser/shared/ui/symbols/symbol_helpers.h
similarity index 93%
rename from ios/chrome/browser/ui/icons/symbol_helpers.h
rename to ios/chrome/browser/shared/ui/symbols/symbol_helpers.h
index f17c920..ea935e39 100644
--- a/ios/chrome/browser/ui/icons/symbol_helpers.h
+++ b/ios/chrome/browser/shared/ui/symbols/symbol_helpers.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_UI_ICONS_SYMBOL_HELPERS_H_
-#define IOS_CHROME_BROWSER_UI_ICONS_SYMBOL_HELPERS_H_
+#ifndef IOS_CHROME_BROWSER_SHARED_UI_SYMBOLS_SYMBOL_HELPERS_H_
+#define IOS_CHROME_BROWSER_SHARED_UI_SYMBOLS_SYMBOL_HELPERS_H_
 
 #import <UIKit/UIKit.h>
 
@@ -66,4 +66,4 @@
 // root screen, with multicolor enabled.
 UIImage* CustomSettingsRootMulticolorSymbol(NSString* symbol_name);
 
-#endif  // IOS_CHROME_BROWSER_UI_ICONS_SYMBOL_HELPERS_H_
+#endif  // IOS_CHROME_BROWSER_SHARED_UI_SYMBOLS_SYMBOL_HELPERS_H_

ios/chrome/browser/shared/ui/symbols/symbol_helpers.mm

diff --git a/ios/chrome/browser/ui/icons/symbol_helpers.mm b/ios/chrome/browser/shared/ui/symbols/symbol_helpers.mm
similarity index 96%
rename from ios/chrome/browser/ui/icons/symbol_helpers.mm
rename to ios/chrome/browser/shared/ui/symbols/symbol_helpers.mm
index 8b745dbe..f63895b2 100644
--- a/ios/chrome/browser/ui/icons/symbol_helpers.mm
+++ b/ios/chrome/browser/shared/ui/symbols/symbol_helpers.mm
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/icons/symbol_helpers.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbol_helpers.h"
 
 #import "base/check.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
-#import "ios/chrome/browser/ui/icons/symbol_configurations.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbol_configurations.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/chrome/browser/shared/ui/symbols/symbol_names.h

diff --git a/ios/chrome/browser/ui/icons/symbol_names.h b/ios/chrome/browser/shared/ui/symbols/symbol_names.h
similarity index 95%
rename from ios/chrome/browser/ui/icons/symbol_names.h
rename to ios/chrome/browser/shared/ui/symbols/symbol_names.h
index 582460f..8aa914f 100644
--- a/ios/chrome/browser/ui/icons/symbol_names.h
+++ b/ios/chrome/browser/shared/ui/symbols/symbol_names.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_UI_ICONS_SYMBOL_NAMES_H_
-#define IOS_CHROME_BROWSER_UI_ICONS_SYMBOL_NAMES_H_
+#ifndef IOS_CHROME_BROWSER_SHARED_UI_SYMBOLS_SYMBOL_NAMES_H_
+#define IOS_CHROME_BROWSER_SHARED_UI_SYMBOLS_SYMBOL_NAMES_H_
 
 #import <UIKit/UIKit.h>
 
 #import "build/build_config.h"
-#import "ios/chrome/browser/ui/icons/buildflags.h"
+#import "ios/chrome/browser/shared/ui/symbols/buildflags.h"
 
 /// *******
 /// Import `symbols.h` and not this file directly.
@@ -158,4 +158,4 @@
 extern NSString* const kLaptopSymbol;
 extern NSString* const kDesktopSymbol;
 
-#endif  // IOS_CHROME_BROWSER_UI_ICONS_SYMBOL_NAMES_H_
+#endif  // IOS_CHROME_BROWSER_SHARED_UI_SYMBOLS_SYMBOL_NAMES_H_

ios/chrome/browser/shared/ui/symbols/symbol_names.mm

diff --git a/ios/chrome/browser/ui/icons/symbol_names.mm b/ios/chrome/browser/shared/ui/symbols/symbol_names.mm
similarity index 98%
rename from ios/chrome/browser/ui/icons/symbol_names.mm
rename to ios/chrome/browser/shared/ui/symbols/symbol_names.mm
index 8cc8250..ae30169 100644
--- a/ios/chrome/browser/ui/icons/symbol_names.mm
+++ b/ios/chrome/browser/shared/ui/symbols/symbol_names.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/chrome/browser/ui/icons/symbol_names.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbol_names.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/chrome/browser/shared/ui/symbols/symbols.h

diff --git a/ios/chrome/browser/shared/ui/symbols/symbols.h b/ios/chrome/browser/shared/ui/symbols/symbols.h
index 4e22791..31563232 100644
--- a/ios/chrome/browser/shared/ui/symbols/symbols.h
+++ b/ios/chrome/browser/shared/ui/symbols/symbols.h
@@ -1,11 +1,14 @@
-// Copyright 2023 The Chromium Authors
+// Copyright 2022 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef IOS_CHROME_BROWSER_SHARED_UI_SYMBOLS_SYMBOLS_H_
 #define IOS_CHROME_BROWSER_SHARED_UI_SYMBOLS_SYMBOLS_H_
 
-// Temporary include.
-#import "ios/chrome/browser/ui/icons/symbols.h"
+// This is a umbrella header to make the imports easier. See
+// http://go/chrome-ios-symbols for usages.
+#import "ios/chrome/browser/shared/ui/symbols/symbol_configurations.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbol_helpers.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbol_names.h"
 
 #endif  // IOS_CHROME_BROWSER_SHARED_UI_SYMBOLS_SYMBOLS_H_

ios/chrome/browser/shared/ui/table_view/cells/BUILD.gn

diff --git a/ios/chrome/browser/shared/ui/table_view/cells/BUILD.gn b/ios/chrome/browser/shared/ui/table_view/cells/BUILD.gn
index b52f76e8d..0c8622ed 100644
--- a/ios/chrome/browser/shared/ui/table_view/cells/BUILD.gn
+++ b/ios/chrome/browser/shared/ui/table_view/cells/BUILD.gn
@@ -67,8 +67,8 @@
     "//ios/chrome/browser/shared/public/features",
     "//ios/chrome/browser/shared/ui/elements",
     "//ios/chrome/browser/shared/ui/list_model",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view:styler",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/settings/cells:public",
     "//ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/resources",
     "//ios/chrome/common:button_config",
@@ -108,9 +108,9 @@
     "//base/test:test_support",
     "//components/url_formatter",
     "//ios/chrome/browser/net:crurl",
+    "//ios/chrome/browser/shared/ui/symbols",
+    "//ios/chrome/browser/shared/ui/symbols:icons",
     "//ios/chrome/browser/shared/ui/table_view:styler",
-    "//ios/chrome/browser/ui/icons",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/table_view:cells_constants",
     "//net:net",

ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_icon_item_unittest.mm

diff --git a/ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_icon_item_unittest.mm b/ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_icon_item_unittest.mm
index 55336ae..d887b4b 100644
--- a/ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_icon_item_unittest.mm
+++ b/ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_icon_item_unittest.mm
@@ -5,10 +5,10 @@
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_icon_item.h"
 
 #import "base/mac/foundation_util.h"
+#import "ios/chrome/browser/shared/ui/symbols/chrome_icon.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_styler.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/chrome_icon.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/ui/table_view/table_view_cells_constants.h"
 #import "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"

ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_text_item.mm

diff --git a/ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_text_item.mm b/ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_text_item.mm
index 0da7eb4..e8ff318 100644
--- a/ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_text_item.mm
+++ b/ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_text_item.mm
@@ -4,9 +4,9 @@
 
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_text_item.h"
 
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_styler.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/table_view/table_view_cells_constants.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"

ios/chrome/browser/shared/ui/table_view/cells/table_view_info_button_cell.mm

diff --git a/ios/chrome/browser/shared/ui/table_view/cells/table_view_info_button_cell.mm b/ios/chrome/browser/shared/ui/table_view/cells/table_view_info_button_cell.mm
index 5d4369f3..79df57e 100644
--- a/ios/chrome/browser/shared/ui/table_view/cells/table_view_info_button_cell.mm
+++ b/ios/chrome/browser/shared/ui/table_view/cells/table_view_info_button_cell.mm
@@ -4,8 +4,8 @@
 
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_info_button_cell.h"
 
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/settings/cells/settings_cells_constants.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/table_view/table_view_cells_constants.h"

ios/chrome/browser/shared/ui/table_view/cells/table_view_item_unittest.mm

diff --git a/ios/chrome/browser/shared/ui/table_view/cells/table_view_item_unittest.mm b/ios/chrome/browser/shared/ui/table_view/cells/table_view_item_unittest.mm
index 7c026b22..ccc3317 100644
--- a/ios/chrome/browser/shared/ui/table_view/cells/table_view_item_unittest.mm
+++ b/ios/chrome/browser/shared/ui/table_view/cells/table_view_item_unittest.mm
@@ -4,8 +4,8 @@
 
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_item.h"
 
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_styler.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #import "testing/platform_test.h"

ios/chrome/browser/shared/ui/table_view/cells/table_view_multi_line_text_edit_item.mm

diff --git a/ios/chrome/browser/shared/ui/table_view/cells/table_view_multi_line_text_edit_item.mm b/ios/chrome/browser/shared/ui/table_view/cells/table_view_multi_line_text_edit_item.mm
index 73f0183..0075632 100644
--- a/ios/chrome/browser/shared/ui/table_view/cells/table_view_multi_line_text_edit_item.mm
+++ b/ios/chrome/browser/shared/ui/table_view/cells/table_view_multi_line_text_edit_item.mm
@@ -4,9 +4,9 @@
 
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_multi_line_text_edit_item.h"
 
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_multi_line_text_edit_item_delegate.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_styler.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/table_view/table_view_cells_constants.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"

ios/chrome/browser/shared/ui/table_view/cells/table_view_text_edit_item.mm

diff --git a/ios/chrome/browser/shared/ui/table_view/cells/table_view_text_edit_item.mm b/ios/chrome/browser/shared/ui/table_view/cells/table_view_text_edit_item.mm
index d9c9023..5a989450 100644
--- a/ios/chrome/browser/shared/ui/table_view/cells/table_view_text_edit_item.mm
+++ b/ios/chrome/browser/shared/ui/table_view/cells/table_view_text_edit_item.mm
@@ -6,11 +6,11 @@
 
 #import "base/notreached.h"
 #import "ios/chrome/browser/shared/ui/elements/extended_touch_target_button.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_edit_item_delegate.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_styler.h"
 #import "ios/chrome/browser/shared/ui/util/rtl_geometry.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/table_view/table_view_cells_constants.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"

ios/chrome/browser/shared/ui/util/BUILD.gn

diff --git a/ios/chrome/browser/shared/ui/util/BUILD.gn b/ios/chrome/browser/shared/ui/util/BUILD.gn
index 751ca0d..5a59bb8f 100644
--- a/ios/chrome/browser/shared/ui/util/BUILD.gn
+++ b/ios/chrome/browser/shared/ui/util/BUILD.gn
@@ -51,7 +51,7 @@
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/flags:system_flags",
     "//ios/chrome/browser/shared/public/features",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/common:button_config",
     "//ios/chrome/common:timing",
     "//ios/chrome/common/ui/util",

ios/chrome/browser/shared/ui/util/uikit_ui_util.mm

diff --git a/ios/chrome/browser/shared/ui/util/uikit_ui_util.mm b/ios/chrome/browser/shared/ui/util/uikit_ui_util.mm
index 430f4b6..a7dd86f 100644
--- a/ios/chrome/browser/shared/ui/util/uikit_ui_util.mm
+++ b/ios/chrome/browser/shared/ui/util/uikit_ui_util.mm
@@ -20,9 +20,9 @@
 #import "base/numerics/math_constants.h"
 #import "ios/chrome/browser/flags/system_flags.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/dynamic_type_util.h"
 #import "ios/chrome/browser/shared/ui/util/rtl_geometry.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/ui/util/ui_util.h"
 #import "ui/base/l10n/l10n_util.h"
 #import "ui/base/l10n/l10n_util_mac.h"

ios/chrome/browser/snapshots/snapshot_cache.mm

diff --git a/ios/chrome/browser/snapshots/snapshot_cache.mm b/ios/chrome/browser/snapshots/snapshot_cache.mm
index 45864ff..2afb1357 100644
--- a/ios/chrome/browser/snapshots/snapshot_cache.mm
+++ b/ios/chrome/browser/snapshots/snapshot_cache.mm
@@ -27,6 +27,7 @@
 #import "base/threading/scoped_blocking_call.h"
 #import "base/time/time.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
+#import "ios/chrome/browser/snapshots/features.h"
 #import "ios/chrome/browser/snapshots/snapshot_cache_observer.h"
 #import "ios/chrome/browser/snapshots/snapshot_lru_cache.h"
 #import "ios/chrome/browser/tabs/features.h"
@@ -163,6 +164,8 @@
 void WriteImageToDisk(UIImage* image, const base::FilePath& file_path) {
   if (!image)
     return;
+  // CGImage should exist, otherwise UIImageJPEG(PNG)Representation returns nil.
+  CHECK(image.CGImage);
 
   base::FilePath directory = file_path.DirName();
   if (!base::DirectoryExists(directory)) {
@@ -177,8 +180,14 @@
   NSString* path = base::SysUTF8ToNSString(file_path.AsUTF8Unsafe());
   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
                                                 base::BlockingType::WILL_BLOCK);
-  [UIImageJPEGRepresentation(image, kJPEGImageQuality) writeToFile:path
-                                                        atomically:YES];
+  NSData* data = UIImageJPEGRepresentation(image, kJPEGImageQuality);
+  if (!data && base::FeatureList::IsEnabled(kPDFSnapshot)) {
+    // Use UIImagePNGRepresentation instead when ImageJPEGRepresentation returns
+    // nil. It happens when the underlying CGImageRef contains data in an
+    // unsupported bitmap format.
+    data = UIImagePNGRepresentation(image);
+  }
+  [data writeToFile:path atomically:YES];
 
   // Encrypt the snapshot file (mostly for Incognito, but can't hurt to
   // always do it).

ios/chrome/browser/snapshots/snapshot_tab_helper.mm

diff --git a/ios/chrome/browser/snapshots/snapshot_tab_helper.mm b/ios/chrome/browser/snapshots/snapshot_tab_helper.mm
index 99831fa..9007ce9 100644
--- a/ios/chrome/browser/snapshots/snapshot_tab_helper.mm
+++ b/ios/chrome/browser/snapshots/snapshot_tab_helper.mm
@@ -8,7 +8,6 @@
 #import "base/memory/ptr_util.h"
 #import "base/metrics/histogram_macros.h"
 #import "base/task/sequenced_task_runner.h"
-#import "ios/chrome/browser/snapshots/features.h"
 #import "ios/chrome/browser/snapshots/snapshot_cache.h"
 #import "ios/chrome/browser/snapshots/snapshot_generator.h"
 #import "ios/web/public/thread/web_task_traits.h"
@@ -35,9 +34,6 @@
   kMaxValue = kSnapshotSucceeded,
 };
 
-// MIME type of PDF.
-const char kMimeTypePDF[] = "application/pdf";
-
 }  // namespace
 
 SnapshotTabHelper::~SnapshotTabHelper() {
@@ -63,14 +59,9 @@
 void SnapshotTabHelper::UpdateSnapshotWithCallback(void (^callback)(UIImage*)) {
   was_loading_during_last_snapshot_ = web_state_->IsLoading();
 
-  bool is_pdf = web_state_->GetContentsMimeType() == kMimeTypePDF;
   bool showing_native_content =
       web::GetWebClient()->IsAppSpecificURL(web_state_->GetLastCommittedURL());
-  bool can_use_wkwebview_api =
-      base::FeatureList::IsEnabled(kPDFSnapshot)
-          ? !is_pdf && !showing_native_content && web_state_->CanTakeSnapshot()
-          : !showing_native_content && web_state_->CanTakeSnapshot();
-  if (can_use_wkwebview_api) {
+  if (!showing_native_content && web_state_->CanTakeSnapshot()) {
     // Take the snapshot using the optimized WKWebView snapshotting API for
     // pages loaded in the web view when the WebState snapshot API is available.
     [snapshot_generator_ updateWebViewSnapshotWithCompletion:callback];

ios/chrome/browser/sync/BUILD.gn

diff --git a/ios/chrome/browser/sync/BUILD.gn b/ios/chrome/browser/sync/BUILD.gn
index 95a291b..5cd64b9 100644
--- a/ios/chrome/browser/sync/BUILD.gn
+++ b/ios/chrome/browser/sync/BUILD.gn
@@ -88,6 +88,7 @@
     "//ios/chrome/common",
     "//ios/components/webui:url_constants",
     "//ios/web",
+    "//ios/web/common:features",
     "//ios/web/public/session",
     "//net",
     "//ui/base",

ios/chrome/browser/sync/ios_chrome_synced_tab_delegate.h

diff --git a/ios/chrome/browser/sync/ios_chrome_synced_tab_delegate.h b/ios/chrome/browser/sync/ios_chrome_synced_tab_delegate.h
index 6ad2367..10916bf7 100644
--- a/ios/chrome/browser/sync/ios_chrome_synced_tab_delegate.h
+++ b/ios/chrome/browser/sync/ios_chrome_synced_tab_delegate.h
@@ -52,14 +52,17 @@
 
   explicit IOSChromeSyncedTabDelegate(web::WebState* web_state);
 
-  // Whether navigation data should be taken from session storage.
-  // Storage must be used if slim navigation is enabled and the tab has not be
-  // displayed.
-  // If the session storage must be used and was not fetched yet, bet it from
-  // `web_state_`.
+  // Returns whether the navigation data must be read from session storage.
+  // Can only be used if placeholder tabs support is not enabled. If this
+  // method returns true, then `session_storage_` must be used to get the
+  // navigation information.
   bool GetSessionStorageIfNeeded() const;
 
-  web::WebState* web_state_;
+  // The associated WebState.
+  web::WebState* const web_state_;
+
+  // The session storage for the WebState. Used only when the support for
+  // placeholder tabs is not enabled. Invalid to use otherwise.
   mutable CRWSessionStorage* session_storage_;
 
   WEB_STATE_USER_DATA_KEY_DECL();

ios/chrome/browser/sync/ios_chrome_synced_tab_delegate.mm

diff --git a/ios/chrome/browser/sync/ios_chrome_synced_tab_delegate.mm b/ios/chrome/browser/sync/ios_chrome_synced_tab_delegate.mm
index c7944b0..79481c21 100644
--- a/ios/chrome/browser/sync/ios_chrome_synced_tab_delegate.mm
+++ b/ios/chrome/browser/sync/ios_chrome_synced_tab_delegate.mm
@@ -4,11 +4,13 @@
 
 #import "ios/chrome/browser/sync/ios_chrome_synced_tab_delegate.h"
 
+#import "base/check.h"
 #import "components/sessions/ios/ios_serialized_navigation_builder.h"
 #import "components/sync_sessions/sync_sessions_client.h"
 #import "components/sync_sessions/synced_window_delegates_getter.h"
 #import "ios/chrome/browser/complex_tasks/ios_task_tab_helper.h"
 #import "ios/chrome/browser/sessions/ios_chrome_session_tab_helper.h"
+#import "ios/web/common/features.h"
 #import "ios/web/public/navigation/navigation_item.h"
 #import "ios/web/public/navigation/navigation_manager.h"
 #import "ios/web/public/session/crw_navigation_item_storage.h"
@@ -32,6 +34,23 @@
              : web_state->GetNavigationManager()->GetItemAtIndex(index);
 }
 
+// Returns whether placeholder tabs are supported.
+bool ArePlaceholderTabsSupported() {
+  // The support for placeholder tabs requires the WebState session id to be
+  // stable across application restart. It is the case since M-114 which added
+  // the code to save and restore the identifier. However, it also requires
+  // that the stable identifier is communicated to sync with the detail about
+  // the corresponding session which will happen as the application is used.
+  //
+  // Yet, placeholder tabs support is required to enable session restoration
+  // optimisations. As this will be launched later, it is expected that by
+  // that point, all existing sessions will have been converted to use the
+  // stable session id and the session state uploaded to sync. Thus it is
+  // safe to enable the support of placeholder tabs behind the same feature
+  // controlling the other session restoration optimisations.
+  return web::features::UseSessionSerializationOptimizations();
+}
+
 }  // namespace
 
 IOSChromeSyncedTabDelegate::IOSChromeSyncedTabDelegate(web::WebState* web_state)
@@ -58,6 +77,7 @@
 }
 
 bool IOSChromeSyncedTabDelegate::IsInitialBlankNavigation() const {
+  DCHECK(!IsPlaceholderTab());
   if (GetSessionStorageIfNeeded()) {
     return session_storage_.itemStorages.count == 0;
   }
@@ -65,6 +85,7 @@
 }
 
 int IOSChromeSyncedTabDelegate::GetCurrentEntryIndex() const {
+  DCHECK(!IsPlaceholderTab());
   if (GetSessionStorageIfNeeded()) {
     NSInteger lastCommittedIndex = session_storage_.lastCommittedItemIndex;
     if (lastCommittedIndex < 0 ||
@@ -85,6 +106,7 @@
 }
 
 int IOSChromeSyncedTabDelegate::GetEntryCount() const {
+  DCHECK(!IsPlaceholderTab());
   if (GetSessionStorageIfNeeded()) {
     return static_cast<int>(session_storage_.itemStorages.count);
   }
@@ -92,6 +114,7 @@
 }
 
 GURL IOSChromeSyncedTabDelegate::GetVirtualURLAtIndex(int i) const {
+  DCHECK(!IsPlaceholderTab());
   if (GetSessionStorageIfNeeded()) {
     DCHECK_GE(i, 0);
     NSArray<CRWNavigationItemStorage*>* item_storages =
@@ -106,12 +129,14 @@
 
 std::string IOSChromeSyncedTabDelegate::GetPageLanguageAtIndex(int i) const {
   // TODO(crbug.com/957657): Add page language to NavigationItem.
+  DCHECK(!IsPlaceholderTab());
   return std::string();
 }
 
 void IOSChromeSyncedTabDelegate::GetSerializedNavigationAtIndex(
     int i,
     sessions::SerializedNavigationEntry* serialized_entry) const {
+  DCHECK(!IsPlaceholderTab());
   if (GetSessionStorageIfNeeded()) {
     NSArray<CRWNavigationItemStorage*>* item_storages =
         session_storage_.itemStorages;
@@ -131,6 +156,7 @@
 }
 
 bool IOSChromeSyncedTabDelegate::ProfileHasChildAccount() const {
+  DCHECK(!IsPlaceholderTab());
   return false;
 }
 
@@ -141,16 +167,35 @@
 }
 
 bool IOSChromeSyncedTabDelegate::IsPlaceholderTab() const {
-  // GetSessionId is not restored so the tab get a new session ID.
-  // Placeholder tabs cannot be used.
+  // Can't be a placeholder tab if the support for placeholder tabs is not
+  // enabled.
+  if (!ArePlaceholderTabsSupported()) {
+    return false;
+  }
+
+  // A tab is considered as "placeholder" if it is not fully loaded. This
+  // corresponds to "unrealized" tabs or tabs that are still restoring their
+  // navigation history.
+  if (!web_state_->IsRealized()) {
+    return true;
+  }
+
+  if (web_state_->GetNavigationManager()->IsRestoreSessionInProgress()) {
+    return true;
+  }
+
+  // The WebState is realized and the navigation history fully loaded, the
+  // tab can be considered as valid for sync.
   return false;
 }
 
 bool IOSChromeSyncedTabDelegate::ShouldSync(
     sync_sessions::SyncSessionsClient* sessions_client) {
-  if (sessions_client->GetSyncedWindowDelegatesGetter()->FindById(
-          GetWindowId()) == nullptr)
+  DCHECK(!IsPlaceholderTab());
+  if (!sessions_client->GetSyncedWindowDelegatesGetter()->FindById(
+          GetWindowId())) {
     return false;
+  }
 
   if (IsInitialBlankNavigation())
     return false;  // This deliberately ignores a new pending entry.
@@ -168,6 +213,7 @@
 }
 
 int64_t IOSChromeSyncedTabDelegate::GetTaskIdForNavigationId(int nav_id) const {
+  DCHECK(!IsPlaceholderTab());
   const IOSContentRecordTaskId* record =
       IOSTaskTabHelper::FromWebState(web_state_)
           ->GetContextRecordTaskId(nav_id);
@@ -176,6 +222,7 @@
 
 int64_t IOSChromeSyncedTabDelegate::GetParentTaskIdForNavigationId(
     int nav_id) const {
+  DCHECK(!IsPlaceholderTab());
   const IOSContentRecordTaskId* record =
       IOSTaskTabHelper::FromWebState(web_state_)
           ->GetContextRecordTaskId(nav_id);
@@ -184,6 +231,7 @@
 
 int64_t IOSChromeSyncedTabDelegate::GetRootTaskIdForNavigationId(
     int nav_id) const {
+  DCHECK(!IsPlaceholderTab());
   const IOSContentRecordTaskId* record =
       IOSTaskTabHelper::FromWebState(web_state_)
           ->GetContextRecordTaskId(nav_id);
@@ -191,6 +239,13 @@
 }
 
 bool IOSChromeSyncedTabDelegate::GetSessionStorageIfNeeded() const {
+  // Never use the session storage when placeholder tabs support is enabled.
+  // In fact, using the session storage is a workaround to missing placeholder
+  // tab support.
+  if (ArePlaceholderTabsSupported()) {
+    return false;
+  }
+
   // Unrealized web states should always use session storage, regardless of
   // navigation items.
   if (!web_state_->IsRealized()) {

ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.mm

diff --git a/ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.mm b/ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.mm
index 0b37ca1..6df5d1e 100644
--- a/ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.mm
+++ b/ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.mm
@@ -156,6 +156,12 @@
       GetSyncedTabDelegateFromWebState(web_state);
   if (!tab)
     return;
+  // Some WebState event happen during the navigation restoration. Ignore
+  // them as the tab is still considered as placeholder by this point as
+  // the session cannot be forwarded to sync yet.
+  if (tab->IsPlaceholderTab()) {
+    return;
+  }
   if (handler_)
     handler_->OnLocalTabModified(tab);
   if (!tab->ShouldSync(sessions_client_))

ios/chrome/browser/ui/authentication/cells/BUILD.gn

diff --git a/ios/chrome/browser/ui/authentication/cells/BUILD.gn b/ios/chrome/browser/ui/authentication/cells/BUILD.gn
index 0bb0b62..7c3a17a9 100644
--- a/ios/chrome/browser/ui/authentication/cells/BUILD.gn
+++ b/ios/chrome/browser/ui/authentication/cells/BUILD.gn
@@ -28,11 +28,11 @@
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/signin:constants",
     "//ios/chrome/browser/signin:signin_util",
     "//ios/chrome/browser/ui/authentication/views",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/settings/cells:public",
     "//ios/chrome/common:button_config",

ios/chrome/browser/ui/authentication/cells/table_view_account_item.mm

diff --git a/ios/chrome/browser/ui/authentication/cells/table_view_account_item.mm b/ios/chrome/browser/ui/authentication/cells/table_view_account_item.mm
index 2c0764b..da9cd77 100644
--- a/ios/chrome/browser/ui/authentication/cells/table_view_account_item.mm
+++ b/ios/chrome/browser/ui/authentication/cells/table_view_account_item.mm
@@ -5,8 +5,8 @@
 #import "ios/chrome/browser/ui/authentication/cells/table_view_account_item.h"
 
 #import "base/mac/foundation_util.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/settings/cells/settings_cells_constants.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/table_view/table_view_cells_constants.h"

ios/chrome/browser/ui/authentication/tangible_sync/BUILD.gn

diff --git a/ios/chrome/browser/ui/authentication/tangible_sync/BUILD.gn b/ios/chrome/browser/ui/authentication/tangible_sync/BUILD.gn
index 465ef91..e852114 100644
--- a/ios/chrome/browser/ui/authentication/tangible_sync/BUILD.gn
+++ b/ios/chrome/browser/ui/authentication/tangible_sync/BUILD.gn
@@ -50,9 +50,9 @@
     "//components/signin/public/base",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/shared/ui/elements",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/first_run:field_trial",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/promo_style",
     "//ios/chrome/common/ui/util",

ios/chrome/browser/ui/authentication/tangible_sync/tangible_sync_view_controller.mm

diff --git a/ios/chrome/browser/ui/authentication/tangible_sync/tangible_sync_view_controller.mm b/ios/chrome/browser/ui/authentication/tangible_sync/tangible_sync_view_controller.mm
index 27e472c..3d46f9d 100644
--- a/ios/chrome/browser/ui/authentication/tangible_sync/tangible_sync_view_controller.mm
+++ b/ios/chrome/browser/ui/authentication/tangible_sync/tangible_sync_view_controller.mm
@@ -10,8 +10,8 @@
 #import "components/password_manager/core/common/password_manager_features.h"
 #import "components/signin/public/base/signin_metrics.h"
 #import "ios/chrome/browser/shared/ui/elements/instruction_view.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/authentication/signin/signin_constants.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"
 #import "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/ui/badges/BUILD.gn

diff --git a/ios/chrome/browser/ui/badges/BUILD.gn b/ios/chrome/browser/ui/badges/BUILD.gn
index e22f773..ccccf65 100644
--- a/ios/chrome/browser/ui/badges/BUILD.gn
+++ b/ios/chrome/browser/ui/badges/BUILD.gn
@@ -30,7 +30,7 @@
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/infobars:public",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ui/base",
   ]
 }
@@ -74,9 +74,9 @@
     "//ios/chrome/browser/shared/public/features",
     "//ios/chrome/browser/shared/ui/elements",
     "//ios/chrome/browser/shared/ui/list_model",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/ui/fullscreen:ui",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/resources:password_key",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web_state_list",

ios/chrome/browser/ui/badges/badge_button_factory.mm

diff --git a/ios/chrome/browser/ui/badges/badge_button_factory.mm b/ios/chrome/browser/ui/badges/badge_button_factory.mm
index 141dca25..3221d2b 100644
--- a/ios/chrome/browser/ui/badges/badge_button_factory.mm
+++ b/ios/chrome/browser/ui/badges/badge_button_factory.mm
@@ -9,11 +9,11 @@
 #import "base/notreached.h"
 #import "build/build_config.h"
 #import "components/password_manager/core/common/password_manager_features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/badges/badge_button.h"
 #import "ios/chrome/browser/ui/badges/badge_constants.h"
 #import "ios/chrome/browser/ui/badges/badge_delegate.h"
 #import "ios/chrome/browser/ui/badges/badge_overflow_menu_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/grit/ios_strings.h"
 #import "ui/base/l10n/l10n_util.h"

ios/chrome/browser/ui/badges/badge_mediator.mm

diff --git a/ios/chrome/browser/ui/badges/badge_mediator.mm b/ios/chrome/browser/ui/badges/badge_mediator.mm
index 31bf989..b997fc56 100644
--- a/ios/chrome/browser/ui/badges/badge_mediator.mm
+++ b/ios/chrome/browser/ui/badges/badge_mediator.mm
@@ -25,13 +25,13 @@
 #import "ios/chrome/browser/overlays/public/overlay_request_queue.h"
 #import "ios/chrome/browser/shared/public/commands/browser_coordinator_commands.h"
 #import "ios/chrome/browser/shared/ui/list_model/list_model.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/badges/badge_button.h"
 #import "ios/chrome/browser/ui/badges/badge_consumer.h"
 #import "ios/chrome/browser/ui/badges/badge_item.h"
 #import "ios/chrome/browser/ui/badges/badge_static_item.h"
 #import "ios/chrome/browser/ui/badges/badge_tappable_item.h"
 #import "ios/chrome/browser/ui/badges/badge_type_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/browser/web_state_list/web_state_list_observer_bridge.h"
 #import "ios/web/public/permissions/permissions.h"

ios/chrome/browser/ui/badges/badge_overflow_menu_util.mm

diff --git a/ios/chrome/browser/ui/badges/badge_overflow_menu_util.mm b/ios/chrome/browser/ui/badges/badge_overflow_menu_util.mm
index 69efa2d..5cb7f70 100644
--- a/ios/chrome/browser/ui/badges/badge_overflow_menu_util.mm
+++ b/ios/chrome/browser/ui/badges/badge_overflow_menu_util.mm
@@ -7,9 +7,9 @@
 #import "base/metrics/histogram_functions.h"
 #import "base/notreached.h"
 #import "components/strings/grit/components_strings.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/badges/badge_constants.h"
 #import "ios/chrome/browser/ui/badges/badges_histograms.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/grit/ios_strings.h"
 #import "ui/base/l10n/l10n_util.h"
 

ios/chrome/browser/ui/bookmarks/BUILD.gn

diff --git a/ios/chrome/browser/ui/bookmarks/BUILD.gn b/ios/chrome/browser/ui/bookmarks/BUILD.gn
index 910b4b4b..2c51c52a 100644
--- a/ios/chrome/browser/ui/bookmarks/BUILD.gn
+++ b/ios/chrome/browser/ui/bookmarks/BUILD.gn
@@ -116,9 +116,9 @@
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/flags:system_flags",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/sync",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/undo",
     "//ios/chrome/common/ui/colors",
     "//ios/third_party/material_components_ios",

ios/chrome/browser/ui/bookmarks/cells/BUILD.gn

diff --git a/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn b/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
index d2067f96..99c960a 100644
--- a/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
+++ b/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
@@ -22,14 +22,14 @@
     "//components/bookmarks/browser",
     "//components/url_formatter",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/shared/ui/symbols",
+    "//ios/chrome/browser/shared/ui/symbols:icons",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/shared/ui/table_view/cells",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication/cells",
     "//ios/chrome/browser/ui/bookmarks:constants",
     "//ios/chrome/browser/ui/bookmarks:utils",
-    "//ios/chrome/browser/ui/icons",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/ntp:logo",
     "//ios/chrome/common/ui/util",
     "//ios/third_party/material_components_ios",

ios/chrome/browser/ui/bookmarks/cells/bookmark_home_node_item.mm

diff --git a/ios/chrome/browser/ui/bookmarks/cells/bookmark_home_node_item.mm b/ios/chrome/browser/ui/bookmarks/cells/bookmark_home_node_item.mm
index 622fcd2..27e6cd1 100644
--- a/ios/chrome/browser/ui/bookmarks/cells/bookmark_home_node_item.mm
+++ b/ios/chrome/browser/ui/bookmarks/cells/bookmark_home_node_item.mm
@@ -8,10 +8,10 @@
 #import "base/strings/sys_string_conversions.h"
 #import "components/bookmarks/browser/bookmark_node.h"
 #import "components/url_formatter/elide_url.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_url_item.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h"
 #import "ios/chrome/browser/ui/bookmarks/cells/table_view_bookmarks_folder_item.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)

ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm

diff --git a/ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm b/ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm
index b9d5caee..37105af 100644
--- a/ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm
+++ b/ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm
@@ -7,10 +7,10 @@
 #import "base/i18n/rtl.h"
 #import "base/mac/foundation_util.h"
 #import "base/strings/sys_string_conversions.h"
+#import "ios/chrome/browser/shared/ui/symbols/chrome_icon.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_ui_constants.h"
-#import "ios/chrome/browser/ui/icons/chrome_icon.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"
 #import "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/ui/bookmarks/cells/table_view_bookmarks_folder_item.mm

diff --git a/ios/chrome/browser/ui/bookmarks/cells/table_view_bookmarks_folder_item.mm b/ios/chrome/browser/ui/bookmarks/cells/table_view_bookmarks_folder_item.mm
index 908ed2bc..d1f19ab 100644
--- a/ios/chrome/browser/ui/bookmarks/cells/table_view_bookmarks_folder_item.mm
+++ b/ios/chrome/browser/ui/bookmarks/cells/table_view_bookmarks_folder_item.mm
@@ -7,10 +7,10 @@
 #import "base/i18n/rtl.h"
 #import "base/mac/foundation_util.h"
 #import "base/strings/sys_string_conversions.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/rtl_geometry.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_ui_constants.h"
 #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_table_cell_title_edit_delegate.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/grit/ios_strings.h"
 #import "ui/base/l10n/l10n_util_mac.h"
 

ios/chrome/browser/ui/bookmarks/editor/BUILD.gn

diff --git a/ios/chrome/browser/ui/bookmarks/editor/BUILD.gn b/ios/chrome/browser/ui/bookmarks/editor/BUILD.gn
index efd46cd1..0ece3248 100644
--- a/ios/chrome/browser/ui/bookmarks/editor/BUILD.gn
+++ b/ios/chrome/browser/ui/bookmarks/editor/BUILD.gn
@@ -56,6 +56,9 @@
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
+    "//ios/chrome/browser/shared/ui/symbols",
+    "//ios/chrome/browser/shared/ui/symbols:icons",
+    "//ios/chrome/browser/shared/ui/symbols/resources:cloud_slash",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/shared/ui/table_view:utils",
@@ -66,9 +69,6 @@
     "//ios/chrome/browser/ui/bookmarks/cells",
     "//ios/chrome/browser/ui/bookmarks/folder_chooser",
     "//ios/chrome/browser/ui/bookmarks/folder_editor",
-    "//ios/chrome/browser/ui/icons",
-    "//ios/chrome/browser/ui/icons:symbols",
-    "//ios/chrome/browser/ui/icons/resources:cloud_slash",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/common/ui/util",

ios/chrome/browser/ui/bookmarks/editor/bookmarks_editor_view_controller.mm

diff --git a/ios/chrome/browser/ui/bookmarks/editor/bookmarks_editor_view_controller.mm b/ios/chrome/browser/ui/bookmarks/editor/bookmarks_editor_view_controller.mm
index cb218e8..8229c52 100644
--- a/ios/chrome/browser/ui/bookmarks/editor/bookmarks_editor_view_controller.mm
+++ b/ios/chrome/browser/ui/bookmarks/editor/bookmarks_editor_view_controller.mm
@@ -21,6 +21,7 @@
 #import "ios/chrome/browser/flags/system_flags.h"
 #import "ios/chrome/browser/main/browser.h"
 #import "ios/chrome/browser/shared/public/commands/snackbar_commands.h"
+#import "ios/chrome/browser/shared/ui/symbols/chrome_icon.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_header_footer_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_styler.h"
 #import "ios/chrome/browser/shared/ui/table_view/table_view_utils.h"
@@ -32,7 +33,6 @@
 #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.h"
 #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_text_field_item.h"
 #import "ios/chrome/browser/ui/bookmarks/editor/bookmarks_editor_mutator.h"
-#import "ios/chrome/browser/ui/icons/chrome_icon.h"
 #import "ios/chrome/browser/ui/image_util/image_util.h"
 #import "ios/chrome/browser/ui/keyboard/UIKeyCommand+Chrome.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"

ios/chrome/browser/ui/bookmarks/folder_chooser/BUILD.gn

diff --git a/ios/chrome/browser/ui/bookmarks/folder_chooser/BUILD.gn b/ios/chrome/browser/ui/bookmarks/folder_chooser/BUILD.gn
index 89bd5d1..6c6e22d 100644
--- a/ios/chrome/browser/ui/bookmarks/folder_chooser/BUILD.gn
+++ b/ios/chrome/browser/ui/bookmarks/folder_chooser/BUILD.gn
@@ -72,6 +72,7 @@
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/shared/ui/symbols:icons",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:utils",
     "//ios/chrome/browser/signin:signin",
@@ -79,7 +80,6 @@
     "//ios/chrome/browser/ui/bookmarks:constants",
     "//ios/chrome/browser/ui/bookmarks:utils",
     "//ios/chrome/browser/ui/bookmarks/cells",
-    "//ios/chrome/browser/ui/icons",
     "//ios/chrome/common/ui/colors",
     "//ui/base",
   ]

ios/chrome/browser/ui/bookmarks/folder_chooser/bookmarks_folder_chooser_view_controller.mm

diff --git a/ios/chrome/browser/ui/bookmarks/folder_chooser/bookmarks_folder_chooser_view_controller.mm b/ios/chrome/browser/ui/bookmarks/folder_chooser/bookmarks_folder_chooser_view_controller.mm
index 45e42d2d..7ee0898e 100644
--- a/ios/chrome/browser/ui/bookmarks/folder_chooser/bookmarks_folder_chooser_view_controller.mm
+++ b/ios/chrome/browser/ui/bookmarks/folder_chooser/bookmarks_folder_chooser_view_controller.mm
@@ -15,6 +15,7 @@
 #import "base/strings/sys_string_conversions.h"
 #import "components/bookmarks/browser/bookmark_model.h"
 #import "ios/chrome/browser/bookmarks/bookmark_model_bridge_observer.h"
+#import "ios/chrome/browser/shared/ui/symbols/chrome_icon.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_header_footer_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/table_view_utils.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_ui_constants.h"
@@ -22,7 +23,6 @@
 #import "ios/chrome/browser/ui/bookmarks/cells/table_view_bookmarks_folder_item.h"
 #import "ios/chrome/browser/ui/bookmarks/folder_chooser/bookmarks_folder_chooser_mutator.h"
 #import "ios/chrome/browser/ui/bookmarks/folder_chooser/bookmarks_folder_chooser_view_controller_presentation_delegate.h"
-#import "ios/chrome/browser/ui/icons/chrome_icon.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/grit/ios_strings.h"
 #import "ui/base/l10n/l10n_util_mac.h"

ios/chrome/browser/ui/bookmarks/folder_editor/BUILD.gn

diff --git a/ios/chrome/browser/ui/bookmarks/folder_editor/BUILD.gn b/ios/chrome/browser/ui/bookmarks/folder_editor/BUILD.gn
index b6593714..7a2fba6 100644
--- a/ios/chrome/browser/ui/bookmarks/folder_editor/BUILD.gn
+++ b/ios/chrome/browser/ui/bookmarks/folder_editor/BUILD.gn
@@ -65,6 +65,7 @@
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/shared/coordinator/alert",
     "//ios/chrome/browser/shared/public/commands",
+    "//ios/chrome/browser/shared/ui/symbols:icons",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/shared/ui/table_view:table_view",
     "//ios/chrome/browser/shared/ui/table_view:utils",
@@ -74,7 +75,6 @@
     "//ios/chrome/browser/ui/bookmarks:core",
     "//ios/chrome/browser/ui/bookmarks:utils",
     "//ios/chrome/browser/ui/bookmarks/cells",
-    "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/common/ui/util",

ios/chrome/browser/ui/bookmarks/folder_editor/bookmarks_folder_editor_view_controller.mm

diff --git a/ios/chrome/browser/ui/bookmarks/folder_editor/bookmarks_folder_editor_view_controller.mm b/ios/chrome/browser/ui/bookmarks/folder_editor/bookmarks_folder_editor_view_controller.mm
index f45a591..87c08318 100644
--- a/ios/chrome/browser/ui/bookmarks/folder_editor/bookmarks_folder_editor_view_controller.mm
+++ b/ios/chrome/browser/ui/bookmarks/folder_editor/bookmarks_folder_editor_view_controller.mm
@@ -22,6 +22,7 @@
 #import "ios/chrome/browser/main/browser.h"
 #import "ios/chrome/browser/shared/coordinator/alert/action_sheet_coordinator.h"
 #import "ios/chrome/browser/shared/public/commands/snackbar_commands.h"
+#import "ios/chrome/browser/shared/ui/symbols/chrome_icon.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_styler.h"
 #import "ios/chrome/browser/shared/ui/table_view/table_view_utils.h"
 #import "ios/chrome/browser/shared/ui/util/rtl_geometry.h"
@@ -31,7 +32,6 @@
 #import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h"
 #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.h"
 #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_text_field_item.h"
-#import "ios/chrome/browser/ui/icons/chrome_icon.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"
 #import "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/ui/bring_android_tabs/BUILD.gn

diff --git a/ios/chrome/browser/ui/bring_android_tabs/BUILD.gn b/ios/chrome/browser/ui/bring_android_tabs/BUILD.gn
index 829a2952..45e18c2 100644
--- a/ios/chrome/browser/ui/bring_android_tabs/BUILD.gn
+++ b/ios/chrome/browser/ui/bring_android_tabs/BUILD.gn
@@ -62,7 +62,7 @@
     "resources:bring_android_tabs_icon",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/shared/public/commands",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/common/ui/colors:swift",
     "//ios/chrome/common/ui/confirmation_alert",
     "//ui/base",

ios/chrome/browser/ui/bring_android_tabs/bring_android_tabs_swift_bridge.h

diff --git a/ios/chrome/browser/ui/bring_android_tabs/bring_android_tabs_swift_bridge.h b/ios/chrome/browser/ui/bring_android_tabs/bring_android_tabs_swift_bridge.h
index da0ab342..6374e638 100644
--- a/ios/chrome/browser/ui/bring_android_tabs/bring_android_tabs_swift_bridge.h
+++ b/ios/chrome/browser/ui/bring_android_tabs/bring_android_tabs_swift_bridge.h
@@ -8,9 +8,9 @@
 // Bridging header between Swift and Obj-C. These types/imports need to be pure
 // Obj-C and have no C++ in them.
 #import "ios/chrome/browser/shared/public/commands/bring_android_tabs_commands.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/bring_android_tabs/bring_android_tabs_prompt_view_controller_delegate.h"
 #import "ios/chrome/browser/ui/bring_android_tabs/constants.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/ui/confirmation_alert/confirmation_alert_action_handler.h"
 #import "ios/chrome/common/ui/confirmation_alert/confirmation_alert_view_controller.h"
 #import "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/ui/browser_container/BUILD.gn

diff --git a/ios/chrome/browser/ui/browser_container/BUILD.gn b/ios/chrome/browser/ui/browser_container/BUILD.gn
index 5dd2ff5..c642430 100644
--- a/ios/chrome/browser/ui/browser_container/BUILD.gn
+++ b/ios/chrome/browser/ui/browser_container/BUILD.gn
@@ -63,8 +63,8 @@
     "//base",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/link_to_text",
     "//ios/chrome/browser/ui/partial_translate",
     "//ios/chrome/common/ui/util",

ios/chrome/browser/ui/browser_container/browser_edit_menu_handler.mm

diff --git a/ios/chrome/browser/ui/browser_container/browser_edit_menu_handler.mm b/ios/chrome/browser/ui/browser_container/browser_edit_menu_handler.mm
index 82384e1..5c127e2 100644
--- a/ios/chrome/browser/ui/browser_container/browser_edit_menu_handler.mm
+++ b/ios/chrome/browser/ui/browser_container/browser_edit_menu_handler.mm
@@ -7,8 +7,8 @@
 #import "base/feature_list.h"
 #import "base/mac/foundation_util.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/link_to_text/link_to_text_delegate.h"
 #import "ios/chrome/browser/ui/partial_translate/partial_translate_delegate.h"
 #import "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/ui/bubble/BUILD.gn

diff --git a/ios/chrome/browser/ui/bubble/BUILD.gn b/ios/chrome/browser/ui/bubble/BUILD.gn
index d1d3ffda..7d13655 100644
--- a/ios/chrome/browser/ui/bubble/BUILD.gn
+++ b/ios/chrome/browser/ui/bubble/BUILD.gn
@@ -28,8 +28,8 @@
     "//ios/chrome/browser/flags:system_flags",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/url",
     "//ios/chrome/browser/url:constants",
     "//ios/chrome/common",

ios/chrome/browser/ui/bubble/bubble_view.mm

diff --git a/ios/chrome/browser/ui/bubble/bubble_view.mm b/ios/chrome/browser/ui/bubble/bubble_view.mm
index 960f72d..91a394c 100644
--- a/ios/chrome/browser/ui/bubble/bubble_view.mm
+++ b/ios/chrome/browser/ui/bubble/bubble_view.mm
@@ -10,10 +10,10 @@
 #import "base/ios/ios_util.h"
 #import "base/notreached.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/rtl_geometry.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
 #import "ios/chrome/browser/ui/bubble/bubble_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/button_configuration_util.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/ui/content_suggestions/BUILD.gn

diff --git a/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/ios/chrome/browser/ui/content_suggestions/BUILD.gn
index 0169f08..cc87880c 100644
--- a/ios/chrome/browser/ui/content_suggestions/BUILD.gn
+++ b/ios/chrome/browser/ui/content_suggestions/BUILD.gn
@@ -185,12 +185,12 @@
     "//ios/chrome/browser/shared/public/features",
     "//ios/chrome/browser/shared/ui/elements",
     "//ios/chrome/browser/shared/ui/list_model",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/ui/content_suggestions:metrics",
     "//ios/chrome/browser/ui/content_suggestions/cells",
     "//ios/chrome/browser/ui/content_suggestions/cells:constants",
     "//ios/chrome/browser/ui/content_suggestions/identifier",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/lens:lens_availability",
     "//ios/chrome/browser/ui/lens:lens_entrypoint",
     "//ios/chrome/browser/ui/ntp",
@@ -240,9 +240,9 @@
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/ui/content_suggestions/cells:constants",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/location_bar:constants",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/start_surface:feature_flags",

ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn

diff --git a/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn b/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn
index b23fa1f..cec0f16 100644
--- a/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn
+++ b/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn
@@ -37,6 +37,7 @@
     "//components/ntp_tiles",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/ui/content_suggestions:constants",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
@@ -44,7 +45,6 @@
     "//ios/chrome/browser/ui/content_suggestions:feature_flags",
     "//ios/chrome/browser/ui/content_suggestions:public",
     "//ios/chrome/browser/ui/content_suggestions/identifier",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/resources:module_shadow",
     "//ios/chrome/common:string_util",
@@ -71,8 +71,8 @@
 
   deps = [
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/ui/content_suggestions:feature_flags",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ui/base:base",
   ]
 }

ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_most_visited_action_item.mm

diff --git a/ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_most_visited_action_item.mm b/ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_most_visited_action_item.mm
index f2987c0..3dc6df1 100644
--- a/ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_most_visited_action_item.mm
+++ b/ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_most_visited_action_item.mm
@@ -5,8 +5,8 @@
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_most_visited_action_item.h"
 
 #import "base/check.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_tile_constants.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_shortcut_tile_view.mm

diff --git a/ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_shortcut_tile_view.mm b/ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_shortcut_tile_view.mm
index bd4f6be2..38297109 100644
--- a/ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_shortcut_tile_view.mm
+++ b/ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_shortcut_tile_view.mm
@@ -4,8 +4,8 @@
 
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_shortcut_tile_view.h"
 
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_most_visited_action_item.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"
 

ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_tile_constants.mm

diff --git a/ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_tile_constants.mm b/ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_tile_constants.mm
index c228ee1bd..904e819e 100644
--- a/ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_tile_constants.mm
+++ b/ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_tile_constants.mm
@@ -7,7 +7,7 @@
 #import "base/notreached.h"
 #import "base/strings/sys_string_conversions.h"
 #import "base/strings/utf_string_conversions.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/grit/ios_strings.h"
 #import "ui/base/l10n/l10n_util.h"
 

ios/chrome/browser/ui/content_suggestions/cells/query_suggestion_view.mm

diff --git a/ios/chrome/browser/ui/content_suggestions/cells/query_suggestion_view.mm b/ios/chrome/browser/ui/content_suggestions/cells/query_suggestion_view.mm
index ce06cb0c..fbb32241 100644
--- a/ios/chrome/browser/ui/content_suggestions/cells/query_suggestion_view.mm
+++ b/ios/chrome/browser/ui/content_suggestions/cells/query_suggestion_view.mm
@@ -4,8 +4,8 @@
 
 #import "ios/chrome/browser/ui/content_suggestions/cells/query_suggestion_view.h"
 
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_cells_constants.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"
 #import "url/gurl.h"

ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_utils.mm

diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_utils.mm b/ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_utils.mm
index 70018ad..86368f3 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_utils.mm
+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_utils.mm
@@ -7,9 +7,9 @@
 #import "base/i18n/rtl.h"
 #import "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
 #import "ios/chrome/browser/ui/content_suggestions/ntp_home_constant.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/location_bar/location_bar_constants.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_header_constants.h"
 #import "ios/chrome/browser/ui/start_surface/start_surface_features.h"

ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller.mm

diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller.mm b/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller.mm
index 87ee30ec..0ebf1e5 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller.mm
+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller.mm
@@ -19,6 +19,7 @@
 #import "ios/chrome/browser/shared/public/commands/omnibox_commands.h"
 #import "ios/chrome/browser/shared/public/commands/open_lens_input_selection_command.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/layout_guide_names.h"
 #import "ios/chrome/browser/shared/ui/util/named_guide.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
@@ -31,7 +32,6 @@
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller_delegate.h"
 #import "ios/chrome/browser/ui/content_suggestions/ntp_home_constant.h"
 #import "ios/chrome/browser/ui/content_suggestions/ntp_home_metrics.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/lens/lens_entrypoint.h"
 #import "ios/chrome/browser/ui/ntp/logo_vendor.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_controller_delegate.h"

ios/chrome/browser/ui/download/BUILD.gn

diff --git a/ios/chrome/browser/ui/download/BUILD.gn b/ios/chrome/browser/ui/download/BUILD.gn
index 86b092a..307e24f5 100644
--- a/ios/chrome/browser/ui/download/BUILD.gn
+++ b/ios/chrome/browser/ui/download/BUILD.gn
@@ -44,10 +44,10 @@
     "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/store_kit",
     "//ios/chrome/browser/ui/download/activities",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/main:layout_guide_util",
     "//ios/chrome/browser/ui/presenters",
     "//ios/chrome/browser/web:web_internal",

ios/chrome/browser/ui/download/activities/BUILD.gn

diff --git a/ios/chrome/browser/ui/download/activities/BUILD.gn b/ios/chrome/browser/ui/download/activities/BUILD.gn
index 53b4fc5..4d69ef9 100644
--- a/ios/chrome/browser/ui/download/activities/BUILD.gn
+++ b/ios/chrome/browser/ui/download/activities/BUILD.gn
@@ -14,7 +14,7 @@
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/download",
     "//ios/chrome/browser/shared/public/commands",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/ui/popup_menu/public:popup_menu_ui",
     "//ui/base",
   ]

ios/chrome/browser/ui/download/activities/open_downloads_folder_activity.mm

diff --git a/ios/chrome/browser/ui/download/activities/open_downloads_folder_activity.mm b/ios/chrome/browser/ui/download/activities/open_downloads_folder_activity.mm
index b6114a9..ef23d38 100644
--- a/ios/chrome/browser/ui/download/activities/open_downloads_folder_activity.mm
+++ b/ios/chrome/browser/ui/download/activities/open_downloads_folder_activity.mm
@@ -7,7 +7,7 @@
 #import "base/metrics/user_metrics.h"
 #import "base/metrics/user_metrics_action.h"
 #import "ios/chrome/browser/shared/public/commands/browser_coordinator_commands.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/grit/ios_strings.h"
 #import "ui/base/l10n/l10n_util_mac.h"
 

ios/chrome/browser/ui/download/download_manager_state_view.mm

diff --git a/ios/chrome/browser/ui/download/download_manager_state_view.mm b/ios/chrome/browser/ui/download/download_manager_state_view.mm
index bcdb185a..8709dc4 100644
--- a/ios/chrome/browser/ui/download/download_manager_state_view.mm
+++ b/ios/chrome/browser/ui/download/download_manager_state_view.mm
@@ -4,7 +4,7 @@
 
 #import "ios/chrome/browser/ui/download/download_manager_state_view.h"
 
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)

ios/chrome/browser/ui/download/download_manager_view_controller.mm

diff --git a/ios/chrome/browser/ui/download/download_manager_view_controller.mm b/ios/chrome/browser/ui/download/download_manager_view_controller.mm
index e7f9509d..fe8ab315 100644
--- a/ios/chrome/browser/ui/download/download_manager_view_controller.mm
+++ b/ios/chrome/browser/ui/download/download_manager_view_controller.mm
@@ -9,12 +9,12 @@
 #import "base/strings/sys_string_conversions.h"
 #import "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/download/download_manager_metric_names.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/layout_guide_names.h"
 #import "ios/chrome/browser/shared/ui/util/util_swift.h"
 #import "ios/chrome/browser/ui/download/download_manager_animation_constants.h"
 #import "ios/chrome/browser/ui/download/download_manager_state_view.h"
 #import "ios/chrome/browser/ui/download/radial_progress_view.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"
 #import "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/ui/follow/BUILD.gn

diff --git a/ios/chrome/browser/ui/follow/BUILD.gn b/ios/chrome/browser/ui/follow/BUILD.gn
index 409f7241..afde59c 100644
--- a/ios/chrome/browser/ui/follow/BUILD.gn
+++ b/ios/chrome/browser/ui/follow/BUILD.gn
@@ -67,7 +67,7 @@
     ":follow",
     "//base",
     "//ios/chrome/app/strings",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/confirmation_alert",
     "//ios/chrome/common/ui/favicon",

ios/chrome/browser/ui/follow/first_follow_view_controller.mm

diff --git a/ios/chrome/browser/ui/follow/first_follow_view_controller.mm b/ios/chrome/browser/ui/follow/first_follow_view_controller.mm
index aea4a93..2d6eff87 100644
--- a/ios/chrome/browser/ui/follow/first_follow_view_controller.mm
+++ b/ios/chrome/browser/ui/follow/first_follow_view_controller.mm
@@ -5,8 +5,8 @@
 #import "ios/chrome/browser/ui/follow/first_follow_view_controller.h"
 
 #import "base/strings/sys_string_conversions.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/follow/followed_web_channel.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/favicon/favicon_container_view.h"
 #import "ios/chrome/common/ui/favicon/favicon_view.h"

ios/chrome/browser/ui/icons/BUILD.gn

diff --git a/ios/chrome/browser/ui/icons/BUILD.gn b/ios/chrome/browser/ui/icons/BUILD.gn
deleted file mode 100644
index 19f627e..0000000
--- a/ios/chrome/browser/ui/icons/BUILD.gn
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 2016 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/buildflag_header.gni")
-import("//build/config/ios/ios_sdk.gni")
-
-declare_args() {
-  # This defines targets to include branded icons.
-  ios_branded_icons = ":branded"
-}
-
-_use_branded_symbols = get_label_info(":branded", "label_no_toolchain") !=
-                       get_label_info(ios_branded_icons, "label_no_toolchain")
-
-buildflag_header("buildflags") {
-  header = "buildflags.h"
-  flags = [ "IOS_USE_BRANDED_SYMBOLS=$_use_branded_symbols" ]
-}
-
-source_set("icons") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "chrome_icon.h",
-    "chrome_icon.mm",
-  ]
-  deps = [
-    "//base",
-    "//ios/chrome/app/strings",
-    "//third_party/material_design_icons:ic_arrow_back",
-    "//third_party/material_design_icons:ic_chevron_right",
-    "//third_party/material_design_icons:ic_close",
-    "//third_party/material_design_icons:ic_info",
-    "//third_party/material_design_icons:ic_search",
-    "//ui/base",
-  ]
-  frameworks = [
-    "CoreGraphics.framework",
-    "UIKit.framework",
-  ]
-}
-
-source_set("symbols") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  public = [ "symbols.h" ]
-  sources = [
-    "symbol_configurations.h",
-    "symbol_configurations.mm",
-    "symbol_helpers.h",
-    "symbol_helpers.mm",
-    "symbol_names.h",
-    "symbol_names.mm",
-  ]
-  deps = [
-    ":buildflags",
-    "//base",
-    "//ios/chrome/browser/shared/public/features",
-    "//ios/chrome/browser/ui/icons/resources:arrow_clockwise",
-    "//ios/chrome/browser/ui/icons/resources:arrow_triangle_slash_circlepath",
-    "//ios/chrome/browser/ui/icons/resources:camera",
-    "//ios/chrome/browser/ui/icons/resources:camera_fill",
-    "//ios/chrome/browser/ui/icons/resources:camera_lens",
-    "//ios/chrome/browser/ui/icons/resources:checkerboard_shield",
-    "//ios/chrome/browser/ui/icons/resources:checkermark_shield",
-    "//ios/chrome/browser/ui/icons/resources:chrome_product",
-    "//ios/chrome/browser/ui/icons/resources:cloud_and_arrow_up",
-    "//ios/chrome/browser/ui/icons/resources:cloud_slash",
-    "//ios/chrome/browser/ui/icons/resources:dino",
-    "//ios/chrome/browser/ui/icons/resources:incognito",
-    "//ios/chrome/browser/ui/icons/resources:incognito_circle_fill",
-    "//ios/chrome/browser/ui/icons/resources:incognito_circle_fill_ios14",
-    "//ios/chrome/browser/ui/icons/resources:language",
-    "//ios/chrome/browser/ui/icons/resources:laptopcomputer_and_phone",
-    "//ios/chrome/browser/ui/icons/resources:legacy_cloud_and_arrow_up",
-    "//ios/chrome/browser/ui/icons/resources:legacy_cloud_slash",
-    "//ios/chrome/browser/ui/icons/resources:legacy_plus_circle_fill",
-    "//ios/chrome/browser/ui/icons/resources:line_downtrend",
-    "//ios/chrome/browser/ui/icons/resources:location",
-    "//ios/chrome/browser/ui/icons/resources:location.fill",
-    "//ios/chrome/browser/ui/icons/resources:password",
-    "//ios/chrome/browser/ui/icons/resources:password_manager",
-    "//ios/chrome/browser/ui/icons/resources:photo_badge_magnifyingglass",
-    "//ios/chrome/browser/ui/icons/resources:photo_badge_plus",
-    "//ios/chrome/browser/ui/icons/resources:plus_circle_fill",
-    "//ios/chrome/browser/ui/icons/resources:plus_circle_fill_ios14",
-    "//ios/chrome/browser/ui/icons/resources:popup_badge_minus",
-    "//ios/chrome/browser/ui/icons/resources:shield",
-    "//ios/chrome/browser/ui/icons/resources:square_bullet_square",
-    "//ios/chrome/browser/ui/icons/resources:square_number",
-    "//ios/chrome/browser/ui/icons/resources:tab_grid_new_tab_button_incognito_ios14",
-    "//ios/chrome/browser/ui/icons/resources:tab_grid_new_tab_button_ios14",
-    "//ios/chrome/browser/ui/icons/resources:tab_grid_new_tab_floating_button_incognito_ios14",
-    "//ios/chrome/browser/ui/icons/resources:tab_grid_new_tab_floating_button_ios14",
-    "//ios/chrome/browser/ui/icons/resources:translate",
-    "//ios/chrome/browser/ui/icons/resources:tuner",
-    "//ios/chrome/common/ui/colors",
-    ios_branded_icons,
-  ]
-
-  # This icon uses template format version 4 but catalyst only currently supports version 3. See details in crbug.com/1392708#c28.
-  if (target_environment != "catalyst") {
-    deps += [ "//ios/chrome/browser/ui/icons/resources:multicolor_password" ]
-  }
-}
-
-source_set("symbols_views") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "colorful_background_symbol_view.h",
-    "colorful_background_symbol_view.mm",
-  ]
-  deps = [
-    ":symbols",
-    "//ios/chrome/common/ui/colors",
-    "//ios/chrome/common/ui/table_view:cells_constants",
-    "//ios/chrome/common/ui/util",
-  ]
-}
-
-source_set("unit_tests") {
-  testonly = true
-  sources = [ "chrome_icon_unittest.mm" ]
-  deps = [
-    ":icons",
-    "//testing/gtest",
-    "//third_party/ocmock",
-    "//ui/base",
-  ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
-# TODO(crbug.com/734054): remove this target when the downstream repository
-# has been fixed to directly depends on the individual targets.
-group("assets") {
-  deps = [
-    "//third_party/material_design_icons:ic_arrow_back",
-    "//third_party/material_design_icons:ic_chevron_right",
-    "//third_party/material_design_icons:ic_close",
-    "//third_party/material_design_icons:ic_info",
-    "//third_party/material_design_icons:ic_search",
-  ]
-}
-
-group("branded") {
-  # Empty in the non-branded repo.
-}

ios/chrome/browser/ui/icons/symbols.h

diff --git a/ios/chrome/browser/ui/icons/symbols.h b/ios/chrome/browser/ui/icons/symbols.h
deleted file mode 100644
index 5a5c7c3..0000000
--- a/ios/chrome/browser/ui/icons/symbols.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2022 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef IOS_CHROME_BROWSER_UI_ICONS_SYMBOLS_H_
-#define IOS_CHROME_BROWSER_UI_ICONS_SYMBOLS_H_
-
-// This is a umbrella header to make the imports easier. See
-// http://go/chrome-ios-symbols for usages.
-#import "ios/chrome/browser/ui/icons/symbol_configurations.h"
-#import "ios/chrome/browser/ui/icons/symbol_helpers.h"
-#import "ios/chrome/browser/ui/icons/symbol_names.h"
-
-#endif  // IOS_CHROME_BROWSER_UI_ICONS_SYMBOLS_H_

ios/chrome/browser/ui/incognito_reauth/BUILD.gn

diff --git a/ios/chrome/browser/ui/incognito_reauth/BUILD.gn b/ios/chrome/browser/ui/incognito_reauth/BUILD.gn
index 7a3bb34..4f2078e 100644
--- a/ios/chrome/browser/ui/incognito_reauth/BUILD.gn
+++ b/ios/chrome/browser/ui/incognito_reauth/BUILD.gn
@@ -38,7 +38,7 @@
   deps = [
     ":incognito_reauth_util",
     "//ios/chrome/app/strings",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/common/ui/util",
     "//ui/base",
   ]

ios/chrome/browser/ui/incognito_reauth/incognito_reauth_view.mm

diff --git a/ios/chrome/browser/ui/incognito_reauth/incognito_reauth_view.mm b/ios/chrome/browser/ui/incognito_reauth/incognito_reauth_view.mm
index 6f37845..6b04655 100644
--- a/ios/chrome/browser/ui/incognito_reauth/incognito_reauth_view.mm
+++ b/ios/chrome/browser/ui/incognito_reauth/incognito_reauth_view.mm
@@ -5,7 +5,7 @@
 #import "ios/chrome/browser/ui/incognito_reauth/incognito_reauth_view.h"
 
 #import "base/strings/sys_string_conversions.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/incognito_reauth/incognito_reauth_util.h"
 #import "ios/chrome/browser/ui/incognito_reauth/incognito_reauth_view_label.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"

ios/chrome/browser/ui/infobars/banners/BUILD.gn

diff --git a/ios/chrome/browser/ui/infobars/banners/BUILD.gn b/ios/chrome/browser/ui/infobars/banners/BUILD.gn
index 6c2aaf6..3ddf005 100644
--- a/ios/chrome/browser/ui/infobars/banners/BUILD.gn
+++ b/ios/chrome/browser/ui/infobars/banners/BUILD.gn
@@ -18,8 +18,8 @@
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/infobars:public",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/util",
     "//ui/base",

ios/chrome/browser/ui/infobars/banners/infobar_banner_view_controller.mm

diff --git a/ios/chrome/browser/ui/infobars/banners/infobar_banner_view_controller.mm b/ios/chrome/browser/ui/infobars/banners/infobar_banner_view_controller.mm
index 22618e10..113a2789 100644
--- a/ios/chrome/browser/ui/infobars/banners/infobar_banner_view_controller.mm
+++ b/ios/chrome/browser/ui/infobars/banners/infobar_banner_view_controller.mm
@@ -9,8 +9,8 @@
 #import "base/metrics/user_metrics_action.h"
 #import "base/time/time.h"
 #import "ios/chrome/browser/infobars/infobar_metrics_recorder.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/infobars/banners/infobar_banner_constants.h"
 #import "ios/chrome/browser/ui/infobars/banners/infobar_banner_delegate.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"

ios/chrome/browser/ui/infobars/modals/BUILD.gn

diff --git a/ios/chrome/browser/ui/infobars/modals/BUILD.gn b/ios/chrome/browser/ui/infobars/modals/BUILD.gn
index e2e95ad..4da6463 100644
--- a/ios/chrome/browser/ui/infobars/modals/BUILD.gn
+++ b/ios/chrome/browser/ui/infobars/modals/BUILD.gn
@@ -36,13 +36,13 @@
     "//ios/chrome/browser/infobars:public",
     "//ios/chrome/browser/net:crurl",
     "//ios/chrome/browser/passwords:public",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/ui/autofill:autofill_message",
     "//ios/chrome/browser/ui/autofill:autofill_metrics",
     "//ios/chrome/browser/ui/autofill/cells",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/infobars/coordinators:translate_public",
     "//ios/chrome/common/ui/table_view:cells_constants",
     "//ui/base",

ios/chrome/browser/ui/infobars/modals/autofill_address_profile/BUILD.gn

diff --git a/ios/chrome/browser/ui/infobars/modals/autofill_address_profile/BUILD.gn b/ios/chrome/browser/ui/infobars/modals/autofill_address_profile/BUILD.gn
index f6bd303..bf59d19 100644
--- a/ios/chrome/browser/ui/infobars/modals/autofill_address_profile/BUILD.gn
+++ b/ios/chrome/browser/ui/infobars/modals/autofill_address_profile/BUILD.gn
@@ -20,12 +20,12 @@
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/ui/autofill:autofill_ui_type",
     "//ios/chrome/browser/ui/autofill/cells",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/infobars/modals:modals",
     "//ios/chrome/browser/ui/infobars/modals:public",
     "//ios/chrome/browser/ui/settings/cells:cells",

ios/chrome/browser/ui/infobars/modals/autofill_address_profile/infobar_save_address_profile_table_view_controller.mm

diff --git a/ios/chrome/browser/ui/infobars/modals/autofill_address_profile/infobar_save_address_profile_table_view_controller.mm b/ios/chrome/browser/ui/infobars/modals/autofill_address_profile/infobar_save_address_profile_table_view_controller.mm
index 70ca97b0..65cea57 100644
--- a/ios/chrome/browser/ui/infobars/modals/autofill_address_profile/infobar_save_address_profile_table_view_controller.mm
+++ b/ios/chrome/browser/ui/infobars/modals/autofill_address_profile/infobar_save_address_profile_table_view_controller.mm
@@ -12,13 +12,13 @@
 #import "components/autofill/core/common/autofill_features.h"
 #import "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/infobars/infobar_metrics_recorder.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_button_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_styler.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
 #import "ios/chrome/browser/ui/autofill/autofill_ui_type.h"
 #import "ios/chrome/browser/ui/autofill/autofill_ui_type_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/infobars/modals/autofill_address_profile/infobar_save_address_profile_modal_delegate.h"
 #import "ios/chrome/browser/ui/infobars/modals/infobar_modal_constants.h"
 #import "ios/chrome/browser/ui/settings/cells/settings_image_detail_text_cell.h"

ios/chrome/browser/ui/infobars/modals/infobar_modal_view_controller.mm

diff --git a/ios/chrome/browser/ui/infobars/modals/infobar_modal_view_controller.mm b/ios/chrome/browser/ui/infobars/modals/infobar_modal_view_controller.mm
index cc3869d..745d96c 100644
--- a/ios/chrome/browser/ui/infobars/modals/infobar_modal_view_controller.mm
+++ b/ios/chrome/browser/ui/infobars/modals/infobar_modal_view_controller.mm
@@ -4,7 +4,7 @@
 
 #import "ios/chrome/browser/ui/infobars/modals/infobar_modal_view_controller.h"
 
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/infobars/modals/infobar_modal_constants.h"
 #import "ios/chrome/browser/ui/infobars/modals/infobar_modal_delegate.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"

ios/chrome/browser/ui/infobars/modals/infobar_password_table_view_controller.mm

diff --git a/ios/chrome/browser/ui/infobars/modals/infobar_password_table_view_controller.mm b/ios/chrome/browser/ui/infobars/modals/infobar_password_table_view_controller.mm
index 13e80578..92c6af12 100644
--- a/ios/chrome/browser/ui/infobars/modals/infobar_password_table_view_controller.mm
+++ b/ios/chrome/browser/ui/infobars/modals/infobar_password_table_view_controller.mm
@@ -10,11 +10,11 @@
 #import "base/notreached.h"
 #import "ios/chrome/browser/infobars/infobar_metrics_recorder.h"
 #import "ios/chrome/browser/passwords/ios_chrome_password_infobar_metrics_recorder.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_button_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_edit_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_styler.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/infobars/modals/infobar_modal_constants.h"
 #import "ios/chrome/browser/ui/infobars/modals/infobar_password_modal_delegate.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"

ios/chrome/browser/ui/location_bar/BUILD.gn

diff --git a/ios/chrome/browser/ui/location_bar/BUILD.gn b/ios/chrome/browser/ui/location_bar/BUILD.gn
index 0b863fe..3f6dd0fb 100644
--- a/ios/chrome/browser/ui/location_bar/BUILD.gn
+++ b/ios/chrome/browser/ui/location_bar/BUILD.gn
@@ -54,6 +54,7 @@
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
     "//ios/chrome/browser/shared/ui/elements",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/ssl",
     "//ios/chrome/browser/ui/badges",
@@ -61,7 +62,6 @@
     "//ios/chrome/browser/ui/default_promo",
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/fullscreen:ui",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/lens:lens_entrypoint",
     "//ios/chrome/browser/ui/main:default_browser_scene_agent",
     "//ios/chrome/browser/ui/main:layout_guide_util",

ios/chrome/browser/ui/location_bar/location_bar_steady_view.mm

diff --git a/ios/chrome/browser/ui/location_bar/location_bar_steady_view.mm b/ios/chrome/browser/ui/location_bar/location_bar_steady_view.mm
index 507a46a..b034a780 100644
--- a/ios/chrome/browser/ui/location_bar/location_bar_steady_view.mm
+++ b/ios/chrome/browser/ui/location_bar/location_bar_steady_view.mm
@@ -8,9 +8,9 @@
 #import "base/check_op.h"
 #import "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/shared/ui/elements/extended_touch_target_button.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/dynamic_type_util.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_constants.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"

ios/chrome/browser/ui/location_bar/location_bar_view_controller.mm

diff --git a/ios/chrome/browser/ui/location_bar/location_bar_view_controller.mm b/ios/chrome/browser/ui/location_bar/location_bar_view_controller.mm
index 9feef0a2..f6f8d53 100644
--- a/ios/chrome/browser/ui/location_bar/location_bar_view_controller.mm
+++ b/ios/chrome/browser/ui/location_bar/location_bar_view_controller.mm
@@ -19,12 +19,12 @@
 #import "ios/chrome/browser/shared/public/commands/browser_coordinator_commands.h"
 #import "ios/chrome/browser/shared/public/commands/load_query_commands.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/layout_guide_names.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
 #import "ios/chrome/browser/shared/ui/util/util_swift.h"
 #import "ios/chrome/browser/ui/badges/badge_item.h"
 #import "ios/chrome/browser/ui/fullscreen/fullscreen_animator.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/location_bar/location_bar_constants.h"
 #import "ios/chrome/browser/ui/location_bar/location_bar_steady_view.h"
 #import "ios/chrome/browser/ui/orchestrator/location_bar_offset_provider.h"

ios/chrome/browser/ui/menu/BUILD.gn

diff --git a/ios/chrome/browser/ui/menu/BUILD.gn b/ios/chrome/browser/ui/menu/BUILD.gn
index e483210..6176d35 100644
--- a/ios/chrome/browser/ui/menu/BUILD.gn
+++ b/ios/chrome/browser/ui/menu/BUILD.gn
@@ -27,8 +27,8 @@
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/url_loading",
@@ -69,7 +69,7 @@
     "//ios/chrome/browser/sessions:test_support",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/window_activities",

ios/chrome/browser/ui/menu/action_factory.mm

diff --git a/ios/chrome/browser/ui/menu/action_factory.mm b/ios/chrome/browser/ui/menu/action_factory.mm
index 1425dbc..e49dcdb 100644
--- a/ios/chrome/browser/ui/menu/action_factory.mm
+++ b/ios/chrome/browser/ui/menu/action_factory.mm
@@ -9,8 +9,8 @@
 #import "ios/chrome/browser/shared/public/commands/application_commands.h"
 #import "ios/chrome/browser/shared/public/commands/command_dispatcher.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/pasteboard_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/grit/ios_strings.h"
 #import "ui/base/l10n/l10n_util_mac.h"
 #import "url/gurl.h"

ios/chrome/browser/ui/menu/action_factory_unittest.mm

diff --git a/ios/chrome/browser/ui/menu/action_factory_unittest.mm b/ios/chrome/browser/ui/menu/action_factory_unittest.mm
index 94a8a74..ce71f96 100644
--- a/ios/chrome/browser/ui/menu/action_factory_unittest.mm
+++ b/ios/chrome/browser/ui/menu/action_factory_unittest.mm
@@ -8,7 +8,7 @@
 #import "base/test/scoped_feature_list.h"
 #import "base/test/task_environment.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/menu/action_factory+protected.h"
 #import "ios/chrome/browser/ui/menu/menu_action_type.h"
 #import "ios/chrome/browser/ui/menu/menu_histograms.h"

ios/chrome/browser/ui/menu/browser_action_factory.mm

diff --git a/ios/chrome/browser/ui/menu/browser_action_factory.mm b/ios/chrome/browser/ui/menu/browser_action_factory.mm
index 7b5d16d..bda49e2 100644
--- a/ios/chrome/browser/ui/menu/browser_action_factory.mm
+++ b/ios/chrome/browser/ui/menu/browser_action_factory.mm
@@ -19,8 +19,8 @@
 #import "ios/chrome/browser/shared/public/commands/open_new_tab_command.h"
 #import "ios/chrome/browser/shared/public/commands/qr_scanner_commands.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/pasteboard_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/incognito_reauth/incognito_reauth_scene_agent.h"
 #import "ios/chrome/browser/ui/main/scene_state_browser_agent.h"
 #import "ios/chrome/browser/ui/menu/action_factory+protected.h"

ios/chrome/browser/ui/menu/browser_action_factory_unittest.mm

diff --git a/ios/chrome/browser/ui/menu/browser_action_factory_unittest.mm b/ios/chrome/browser/ui/menu/browser_action_factory_unittest.mm
index d6cc0cc..894a8a6 100644
--- a/ios/chrome/browser/ui/menu/browser_action_factory_unittest.mm
+++ b/ios/chrome/browser/ui/menu/browser_action_factory_unittest.mm
@@ -20,7 +20,7 @@
 #import "ios/chrome/browser/shared/public/commands/load_query_commands.h"
 #import "ios/chrome/browser/shared/public/commands/qr_scanner_commands.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/main/scene_state.h"
 #import "ios/chrome/browser/ui/main/scene_state_browser_agent.h"
 #import "ios/chrome/browser/ui/menu/menu_action_type.h"

ios/chrome/browser/ui/ntp/BUILD.gn

diff --git a/ios/chrome/browser/ui/ntp/BUILD.gn b/ios/chrome/browser/ui/ntp/BUILD.gn
index 94964d5c..d3893a2 100644
--- a/ios/chrome/browser/ui/ntp/BUILD.gn
+++ b/ios/chrome/browser/ui/ntp/BUILD.gn
@@ -233,6 +233,7 @@
     "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/tabs",
@@ -246,7 +247,6 @@
     "//ios/chrome/browser/ui/content_suggestions/cells:constants",
     "//ios/chrome/browser/ui/favicon",
     "//ios/chrome/browser/ui/gestures",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/ntp/feed_top_section",
     "//ios/chrome/browser/ui/ntp/metrics",
     "//ios/chrome/browser/ui/overscroll_actions",

ios/chrome/browser/ui/ntp/feed_header_view_controller.mm

diff --git a/ios/chrome/browser/ui/ntp/feed_header_view_controller.mm b/ios/chrome/browser/ui/ntp/feed_header_view_controller.mm
index bd0c35b..bda844d 100644
--- a/ios/chrome/browser/ui/ntp/feed_header_view_controller.mm
+++ b/ios/chrome/browser/ui/ntp/feed_header_view_controller.mm
@@ -5,10 +5,10 @@
 #import "ios/chrome/browser/ui/ntp/feed_header_view_controller.h"
 
 #import "ios/chrome/browser/ntp/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_feature.h"
 #import "ios/chrome/browser/ui/content_suggestions/ntp_home_constant.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/ntp/discover_feed_constants.h"
 #import "ios/chrome/browser/ui/ntp/feed_control_delegate.h"
 #import "ios/chrome/browser/ui/ntp/metrics/feed_metrics_recorder.h"

ios/chrome/browser/ui/ntp/incognito/BUILD.gn

diff --git a/ios/chrome/browser/ui/ntp/incognito/BUILD.gn b/ios/chrome/browser/ui/ntp/incognito/BUILD.gn
index 553f7575..722cdca 100644
--- a/ios/chrome/browser/ui/ntp/incognito/BUILD.gn
+++ b/ios/chrome/browser/ui/ntp/incognito/BUILD.gn
@@ -21,8 +21,8 @@
     "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/ntp:constants",
     "//ios/chrome/browser/ui/ntp:ntp_internal",

ios/chrome/browser/ui/ntp/incognito/incognito_view.mm

diff --git a/ios/chrome/browser/ui/ntp/incognito/incognito_view.mm b/ios/chrome/browser/ui/ntp/incognito/incognito_view.mm
index b1cb506..2182e7bc 100644
--- a/ios/chrome/browser/ui/ntp/incognito/incognito_view.mm
+++ b/ios/chrome/browser/ui/ntp/incognito/incognito_view.mm
@@ -8,9 +8,9 @@
 #import "components/content_settings/core/common/features.h"
 #import "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/drag_and_drop/url_drag_drop_handler.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/rtl_geometry.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/ntp/incognito/incognito_view_util.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_url_loader_delegate.h"
 #import "ios/chrome/browser/ui/toolbar/public/toolbar_constants.h"

ios/chrome/browser/ui/ntp/incognito/revamped_incognito_view.mm

diff --git a/ios/chrome/browser/ui/ntp/incognito/revamped_incognito_view.mm b/ios/chrome/browser/ui/ntp/incognito/revamped_incognito_view.mm
index 56f8c76..b91f4946 100644
--- a/ios/chrome/browser/ui/ntp/incognito/revamped_incognito_view.mm
+++ b/ios/chrome/browser/ui/ntp/incognito/revamped_incognito_view.mm
@@ -8,9 +8,9 @@
 #import "components/content_settings/core/common/features.h"
 #import "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/drag_and_drop/url_drag_drop_handler.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/rtl_geometry.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/ntp/incognito/incognito_view_util.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_url_loader_delegate.h"
 #import "ios/chrome/browser/ui/toolbar/public/toolbar_constants.h"

ios/chrome/browser/ui/omnibox/BUILD.gn

diff --git a/ios/chrome/browser/ui/omnibox/BUILD.gn b/ios/chrome/browser/ui/omnibox/BUILD.gn
index e079e0db..4b673eb 100644
--- a/ios/chrome/browser/ui/omnibox/BUILD.gn
+++ b/ios/chrome/browser/ui/omnibox/BUILD.gn
@@ -59,8 +59,8 @@
     "resources:pedal_settings",
     "resources:search",
     "//base",
-    "//ios/chrome/browser/ui/icons:buildflags",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
+    "//ios/chrome/browser/shared/ui/symbols:buildflags",
   ]
 }
 
@@ -83,7 +83,7 @@
     "//components/omnibox/browser",
     "//components/security_state/core",
     "//ios/chrome/browser/shared/public/features",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//third_party/omnibox_proto",
   ]
   public_deps = [
@@ -102,7 +102,7 @@
   ]
   deps = [
     "//base",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
   ]
 }
 

ios/chrome/browser/ui/omnibox/omnibox_icon_type.mm

diff --git a/ios/chrome/browser/ui/omnibox/omnibox_icon_type.mm b/ios/chrome/browser/ui/omnibox/omnibox_icon_type.mm
index 64fbee6..2312fe9 100644
--- a/ios/chrome/browser/ui/omnibox/omnibox_icon_type.mm
+++ b/ios/chrome/browser/ui/omnibox/omnibox_icon_type.mm
@@ -5,7 +5,7 @@
 #import "ios/chrome/browser/ui/omnibox/omnibox_icon_type.h"
 
 #import "base/notreached.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/chrome/browser/ui/omnibox/omnibox_suggestion_icon_util.h

diff --git a/ios/chrome/browser/ui/omnibox/omnibox_suggestion_icon_util.h b/ios/chrome/browser/ui/omnibox/omnibox_suggestion_icon_util.h
index 0622c11..36c8b27 100644
--- a/ios/chrome/browser/ui/omnibox/omnibox_suggestion_icon_util.h
+++ b/ios/chrome/browser/ui/omnibox/omnibox_suggestion_icon_util.h
@@ -7,7 +7,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import "ios/chrome/browser/ui/icons/buildflags.h"
+#import "ios/chrome/browser/shared/ui/symbols/buildflags.h"
 
 // All available icons for autocomplete suggestions in the popup.
 enum class OmniboxSuggestionIconType {

ios/chrome/browser/ui/omnibox/omnibox_suggestion_icon_util.mm

diff --git a/ios/chrome/browser/ui/omnibox/omnibox_suggestion_icon_util.mm b/ios/chrome/browser/ui/omnibox/omnibox_suggestion_icon_util.mm
index 1db6e1e..001751e3 100644
--- a/ios/chrome/browser/ui/omnibox/omnibox_suggestion_icon_util.mm
+++ b/ios/chrome/browser/ui/omnibox/omnibox_suggestion_icon_util.mm
@@ -5,7 +5,7 @@
 #import "ios/chrome/browser/ui/omnibox/omnibox_suggestion_icon_util.h"
 
 #import "base/notreached.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/chrome/browser/ui/omnibox/omnibox_util.mm

diff --git a/ios/chrome/browser/ui/omnibox/omnibox_util.mm b/ios/chrome/browser/ui/omnibox/omnibox_util.mm
index a3f9d1b..3058ee3 100644
--- a/ios/chrome/browser/ui/omnibox/omnibox_util.mm
+++ b/ios/chrome/browser/ui/omnibox/omnibox_util.mm
@@ -7,7 +7,7 @@
 #import "base/notreached.h"
 #import "base/strings/utf_string_conversions.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/grit/ios_theme_resources.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)

ios/chrome/browser/ui/omnibox/popup/BUILD.gn

diff --git a/ios/chrome/browser/ui/omnibox/popup/BUILD.gn b/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
index 5fa6768f..cc3d1a8 100644
--- a/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
+++ b/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
@@ -89,11 +89,11 @@
     "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
+    "//ios/chrome/browser/shared/ui/symbols:symbols_views",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/ui/default_promo",
     "//ios/chrome/browser/ui/favicon",
-    "//ios/chrome/browser/ui/icons:symbols",
-    "//ios/chrome/browser/ui/icons:symbols_views",
     "//ios/chrome/browser/ui/main:default_browser_scene_agent",
     "//ios/chrome/browser/ui/main:layout_guide_util",
     "//ios/chrome/browser/ui/main:scene_state_header",
@@ -176,11 +176,11 @@
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
     "//ios/chrome/browser/shared/ui/elements",
+    "//ios/chrome/browser/shared/ui/symbols",
+    "//ios/chrome/browser/shared/ui/symbols:symbols_views",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/ui/content_suggestions/cells",
     "//ios/chrome/browser/ui/favicon",
-    "//ios/chrome/browser/ui/icons:symbols",
-    "//ios/chrome/browser/ui/icons:symbols_views",
     "//ios/chrome/browser/ui/omnibox:features",
     "//ios/chrome/browser/ui/omnibox:omnibox_popup_shared",
     "//ios/chrome/browser/ui/omnibox:omnibox_suggestion_icon_util",

ios/chrome/browser/ui/omnibox/popup/omnibox_icon_view.mm

diff --git a/ios/chrome/browser/ui/omnibox/popup/omnibox_icon_view.mm b/ios/chrome/browser/ui/omnibox/popup/omnibox_icon_view.mm
index c57e219..9a21e20 100644
--- a/ios/chrome/browser/ui/omnibox/popup/omnibox_icon_view.mm
+++ b/ios/chrome/browser/ui/omnibox/popup/omnibox_icon_view.mm
@@ -5,8 +5,8 @@
 #import "ios/chrome/browser/ui/omnibox/popup/omnibox_icon_view.h"
 
 #import "ios/chrome/browser/net/crurl.h"
-#import "ios/chrome/browser/ui/icons/colorful_background_symbol_view.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/colorful_background_symbol_view.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_ui_features.h"
 #import "ios/chrome/browser/ui/omnibox/popup/favicon_retriever.h"
 #import "ios/chrome/browser/ui/omnibox/popup/image_retriever.h"

ios/chrome/browser/ui/omnibox/popup/omnibox_pedal_annotator.mm

diff --git a/ios/chrome/browser/ui/omnibox/popup/omnibox_pedal_annotator.mm b/ios/chrome/browser/ui/omnibox/popup/omnibox_pedal_annotator.mm
index 49b8f309..62ae244 100644
--- a/ios/chrome/browser/ui/omnibox/popup/omnibox_pedal_annotator.mm
+++ b/ios/chrome/browser/ui/omnibox/popup/omnibox_pedal_annotator.mm
@@ -13,8 +13,8 @@
 #import "ios/chrome/browser/shared/public/commands/application_commands.h"
 #import "ios/chrome/browser/shared/public/commands/omnibox_commands.h"
 #import "ios/chrome/browser/shared/public/commands/open_new_tab_command.h"
-#import "ios/chrome/browser/ui/icons/colorful_background_symbol_view.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/colorful_background_symbol_view.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/omnibox/popup/popup_swift.h"
 #import "ios/chrome/browser/url/chrome_url_constants.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"

ios/chrome/browser/ui/omnibox/popup/omnibox_popup_row_cell.mm

diff --git a/ios/chrome/browser/ui/omnibox/popup/omnibox_popup_row_cell.mm b/ios/chrome/browser/ui/omnibox/popup/omnibox_popup_row_cell.mm
index 460c5f5..f840d16 100644
--- a/ios/chrome/browser/ui/omnibox/popup/omnibox_popup_row_cell.mm
+++ b/ios/chrome/browser/ui/omnibox/popup/omnibox_popup_row_cell.mm
@@ -11,11 +11,11 @@
 #import "components/omnibox/common/omnibox_features.h"
 #import "ios/chrome/browser/shared/ui/elements/extended_touch_target_button.h"
 #import "ios/chrome/browser/shared/ui/elements/fade_truncating_label.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/attributed_string_util.h"
 #import "ios/chrome/browser/shared/ui/util/layout_guide_names.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
 #import "ios/chrome/browser/shared/ui/util/util_swift.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_ui_features.h"
 #import "ios/chrome/browser/ui/omnibox/popup/autocomplete_suggestion.h"
 #import "ios/chrome/browser/ui/omnibox/popup/omnibox_icon_view.h"

ios/chrome/browser/ui/omnibox/popup/simple_omnibox_icon.mm

diff --git a/ios/chrome/browser/ui/omnibox/popup/simple_omnibox_icon.mm b/ios/chrome/browser/ui/omnibox/popup/simple_omnibox_icon.mm
index 6b2ddaf..3322e24f 100644
--- a/ios/chrome/browser/ui/omnibox/popup/simple_omnibox_icon.mm
+++ b/ios/chrome/browser/ui/omnibox/popup/simple_omnibox_icon.mm
@@ -7,7 +7,7 @@
 #import "base/notreached.h"
 #import "ios/chrome/browser/net/crurl.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/omnibox/omnibox_suggestion_icon_util.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/public/provider/chrome/browser/branded_images/branded_images_api.h"

ios/chrome/browser/ui/overlays/infobar_banner/autofill_address_profile/BUILD.gn

diff --git a/ios/chrome/browser/ui/overlays/infobar_banner/autofill_address_profile/BUILD.gn b/ios/chrome/browser/ui/overlays/infobar_banner/autofill_address_profile/BUILD.gn
index 439d4a11..d81f940 100644
--- a/ios/chrome/browser/ui/overlays/infobar_banner/autofill_address_profile/BUILD.gn
+++ b/ios/chrome/browser/ui/overlays/infobar_banner/autofill_address_profile/BUILD.gn
@@ -15,7 +15,7 @@
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/infobar_banner",
     "//ios/chrome/browser/overlays/public/infobar_modal",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/ui/infobars/banners",
     "//ios/chrome/browser/ui/overlays:coordinators",
     "//ios/chrome/browser/ui/overlays/infobar_banner:mediators",
@@ -42,7 +42,7 @@
     "//ios/chrome/browser/overlays/public/infobar_banner",
     "//ios/chrome/browser/overlays/public/infobar_modal",
     "//ios/chrome/browser/overlays/test",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/ui/infobars/banners/test",
     "//ios/chrome/browser/ui/infobars/test",
     "//ios/chrome/browser/ui/overlays/test",

ios/chrome/browser/ui/overlays/infobar_banner/autofill_address_profile/save_address_profile_infobar_banner_overlay_mediator.mm

diff --git a/ios/chrome/browser/ui/overlays/infobar_banner/autofill_address_profile/save_address_profile_infobar_banner_overlay_mediator.mm b/ios/chrome/browser/ui/overlays/infobar_banner/autofill_address_profile/save_address_profile_infobar_banner_overlay_mediator.mm
index a80b0f7..f485ac5 100644
--- a/ios/chrome/browser/ui/overlays/infobar_banner/autofill_address_profile/save_address_profile_infobar_banner_overlay_mediator.mm
+++ b/ios/chrome/browser/ui/overlays/infobar_banner/autofill_address_profile/save_address_profile_infobar_banner_overlay_mediator.mm
@@ -8,7 +8,7 @@
 #import "ios/chrome/browser/overlays/public/infobar_banner/infobar_banner_overlay_responses.h"
 #import "ios/chrome/browser/overlays/public/infobar_banner/save_address_profile_infobar_banner_overlay_request_config.h"
 #import "ios/chrome/browser/overlays/public/overlay_response.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/infobars/banners/infobar_banner_consumer.h"
 #import "ios/chrome/browser/ui/overlays/infobar_banner/infobar_banner_overlay_mediator+consumer_support.h"
 #import "ios/chrome/browser/ui/overlays/infobar_banner/infobar_banner_overlay_mediator.h"

ios/chrome/browser/ui/overlays/infobar_banner/autofill_address_profile/save_address_profile_infobar_banner_overlay_mediator_unittest.mm

diff --git a/ios/chrome/browser/ui/overlays/infobar_banner/autofill_address_profile/save_address_profile_infobar_banner_overlay_mediator_unittest.mm b/ios/chrome/browser/ui/overlays/infobar_banner/autofill_address_profile/save_address_profile_infobar_banner_overlay_mediator_unittest.mm
index 4e404d1..cc71636 100644
--- a/ios/chrome/browser/ui/overlays/infobar_banner/autofill_address_profile/save_address_profile_infobar_banner_overlay_mediator_unittest.mm
+++ b/ios/chrome/browser/ui/overlays/infobar_banner/autofill_address_profile/save_address_profile_infobar_banner_overlay_mediator_unittest.mm
@@ -17,7 +17,7 @@
 #import "ios/chrome/browser/overlays/public/infobar_banner/infobar_banner_overlay_responses.h"
 #import "ios/chrome/browser/overlays/public/infobar_banner/save_address_profile_infobar_banner_overlay_request_config.h"
 #import "ios/chrome/browser/overlays/test/fake_overlay_request_callback_installer.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/infobars/banners/test/fake_infobar_banner_consumer.h"
 #import "testing/gtest_mac.h"
 #import "testing/platform_test.h"

ios/chrome/browser/ui/overlays/infobar_banner/passwords/BUILD.gn

diff --git a/ios/chrome/browser/ui/overlays/infobar_banner/passwords/BUILD.gn b/ios/chrome/browser/ui/overlays/infobar_banner/passwords/BUILD.gn
index 6a4b19e..5661f1b6 100644
--- a/ios/chrome/browser/ui/overlays/infobar_banner/passwords/BUILD.gn
+++ b/ios/chrome/browser/ui/overlays/infobar_banner/passwords/BUILD.gn
@@ -16,7 +16,7 @@
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/infobar_banner",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/ui/infobars/banners",
     "//ios/chrome/browser/ui/overlays/infobar_banner:mediators",
     "//ui/base",
@@ -46,7 +46,7 @@
     "//ios/chrome/browser/passwords:infobar_delegates",
     "//ios/chrome/browser/passwords/test",
     "//ios/chrome/browser/shared/public/features",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/ui/infobars/banners/test",
     "//ios/chrome/browser/ui/infobars/test",
     "//ios/chrome/browser/ui/overlays/test",

ios/chrome/browser/ui/overlays/infobar_banner/passwords/password_infobar_banner_overlay_mediator.mm

diff --git a/ios/chrome/browser/ui/overlays/infobar_banner/passwords/password_infobar_banner_overlay_mediator.mm b/ios/chrome/browser/ui/overlays/infobar_banner/passwords/password_infobar_banner_overlay_mediator.mm
index 628f1fb..8a262ea 100644
--- a/ios/chrome/browser/ui/overlays/infobar_banner/passwords/password_infobar_banner_overlay_mediator.mm
+++ b/ios/chrome/browser/ui/overlays/infobar_banner/passwords/password_infobar_banner_overlay_mediator.mm
@@ -8,7 +8,7 @@
 #import "components/password_manager/core/common/password_manager_features.h"
 #import "ios/chrome/browser/overlays/public/infobar_banner/password_infobar_banner_overlay.h"
 #import "ios/chrome/browser/overlays/public/overlay_request_support.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/infobars/banners/infobar_banner_consumer.h"
 #import "ios/chrome/browser/ui/overlays/infobar_banner/infobar_banner_overlay_mediator+consumer_support.h"
 #import "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/ui/overlays/infobar_banner/passwords/password_infobar_banner_overlay_mediator_unittest.mm

diff --git a/ios/chrome/browser/ui/overlays/infobar_banner/passwords/password_infobar_banner_overlay_mediator_unittest.mm b/ios/chrome/browser/ui/overlays/infobar_banner/passwords/password_infobar_banner_overlay_mediator_unittest.mm
index 1346cdf..8613269c 100644
--- a/ios/chrome/browser/ui/overlays/infobar_banner/passwords/password_infobar_banner_overlay_mediator_unittest.mm
+++ b/ios/chrome/browser/ui/overlays/infobar_banner/passwords/password_infobar_banner_overlay_mediator_unittest.mm
@@ -20,7 +20,7 @@
 #import "ios/chrome/browser/passwords/ios_chrome_save_password_infobar_delegate.h"
 #import "ios/chrome/browser/passwords/test/mock_ios_chrome_save_passwords_infobar_delegate.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/infobars/banners/test/fake_infobar_banner_consumer.h"
 #import "ios/chrome/grit/ios_strings.h"
 #import "testing/gtest_mac.h"

ios/chrome/browser/ui/overlays/infobar_banner/permissions/BUILD.gn

diff --git a/ios/chrome/browser/ui/overlays/infobar_banner/permissions/BUILD.gn b/ios/chrome/browser/ui/overlays/infobar_banner/permissions/BUILD.gn
index 3527b00..f1b1592 100644
--- a/ios/chrome/browser/ui/overlays/infobar_banner/permissions/BUILD.gn
+++ b/ios/chrome/browser/ui/overlays/infobar_banner/permissions/BUILD.gn
@@ -14,7 +14,7 @@
     "//base",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/infobar_banner",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/ui/infobars/banners",
     "//ios/chrome/browser/ui/overlays:coordinators",
     "//ios/chrome/browser/ui/overlays/infobar_banner:mediators",

ios/chrome/browser/ui/overlays/infobar_banner/permissions/permissions_infobar_banner_overlay_mediator.mm

diff --git a/ios/chrome/browser/ui/overlays/infobar_banner/permissions/permissions_infobar_banner_overlay_mediator.mm b/ios/chrome/browser/ui/overlays/infobar_banner/permissions/permissions_infobar_banner_overlay_mediator.mm
index 181a357..dee1490 100644
--- a/ios/chrome/browser/ui/overlays/infobar_banner/permissions/permissions_infobar_banner_overlay_mediator.mm
+++ b/ios/chrome/browser/ui/overlays/infobar_banner/permissions/permissions_infobar_banner_overlay_mediator.mm
@@ -5,7 +5,7 @@
 #import "ios/chrome/browser/ui/overlays/infobar_banner/permissions/permissions_infobar_banner_overlay_mediator.h"
 
 #import "ios/chrome/browser/overlays/public/infobar_banner/permissions_infobar_banner_overlay_request_config.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/infobars/banners/infobar_banner_consumer.h"
 #import "ios/chrome/browser/ui/overlays/infobar_banner/infobar_banner_overlay_mediator+consumer_support.h"
 #import "ios/chrome/browser/ui/overlays/overlay_request_mediator+subclassing.h"

ios/chrome/browser/ui/overlays/infobar_banner/save_card/BUILD.gn

diff --git a/ios/chrome/browser/ui/overlays/infobar_banner/save_card/BUILD.gn b/ios/chrome/browser/ui/overlays/infobar_banner/save_card/BUILD.gn
index 11351ad2..ed91004 100644
--- a/ios/chrome/browser/ui/overlays/infobar_banner/save_card/BUILD.gn
+++ b/ios/chrome/browser/ui/overlays/infobar_banner/save_card/BUILD.gn
@@ -15,7 +15,7 @@
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/infobar_banner",
     "//ios/chrome/browser/overlays/public/infobar_modal",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/ui/infobars/banners",
     "//ios/chrome/browser/ui/overlays:coordinators",
     "//ios/chrome/browser/ui/overlays/infobar_banner:mediators",

ios/chrome/browser/ui/overlays/infobar_banner/save_card/save_card_infobar_banner_overlay_mediator.mm

diff --git a/ios/chrome/browser/ui/overlays/infobar_banner/save_card/save_card_infobar_banner_overlay_mediator.mm b/ios/chrome/browser/ui/overlays/infobar_banner/save_card/save_card_infobar_banner_overlay_mediator.mm
index a158026..2dc56e4 100644
--- a/ios/chrome/browser/ui/overlays/infobar_banner/save_card/save_card_infobar_banner_overlay_mediator.mm
+++ b/ios/chrome/browser/ui/overlays/infobar_banner/save_card/save_card_infobar_banner_overlay_mediator.mm
@@ -9,7 +9,7 @@
 #import "ios/chrome/browser/overlays/public/infobar_banner/save_card_infobar_banner_overlay_request_config.h"
 #import "ios/chrome/browser/overlays/public/infobar_modal/save_card_infobar_modal_overlay_responses.h"
 #import "ios/chrome/browser/overlays/public/overlay_response.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/infobars/banners/infobar_banner_consumer.h"
 #import "ios/chrome/browser/ui/overlays/infobar_banner/infobar_banner_overlay_mediator+consumer_support.h"
 #import "ios/chrome/browser/ui/overlays/infobar_banner/infobar_banner_overlay_mediator.h"

ios/chrome/browser/ui/overlays/infobar_banner/sync_error/BUILD.gn

diff --git a/ios/chrome/browser/ui/overlays/infobar_banner/sync_error/BUILD.gn b/ios/chrome/browser/ui/overlays/infobar_banner/sync_error/BUILD.gn
index 308f38b..dadcdc4 100644
--- a/ios/chrome/browser/ui/overlays/infobar_banner/sync_error/BUILD.gn
+++ b/ios/chrome/browser/ui/overlays/infobar_banner/sync_error/BUILD.gn
@@ -14,7 +14,7 @@
     "//base",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/infobar_banner",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/ui/infobars/banners",
     "//ios/chrome/browser/ui/overlays:coordinators",
     "//ios/chrome/browser/ui/overlays/infobar_banner:mediators",

ios/chrome/browser/ui/overlays/infobar_banner/tailored_security/BUILD.gn

diff --git a/ios/chrome/browser/ui/overlays/infobar_banner/tailored_security/BUILD.gn b/ios/chrome/browser/ui/overlays/infobar_banner/tailored_security/BUILD.gn
index b613e59..9e9a824 100644
--- a/ios/chrome/browser/ui/overlays/infobar_banner/tailored_security/BUILD.gn
+++ b/ios/chrome/browser/ui/overlays/infobar_banner/tailored_security/BUILD.gn
@@ -13,8 +13,8 @@
     "//components/infobars/core",
     "//ios/chrome/browser/overlays/public/infobar_banner",
     "//ios/chrome/browser/safe_browsing/tailored_security:infobar_delegates",
-    "//ios/chrome/browser/ui/icons:buildflags",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
+    "//ios/chrome/browser/shared/ui/symbols:buildflags",
     "//ios/chrome/browser/ui/infobars/banners",
     "//ios/chrome/browser/ui/overlays/infobar_banner:mediators",
   ]
@@ -30,7 +30,7 @@
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/infobar_banner",
     "//ios/chrome/browser/safe_browsing/tailored_security/test",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/ui/infobars/banners/test",
     "//testing/gmock",
     "//testing/gtest",

ios/chrome/browser/ui/overlays/infobar_banner/tailored_security/tailored_security_infobar_banner_overlay_mediator.mm

diff --git a/ios/chrome/browser/ui/overlays/infobar_banner/tailored_security/tailored_security_infobar_banner_overlay_mediator.mm b/ios/chrome/browser/ui/overlays/infobar_banner/tailored_security/tailored_security_infobar_banner_overlay_mediator.mm
index a5070cc..6128a0f 100644
--- a/ios/chrome/browser/ui/overlays/infobar_banner/tailored_security/tailored_security_infobar_banner_overlay_mediator.mm
+++ b/ios/chrome/browser/ui/overlays/infobar_banner/tailored_security/tailored_security_infobar_banner_overlay_mediator.mm
@@ -8,8 +8,8 @@
 #import "components/infobars/core/confirm_infobar_delegate.h"
 #import "ios/chrome/browser/overlays/public/infobar_banner/tailored_security_service_infobar_banner_overlay_request_config.h"
 #import "ios/chrome/browser/safe_browsing/tailored_security/tailored_security_service_infobar_delegate.h"
-#import "ios/chrome/browser/ui/icons/buildflags.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/buildflags.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/infobars/banners/infobar_banner_consumer.h"
 #import "ios/chrome/browser/ui/overlays/infobar_banner/infobar_banner_overlay_mediator+consumer_support.h"
 #import "ios/chrome/browser/ui/overlays/infobar_banner/infobar_banner_overlay_mediator.h"

ios/chrome/browser/ui/overlays/infobar_banner/tailored_security/tailored_security_infobar_banner_overlay_mediator_unittest.mm

diff --git a/ios/chrome/browser/ui/overlays/infobar_banner/tailored_security/tailored_security_infobar_banner_overlay_mediator_unittest.mm b/ios/chrome/browser/ui/overlays/infobar_banner/tailored_security/tailored_security_infobar_banner_overlay_mediator_unittest.mm
index bf39a3f3..768ea58 100644
--- a/ios/chrome/browser/ui/overlays/infobar_banner/tailored_security/tailored_security_infobar_banner_overlay_mediator_unittest.mm
+++ b/ios/chrome/browser/ui/overlays/infobar_banner/tailored_security/tailored_security_infobar_banner_overlay_mediator_unittest.mm
@@ -9,7 +9,7 @@
 #import "ios/chrome/browser/overlays/public/infobar_banner/tailored_security_service_infobar_banner_overlay_request_config.h"
 #import "ios/chrome/browser/overlays/public/overlay_request.h"
 #import "ios/chrome/browser/safe_browsing/tailored_security/test/mock_tailored_security_service_infobar_delegate.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/infobars/banners/test/fake_infobar_banner_consumer.h"
 #import "testing/gtest_mac.h"
 #import "testing/platform_test.h"

ios/chrome/browser/ui/overlays/infobar_banner/translate/BUILD.gn

diff --git a/ios/chrome/browser/ui/overlays/infobar_banner/translate/BUILD.gn b/ios/chrome/browser/ui/overlays/infobar_banner/translate/BUILD.gn
index 4b914ed..35255a8 100644
--- a/ios/chrome/browser/ui/overlays/infobar_banner/translate/BUILD.gn
+++ b/ios/chrome/browser/ui/overlays/infobar_banner/translate/BUILD.gn
@@ -32,7 +32,7 @@
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/infobar_banner",
     "//ios/chrome/browser/shared/public/features",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/ui/infobars/banners",
     "//ios/chrome/browser/ui/overlays:coordinators",
     "//ios/chrome/browser/ui/overlays/infobar_banner:mediators",
@@ -58,8 +58,8 @@
     "//ios/chrome/browser/overlays/public/common/infobars",
     "//ios/chrome/browser/overlays/public/infobar_banner",
     "//ios/chrome/browser/overlays/test",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/translate:test_support",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/infobars/banners/test",
     "//ios/chrome/browser/ui/infobars/test",
     "//ios/chrome/browser/ui/overlays:coordinators",

ios/chrome/browser/ui/overlays/infobar_banner/translate/translate_infobar_banner_overlay_mediator.mm

diff --git a/ios/chrome/browser/ui/overlays/infobar_banner/translate/translate_infobar_banner_overlay_mediator.mm b/ios/chrome/browser/ui/overlays/infobar_banner/translate/translate_infobar_banner_overlay_mediator.mm
index 86b71d4..aea34e0 100644
--- a/ios/chrome/browser/ui/overlays/infobar_banner/translate/translate_infobar_banner_overlay_mediator.mm
+++ b/ios/chrome/browser/ui/overlays/infobar_banner/translate/translate_infobar_banner_overlay_mediator.mm
@@ -9,7 +9,7 @@
 #import "base/notreached.h"
 #import "ios/chrome/browser/overlays/public/infobar_banner/infobar_banner_overlay_responses.h"
 #import "ios/chrome/browser/overlays/public/infobar_banner/translate_infobar_banner_overlay_request_config.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/infobars/banners/infobar_banner_consumer.h"
 #import "ios/chrome/browser/ui/overlays/infobar_banner/infobar_banner_overlay_mediator+consumer_support.h"
 #import "ios/chrome/browser/ui/overlays/overlay_request_mediator+subclassing.h"

ios/chrome/browser/ui/overlays/infobar_banner/translate/translate_infobar_banner_overlay_mediator_unittest.mm

diff --git a/ios/chrome/browser/ui/overlays/infobar_banner/translate/translate_infobar_banner_overlay_mediator_unittest.mm b/ios/chrome/browser/ui/overlays/infobar_banner/translate/translate_infobar_banner_overlay_mediator_unittest.mm
index f522971..d4aec23 100644
--- a/ios/chrome/browser/ui/overlays/infobar_banner/translate/translate_infobar_banner_overlay_mediator_unittest.mm
+++ b/ios/chrome/browser/ui/overlays/infobar_banner/translate/translate_infobar_banner_overlay_mediator_unittest.mm
@@ -9,8 +9,8 @@
 #import "components/infobars/core/infobar.h"
 #import "ios/chrome/browser/infobars/infobar_ios.h"
 #import "ios/chrome/browser/overlays/public/infobar_banner/translate_infobar_banner_overlay_request_config.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/translate/fake_translate_infobar_delegate.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/infobars/banners/test/fake_infobar_banner_consumer.h"
 #import "ios/chrome/grit/ios_strings.h"
 #import "testing/gtest_mac.h"

ios/chrome/browser/ui/overscroll_actions/BUILD.gn

diff --git a/ios/chrome/browser/ui/overscroll_actions/BUILD.gn b/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
index c9995650..c4ec70c 100644
--- a/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
+++ b/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
@@ -17,10 +17,10 @@
     "//ios/chrome/app/strings",
     "//ios/chrome/app/theme",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/fullscreen",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/ntp:logo",
     "//ios/chrome/browser/ui/page_info:constants",
     "//ios/chrome/browser/ui/side_swipe",

ios/chrome/browser/ui/overscroll_actions/overscroll_actions_view.mm

diff --git a/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_view.mm b/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_view.mm
index b5f88f5..a2fd930 100644
--- a/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_view.mm
+++ b/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_view.mm
@@ -11,10 +11,10 @@
 #import "base/numerics/math_constants.h"
 #import "base/task/sequenced_task_runner.h"
 #import "base/time/time.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/rtl_geometry.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
 #import "ios/chrome/browser/ui/content_suggestions/ntp_home_constant.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/grit/ios_chromium_strings.h"
 #import "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/ui/page_info/BUILD.gn

diff --git a/ios/chrome/browser/ui/page_info/BUILD.gn b/ios/chrome/browser/ui/page_info/BUILD.gn
index b252fe07..d1ef1684 100644
--- a/ios/chrome/browser/ui/page_info/BUILD.gn
+++ b/ios/chrome/browser/ui/page_info/BUILD.gn
@@ -23,11 +23,11 @@
     "//ios/chrome/browser/net:crurl",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:utils",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/ui/fancy_ui",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/browser/ui/page_info/requirements",
     "//ios/chrome/browser/ui/permissions",
@@ -84,10 +84,10 @@
     "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui/fullscreen:coordinators",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/page_info/requirements",
     "//ios/chrome/browser/ui/permissions",
     "//ios/chrome/browser/ui/permissions:permission_info",

ios/chrome/browser/ui/page_info/page_info_site_security_mediator.mm

diff --git a/ios/chrome/browser/ui/page_info/page_info_site_security_mediator.mm b/ios/chrome/browser/ui/page_info/page_info_site_security_mediator.mm
index 2163ec6..97e0b71 100644
--- a/ios/chrome/browser/ui/page_info/page_info_site_security_mediator.mm
+++ b/ios/chrome/browser/ui/page_info/page_info_site_security_mediator.mm
@@ -12,7 +12,7 @@
 #import "components/strings/grit/components_google_chrome_strings.h"
 #import "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/reading_list/offline_page_tab_helper.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/page_info/page_info_site_security_description.h"
 #import "ios/chrome/browser/url/chrome_url_constants.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"

ios/chrome/browser/ui/page_info/page_info_view_controller.mm

diff --git a/ios/chrome/browser/ui/page_info/page_info_view_controller.mm b/ios/chrome/browser/ui/page_info/page_info_view_controller.mm
index ed76151..0064604b 100644
--- a/ios/chrome/browser/ui/page_info/page_info_view_controller.mm
+++ b/ios/chrome/browser/ui/page_info/page_info_view_controller.mm
@@ -11,6 +11,7 @@
 #import "base/strings/sys_string_conversions.h"
 #import "ios/chrome/browser/net/crurl.h"
 #import "ios/chrome/browser/shared/public/commands/page_info_commands.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_attributed_string_header_footer_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_icon_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_link_header_footer_item.h"
@@ -21,7 +22,6 @@
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_link_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/table_view_utils.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/keyboard/UIKeyCommand+Chrome.h"
 #import "ios/chrome/browser/ui/page_info/page_info_constants.h"
 #import "ios/chrome/browser/ui/permissions/permission_info.h"

ios/chrome/browser/ui/passwords/bottom_sheet/BUILD.gn

diff --git a/ios/chrome/browser/ui/passwords/bottom_sheet/BUILD.gn b/ios/chrome/browser/ui/passwords/bottom_sheet/BUILD.gn
index fbee4e5..ba1fa86 100644
--- a/ios/chrome/browser/ui/passwords/bottom_sheet/BUILD.gn
+++ b/ios/chrome/browser/ui/passwords/bottom_sheet/BUILD.gn
@@ -24,10 +24,10 @@
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/passwords:password_controller_delegate",
     "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view/cells",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/settings/password:title_view",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common/ui/colors",

ios/chrome/browser/ui/passwords/bottom_sheet/password_suggestion_bottom_sheet_view_controller.mm

diff --git a/ios/chrome/browser/ui/passwords/bottom_sheet/password_suggestion_bottom_sheet_view_controller.mm b/ios/chrome/browser/ui/passwords/bottom_sheet/password_suggestion_bottom_sheet_view_controller.mm
index 5ff918a..863361c 100644
--- a/ios/chrome/browser/ui/passwords/bottom_sheet/password_suggestion_bottom_sheet_view_controller.mm
+++ b/ios/chrome/browser/ui/passwords/bottom_sheet/password_suggestion_bottom_sheet_view_controller.mm
@@ -10,10 +10,10 @@
 #import "components/autofill/ios/browser/form_suggestion.h"
 #import "ios/chrome/browser/favicon/favicon_loader.h"
 #import "ios/chrome/browser/passwords/password_controller_delegate.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_url_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_controller.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/passwords/bottom_sheet/password_suggestion_bottom_sheet_delegate.h"
 #import "ios/chrome/browser/ui/settings/password/branded_navigation_item_title_view.h"
 #import "ios/chrome/browser/ui/settings/password/create_password_manager_title_view.h"

ios/chrome/browser/ui/popup_menu/BUILD.gn

diff --git a/ios/chrome/browser/ui/popup_menu/BUILD.gn b/ios/chrome/browser/ui/popup_menu/BUILD.gn
index 3892a65..c2dbd9e 100644
--- a/ios/chrome/browser/ui/popup_menu/BUILD.gn
+++ b/ios/chrome/browser/ui/popup_menu/BUILD.gn
@@ -80,6 +80,7 @@
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
     "//ios/chrome/browser/shared/ui/list_model",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/tabs:features",
@@ -89,7 +90,6 @@
     "//ios/chrome/browser/ui/browser_container:ui",
     "//ios/chrome/browser/ui/bubble",
     "//ios/chrome/browser/ui/content_suggestions/cells:constants",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/lens:lens_entrypoint",
     "//ios/chrome/browser/ui/main:layout_guide_util",
     "//ios/chrome/browser/ui/main:scene_state_header",
@@ -171,8 +171,8 @@
     "//ios/chrome/browser/reading_list:test_support",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/popup_menu/cells",
     "//ios/chrome/browser/ui/popup_menu/public",

ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn

diff --git a/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn b/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn
index 35a96602..b4082a3 100644
--- a/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn
+++ b/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn
@@ -54,13 +54,13 @@
     "//ios/chrome/browser/settings/sync/utils:identity_error_util",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/tabs:features",
     "//ios/chrome/browser/translate",
     "//ios/chrome/browser/ui/bookmarks:core",
     "//ios/chrome/browser/ui/browser_container:ui",
     "//ios/chrome/browser/ui/follow",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/ntp/metrics",
     "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/popup_menu:metrics_protocols",

ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/BUILD.gn

diff --git a/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/BUILD.gn b/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/BUILD.gn
index 6b15f9f..05e0433 100644
--- a/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/BUILD.gn
+++ b/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/BUILD.gn
@@ -26,7 +26,7 @@
     "//components/prefs",
     "//components/prefs:test_support",
     "//ios/chrome/browser/prefs:pref_names",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/ui/popup_menu/overflow_menu:feature_flags",
     "//ios/chrome/browser/ui/popup_menu/overflow_menu:overflow_menu_constants",
     "//ios/chrome/browser/ui/popup_menu/overflow_menu:overflow_menu_swift",

ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history_unittest.mm

diff --git a/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history_unittest.mm b/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history_unittest.mm
index 35fdafb8..3913c30d 100644
--- a/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history_unittest.mm
+++ b/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history_unittest.mm
@@ -12,7 +12,7 @@
 #import "components/prefs/scoped_user_pref_update.h"
 #import "components/prefs/testing_pref_service.h"
 #import "ios/chrome/browser/prefs/pref_names.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/constants.h"
 #import "ios/chrome/browser/ui/popup_menu/overflow_menu/feature_flags.h"
 #import "ios/chrome/browser/ui/popup_menu/overflow_menu/overflow_menu_constants.h"

ios/chrome/browser/ui/popup_menu/overflow_menu/overflow_menu_mediator.mm

diff --git a/ios/chrome/browser/ui/popup_menu/overflow_menu/overflow_menu_mediator.mm b/ios/chrome/browser/ui/popup_menu/overflow_menu/overflow_menu_mediator.mm
index fb4b98a9..99d6172 100644
--- a/ios/chrome/browser/ui/popup_menu/overflow_menu/overflow_menu_mediator.mm
+++ b/ios/chrome/browser/ui/popup_menu/overflow_menu/overflow_menu_mediator.mm
@@ -54,10 +54,10 @@
 #import "ios/chrome/browser/shared/public/commands/reading_list_add_command.h"
 #import "ios/chrome/browser/shared/public/commands/text_zoom_commands.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
 #import "ios/chrome/browser/tabs/features.h"
 #import "ios/chrome/browser/translate/chrome_ios_translate_client.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/ntp/metrics/feed_metrics_recorder.h"
 #import "ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/constants.h"
 #import "ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history.h"

ios/chrome/browser/ui/popup_menu/popup_menu_mediator.mm

diff --git a/ios/chrome/browser/ui/popup_menu/popup_menu_mediator.mm b/ios/chrome/browser/ui/popup_menu/popup_menu_mediator.mm
index 155c2b8..e4d986b3 100644
--- a/ios/chrome/browser/ui/popup_menu/popup_menu_mediator.mm
+++ b/ios/chrome/browser/ui/popup_menu/popup_menu_mediator.mm
@@ -50,10 +50,10 @@
 #import "ios/chrome/browser/shared/public/commands/search_image_with_lens_command.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
 #import "ios/chrome/browser/shared/ui/list_model/list_model.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
 #import "ios/chrome/browser/translate/chrome_ios_translate_client.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_tile_constants.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/lens/lens_entrypoint.h"
 #import "ios/chrome/browser/ui/popup_menu/cells/popup_menu_text_item.h"
 #import "ios/chrome/browser/ui/popup_menu/cells/popup_menu_tools_item.h"

ios/chrome/browser/ui/popup_menu/popup_menu_mediator_unittest.mm

diff --git a/ios/chrome/browser/ui/popup_menu/popup_menu_mediator_unittest.mm b/ios/chrome/browser/ui/popup_menu/popup_menu_mediator_unittest.mm
index 72aa719..0a3f745 100644
--- a/ios/chrome/browser/ui/popup_menu/popup_menu_mediator_unittest.mm
+++ b/ios/chrome/browser/ui/popup_menu/popup_menu_mediator_unittest.mm
@@ -39,7 +39,7 @@
 #import "ios/chrome/browser/reading_list/reading_list_model_factory.h"
 #import "ios/chrome/browser/reading_list/reading_list_test_utils.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/popup_menu/cells/popup_menu_text_item.h"
 #import "ios/chrome/browser/ui/popup_menu/cells/popup_menu_tools_item.h"
 #import "ios/chrome/browser/ui/popup_menu/popup_menu_constants.h"

ios/chrome/browser/ui/price_notifications/cells/BUILD.gn

diff --git a/ios/chrome/browser/ui/price_notifications/cells/BUILD.gn b/ios/chrome/browser/ui/price_notifications/cells/BUILD.gn
index c2a5b2c..70de4b6 100644
--- a/ios/chrome/browser/ui/price_notifications/cells/BUILD.gn
+++ b/ios/chrome/browser/ui/price_notifications/cells/BUILD.gn
@@ -23,10 +23,10 @@
   deps = [
     "//components/url_formatter",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/shared/ui/table_view/cells",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/price_notifications:constants",
     "//ios/chrome/common:button_config",
     "//ios/chrome/common/ui/colors",

ios/chrome/browser/ui/price_notifications/cells/price_notifications_menu_button.mm

diff --git a/ios/chrome/browser/ui/price_notifications/cells/price_notifications_menu_button.mm b/ios/chrome/browser/ui/price_notifications/cells/price_notifications_menu_button.mm
index e354be49e..fc93376 100644
--- a/ios/chrome/browser/ui/price_notifications/cells/price_notifications_menu_button.mm
+++ b/ios/chrome/browser/ui/price_notifications/cells/price_notifications_menu_button.mm
@@ -4,7 +4,7 @@
 
 #import "ios/chrome/browser/ui/price_notifications/cells/price_notifications_menu_button.h"
 
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/price_notifications/price_notifications_constants.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 

ios/chrome/browser/ui/price_notifications/cells/price_notifications_table_view_item.mm

diff --git a/ios/chrome/browser/ui/price_notifications/cells/price_notifications_table_view_item.mm b/ios/chrome/browser/ui/price_notifications/cells/price_notifications_table_view_item.mm
index 147aeaf..75bda65 100644
--- a/ios/chrome/browser/ui/price_notifications/cells/price_notifications_table_view_item.mm
+++ b/ios/chrome/browser/ui/price_notifications/cells/price_notifications_table_view_item.mm
@@ -6,9 +6,9 @@
 
 #import "base/strings/sys_string_conversions.h"
 #import "components/url_formatter/elide_url.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_styler.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/price_notifications/cells/price_notifications_image_container_view.h"
 #import "ios/chrome/browser/ui/price_notifications/cells/price_notifications_menu_button.h"
 #import "ios/chrome/browser/ui/price_notifications/cells/price_notifications_price_chip_view.h"

ios/chrome/browser/ui/qr_scanner/BUILD.gn

diff --git a/ios/chrome/browser/ui/qr_scanner/BUILD.gn b/ios/chrome/browser/ui/qr_scanner/BUILD.gn
index ce1fd8e..b5dc79d5 100644
--- a/ios/chrome/browser/ui/qr_scanner/BUILD.gn
+++ b/ios/chrome/browser/ui/qr_scanner/BUILD.gn
@@ -18,8 +18,8 @@
     "//components/version_info",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/shared/public/commands",
+    "//ios/chrome/browser/shared/ui/symbols:icons",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/scanner",
     "//ios/chrome/common:ios_app_bundle_id_prefix_buildflags",
     "//ios/chrome/common/ui/util",
@@ -93,7 +93,7 @@
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/search_engines",
-    "//ios/chrome/browser/ui/icons",
+    "//ios/chrome/browser/shared/ui/symbols:icons",
     "//ios/chrome/browser/ui/location_bar",
     "//ios/chrome/browser/ui/scanner",
     "//ios/chrome/browser/ui/scanner:camera_state",

ios/chrome/browser/ui/qr_scanner/qr_scanner_app_interface.mm

diff --git a/ios/chrome/browser/ui/qr_scanner/qr_scanner_app_interface.mm b/ios/chrome/browser/ui/qr_scanner/qr_scanner_app_interface.mm
index 8f9aa73..b5409eab 100644
--- a/ios/chrome/browser/ui/qr_scanner/qr_scanner_app_interface.mm
+++ b/ios/chrome/browser/ui/qr_scanner/qr_scanner_app_interface.mm
@@ -12,7 +12,7 @@
 #import "ios/chrome/app/main_controller.h"
 #import "ios/chrome/browser/main/browser.h"
 #import "ios/chrome/browser/search_engines/template_url_service_factory.h"
-#import "ios/chrome/browser/ui/icons/chrome_icon.h"
+#import "ios/chrome/browser/shared/ui/symbols/chrome_icon.h"
 #import "ios/chrome/browser/ui/location_bar/location_bar_coordinator.h"
 #import "ios/chrome/browser/ui/location_bar/location_bar_url_loader.h"
 #import "ios/chrome/browser/ui/qr_scanner/qr_scanner_camera_controller.h"

ios/chrome/browser/ui/reading_list/BUILD.gn

diff --git a/ios/chrome/browser/ui/reading_list/BUILD.gn b/ios/chrome/browser/ui/reading_list/BUILD.gn
index bd269764..619668c 100644
--- a/ios/chrome/browser/ui/reading_list/BUILD.gn
+++ b/ios/chrome/browser/ui/reading_list/BUILD.gn
@@ -44,6 +44,7 @@
     "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/shared/ui/table_view/cells",
@@ -55,7 +56,6 @@
     "//ios/chrome/browser/ui/authentication/cells",
     "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils",
     "//ios/chrome/browser/ui/favicon",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/menu",

ios/chrome/browser/ui/reading_list/reading_list_table_view_item.mm

diff --git a/ios/chrome/browser/ui/reading_list/reading_list_table_view_item.mm b/ios/chrome/browser/ui/reading_list/reading_list_table_view_item.mm
index a595171..62e0d86 100644
--- a/ios/chrome/browser/ui/reading_list/reading_list_table_view_item.mm
+++ b/ios/chrome/browser/ui/reading_list/reading_list_table_view_item.mm
@@ -10,10 +10,10 @@
 #import "base/strings/utf_string_conversions.h"
 #import "base/time/time.h"
 #import "components/url_formatter/elide_url.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_url_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_styler.h"
 #import "ios/chrome/browser/shared/ui/util/pasteboard_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/reading_list/reading_list_list_item_custom_action_factory.h"
 #import "ios/chrome/browser/ui/reading_list/reading_list_list_item_util.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"

ios/chrome/browser/ui/recent_tabs/BUILD.gn

diff --git a/ios/chrome/browser/ui/recent_tabs/BUILD.gn b/ios/chrome/browser/ui/recent_tabs/BUILD.gn
index ffa26ba3..82cbdec 100644
--- a/ios/chrome/browser/ui/recent_tabs/BUILD.gn
+++ b/ios/chrome/browser/ui/recent_tabs/BUILD.gn
@@ -84,6 +84,7 @@
     "//ios/chrome/browser/sessions:serialisation",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/shared/ui/table_view:utils",
@@ -97,7 +98,6 @@
     "//ios/chrome/browser/ui/authentication/cells",
     "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils",
     "//ios/chrome/browser/ui/authentication/signin:signin_headers",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/browser/ui/settings/sync/utils",
     "//ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/resources",

ios/chrome/browser/ui/recent_tabs/recent_tabs_table_view_controller.mm

diff --git a/ios/chrome/browser/ui/recent_tabs/recent_tabs_table_view_controller.mm b/ios/chrome/browser/ui/recent_tabs/recent_tabs_table_view_controller.mm
index a94c0de..1986940 100644
--- a/ios/chrome/browser/ui/recent_tabs/recent_tabs_table_view_controller.mm
+++ b/ios/chrome/browser/ui/recent_tabs/recent_tabs_table_view_controller.mm
@@ -37,6 +37,7 @@
 #import "ios/chrome/browser/shared/public/commands/open_new_tab_command.h"
 #import "ios/chrome/browser/shared/public/commands/show_signin_command.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_activity_indicator_header_footer_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_disclosure_header_footer_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_illustrated_item.h"
@@ -68,7 +69,6 @@
 #import "ios/chrome/browser/ui/authentication/signin/signin_utils.h"
 #import "ios/chrome/browser/ui/authentication/signin_presenter.h"
 #import "ios/chrome/browser/ui/authentication/signin_promo_view_mediator.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/keyboard/UIKeyCommand+Chrome.h"
 #import "ios/chrome/browser/ui/recent_tabs/recent_tabs_constants.h"
 #import "ios/chrome/browser/ui/recent_tabs/recent_tabs_menu_provider.h"

ios/chrome/browser/ui/scanner/BUILD.gn

diff --git a/ios/chrome/browser/ui/scanner/BUILD.gn b/ios/chrome/browser/ui/scanner/BUILD.gn
index d7038ac..87a500d 100644
--- a/ios/chrome/browser/ui/scanner/BUILD.gn
+++ b/ios/chrome/browser/ui/scanner/BUILD.gn
@@ -29,8 +29,8 @@
     "//components/version_info",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/shared/public/commands",
+    "//ios/chrome/browser/shared/ui/symbols:icons",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/icons",
     "//ios/chrome/common:ios_app_bundle_id_prefix_buildflags",
     "//ios/chrome/common/ui/util",
     "//ios/third_party/material_components_ios",

ios/chrome/browser/ui/scanner/scanner_view.mm

diff --git a/ios/chrome/browser/ui/scanner/scanner_view.mm b/ios/chrome/browser/ui/scanner/scanner_view.mm
index 58e35197..6b274a9 100644
--- a/ios/chrome/browser/ui/scanner/scanner_view.mm
+++ b/ios/chrome/browser/ui/scanner/scanner_view.mm
@@ -7,7 +7,7 @@
 #import "base/check.h"
 #import "base/mac/foundation_util.h"
 #import "base/numerics/math_constants.h"
-#import "ios/chrome/browser/ui/icons/chrome_icon.h"
+#import "ios/chrome/browser/shared/ui/symbols/chrome_icon.h"
 #import "ios/chrome/browser/ui/scanner/preview_overlay_view.h"
 #import "ios/chrome/browser/ui/scanner/video_preview_view.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"

ios/chrome/browser/ui/send_tab_to_self/BUILD.gn

diff --git a/ios/chrome/browser/ui/send_tab_to_self/BUILD.gn b/ios/chrome/browser/ui/send_tab_to_self/BUILD.gn
index 2916d75f..af979b84 100644
--- a/ios/chrome/browser/ui/send_tab_to_self/BUILD.gn
+++ b/ios/chrome/browser/ui/send_tab_to_self/BUILD.gn
@@ -50,10 +50,10 @@
     "//components/send_tab_to_self",
     "//components/sync_device_info",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/shared/ui/table_view/cells",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/infobars/presentation:positioner",
     "//ios/chrome/browser/ui/overlays:util",
     "//ios/chrome/browser/ui/settings/cells",

ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_image_detail_text_item.mm

diff --git a/ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_image_detail_text_item.mm b/ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_image_detail_text_item.mm
index 025f4dba..fb1ee61 100644
--- a/ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_image_detail_text_item.mm
+++ b/ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_image_detail_text_item.mm
@@ -5,8 +5,8 @@
 #import "ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_image_detail_text_item.h"
 
 #import "base/check.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/settings/cells/settings_image_detail_text_cell.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/table_view/table_view_cells_constants.h"

ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_table_view_controller.mm

diff --git a/ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_table_view_controller.mm b/ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_table_view_controller.mm
index 79c5a88d..b94e74b 100644
--- a/ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_table_view_controller.mm
+++ b/ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_table_view_controller.mm
@@ -15,6 +15,7 @@
 #import "components/send_tab_to_self/send_tab_to_self_model.h"
 #import "components/send_tab_to_self/target_device_info.h"
 #import "components/sync_device_info/device_info.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_icon_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_button_item.h"
@@ -22,7 +23,6 @@
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_url_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_styler.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_image_detail_text_item.h"
 #import "ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_manage_devices_item.h"
 #import "ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_modal_delegate.h"

ios/chrome/browser/ui/settings/BUILD.gn

diff --git a/ios/chrome/browser/ui/settings/BUILD.gn b/ios/chrome/browser/ui/settings/BUILD.gn
index b2e4a916..8f41c6a 100644
--- a/ios/chrome/browser/ui/settings/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/BUILD.gn
@@ -140,6 +140,9 @@
     "//ios/chrome/browser/shared/public/features",
     "//ios/chrome/browser/shared/ui/elements:elements_internal",
     "//ios/chrome/browser/shared/ui/list_model",
+    "//ios/chrome/browser/shared/ui/symbols",
+    "//ios/chrome/browser/shared/ui/symbols:buildflags",
+    "//ios/chrome/browser/shared/ui/symbols:icons",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/shared/ui/table_view:utils",
@@ -159,9 +162,6 @@
     "//ios/chrome/browser/ui/content_suggestions:feature_flags",
     "//ios/chrome/browser/ui/content_suggestions/cells",
     "//ios/chrome/browser/ui/first_run:field_trial",
-    "//ios/chrome/browser/ui/icons",
-    "//ios/chrome/browser/ui/icons:buildflags",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/ntp:feature_flags",
@@ -331,6 +331,7 @@
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols:icons",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:test_support",
     "//ios/chrome/browser/shared/ui/table_view:utils",
@@ -342,7 +343,6 @@
     "//ios/chrome/browser/sync:test_support",
     "//ios/chrome/browser/translate",
     "//ios/chrome/browser/ui/authentication/cells",
-    "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/settings:constants",
     "//ios/chrome/browser/ui/settings/cells",

ios/chrome/browser/ui/settings/autofill/BUILD.gn

diff --git a/ios/chrome/browser/ui/settings/autofill/BUILD.gn b/ios/chrome/browser/ui/settings/autofill/BUILD.gn
index f17c359..25b12fd8 100644
--- a/ios/chrome/browser/ui/settings/autofill/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/autofill/BUILD.gn
@@ -47,6 +47,7 @@
     "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:utils",
     "//ios/chrome/browser/shared/ui/table_view/cells",
@@ -57,7 +58,6 @@
     "//ios/chrome/browser/ui/autofill:autofill_ui_type",
     "//ios/chrome/browser/ui/autofill/cells",
     "//ios/chrome/browser/ui/autofill/form_input_accessory:form_input_accessory",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/settings:settings_root_categories",
     "//ios/chrome/browser/ui/settings/autofill/cells",

ios/chrome/browser/ui/settings/autofill/autofill_profile_table_view_controller.mm

diff --git a/ios/chrome/browser/ui/settings/autofill/autofill_profile_table_view_controller.mm b/ios/chrome/browser/ui/settings/autofill/autofill_profile_table_view_controller.mm
index 3c9301b2..b9ea63c7 100644
--- a/ios/chrome/browser/ui/settings/autofill/autofill_profile_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/autofill/autofill_profile_table_view_controller.mm
@@ -24,6 +24,7 @@
 #import "ios/chrome/browser/net/crurl.h"
 #import "ios/chrome/browser/shared/coordinator/alert/action_sheet_coordinator.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_text_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_info_button_cell.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_info_button_item.h"
@@ -38,7 +39,6 @@
 #import "ios/chrome/browser/signin/authentication_service_factory.h"
 #import "ios/chrome/browser/sync/sync_setup_service.h"
 #import "ios/chrome/browser/sync/sync_setup_service_factory.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/settings/autofill/autofill_constants.h"
 #import "ios/chrome/browser/ui/settings/autofill/autofill_profile_edit_coordinator.h"
 #import "ios/chrome/browser/ui/settings/autofill/cells/autofill_address_profile_source.h"

ios/chrome/browser/ui/settings/cells/BUILD.gn

diff --git a/ios/chrome/browser/ui/settings/cells/BUILD.gn b/ios/chrome/browser/ui/settings/cells/BUILD.gn
index 6fdf057..84731ee 100644
--- a/ios/chrome/browser/ui/settings/cells/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/cells/BUILD.gn
@@ -39,12 +39,12 @@
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
+    "//ios/chrome/browser/shared/ui/symbols:icons",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/shared/ui/table_view/cells",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/ui/authentication:authentication_constants",
-    "//ios/chrome/browser/ui/icons",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/settings:constants",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/table_view:cells_constants",

ios/chrome/browser/ui/settings/cells/settings_check_item.mm

diff --git a/ios/chrome/browser/ui/settings/cells/settings_check_item.mm b/ios/chrome/browser/ui/settings/cells/settings_check_item.mm
index 9ca2613..2d9e72d 100644
--- a/ios/chrome/browser/ui/settings/cells/settings_check_item.mm
+++ b/ios/chrome/browser/ui/settings/cells/settings_check_item.mm
@@ -5,7 +5,7 @@
 #import "ios/chrome/browser/ui/settings/cells/settings_check_item.h"
 
 #import "components/password_manager/core/common/password_manager_features.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/settings/cells/settings_check_cell.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 

ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn

diff --git a/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn b/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn
index 649e686c..aeb8f11 100644
--- a/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn
@@ -48,6 +48,8 @@
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/ui/elements:elements_internal",
     "//ios/chrome/browser/shared/ui/list_model",
+    "//ios/chrome/browser/shared/ui/symbols",
+    "//ios/chrome/browser/shared/ui/symbols:icons",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/shared/ui/table_view:utils",
@@ -55,8 +57,6 @@
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui/authentication",
-    "//ios/chrome/browser/ui/icons",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/browser/ui/resources:password_key",
     "//ios/chrome/browser/ui/settings:settings_root",

ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_manager.mm

diff --git a/ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_manager.mm b/ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_manager.mm
index 0b5ed11..1c915cc 100644
--- a/ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_manager.mm
+++ b/ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_manager.mm
@@ -38,6 +38,8 @@
 #import "ios/chrome/browser/search_engines/template_url_service_factory.h"
 #import "ios/chrome/browser/shared/coordinator/alert/action_sheet_coordinator.h"
 #import "ios/chrome/browser/shared/ui/list_model/list_model.h"
+#import "ios/chrome/browser/shared/ui/symbols/chrome_icon.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_icon_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_button_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_item.h"
@@ -47,8 +49,6 @@
 #import "ios/chrome/browser/signin/authentication_service_factory.h"
 #import "ios/chrome/browser/signin/identity_manager_factory.h"
 #import "ios/chrome/browser/sync/sync_service_factory.h"
-#import "ios/chrome/browser/ui/icons/chrome_icon.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/settings/cells/clear_browsing_data_constants.h"
 #import "ios/chrome/browser/ui/settings/cells/search_engine_item.h"
 #import "ios/chrome/browser/ui/settings/cells/table_view_clear_browsing_data_item.h"

ios/chrome/browser/ui/settings/google_services/BUILD.gn

diff --git a/ios/chrome/browser/ui/settings/google_services/BUILD.gn b/ios/chrome/browser/ui/settings/google_services/BUILD.gn
index 0261f08..06ee296 100644
--- a/ios/chrome/browser/ui/settings/google_services/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/google_services/BUILD.gn
@@ -59,6 +59,8 @@
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
     "//ios/chrome/browser/shared/ui/list_model",
+    "//ios/chrome/browser/shared/ui/symbols",
+    "//ios/chrome/browser/shared/ui/symbols:icons",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:utils",
     "//ios/chrome/browser/shared/ui/util",
@@ -70,8 +72,6 @@
     "//ios/chrome/browser/ui/authentication:authentication_constants",
     "//ios/chrome/browser/ui/authentication/cells",
     "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils",
-    "//ios/chrome/browser/ui/icons",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/settings:constants",
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/settings/cells",

ios/chrome/browser/ui/settings/google_services/accounts_table_view_controller.mm

diff --git a/ios/chrome/browser/ui/settings/google_services/accounts_table_view_controller.mm b/ios/chrome/browser/ui/settings/google_services/accounts_table_view_controller.mm
index 815fd42..5c9dbb2 100644
--- a/ios/chrome/browser/ui/settings/google_services/accounts_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/google_services/accounts_table_view_controller.mm
@@ -29,6 +29,8 @@
 #import "ios/chrome/browser/shared/public/commands/open_new_tab_command.h"
 #import "ios/chrome/browser/shared/public/commands/show_signin_command.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/chrome_icon.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_text_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_link_header_footer_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_header_footer_item.h"
@@ -49,8 +51,6 @@
 #import "ios/chrome/browser/ui/authentication/cells/table_view_account_item.h"
 #import "ios/chrome/browser/ui/authentication/enterprise/enterprise_utils.h"
 #import "ios/chrome/browser/ui/authentication/signout_action_sheet_coordinator.h"
-#import "ios/chrome/browser/ui/icons/chrome_icon.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/settings/cells/settings_image_detail_text_item.h"
 #import "ios/chrome/browser/ui/settings/google_services/accounts_table_view_controller_constants.h"
 #import "ios/chrome/browser/ui/settings/settings_root_view_controlling.h"

ios/chrome/browser/ui/settings/google_services/manage_sync_settings_coordinator.mm

diff --git a/ios/chrome/browser/ui/settings/google_services/manage_sync_settings_coordinator.mm b/ios/chrome/browser/ui/settings/google_services/manage_sync_settings_coordinator.mm
index 2ceb257..641543d 100644
--- a/ios/chrome/browser/ui/settings/google_services/manage_sync_settings_coordinator.mm
+++ b/ios/chrome/browser/ui/settings/google_services/manage_sync_settings_coordinator.mm
@@ -19,6 +19,7 @@
 #import "ios/chrome/browser/shared/public/commands/browsing_data_commands.h"
 #import "ios/chrome/browser/shared/public/commands/command_dispatcher.h"
 #import "ios/chrome/browser/shared/public/commands/open_new_tab_command.h"
+#import "ios/chrome/browser/shared/ui/symbols/chrome_icon.h"
 #import "ios/chrome/browser/shared/ui/table_view/table_view_utils.h"
 #import "ios/chrome/browser/signin/authentication_service.h"
 #import "ios/chrome/browser/signin/authentication_service_factory.h"
@@ -28,7 +29,6 @@
 #import "ios/chrome/browser/sync/sync_setup_service.h"
 #import "ios/chrome/browser/sync/sync_setup_service_factory.h"
 #import "ios/chrome/browser/ui/authentication/signout_action_sheet_coordinator.h"
-#import "ios/chrome/browser/ui/icons/chrome_icon.h"
 #import "ios/chrome/browser/ui/settings/google_services/manage_sync_settings_command_handler.h"
 #import "ios/chrome/browser/ui/settings/google_services/manage_sync_settings_mediator.h"
 #import "ios/chrome/browser/ui/settings/google_services/manage_sync_settings_table_view_controller.h"

ios/chrome/browser/ui/settings/google_services/manage_sync_settings_mediator.mm

diff --git a/ios/chrome/browser/ui/settings/google_services/manage_sync_settings_mediator.mm b/ios/chrome/browser/ui/settings/google_services/manage_sync_settings_mediator.mm
index 6804217..e37cc19 100644
--- a/ios/chrome/browser/ui/settings/google_services/manage_sync_settings_mediator.mm
+++ b/ios/chrome/browser/ui/settings/google_services/manage_sync_settings_mediator.mm
@@ -17,6 +17,7 @@
 #import "components/sync/driver/sync_service.h"
 #import "ios/chrome/browser/net/crurl.h"
 #import "ios/chrome/browser/shared/ui/list_model/list_model.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_icon_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_image_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_info_button_item.h"
@@ -26,7 +27,6 @@
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
 #import "ios/chrome/browser/sync/sync_observer_bridge.h"
 #import "ios/chrome/browser/sync/sync_setup_service.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/settings/cells/sync_switch_item.h"
 #import "ios/chrome/browser/ui/settings/google_services/manage_sync_settings_command_handler.h"
 #import "ios/chrome/browser/ui/settings/google_services/manage_sync_settings_constants.h"

ios/chrome/browser/ui/settings/password/BUILD.gn

diff --git a/ios/chrome/browser/ui/settings/password/BUILD.gn b/ios/chrome/browser/ui/settings/password/BUILD.gn
index e513d47..57307f2e 100644
--- a/ios/chrome/browser/ui/settings/password/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/password/BUILD.gn
@@ -101,6 +101,7 @@
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/net:crurl",
     "//ios/chrome/browser/shared/ui/elements",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:constants",
     "//ios/chrome/browser/shared/ui/table_view:styler",
@@ -109,7 +110,6 @@
     "//ios/chrome/browser/shared/ui/table_view/cells",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/signin",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/settings:settings_root_categories",
     "//ios/chrome/browser/ui/settings/cells",
@@ -153,7 +153,7 @@
   ]
   deps = [
     "//ios/chrome/app/strings:ios_strings_grit",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/common/ui/colors",
     "//ios/public/provider/chrome/browser/font:font_api",
     "//ui/base",

ios/chrome/browser/ui/settings/password/create_password_manager_title_view.mm

diff --git a/ios/chrome/browser/ui/settings/password/create_password_manager_title_view.mm b/ios/chrome/browser/ui/settings/password/create_password_manager_title_view.mm
index ddc6083..46f22a1a 100644
--- a/ios/chrome/browser/ui/settings/password/create_password_manager_title_view.mm
+++ b/ios/chrome/browser/ui/settings/password/create_password_manager_title_view.mm
@@ -6,7 +6,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/settings/password/branded_navigation_item_title_view.h"
 #import "ios/chrome/grit/ios_strings.h"
 #import "ui/base/l10n/l10n_util_mac.h"

ios/chrome/browser/ui/settings/password/password_checkup/BUILD.gn

diff --git a/ios/chrome/browser/ui/settings/password/password_checkup/BUILD.gn b/ios/chrome/browser/ui/settings/password/password_checkup/BUILD.gn
index b4a1816..29ecacb 100644
--- a/ios/chrome/browser/ui/settings/password/password_checkup/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/password/password_checkup/BUILD.gn
@@ -106,10 +106,10 @@
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/passwords:store_factory",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view:test_support",
     "//ios/chrome/browser/shared/ui/table_view:utils",
     "//ios/chrome/browser/shared/ui/table_view/cells",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/common/ui/colors",
     "//ios/web/public/test",

ios/chrome/browser/ui/settings/password/password_checkup/password_checkup_view_controller_unittest.mm

diff --git a/ios/chrome/browser/ui/settings/password/password_checkup/password_checkup_view_controller_unittest.mm b/ios/chrome/browser/ui/settings/password/password_checkup/password_checkup_view_controller_unittest.mm
index 31f4404..57d4e14 100644
--- a/ios/chrome/browser/ui/settings/password/password_checkup/password_checkup_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/settings/password/password_checkup/password_checkup_view_controller_unittest.mm
@@ -18,10 +18,10 @@
 #import "ios/chrome/browser/passwords/ios_chrome_affiliation_service_factory.h"
 #import "ios/chrome/browser/passwords/ios_chrome_password_check_manager_factory.h"
 #import "ios/chrome/browser/passwords/ios_chrome_password_store_factory.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_controller_test.h"
 #import "ios/chrome/browser/shared/ui/table_view/table_view_utils.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/settings/cells/settings_check_item.h"
 #import "ios/chrome/browser/ui/settings/password/password_checkup/password_checkup_commands.h"
 #import "ios/chrome/browser/ui/settings/password/password_checkup/password_checkup_constants.h"

ios/chrome/browser/ui/settings/password/password_details/BUILD.gn

diff --git a/ios/chrome/browser/ui/settings/password/password_details/BUILD.gn b/ios/chrome/browser/ui/settings/password/password_details/BUILD.gn
index 78d3ae2c..de498594 100644
--- a/ios/chrome/browser/ui/settings/password/password_details/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/password/password_details/BUILD.gn
@@ -83,10 +83,10 @@
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
     "//ios/chrome/browser/shared/ui/list_model:list_model",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view:utils",
     "//ios/chrome/browser/shared/ui/table_view/cells",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/infobars/resources:infobar_hide_password_icon",
     "//ios/chrome/browser/ui/infobars/resources:infobar_reveal_password_icon",
     "//ios/chrome/browser/ui/keyboard",

ios/chrome/browser/ui/settings/password/password_details/add_password_view_controller.mm

diff --git a/ios/chrome/browser/ui/settings/password/password_details/add_password_view_controller.mm b/ios/chrome/browser/ui/settings/password/password_details/add_password_view_controller.mm
index fd3712a..d39cdc5 100644
--- a/ios/chrome/browser/ui/settings/password/password_details/add_password_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/password/password_details/add_password_view_controller.mm
@@ -16,6 +16,7 @@
 #import "components/password_manager/core/common/password_manager_features.h"
 #import "components/sync/base/features.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_link_header_footer_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_multi_line_text_edit_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_multi_line_text_edit_item_delegate.h"
@@ -24,7 +25,6 @@
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/table_view_utils.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/keyboard/UIKeyCommand+Chrome.h"
 #import "ios/chrome/browser/ui/settings/cells/settings_image_detail_text_item.h"
 #import "ios/chrome/browser/ui/settings/password/password_details/add_password_handler.h"

ios/chrome/browser/ui/settings/password/password_details/password_details_table_view_controller.mm

diff --git a/ios/chrome/browser/ui/settings/password/password_details/password_details_table_view_controller.mm b/ios/chrome/browser/ui/settings/password/password_details/password_details_table_view_controller.mm
index d0a2ac50..69d7c43 100644
--- a/ios/chrome/browser/ui/settings/password/password_details/password_details_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/password/password_details/password_details_table_view_controller.mm
@@ -18,6 +18,7 @@
 #import "ios/chrome/browser/shared/public/commands/open_new_tab_command.h"
 #import "ios/chrome/browser/shared/public/commands/snackbar_commands.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_multi_line_text_edit_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_multi_line_text_edit_item_delegate.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_button_item.h"
@@ -27,7 +28,6 @@
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/table_view_utils.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/settings/cells/settings_image_detail_text_item.h"
 #import "ios/chrome/browser/ui/settings/password/password_details/cells/table_view_stacked_details_item.h"
 #import "ios/chrome/browser/ui/settings/password/password_details/password_details.h"

ios/chrome/browser/ui/settings/password/password_manager_view_controller_items.mm

diff --git a/ios/chrome/browser/ui/settings/password/password_manager_view_controller_items.mm b/ios/chrome/browser/ui/settings/password/password_manager_view_controller_items.mm
index fe8a015..3d16e8e 100644
--- a/ios/chrome/browser/ui/settings/password/password_manager_view_controller_items.mm
+++ b/ios/chrome/browser/ui/settings/password/password_manager_view_controller_items.mm
@@ -17,9 +17,9 @@
 #import "components/password_manager/core/browser/ui/credential_ui_entry.h"
 #import "components/password_manager/core/common/password_manager_features.h"
 #import "ios/chrome/browser/net/crurl.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_styler.h"
 #import "ios/chrome/browser/shared/ui/table_view/table_view_favicon_data_source.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/settings/password/passwords_table_view_constants.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/favicon/favicon_attributes.h"

ios/chrome/browser/ui/settings/password/password_settings/BUILD.gn

diff --git a/ios/chrome/browser/ui/settings/password/password_settings/BUILD.gn b/ios/chrome/browser/ui/settings/password/password_settings/BUILD.gn
index 828551e8..bab6bf9 100644
--- a/ios/chrome/browser/ui/settings/password/password_settings/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/password/password_settings/BUILD.gn
@@ -57,9 +57,9 @@
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/shared/public/commands",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:utils",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/reauthentication",
     "//ios/chrome/common/ui/util:image_util",

ios/chrome/browser/ui/settings/password/password_settings/password_settings_view_controller.mm

diff --git a/ios/chrome/browser/ui/settings/password/password_settings/password_settings_view_controller.mm b/ios/chrome/browser/ui/settings/password/password_settings/password_settings_view_controller.mm
index 1c99d15..54e2a7d 100644
--- a/ios/chrome/browser/ui/settings/password/password_settings/password_settings_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/password/password_settings/password_settings_view_controller.mm
@@ -10,6 +10,7 @@
 #import "base/notreached.h"
 #import "base/strings/sys_string_conversions.h"
 #import "components/strings/grit/components_strings.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_icon_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_image_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_info_button_cell.h"
@@ -18,7 +19,6 @@
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_switch_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/table_view_utils.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/settings/password/password_settings/password_settings_constants.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/reauthentication/reauthentication_module.h"

ios/chrome/browser/ui/settings/price_notifications/BUILD.gn

diff --git a/ios/chrome/browser/ui/settings/price_notifications/BUILD.gn b/ios/chrome/browser/ui/settings/price_notifications/BUILD.gn
index 2ea3fc9..d74c5ca 100644
--- a/ios/chrome/browser/ui/settings/price_notifications/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/price_notifications/BUILD.gn
@@ -17,9 +17,9 @@
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/ui/list_model",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view:utils",
     "//ios/chrome/browser/shared/ui/table_view/cells",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/settings/price_notifications/tracking_price",
     "//ios/chrome/common/ui/colors",
     "//ui/base",

ios/chrome/browser/ui/settings/price_notifications/price_notifications_mediator.mm

diff --git a/ios/chrome/browser/ui/settings/price_notifications/price_notifications_mediator.mm b/ios/chrome/browser/ui/settings/price_notifications/price_notifications_mediator.mm
index c2a1b652..29d608f 100644
--- a/ios/chrome/browser/ui/settings/price_notifications/price_notifications_mediator.mm
+++ b/ios/chrome/browser/ui/settings/price_notifications/price_notifications_mediator.mm
@@ -6,8 +6,8 @@
 
 #import "base/notreached.h"
 #import "ios/chrome/browser/shared/ui/list_model/list_model.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_icon_item.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/settings/price_notifications/price_notifications_constants.h"
 #import "ios/chrome/browser/ui/settings/price_notifications/price_notifications_consumer.h"
 #import "ios/chrome/browser/ui/settings/price_notifications/price_notifications_navigation_commands.h"

ios/chrome/browser/ui/settings/privacy/BUILD.gn

diff --git a/ios/chrome/browser/ui/settings/privacy/BUILD.gn b/ios/chrome/browser/ui/settings/privacy/BUILD.gn
index fc9e7ea9..99f7c4a 100644
--- a/ios/chrome/browser/ui/settings/privacy/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/privacy/BUILD.gn
@@ -45,13 +45,13 @@
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
     "//ios/chrome/browser/shared/ui/list_model",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/shared/ui/table_view:utils",
     "//ios/chrome/browser/shared/ui/table_view/cells",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/incognito_interstitial:constants",
     "//ios/chrome/browser/ui/settings:constants",
     "//ios/chrome/browser/ui/settings:settings_root",

ios/chrome/browser/ui/settings/privacy/privacy_safe_browsing_mediator.mm

diff --git a/ios/chrome/browser/ui/settings/privacy/privacy_safe_browsing_mediator.mm b/ios/chrome/browser/ui/settings/privacy/privacy_safe_browsing_mediator.mm
index d64b5e9..6aab668 100644
--- a/ios/chrome/browser/ui/settings/privacy/privacy_safe_browsing_mediator.mm
+++ b/ios/chrome/browser/ui/settings/privacy/privacy_safe_browsing_mediator.mm
@@ -16,10 +16,10 @@
 #import "ios/chrome/browser/prefs/pref_names.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
 #import "ios/chrome/browser/shared/ui/list_model/list_model.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_info_button_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_info_button_item_delegate.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/settings/cells/settings_image_detail_text_item.h"
 #import "ios/chrome/browser/ui/settings/privacy/privacy_constants.h"
 #import "ios/chrome/browser/ui/settings/privacy/privacy_safe_browsing_consumer.h"

ios/chrome/browser/ui/settings/privacy/safe_browsing/BUILD.gn

diff --git a/ios/chrome/browser/ui/settings/privacy/safe_browsing/BUILD.gn b/ios/chrome/browser/ui/settings/privacy/safe_browsing/BUILD.gn
index daac636..60339a30 100644
--- a/ios/chrome/browser/ui/settings/privacy/safe_browsing/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/privacy/safe_browsing/BUILD.gn
@@ -37,6 +37,7 @@
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
     "//ios/chrome/browser/shared/ui/list_model",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/shared/ui/table_view:utils",
@@ -44,7 +45,6 @@
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",

ios/chrome/browser/ui/settings/privacy/safe_browsing/safe_browsing_enhanced_protection_mediator.mm

diff --git a/ios/chrome/browser/ui/settings/privacy/safe_browsing/safe_browsing_enhanced_protection_mediator.mm b/ios/chrome/browser/ui/settings/privacy/safe_browsing/safe_browsing_enhanced_protection_mediator.mm
index 066830d9..00a5b7d 100644
--- a/ios/chrome/browser/ui/settings/privacy/safe_browsing/safe_browsing_enhanced_protection_mediator.mm
+++ b/ios/chrome/browser/ui/settings/privacy/safe_browsing/safe_browsing_enhanced_protection_mediator.mm
@@ -5,7 +5,7 @@
 #import "ios/chrome/browser/ui/settings/privacy/safe_browsing/safe_browsing_enhanced_protection_mediator.h"
 
 #import "ios/chrome/browser/shared/ui/list_model/list_model.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/settings/cells/settings_image_detail_text_item.h"
 #import "ios/chrome/browser/ui/settings/privacy/safe_browsing/safe_browsing_constants.h"
 #import "ios/chrome/browser/ui/settings/privacy/safe_browsing/safe_browsing_enhanced_protection_consumer.h"

ios/chrome/browser/ui/settings/privacy/safe_browsing/safe_browsing_standard_protection_mediator.mm

diff --git a/ios/chrome/browser/ui/settings/privacy/safe_browsing/safe_browsing_standard_protection_mediator.mm b/ios/chrome/browser/ui/settings/privacy/safe_browsing/safe_browsing_standard_protection_mediator.mm
index 221b49f..110a70ee 100644
--- a/ios/chrome/browser/ui/settings/privacy/safe_browsing/safe_browsing_standard_protection_mediator.mm
+++ b/ios/chrome/browser/ui/settings/privacy/safe_browsing/safe_browsing_standard_protection_mediator.mm
@@ -12,10 +12,10 @@
 #import "components/safe_browsing/core/common/safe_browsing_prefs.h"
 #import "components/signin/public/identity_manager/objc/identity_manager_observer_bridge.h"
 #import "ios/chrome/browser/shared/ui/list_model/list_model.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_info_button_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_switch_item.h"
 #import "ios/chrome/browser/signin/authentication_service.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/settings/cells/safe_browsing_header_item.h"
 #import "ios/chrome/browser/ui/settings/cells/sync_switch_item.h"
 #import "ios/chrome/browser/ui/settings/privacy/safe_browsing/safe_browsing_constants.h"

ios/chrome/browser/ui/settings/safety_check/BUILD.gn

diff --git a/ios/chrome/browser/ui/settings/safety_check/BUILD.gn b/ios/chrome/browser/ui/settings/safety_check/BUILD.gn
index 759cc50f..2140109 100644
--- a/ios/chrome/browser/ui/settings/safety_check/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/safety_check/BUILD.gn
@@ -73,12 +73,12 @@
     "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:utils",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/resources:password_key",
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/settings/cells",
@@ -124,13 +124,13 @@
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view:test_support",
     "//ios/chrome/browser/shared/ui/table_view/cells",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/signin:test_support",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/sync:test_support",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/upgrade",

ios/chrome/browser/ui/settings/safety_check/safety_check_mediator.mm

diff --git a/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator.mm b/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator.mm
index da72007..c2c28ac6 100644
--- a/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator.mm
+++ b/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator.mm
@@ -28,13 +28,13 @@
 #import "ios/chrome/browser/passwords/password_check_observer_bridge.h"
 #import "ios/chrome/browser/passwords/password_store_observer_bridge.h"
 #import "ios/chrome/browser/prefs/pref_names.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_link_header_footer_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/table_view_utils.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
 #import "ios/chrome/browser/signin/authentication_service.h"
 #import "ios/chrome/browser/sync/sync_setup_service.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/settings/cells/settings_check_item.h"
 #import "ios/chrome/browser/ui/settings/password/password_checkup/password_checkup_utils.h"
 #import "ios/chrome/browser/ui/settings/safety_check/safety_check_constants.h"

ios/chrome/browser/ui/settings/safety_check/safety_check_mediator_unittest.mm

diff --git a/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator_unittest.mm b/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator_unittest.mm
index 9f4c834e..f97381b 100644
--- a/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator_unittest.mm
+++ b/ios/chrome/browser/ui/settings/safety_check/safety_check_mediator_unittest.mm
@@ -32,6 +32,7 @@
 #import "ios/chrome/browser/passwords/ios_chrome_password_store_factory.h"
 #import "ios/chrome/browser/passwords/password_check_observer_bridge.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_text_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_controller_test.h"
 #import "ios/chrome/browser/signin/authentication_service.h"
@@ -39,7 +40,6 @@
 #import "ios/chrome/browser/signin/fake_authentication_service_delegate.h"
 #import "ios/chrome/browser/sync/sync_setup_service_factory.h"
 #import "ios/chrome/browser/sync/sync_setup_service_mock.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/settings/cells/settings_check_item.h"
 #import "ios/chrome/browser/ui/settings/safety_check/safety_check_constants.h"
 #import "ios/chrome/browser/ui/settings/safety_check/safety_check_consumer.h"

ios/chrome/browser/ui/settings/settings_navigation_controller.mm

diff --git a/ios/chrome/browser/ui/settings/settings_navigation_controller.mm b/ios/chrome/browser/ui/settings/settings_navigation_controller.mm
index 2335ff42..5eddfb7 100644
--- a/ios/chrome/browser/ui/settings/settings_navigation_controller.mm
+++ b/ios/chrome/browser/ui/settings/settings_navigation_controller.mm
@@ -14,12 +14,12 @@
 #import "ios/chrome/browser/application_context/application_context.h"
 #import "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #import "ios/chrome/browser/main/browser.h"
+#import "ios/chrome/browser/shared/ui/symbols/chrome_icon.h"
 #import "ios/chrome/browser/shared/ui/table_view/table_view_utils.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
 #import "ios/chrome/browser/sync/sync_setup_service.h"
 #import "ios/chrome/browser/sync/sync_setup_service_factory.h"
 #import "ios/chrome/browser/tabs/inactive_tabs/features.h"
-#import "ios/chrome/browser/ui/icons/chrome_icon.h"
 #import "ios/chrome/browser/ui/keyboard/UIKeyCommand+Chrome.h"
 #import "ios/chrome/browser/ui/settings/autofill/autofill_credit_card_table_view_controller.h"
 #import "ios/chrome/browser/ui/settings/autofill/autofill_profile_table_view_controller.h"

ios/chrome/browser/ui/settings/settings_table_view_controller.mm

diff --git a/ios/chrome/browser/ui/settings/settings_table_view_controller.mm b/ios/chrome/browser/ui/settings/settings_table_view_controller.mm
index 691619fa..13e7f44 100644
--- a/ios/chrome/browser/ui/settings/settings_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/settings_table_view_controller.mm
@@ -53,6 +53,8 @@
 #import "ios/chrome/browser/shared/public/commands/command_dispatcher.h"
 #import "ios/chrome/browser/shared/public/commands/snackbar_commands.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/buildflags.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_icon_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_image_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_info_button_cell.h"
@@ -80,8 +82,6 @@
 #import "ios/chrome/browser/ui/authentication/signin_presenter.h"
 #import "ios/chrome/browser/ui/authentication/signin_promo_view_mediator.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_feature.h"
-#import "ios/chrome/browser/ui/icons/buildflags.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/main/scene_state.h"
 #import "ios/chrome/browser/ui/main/scene_state_browser_agent.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_feature.h"

ios/chrome/browser/ui/settings/sync/utils/BUILD.gn

diff --git a/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn b/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn
index bdcb4a2d..c3c88b0 100644
--- a/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn
@@ -29,10 +29,10 @@
     "//ios/chrome/browser/settings/sync/utils:identity_error_util",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/settings:constants",
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/common/ui/colors",
@@ -55,9 +55,9 @@
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/sync:test_support",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/settings/sync/utils/test",
     "//ios/chrome/common/ui/colors",
     "//ios/web/public/test",

ios/chrome/browser/ui/settings/sync/utils/sync_error_infobar_delegate.mm

diff --git a/ios/chrome/browser/ui/settings/sync/utils/sync_error_infobar_delegate.mm b/ios/chrome/browser/ui/settings/sync/utils/sync_error_infobar_delegate.mm
index 0cfec128..ec71cc0 100644
--- a/ios/chrome/browser/ui/settings/sync/utils/sync_error_infobar_delegate.mm
+++ b/ios/chrome/browser/ui/settings/sync/utils/sync_error_infobar_delegate.mm
@@ -20,8 +20,8 @@
 #import "ios/chrome/browser/infobars/infobar_ios.h"
 #import "ios/chrome/browser/infobars/infobar_type.h"
 #import "ios/chrome/browser/infobars/infobar_utils.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/sync/sync_service_factory.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/settings/sync/utils/sync_presenter.h"
 #import "ios/chrome/browser/ui/settings/sync/utils/sync_util.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"

ios/chrome/browser/ui/settings/sync/utils/sync_error_infobar_delegate_unittest.mm

diff --git a/ios/chrome/browser/ui/settings/sync/utils/sync_error_infobar_delegate_unittest.mm b/ios/chrome/browser/ui/settings/sync/utils/sync_error_infobar_delegate_unittest.mm
index 3ed0c89..cc8db46 100644
--- a/ios/chrome/browser/ui/settings/sync/utils/sync_error_infobar_delegate_unittest.mm
+++ b/ios/chrome/browser/ui/settings/sync/utils/sync_error_infobar_delegate_unittest.mm
@@ -13,9 +13,9 @@
 #import "ios/chrome/browser/infobars/infobar_ios.h"
 #import "ios/chrome/browser/infobars/infobar_utils.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/sync/mock_sync_service_utils.h"
 #import "ios/chrome/browser/sync/sync_service_factory.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/settings/sync/utils/sync_presenter.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/web/public/test/web_task_environment.h"

ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm

diff --git a/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm b/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm
index 4cdbe2a01..5ac5548 100644
--- a/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm
@@ -7,6 +7,8 @@
 #import "base/mac/foundation_util.h"
 #import "ios/chrome/browser/net/crurl.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/chrome_icon.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_icon_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_text_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_image_item.h"
@@ -30,8 +32,6 @@
 #import "ios/chrome/browser/ui/authentication/cells/table_view_account_item.h"
 #import "ios/chrome/browser/ui/authentication/cells/table_view_signin_promo_item.h"
 #import "ios/chrome/browser/ui/autofill/cells/autofill_edit_item.h"
-#import "ios/chrome/browser/ui/icons/chrome_icon.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/settings/cells/account_sign_in_item.h"
 #import "ios/chrome/browser/ui/settings/cells/copied_to_chrome_item.h"
 #import "ios/chrome/browser/ui/settings/cells/settings_check_cell.h"

ios/chrome/browser/ui/settings/tabs/inactive_tabs/BUILD.gn

diff --git a/ios/chrome/browser/ui/settings/tabs/inactive_tabs/BUILD.gn b/ios/chrome/browser/ui/settings/tabs/inactive_tabs/BUILD.gn
index daa66729..d3c1decf 100644
--- a/ios/chrome/browser/ui/settings/tabs/inactive_tabs/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/tabs/inactive_tabs/BUILD.gn
@@ -33,6 +33,7 @@
     "inactive_tabs_settings_table_view_controller_delegate.h",
   ]
   deps = [
+    "//base:i18n",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/shared/ui/table_view:utils",

ios/chrome/browser/ui/settings/tabs/inactive_tabs/inactive_tabs_settings_table_view_controller.mm

diff --git a/ios/chrome/browser/ui/settings/tabs/inactive_tabs/inactive_tabs_settings_table_view_controller.mm b/ios/chrome/browser/ui/settings/tabs/inactive_tabs/inactive_tabs_settings_table_view_controller.mm
index f092bf4..140a6df5 100644
--- a/ios/chrome/browser/ui/settings/tabs/inactive_tabs/inactive_tabs_settings_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/tabs/inactive_tabs/inactive_tabs_settings_table_view_controller.mm
@@ -4,7 +4,9 @@
 
 #import "ios/chrome/browser/ui/settings/tabs/inactive_tabs/inactive_tabs_settings_table_view_controller.h"
 
+#import "base/i18n/message_formatter.h"
 #import "base/notreached.h"
+#import "base/strings/sys_string_conversions.h"
 #import "base/time/time.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_text_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_styler.h"
@@ -92,25 +94,13 @@
       forSectionWithIdentifier:SectionIdentifierOptions];
 
   // Option items.
-  [model addItem:[self createTextItemWithText:
-                           l10n_util::GetNSString(
-                               IDS_IOS_OPTIONS_INACTIVE_TABS_DISABLED)
-                                         item:ItemTypeOptionsNever]
+  [model addItem:[self createItemWithType:ItemTypeOptionsNever]
       toSectionWithIdentifier:SectionIdentifierOptions];
-  [model addItem:[self createTextItemWithText:
-                           l10n_util::GetNSStringF(
-                               IDS_IOS_OPTIONS_INACTIVE_TABS_THRESHOLD, u"7")
-                                         item:ItemTypeOptions7Days]
+  [model addItem:[self createItemWithType:ItemTypeOptions7Days]
       toSectionWithIdentifier:SectionIdentifierOptions];
-  [model addItem:[self createTextItemWithText:
-                           l10n_util::GetNSStringF(
-                               IDS_IOS_OPTIONS_INACTIVE_TABS_THRESHOLD, u"14")
-                                         item:ItemTypeOptions14Days]
+  [model addItem:[self createItemWithType:ItemTypeOptions14Days]
       toSectionWithIdentifier:SectionIdentifierOptions];
-  [model addItem:[self createTextItemWithText:
-                           l10n_util::GetNSStringF(
-                               IDS_IOS_OPTIONS_INACTIVE_TABS_THRESHOLD, u"21")
-                                         item:ItemTypeOptions21Days]
+  [model addItem:[self createItemWithType:ItemTypeOptions21Days]
       toSectionWithIdentifier:SectionIdentifierOptions];
 
   [self updateCheckedStateWithDaysThreshold:_threshold];
@@ -118,12 +108,19 @@
 
 #pragma mark - Internal methods
 
-// Creates a table view item with text and a type.
-- (TableViewDetailTextItem*)createTextItemWithText:(NSString*)text
-                                              item:(ItemType)item {
+// Creates a table view item for the given type.
+- (TableViewDetailTextItem*)createItemWithType:(ItemType)itemType {
   TableViewDetailTextItem* tableViewItem =
-      [[TableViewDetailTextItem alloc] initWithType:item];
-  tableViewItem.text = text;
+      [[TableViewDetailTextItem alloc] initWithType:itemType];
+  if (itemType == ItemTypeOptionsNever) {
+    tableViewItem.text =
+        l10n_util::GetNSString(IDS_IOS_OPTIONS_INACTIVE_TABS_DISABLED);
+  } else {
+    tableViewItem.text = base::SysUTF16ToNSString(
+        base::i18n::MessageFormatter::FormatWithNumberedArgs(
+            l10n_util::GetStringUTF16(IDS_IOS_OPTIONS_INACTIVE_TABS_THRESHOLD),
+            InactiveDaysThresholdWithItemType(itemType)));
+  }
   tableViewItem.accessibilityTraits |= UIAccessibilityTraitButton;
   return tableViewItem;
 }

ios/chrome/browser/ui/settings/tabs/tabs_settings_table_view_controller.mm

diff --git a/ios/chrome/browser/ui/settings/tabs/tabs_settings_table_view_controller.mm b/ios/chrome/browser/ui/settings/tabs/tabs_settings_table_view_controller.mm
index 39c2424..967a7dd 100644
--- a/ios/chrome/browser/ui/settings/tabs/tabs_settings_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/tabs/tabs_settings_table_view_controller.mm
@@ -4,6 +4,7 @@
 
 #import "ios/chrome/browser/ui/settings/tabs/tabs_settings_table_view_controller.h"
 
+#import "base/i18n/message_formatter.h"
 #import "base/strings/sys_string_conversions.h"
 #import "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_icon_item.h"
@@ -13,7 +14,7 @@
 #import "ios/chrome/browser/ui/settings/tabs/inactive_tabs/inactive_tabs_settings_table_view_controller.h"
 #import "ios/chrome/browser/ui/settings/tabs/tabs_settings_table_view_controller_delegate.h"
 #import "ios/chrome/grit/ios_strings.h"
-#import "ui/base/l10n/l10n_util_mac.h"
+#import "ui/base/l10n/l10n_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
@@ -140,10 +141,10 @@
     _inactiveTabsDetailItem.detailText =
         l10n_util::GetNSString(IDS_IOS_OPTIONS_INACTIVE_TABS_DISABLED);
   } else {
-    std::u16string thresholdString = base::SysNSStringToUTF16(
-        [NSString stringWithFormat:@"%@", @(_inactiveDaysThreshold)]);
-    _inactiveTabsDetailItem.detailText = l10n_util::GetNSStringF(
-        IDS_IOS_OPTIONS_INACTIVE_TABS_THRESHOLD, thresholdString);
+    _inactiveTabsDetailItem.detailText = base::SysUTF16ToNSString(
+        base::i18n::MessageFormatter::FormatWithNumberedArgs(
+            l10n_util::GetStringUTF16(IDS_IOS_OPTIONS_INACTIVE_TABS_THRESHOLD),
+            _inactiveDaysThreshold));
   }
   [self reconfigureCellsForItems:@[ _inactiveTabsDetailItem ]];
 }

ios/chrome/browser/ui/sharing/activity_services/activities/BUILD.gn

diff --git a/ios/chrome/browser/ui/sharing/activity_services/activities/BUILD.gn b/ios/chrome/browser/ui/sharing/activity_services/activities/BUILD.gn
index 6f1dadcc..bfdf0c3d 100644
--- a/ios/chrome/browser/ui/sharing/activity_services/activities/BUILD.gn
+++ b/ios/chrome/browser/ui/sharing/activity_services/activities/BUILD.gn
@@ -30,8 +30,8 @@
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/send_tab_to_self",
     "//ios/chrome/browser/shared/public/commands",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/sharing/activity_services/data",
     "//ios/chrome/browser/web",
     "//ios/web/common:user_agent",

ios/chrome/browser/ui/sharing/activity_services/activities/bookmark_activity.mm

diff --git a/ios/chrome/browser/ui/sharing/activity_services/activities/bookmark_activity.mm b/ios/chrome/browser/ui/sharing/activity_services/activities/bookmark_activity.mm
index 4199e69a..9df12e4 100644
--- a/ios/chrome/browser/ui/sharing/activity_services/activities/bookmark_activity.mm
+++ b/ios/chrome/browser/ui/sharing/activity_services/activities/bookmark_activity.mm
@@ -12,7 +12,7 @@
 #import "ios/chrome/browser/shared/public/commands/bookmark_add_command.h"
 #import "ios/chrome/browser/shared/public/commands/bookmarks_commands.h"
 #import "ios/chrome/browser/shared/public/commands/browser_commands.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/grit/ios_strings.h"
 #import "ui/base/l10n/l10n_util_mac.h"
 #import "url/gurl.h"

ios/chrome/browser/ui/sharing/activity_services/activities/copy_activity.mm

diff --git a/ios/chrome/browser/ui/sharing/activity_services/activities/copy_activity.mm b/ios/chrome/browser/ui/sharing/activity_services/activities/copy_activity.mm
index 4660f8c..7317186 100644
--- a/ios/chrome/browser/ui/sharing/activity_services/activities/copy_activity.mm
+++ b/ios/chrome/browser/ui/sharing/activity_services/activities/copy_activity.mm
@@ -4,8 +4,8 @@
 
 #import "ios/chrome/browser/ui/sharing/activity_services/activities/copy_activity.h"
 
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/pasteboard_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/sharing/activity_services/data/share_to_data.h"
 #import "ios/chrome/grit/ios_strings.h"
 #import "ui/base/l10n/l10n_util_mac.h"

ios/chrome/browser/ui/sharing/activity_services/activities/find_in_page_activity.mm

diff --git a/ios/chrome/browser/ui/sharing/activity_services/activities/find_in_page_activity.mm b/ios/chrome/browser/ui/sharing/activity_services/activities/find_in_page_activity.mm
index 66b2a05..e781462 100644
--- a/ios/chrome/browser/ui/sharing/activity_services/activities/find_in_page_activity.mm
+++ b/ios/chrome/browser/ui/sharing/activity_services/activities/find_in_page_activity.mm
@@ -7,7 +7,7 @@
 #import "base/metrics/user_metrics.h"
 #import "base/metrics/user_metrics_action.h"
 #import "ios/chrome/browser/shared/public/commands/find_in_page_commands.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/sharing/activity_services/data/share_to_data.h"
 #import "ios/chrome/grit/ios_strings.h"
 #import "ui/base/l10n/l10n_util_mac.h"

ios/chrome/browser/ui/sharing/activity_services/activities/generate_qr_code_activity.mm

diff --git a/ios/chrome/browser/ui/sharing/activity_services/activities/generate_qr_code_activity.mm b/ios/chrome/browser/ui/sharing/activity_services/activities/generate_qr_code_activity.mm
index 6764fa5..6693a0b 100644
--- a/ios/chrome/browser/ui/sharing/activity_services/activities/generate_qr_code_activity.mm
+++ b/ios/chrome/browser/ui/sharing/activity_services/activities/generate_qr_code_activity.mm
@@ -6,7 +6,7 @@
 
 #import "base/metrics/user_metrics.h"
 #import "base/metrics/user_metrics_action.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/grit/ios_strings.h"
 #import "ui/base/l10n/l10n_util_mac.h"
 

ios/chrome/browser/ui/sharing/activity_services/activities/print_activity.mm

diff --git a/ios/chrome/browser/ui/sharing/activity_services/activities/print_activity.mm b/ios/chrome/browser/ui/sharing/activity_services/activities/print_activity.mm
index 8eed0c7..4c1255a 100644
--- a/ios/chrome/browser/ui/sharing/activity_services/activities/print_activity.mm
+++ b/ios/chrome/browser/ui/sharing/activity_services/activities/print_activity.mm
@@ -5,7 +5,7 @@
 #import "ios/chrome/browser/ui/sharing/activity_services/activities/print_activity.h"
 
 #import "ios/chrome/browser/shared/public/commands/browser_coordinator_commands.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/sharing/activity_services/data/share_image_data.h"
 #import "ios/chrome/browser/ui/sharing/activity_services/data/share_to_data.h"
 #import "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/ui/sharing/activity_services/activities/reading_list_activity.mm

diff --git a/ios/chrome/browser/ui/sharing/activity_services/activities/reading_list_activity.mm b/ios/chrome/browser/ui/sharing/activity_services/activities/reading_list_activity.mm
index fa893824..91787035 100644
--- a/ios/chrome/browser/ui/sharing/activity_services/activities/reading_list_activity.mm
+++ b/ios/chrome/browser/ui/sharing/activity_services/activities/reading_list_activity.mm
@@ -9,7 +9,7 @@
 #import "base/strings/sys_string_conversions.h"
 #import "ios/chrome/browser/shared/public/commands/browser_commands.h"
 #import "ios/chrome/browser/shared/public/commands/reading_list_add_command.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/grit/ios_strings.h"
 #import "ui/base/l10n/l10n_util_mac.h"
 #import "url/gurl.h"

ios/chrome/browser/ui/sharing/activity_services/activities/request_desktop_or_mobile_site_activity.mm

diff --git a/ios/chrome/browser/ui/sharing/activity_services/activities/request_desktop_or_mobile_site_activity.mm b/ios/chrome/browser/ui/sharing/activity_services/activities/request_desktop_or_mobile_site_activity.mm
index 360cdf0..b89a941 100644
--- a/ios/chrome/browser/ui/sharing/activity_services/activities/request_desktop_or_mobile_site_activity.mm
+++ b/ios/chrome/browser/ui/sharing/activity_services/activities/request_desktop_or_mobile_site_activity.mm
@@ -7,7 +7,7 @@
 #import "base/metrics/user_metrics.h"
 #import "base/metrics/user_metrics_action.h"
 #import "ios/chrome/browser/shared/public/commands/browser_coordinator_commands.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/web/web_navigation_browser_agent.h"
 #import "ios/chrome/grit/ios_strings.h"
 #import "ui/base/l10n/l10n_util_mac.h"

ios/chrome/browser/ui/sharing/activity_services/activities/send_tab_to_self_activity.mm

diff --git a/ios/chrome/browser/ui/sharing/activity_services/activities/send_tab_to_self_activity.mm b/ios/chrome/browser/ui/sharing/activity_services/activities/send_tab_to_self_activity.mm
index d44cd20f..c06c45c 100644
--- a/ios/chrome/browser/ui/sharing/activity_services/activities/send_tab_to_self_activity.mm
+++ b/ios/chrome/browser/ui/sharing/activity_services/activities/send_tab_to_self_activity.mm
@@ -8,7 +8,7 @@
 #import "base/metrics/user_metrics.h"
 #import "base/metrics/user_metrics_action.h"
 #import "ios/chrome/browser/shared/public/commands/browser_coordinator_commands.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/sharing/activity_services/data/share_to_data.h"
 #import "ios/chrome/grit/ios_strings.h"
 #import "ui/base/l10n/l10n_util_mac.h"

ios/chrome/browser/ui/sharing/qr_generator/BUILD.gn

diff --git a/ios/chrome/browser/ui/sharing/qr_generator/BUILD.gn b/ios/chrome/browser/ui/sharing/qr_generator/BUILD.gn
index 02fd3709..e569d58 100644
--- a/ios/chrome/browser/ui/sharing/qr_generator/BUILD.gn
+++ b/ios/chrome/browser/ui/sharing/qr_generator/BUILD.gn
@@ -15,8 +15,8 @@
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/confirmation_alert",
     "//ios/chrome/common/ui/util",

ios/chrome/browser/ui/sharing/qr_generator/qr_generator_view_controller.mm

diff --git a/ios/chrome/browser/ui/sharing/qr_generator/qr_generator_view_controller.mm b/ios/chrome/browser/ui/sharing/qr_generator/qr_generator_view_controller.mm
index ae7c08b..468fb1e 100644
--- a/ios/chrome/browser/ui/sharing/qr_generator/qr_generator_view_controller.mm
+++ b/ios/chrome/browser/ui/sharing/qr_generator/qr_generator_view_controller.mm
@@ -4,7 +4,7 @@
 
 #import "ios/chrome/browser/ui/sharing/qr_generator/qr_generator_view_controller.h"
 
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/sharing/qr_generator/qr_generator_util.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/confirmation_alert/confirmation_alert_action_handler.h"

ios/chrome/browser/ui/spotlight_debugger/BUILD.gn

diff --git a/ios/chrome/browser/ui/spotlight_debugger/BUILD.gn b/ios/chrome/browser/ui/spotlight_debugger/BUILD.gn
index f7d0e22..70e58b8 100644
--- a/ios/chrome/browser/ui/spotlight_debugger/BUILD.gn
+++ b/ios/chrome/browser/ui/spotlight_debugger/BUILD.gn
@@ -12,7 +12,7 @@
   ]
   deps = [
     "//ios/chrome/app/spotlight",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
   ]
 }
 
@@ -32,10 +32,10 @@
     "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/ui/elements",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:utils",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/elements",
     "//ios/chrome/common/ui/table_view:cells_constants",

ios/chrome/browser/ui/spotlight_debugger/spotlight_debugger_view_controller.mm

diff --git a/ios/chrome/browser/ui/spotlight_debugger/spotlight_debugger_view_controller.mm b/ios/chrome/browser/ui/spotlight_debugger/spotlight_debugger_view_controller.mm
index dd6a4e1..d73c872a 100644
--- a/ios/chrome/browser/ui/spotlight_debugger/spotlight_debugger_view_controller.mm
+++ b/ios/chrome/browser/ui/spotlight_debugger/spotlight_debugger_view_controller.mm
@@ -12,9 +12,9 @@
 #import "ios/chrome/app/spotlight/spotlight_interface.h"
 #import "ios/chrome/app/spotlight/spotlight_logger.h"
 #import "ios/chrome/app/spotlight/spotlight_util.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/table_view_navigation_controller.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/elements/highlight_button.h"
 #import "ios/chrome/common/ui/util/button_util.h"

ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn b/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn
index f9b2360..fd3b64de 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn
@@ -165,11 +165,11 @@
     "//ios/chrome/browser/default_browser:utils",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/tabs:features",
     "//ios/chrome/browser/tabs/inactive_tabs:features",
     "//ios/chrome/browser/ui/gestures",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent",
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/browser/ui/menu",

ios/chrome/browser/ui/tab_switcher/tab_grid/grid/BUILD.gn

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/BUILD.gn b/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/BUILD.gn
index 02f12ba..e023000 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/BUILD.gn
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/BUILD.gn
@@ -51,12 +51,12 @@
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
     "//ios/chrome/browser/shared/ui/elements",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/tabs:features",
     "//ios/chrome/browser/tabs/inactive_tabs:features",
     "//ios/chrome/browser/ui/commerce:price_card",
     "//ios/chrome/browser/ui/gestures",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_commands",
     "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_ui",
     "//ios/chrome/browser/ui/menu",

ios/chrome/browser/ui/tab_switcher/tab_grid/grid/grid_cell.mm

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/grid_cell.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/grid_cell.mm
index 09e7bd8..5d55fff 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/grid_cell.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/grid_cell.mm
@@ -10,8 +10,8 @@
 #import "base/check.h"
 #import "base/notreached.h"
 #import "ios/chrome/browser/shared/ui/elements/top_aligned_image_view.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/grid/grid_constants.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"

ios/chrome/browser/ui/tab_switcher/tab_grid/grid/plus_sign_cell.mm

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/plus_sign_cell.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/plus_sign_cell.mm
index c1a2d59..06c29c2 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/plus_sign_cell.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/plus_sign_cell.mm
@@ -4,7 +4,7 @@
 
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/grid/plus_sign_cell.h"
 
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/grid/grid_constants.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"

ios/chrome/browser/ui/tab_switcher/tab_grid/inactive_tabs/BUILD.gn

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/inactive_tabs/BUILD.gn b/ios/chrome/browser/ui/tab_switcher/tab_grid/inactive_tabs/BUILD.gn
index 3c41960..1793e53 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/inactive_tabs/BUILD.gn
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/inactive_tabs/BUILD.gn
@@ -28,9 +28,9 @@
     "//ios/chrome/browser/prefs:pref_names",
     "//ios/chrome/browser/shared/coordinator/alert",
     "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/snapshots",
     "//ios/chrome/browser/tabs/inactive_tabs:features",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/tab_switcher",
     "//ios/chrome/browser/ui/tab_switcher:tab_utils",
@@ -106,7 +106,7 @@
   ]
   deps = [
     "//ios/chrome/app/strings",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/common/ui/colors:swift",
     "//ui/base",
   ]

ios/chrome/browser/ui/tab_switcher/tab_grid/inactive_tabs/inactive_tabs_button_ui_swift_bridge.h

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/inactive_tabs/inactive_tabs_button_ui_swift_bridge.h b/ios/chrome/browser/ui/tab_switcher/tab_grid/inactive_tabs/inactive_tabs_button_ui_swift_bridge.h
index 5652844..cd24fd5 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/inactive_tabs/inactive_tabs_button_ui_swift_bridge.h
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/inactive_tabs/inactive_tabs_button_ui_swift_bridge.h
@@ -8,7 +8,7 @@
 // Bridging header between Swift and Obj-C. These types/imports need to be pure
 // Obj-C and have no C++ in them.
 
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/grit/ios_strings.h"
 
 // Explicitly import the bridging header of the Swift dependencies, as the

ios/chrome/browser/ui/tab_switcher/tab_grid/inactive_tabs/inactive_tabs_user_education_coordinator.mm

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/inactive_tabs/inactive_tabs_user_education_coordinator.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/inactive_tabs/inactive_tabs_user_education_coordinator.mm
index 78b9d71..5b16406 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/inactive_tabs/inactive_tabs_user_education_coordinator.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/inactive_tabs/inactive_tabs_user_education_coordinator.mm
@@ -9,8 +9,8 @@
 #import "base/i18n/message_formatter.h"
 #import "base/strings/sys_string_conversions.h"
 #import "base/time/time.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/tabs/inactive_tabs/features.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/confirmation_alert/confirmation_alert_action_handler.h"
 #import "ios/chrome/common/ui/confirmation_alert/confirmation_alert_view_controller.h"

ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/BUILD.gn

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/BUILD.gn b/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/BUILD.gn
index facee7b..934c272 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/BUILD.gn
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/BUILD.gn
@@ -18,9 +18,9 @@
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/main",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/snapshots",
     "//ios/chrome/browser/tabs:features",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/tab_switcher",
     "//ios/chrome/browser/ui/tab_switcher:tab_utils",
     "//ios/chrome/browser/ui/tab_switcher/tab_grid:tab_collection_commands",
@@ -56,9 +56,9 @@
     ":constants",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/shared/ui/elements",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/tabs:features",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/tab_switcher",
     "//ios/chrome/browser/ui/tab_switcher/tab_grid/grid:grid_ui",
     "//ios/chrome/browser/ui/tab_switcher/tab_grid/grid:grid_ui_constants",

ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/pinned_cell.mm

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/pinned_cell.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/pinned_cell.mm
index 01c9f26..bc79e42 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/pinned_cell.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/pinned_cell.mm
@@ -10,8 +10,8 @@
 #import "base/check.h"
 #import "base/notreached.h"
 #import "ios/chrome/browser/shared/ui/elements/top_aligned_image_view.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/rtl_geometry.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/pinned_tabs_constants.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/transitions/grid_transition_animation.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"

ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/pinned_tabs_mediator.mm

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/pinned_tabs_mediator.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/pinned_tabs_mediator.mm
index 89c683d0..c844ef7 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/pinned_tabs_mediator.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/pinned_tabs_mediator.mm
@@ -18,9 +18,9 @@
 #import "ios/chrome/browser/main/browser_list.h"
 #import "ios/chrome/browser/main/browser_list_factory.h"
 #import "ios/chrome/browser/main/browser_util.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/snapshots/snapshot_tab_helper.h"
 #import "ios/chrome/browser/tabs/features.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_collection_consumer.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_collection_drag_drop_metrics.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/pinned_tabs_constants.h"

ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/BUILD.gn

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/BUILD.gn b/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/BUILD.gn
index b5b1d10..e11421f 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/BUILD.gn
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/BUILD.gn
@@ -12,8 +12,8 @@
 
   deps = [
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/tabs:features",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/tab_switcher/tab_grid/grid:grid_ui_constants",
     "//ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs:constants",

ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/pinned_tabs_context_egtest.mm

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/pinned_tabs_context_egtest.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/pinned_tabs_context_egtest.mm
index 8925dce..56a41f9 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/pinned_tabs_context_egtest.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/pinned_tabs_context_egtest.mm
@@ -7,8 +7,8 @@
 #import "base/ios/ios_util.h"
 #import "base/strings/sys_string_conversions.h"
 #import "base/test/ios/wait_util.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/tabs/features.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/popup_menu/popup_menu_constants.h"
 #import "ios/chrome/grit/ios_strings.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey.h"

ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/pinned_tabs_drag_drop_egtest.mm

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/pinned_tabs_drag_drop_egtest.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/pinned_tabs_drag_drop_egtest.mm
index 0c7ed8d..0253a12 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/pinned_tabs_drag_drop_egtest.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/pinned_tabs_drag_drop_egtest.mm
@@ -7,8 +7,8 @@
 #import "base/ios/device_util.h"
 #import "base/strings/sys_string_conversions.h"
 #import "base/test/ios/wait_util.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/tabs/features.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/grid/grid_constants.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/pinned_tabs_constants.h"
 #import "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/pinned_tabs_overflow_egtest.mm

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/pinned_tabs_overflow_egtest.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/pinned_tabs_overflow_egtest.mm
index d11c5385..2065680 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/pinned_tabs_overflow_egtest.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/pinned_tabs/tests/pinned_tabs_overflow_egtest.mm
@@ -6,8 +6,8 @@
 
 #import "base/ios/ios_util.h"
 #import "base/strings/sys_string_conversions.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/tabs/features.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/popup_menu/popup_menu_constants.h"
 #import "ios/chrome/grit/ios_strings.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey.h"

ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/BUILD.gn

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/BUILD.gn b/ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/BUILD.gn
index 2344495..5776479 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/BUILD.gn
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/BUILD.gn
@@ -19,10 +19,10 @@
     "resources",
     "//base",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/shared/ui/table_view:utils",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/tab_switcher/tab_grid/grid:grid_ui_constants",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/util:util",

ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/suggested_actions_grid_cell.mm

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/suggested_actions_grid_cell.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/suggested_actions_grid_cell.mm
index ea74b68..691bab5d 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/suggested_actions_grid_cell.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/suggested_actions_grid_cell.mm
@@ -4,7 +4,7 @@
 
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/suggested_actions_grid_cell.h"
 
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/grid/grid_constants.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"
 

ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/suggested_actions_view_controller.mm

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/suggested_actions_view_controller.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/suggested_actions_view_controller.mm
index e0c8b82..d8ebe5e4 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/suggested_actions_view_controller.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/suggested_actions_view_controller.mm
@@ -8,13 +8,13 @@
 
 #import "base/check_op.h"
 #import "base/mac/foundation_util.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_image_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_tabs_search_suggested_history_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/cells/table_view_url_item.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_styler.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/grid/grid_constants.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/suggested_actions_delegate.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"

ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_bottom_toolbar.mm

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_bottom_toolbar.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_bottom_toolbar.mm
index 5766f2f5..91b0d884 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_bottom_toolbar.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_bottom_toolbar.mm
@@ -6,8 +6,8 @@
 
 #import "base/strings/sys_string_conversions.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/grid/grid_constants.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_constants.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_new_tab_button.h"

ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_new_tab_button.mm

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_new_tab_button.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_new_tab_button.mm
index 83da581..a152d14 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_new_tab_button.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_new_tab_button.mm
@@ -7,7 +7,7 @@
 #import "base/check.h"
 #import "base/notreached.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_constants.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"

ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_page_control.mm

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_page_control.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_page_control.mm
index e191db3..e9d43021 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_page_control.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_page_control.mm
@@ -9,8 +9,8 @@
 
 #import "base/check_op.h"
 #import "base/cxx17_backports.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_constants.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_top_toolbar.mm

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_top_toolbar.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_top_toolbar.mm
index 287a31a..a885d7f 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_top_toolbar.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_top_toolbar.mm
@@ -9,8 +9,8 @@
 #import "base/ios/ios_util.h"
 #import "base/location.h"
 #import "base/task/sequenced_task_runner.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/grid/grid_constants.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_constants.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_page_control.h"

ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_view_controller.mm

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_view_controller.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_view_controller.mm
index 41edfa1..91122c4 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_view_controller.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_view_controller.mm
@@ -19,6 +19,7 @@
 #import "ios/chrome/browser/shared/public/commands/application_commands.h"
 #import "ios/chrome/browser/shared/public/commands/popup_menu_commands.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_styler.h"
 #import "ios/chrome/browser/shared/ui/util/layout_guide_names.h"
 #import "ios/chrome/browser/shared/ui/util/rtl_geometry.h"
@@ -28,7 +29,6 @@
 #import "ios/chrome/browser/tabs/inactive_tabs/features.h"
 #import "ios/chrome/browser/ui/gestures/view_controller_trait_collection_observer.h"
 #import "ios/chrome/browser/ui/gestures/view_revealing_vertical_pan_handler.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/keyboard/UIKeyCommand+Chrome.h"
 #import "ios/chrome/browser/ui/menu/action_factory.h"
 #import "ios/chrome/browser/ui/recent_tabs/recent_tabs_table_view_controller.h"

ios/chrome/browser/ui/tab_switcher/tab_strip/BUILD.gn

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_strip/BUILD.gn b/ios/chrome/browser/ui/tab_switcher/tab_strip/BUILD.gn
index 49e56b1a..056b1d9 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_strip/BUILD.gn
+++ b/ios/chrome/browser/ui/tab_switcher/tab_strip/BUILD.gn
@@ -38,8 +38,8 @@
     "//components/favicon/ios",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/tab_switcher",
     "//ios/chrome/browser/ui/tab_switcher:tab_utils",

ios/chrome/browser/ui/tab_switcher/tab_strip/tab_strip_cell.mm

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_strip/tab_strip_cell.mm b/ios/chrome/browser/ui/tab_switcher/tab_strip/tab_strip_cell.mm
index 3620c86..55e8642 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_strip/tab_strip_cell.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_strip/tab_strip_cell.mm
@@ -4,7 +4,7 @@
 
 #import "ios/chrome/browser/ui/tab_switcher/tab_strip/tab_strip_cell.h"
 
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/image_util/image_util.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 

ios/chrome/browser/ui/tab_switcher/tab_strip/tab_strip_view_controller.mm

diff --git a/ios/chrome/browser/ui/tab_switcher/tab_strip/tab_strip_view_controller.mm b/ios/chrome/browser/ui/tab_switcher/tab_strip/tab_strip_view_controller.mm
index dd8725d..fe0fd05d 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_strip/tab_strip_view_controller.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_strip/tab_strip_view_controller.mm
@@ -9,7 +9,7 @@
 #import "base/mac/foundation_util.h"
 #import "base/numerics/safe_conversions.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_strip/tab_strip_cell.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_strip/tab_strip_mediator.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_strip/tab_strip_view_layout.h"

ios/chrome/browser/ui/tabs/BUILD.gn

diff --git a/ios/chrome/browser/ui/tabs/BUILD.gn b/ios/chrome/browser/ui/tabs/BUILD.gn
index afb7b99..6a701fe 100644
--- a/ios/chrome/browser/ui/tabs/BUILD.gn
+++ b/ios/chrome/browser/ui/tabs/BUILD.gn
@@ -46,6 +46,7 @@
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
     "//ios/chrome/browser/shared/ui/elements",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/snapshots",
     "//ios/chrome/browser/tabs:features",
@@ -53,7 +54,6 @@
     "//ios/chrome/browser/ui/bubble",
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/gestures",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/menu",

ios/chrome/browser/ui/tabs/tab_strip_controller.mm

diff --git a/ios/chrome/browser/ui/tabs/tab_strip_controller.mm b/ios/chrome/browser/ui/tabs/tab_strip_controller.mm
index 1e13437..573d34d 100644
--- a/ios/chrome/browser/ui/tabs/tab_strip_controller.mm
+++ b/ios/chrome/browser/ui/tabs/tab_strip_controller.mm
@@ -34,6 +34,7 @@
 #import "ios/chrome/browser/shared/public/commands/popup_menu_commands.h"
 #import "ios/chrome/browser/shared/public/commands/reading_list_add_command.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/named_guide.h"
 #import "ios/chrome/browser/shared/ui/util/rtl_geometry.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
@@ -44,7 +45,6 @@
 #import "ios/chrome/browser/ui/bubble/bubble_view.h"
 #import "ios/chrome/browser/ui/fullscreen/scoped_fullscreen_disabler.h"
 #import "ios/chrome/browser/ui/gestures/view_revealing_vertical_pan_handler.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/main/scene_state.h"
 #import "ios/chrome/browser/ui/main/scene_state_browser_agent.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_utils.h"

ios/chrome/browser/ui/tabs/tab_view.mm

diff --git a/ios/chrome/browser/ui/tabs/tab_view.mm b/ios/chrome/browser/ui/tabs/tab_view.mm
index 89338b5..9ff872c7 100644
--- a/ios/chrome/browser/ui/tabs/tab_view.mm
+++ b/ios/chrome/browser/ui/tabs/tab_view.mm
@@ -12,9 +12,9 @@
 #import "ios/chrome/browser/flags/system_flags.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
 #import "ios/chrome/browser/shared/ui/elements/fade_truncating_label.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/rtl_geometry.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/image_util/image_util.h"
 #import "ios/chrome/common/button_configuration_util.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"

ios/chrome/browser/ui/toolbar/BUILD.gn

diff --git a/ios/chrome/browser/ui/toolbar/BUILD.gn b/ios/chrome/browser/ui/toolbar/BUILD.gn
index 4e81cb22..e351f10 100644
--- a/ios/chrome/browser/ui/toolbar/BUILD.gn
+++ b/ios/chrome/browser/ui/toolbar/BUILD.gn
@@ -49,12 +49,12 @@
     "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/ui/bookmarks:core",
     "//ios/chrome/browser/ui/broadcaster",
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/gestures",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/location_bar",
     "//ios/chrome/browser/ui/main:layout_guide_util",
     "//ios/chrome/browser/ui/main:scene_state_header",
@@ -110,10 +110,10 @@
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/ui/fullscreen:ui",
     "//ios/chrome/browser/ui/gestures",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/browser/ui/ntp:ntp",
     "//ios/chrome/browser/ui/omnibox:features",
@@ -161,7 +161,7 @@
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/ui/menu",
     "//ios/chrome/browser/ui/popup_menu/public",
     "//ios/chrome/browser/ui/toolbar/buttons",

ios/chrome/browser/ui/toolbar/adaptive_toolbar_coordinator.mm

diff --git a/ios/chrome/browser/ui/toolbar/adaptive_toolbar_coordinator.mm b/ios/chrome/browser/ui/toolbar/adaptive_toolbar_coordinator.mm
index 3b04d7ba..f2dbdc7 100644
--- a/ios/chrome/browser/ui/toolbar/adaptive_toolbar_coordinator.mm
+++ b/ios/chrome/browser/ui/toolbar/adaptive_toolbar_coordinator.mm
@@ -17,8 +17,8 @@
 #import "ios/chrome/browser/shared/public/commands/find_in_page_commands.h"
 #import "ios/chrome/browser/shared/public/commands/omnibox_commands.h"
 #import "ios/chrome/browser/shared/public/commands/popup_menu_commands.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/main/layout_guide_util.h"
 #import "ios/chrome/browser/ui/menu/browser_action_factory.h"
 #import "ios/chrome/browser/ui/toolbar/adaptive_toolbar_coordinator+subclassing.h"

ios/chrome/browser/ui/toolbar/adaptive_toolbar_view_controller.mm

diff --git a/ios/chrome/browser/ui/toolbar/adaptive_toolbar_view_controller.mm b/ios/chrome/browser/ui/toolbar/adaptive_toolbar_view_controller.mm
index 57e80c81..306f41e6 100644
--- a/ios/chrome/browser/ui/toolbar/adaptive_toolbar_view_controller.mm
+++ b/ios/chrome/browser/ui/toolbar/adaptive_toolbar_view_controller.mm
@@ -11,10 +11,10 @@
 #import "base/time/time.h"
 #import "ios/chrome/browser/shared/public/commands/browser_commands.h"
 #import "ios/chrome/browser/shared/public/commands/omnibox_commands.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/animation_util.h"
 #import "ios/chrome/browser/shared/ui/util/layout_guide_names.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/toolbar/adaptive_toolbar_menus_provider.h"
 #import "ios/chrome/browser/ui/toolbar/adaptive_toolbar_view.h"
 #import "ios/chrome/browser/ui/toolbar/buttons/toolbar_button.h"

ios/chrome/browser/ui/toolbar/buttons/BUILD.gn

diff --git a/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn b/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn
index a6ac25f..928e9b8f 100644
--- a/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn
+++ b/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn
@@ -31,10 +31,10 @@
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/shared/ui/util:util_swift",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/toolbar/public:constants",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web_state_list",

ios/chrome/browser/ui/toolbar/buttons/toolbar_button_factory.mm

diff --git a/ios/chrome/browser/ui/toolbar/buttons/toolbar_button_factory.mm b/ios/chrome/browser/ui/toolbar/buttons/toolbar_button_factory.mm
index 99aca07..c0f277d 100644
--- a/ios/chrome/browser/ui/toolbar/buttons/toolbar_button_factory.mm
+++ b/ios/chrome/browser/ui/toolbar/buttons/toolbar_button_factory.mm
@@ -7,9 +7,9 @@
 #import "base/ios/ios_util.h"
 #import "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/rtl_geometry.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/toolbar/buttons/toolbar_button.h"
 #import "ios/chrome/browser/ui/toolbar/buttons/toolbar_button_actions_handler.h"
 #import "ios/chrome/browser/ui/toolbar/buttons/toolbar_button_visibility_configuration.h"

ios/chrome/browser/ui/toolbar/toolbar_mediator.mm

diff --git a/ios/chrome/browser/ui/toolbar/toolbar_mediator.mm b/ios/chrome/browser/ui/toolbar/toolbar_mediator.mm
index 0cb3b92..0387b39 100644
--- a/ios/chrome/browser/ui/toolbar/toolbar_mediator.mm
+++ b/ios/chrome/browser/ui/toolbar/toolbar_mediator.mm
@@ -20,7 +20,7 @@
 #import "ios/chrome/browser/shared/public/commands/load_query_commands.h"
 #import "ios/chrome/browser/shared/public/commands/open_new_tab_command.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/menu/browser_action_factory.h"
 #import "ios/chrome/browser/ui/toolbar/toolbar_consumer.h"
 #import "ios/chrome/browser/url/chrome_url_constants.h"

ios/chrome/browser/ui/whats_new/cells/BUILD.gn

diff --git a/ios/chrome/browser/ui/whats_new/cells/BUILD.gn b/ios/chrome/browser/ui/whats_new/cells/BUILD.gn
index 384ac5d..002d4c0 100644
--- a/ios/chrome/browser/ui/whats_new/cells/BUILD.gn
+++ b/ios/chrome/browser/ui/whats_new/cells/BUILD.gn
@@ -14,10 +14,10 @@
 
   deps = [
     "//base",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/shared/ui/table_view/cells",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/whats_new/resources:hero_image_background_color",
     "//ios/chrome/browser/ui/whats_new/resources:whats_new_icon_tile",
     "//ios/chrome/common/ui/colors",
@@ -39,9 +39,9 @@
     ":cells",
     "//base",
     "//base/test:test_support",
+    "//ios/chrome/browser/shared/ui/symbols:icons",
     "//ios/chrome/browser/shared/ui/table_view:styler",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/icons",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/table_view:cells_constants",
   ]

ios/chrome/browser/ui/whats_new/cells/whats_new_table_view_banner_item_unittest.mm

diff --git a/ios/chrome/browser/ui/whats_new/cells/whats_new_table_view_banner_item_unittest.mm b/ios/chrome/browser/ui/whats_new/cells/whats_new_table_view_banner_item_unittest.mm
index 85071dd..7f58832 100644
--- a/ios/chrome/browser/ui/whats_new/cells/whats_new_table_view_banner_item_unittest.mm
+++ b/ios/chrome/browser/ui/whats_new/cells/whats_new_table_view_banner_item_unittest.mm
@@ -5,9 +5,9 @@
 #import "ios/chrome/browser/ui/whats_new/cells/whats_new_table_view_banner_item.h"
 
 #import "base/mac/foundation_util.h"
+#import "ios/chrome/browser/shared/ui/symbols/chrome_icon.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_styler.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/chrome_icon.h"
 #import "ios/chrome/common/ui/table_view/table_view_cells_constants.h"
 #import "testing/gtest_mac.h"
 #import "testing/platform_test.h"

ios/chrome/browser/ui/whats_new/cells/whats_new_table_view_item.mm

diff --git a/ios/chrome/browser/ui/whats_new/cells/whats_new_table_view_item.mm b/ios/chrome/browser/ui/whats_new/cells/whats_new_table_view_item.mm
index 24ec233..c7d8839 100644
--- a/ios/chrome/browser/ui/whats_new/cells/whats_new_table_view_item.mm
+++ b/ios/chrome/browser/ui/whats_new/cells/whats_new_table_view_item.mm
@@ -5,8 +5,8 @@
 #import "ios/chrome/browser/ui/whats_new/cells/whats_new_table_view_item.h"
 
 #import "base/check.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/table_view/table_view_cells_constants.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"

ios/chrome/browser/ui/whats_new/cells/whats_new_table_view_item_unittest.mm

diff --git a/ios/chrome/browser/ui/whats_new/cells/whats_new_table_view_item_unittest.mm b/ios/chrome/browser/ui/whats_new/cells/whats_new_table_view_item_unittest.mm
index 9c7e45c..06acccff 100644
--- a/ios/chrome/browser/ui/whats_new/cells/whats_new_table_view_item_unittest.mm
+++ b/ios/chrome/browser/ui/whats_new/cells/whats_new_table_view_item_unittest.mm
@@ -5,9 +5,9 @@
 #import "ios/chrome/browser/ui/whats_new/cells/whats_new_table_view_item.h"
 
 #import "base/mac/foundation_util.h"
+#import "ios/chrome/browser/shared/ui/symbols/chrome_icon.h"
 #import "ios/chrome/browser/shared/ui/table_view/chrome_table_view_styler.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/ui/icons/chrome_icon.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/table_view/table_view_cells_constants.h"
 #import "testing/gtest_mac.h"

ios/chrome/browser/ui/whats_new/data_source/BUILD.gn

diff --git a/ios/chrome/browser/ui/whats_new/data_source/BUILD.gn b/ios/chrome/browser/ui/whats_new/data_source/BUILD.gn
index b3f0b6d..cf03f0c2 100644
--- a/ios/chrome/browser/ui/whats_new/data_source/BUILD.gn
+++ b/ios/chrome/browser/ui/whats_new/data_source/BUILD.gn
@@ -25,7 +25,7 @@
     "resources:whats_new_entries_plist",
     "//base",
     "//ios/chrome/app/strings",
-    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/common/ui/colors",
     "//ui/base",
     "//url",

ios/chrome/browser/ui/whats_new/data_source/whats_new_data_source.mm

diff --git a/ios/chrome/browser/ui/whats_new/data_source/whats_new_data_source.mm b/ios/chrome/browser/ui/whats_new/data_source/whats_new_data_source.mm
index edba267a..e316c9d 100644
--- a/ios/chrome/browser/ui/whats_new/data_source/whats_new_data_source.mm
+++ b/ios/chrome/browser/ui/whats_new/data_source/whats_new_data_source.mm
@@ -10,7 +10,7 @@
 #import "base/strings/string_util.h"
 #import "base/strings/sys_string_conversions.h"
 #import "base/version.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/whats_new/data_source/whats_new_item.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/upgrade/BUILD.gn

diff --git a/ios/chrome/browser/upgrade/BUILD.gn b/ios/chrome/browser/upgrade/BUILD.gn
index 5b8b6268..228297c 100644
--- a/ios/chrome/browser/upgrade/BUILD.gn
+++ b/ios/chrome/browser/upgrade/BUILD.gn
@@ -21,8 +21,8 @@
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/shared/public/commands",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/web_state_list",
     "//ios/web/common",
     "//net",

ios/chrome/browser/upgrade/upgrade_center.mm

diff --git a/ios/chrome/browser/upgrade/upgrade_center.mm b/ios/chrome/browser/upgrade/upgrade_center.mm
index f5b5a2e..a793228 100644
--- a/ios/chrome/browser/upgrade/upgrade_center.mm
+++ b/ios/chrome/browser/upgrade/upgrade_center.mm
@@ -21,7 +21,7 @@
 #import "ios/chrome/browser/infobars/infobar_utils.h"
 #import "ios/chrome/browser/shared/public/commands/application_commands.h"
 #import "ios/chrome/browser/shared/public/commands/open_new_tab_command.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/upgrade/upgrade_constants.h"
 #import "ios/chrome/grit/ios_chromium_strings.h"
 #import "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/web/blocked_popup_tab_helper.mm

diff --git a/ios/chrome/browser/web/blocked_popup_tab_helper.mm b/ios/chrome/browser/web/blocked_popup_tab_helper.mm
index 5284712..e175222 100644
--- a/ios/chrome/browser/web/blocked_popup_tab_helper.mm
+++ b/ios/chrome/browser/web/blocked_popup_tab_helper.mm
@@ -61,7 +61,8 @@
   ui::ImageModel GetIcon() const override {
     if (icon_.IsEmpty()) {
       // This symbol is not created using CustomSymbolWithPointSize() because
-      // "ios/chrome/browser/ui/icons/symbols.h" cannot be imported here.
+      // "ios/chrome/browser/shared/ui/symbols/symbols.h" cannot be imported
+      // here.
       UIImageSymbolConfiguration* configuration = [UIImageSymbolConfiguration
           configurationWithPointSize:kSymbolImagePointSize
                               weight:UIImageSymbolWeightMedium

ios/chrome/test/BUILD.gn

diff --git a/ios/chrome/test/BUILD.gn b/ios/chrome/test/BUILD.gn
index 91ab2c6c..5619f07 100644
--- a/ios/chrome/test/BUILD.gn
+++ b/ios/chrome/test/BUILD.gn
@@ -257,6 +257,7 @@
     "//ios/chrome/browser/shared/public/commands:unit_tests",
     "//ios/chrome/browser/shared/ui/elements:unit_tests",
     "//ios/chrome/browser/shared/ui/list_model:unit_tests",
+    "//ios/chrome/browser/shared/ui/symbols:unit_tests",
     "//ios/chrome/browser/shared/ui/table_view:unit_tests",
     "//ios/chrome/browser/shared/ui/table_view/cells:unit_tests",
     "//ios/chrome/browser/shared/ui/util:unit_tests",
@@ -314,7 +315,6 @@
     "//ios/chrome/browser/ui/fullscreen:unit_tests",
     "//ios/chrome/browser/ui/gestures:unit_tests",
     "//ios/chrome/browser/ui/history:unit_tests",
-    "//ios/chrome/browser/ui/icons:unit_tests",
     "//ios/chrome/browser/ui/incognito_reauth:unit_tests",
     "//ios/chrome/browser/ui/infobars/banners:unit_tests",
     "//ios/chrome/browser/ui/infobars/modals/autofill_address_profile:unit_tests",

ios/chrome/test/earl_grey/BUILD.gn

diff --git a/ios/chrome/test/earl_grey/BUILD.gn b/ios/chrome/test/earl_grey/BUILD.gn
index 5c9a193..5f42e08 100644
--- a/ios/chrome/test/earl_grey/BUILD.gn
+++ b/ios/chrome/test/earl_grey/BUILD.gn
@@ -104,6 +104,7 @@
     "//ios/chrome/browser/sessions:session_service",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view/cells",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/shared/ui/util:eg_app_support+eg2",
@@ -128,7 +129,6 @@
     "//ios/chrome/browser/ui/first_run:eg_app_support+eg2",
     "//ios/chrome/browser/ui/fullscreen/test:eg_app_support+eg2",
     "//ios/chrome/browser/ui/history:constants",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/incognito_interstitial:constants",
     "//ios/chrome/browser/ui/infobars:eg_app_support+eg2",
     "//ios/chrome/browser/ui/location_bar:constants",

ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm

diff --git a/ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm b/ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm
index 91a9b42..8d4636e 100644
--- a/ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm
+++ b/ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm
@@ -42,10 +42,10 @@
 #import "ios/chrome/browser/sessions/session_service_ios.h"
 #import "ios/chrome/browser/shared/public/commands/application_commands.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/util/rtl_geometry.h"
 #import "ios/chrome/browser/signin/fake_system_identity.h"
 #import "ios/chrome/browser/sync/sync_service_factory.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/main/scene_state.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_feature.h"
 #import "ios/chrome/browser/ui/popup_menu/overflow_menu/feature_flags.h"

ios/showcase/badges/BUILD.gn

diff --git a/ios/showcase/badges/BUILD.gn b/ios/showcase/badges/BUILD.gn
index fec23f7a..6d029cae 100644
--- a/ios/showcase/badges/BUILD.gn
+++ b/ios/showcase/badges/BUILD.gn
@@ -13,11 +13,11 @@
     ":badges_constants",
     "//ios/chrome/browser/infobars:badge_state_public",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/ui/badges",
     "//ios/chrome/browser/ui/badges:public",
     "//ios/chrome/browser/ui/badges:util",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/common/ui/util",
     "//ios/showcase/common",
   ]

ios/showcase/badges/sc_badge_container_view_controller.mm

diff --git a/ios/showcase/badges/sc_badge_container_view_controller.mm b/ios/showcase/badges/sc_badge_container_view_controller.mm
index 405f833..cee432e3 100644
--- a/ios/showcase/badges/sc_badge_container_view_controller.mm
+++ b/ios/showcase/badges/sc_badge_container_view_controller.mm
@@ -5,13 +5,13 @@
 #import "ios/showcase/badges/sc_badge_container_view_controller.h"
 
 #import "ios/chrome/browser/infobars/badge_state.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/badges/badge_button.h"
 #import "ios/chrome/browser/ui/badges/badge_button_factory.h"
 #import "ios/chrome/browser/ui/badges/badge_overflow_menu_util.h"
 #import "ios/chrome/browser/ui/badges/badge_static_item.h"
 #import "ios/chrome/browser/ui/badges/badge_tappable_item.h"
 #import "ios/chrome/browser/ui/badges/badge_type.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"
 #import "ios/showcase/badges/sc_badge_constants.h"
 

ios/showcase/follow/BUILD.gn

diff --git a/ios/showcase/follow/BUILD.gn b/ios/showcase/follow/BUILD.gn
index 2c67eae..3cf5ef25 100644
--- a/ios/showcase/follow/BUILD.gn
+++ b/ios/showcase/follow/BUILD.gn
@@ -10,10 +10,10 @@
   deps = [
     "//ios/chrome/browser/follow:enums",
     "//ios/chrome/browser/net:crurl",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/table_view",
     "//ios/chrome/browser/ui/follow",
     "//ios/chrome/browser/ui/follow:first_follow_ui",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/ntp/feed_management:feed_management_ui",
     "//ios/chrome/browser/ui/ntp/feed_management:follow_management_ui",
     "//ios/chrome/browser/ui/ntp/feed_management:navigation_delegate",

ios/showcase/follow/sc_follow_view_controller.mm

diff --git a/ios/showcase/follow/sc_follow_view_controller.mm b/ios/showcase/follow/sc_follow_view_controller.mm
index 0e77431..08a50c79 100644
--- a/ios/showcase/follow/sc_follow_view_controller.mm
+++ b/ios/showcase/follow/sc_follow_view_controller.mm
@@ -6,11 +6,11 @@
 
 #import "ios/chrome/browser/follow/followed_web_site_state.h"
 #import "ios/chrome/browser/net/crurl.h"
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/shared/ui/table_view/table_view_favicon_data_source.h"
 #import "ios/chrome/browser/shared/ui/table_view/table_view_navigation_controller.h"
 #import "ios/chrome/browser/ui/follow/first_follow_view_controller.h"
 #import "ios/chrome/browser/ui/follow/followed_web_channel.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/ntp/feed_management/feed_management_follow_delegate.h"
 #import "ios/chrome/browser/ui/ntp/feed_management/feed_management_navigation_delegate.h"
 #import "ios/chrome/browser/ui/ntp/feed_management/feed_management_view_controller.h"

ios/showcase/infobars/BUILD.gn

diff --git a/ios/showcase/infobars/BUILD.gn b/ios/showcase/infobars/BUILD.gn
index ff1f213..62ad235 100644
--- a/ios/showcase/infobars/BUILD.gn
+++ b/ios/showcase/infobars/BUILD.gn
@@ -17,8 +17,8 @@
     ":constants",
     "//base",
     "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/ui/autofill:autofill_message",
-    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/infobars/banners",
     "//ios/chrome/browser/ui/infobars/coordinators",
     "//ios/chrome/browser/ui/infobars/modals",

ios/showcase/infobars/sc_infobar_modal_save_card_coordinator.mm

diff --git a/ios/showcase/infobars/sc_infobar_modal_save_card_coordinator.mm b/ios/showcase/infobars/sc_infobar_modal_save_card_coordinator.mm
index a2003a46..972e115 100644
--- a/ios/showcase/infobars/sc_infobar_modal_save_card_coordinator.mm
+++ b/ios/showcase/infobars/sc_infobar_modal_save_card_coordinator.mm
@@ -4,8 +4,8 @@
 
 #import "ios/showcase/infobars/sc_infobar_modal_save_card_coordinator.h"
 
+#import "ios/chrome/browser/shared/ui/symbols/symbols.h"
 #import "ios/chrome/browser/ui/autofill/save_card_message_with_links.h"
-#import "ios/chrome/browser/ui/icons/symbols.h"
 #import "ios/chrome/browser/ui/infobars/banners/infobar_banner_delegate.h"
 #import "ios/chrome/browser/ui/infobars/banners/infobar_banner_view_controller.h"
 #import "ios/chrome/browser/ui/infobars/modals/infobar_save_card_modal_delegate.h"

ios/web/annotations/annotations_inttest.mm

diff --git a/ios/web/annotations/annotations_inttest.mm b/ios/web/annotations/annotations_inttest.mm
index a99dc106..c8ac5d4 100644
--- a/ios/web/annotations/annotations_inttest.mm
+++ b/ios/web/annotations/annotations_inttest.mm
@@ -346,6 +346,30 @@
   CheckHtml(html);
 }
 
+// Tests annotation cases with line breaks, including tags boundaries.
+// Covers: DecorateAnnotations, RemoveDecorations
+TEST_F(AnnotationTextManagerTest, DecorateTextBreakElements) {
+  std::string html = "<html><body>"
+                     "<p>abc<br>\ndef</p>"
+                     "</body></html>";
+  LoadHtmlAndExtractText(html);
+  CheckHtml(html);
+
+  NSString* source = base::SysUTF8ToNSString(observer()->extracted_text());
+  CreateAndApplyAnnotations(source, @[ @"abc\n\ndef" ], observer() -> seq_id());
+
+  // Check the resulting html is annotating at the right place.
+  CheckHtml("<html><body>"
+            "<p><chrome_annotation>abc</chrome_annotation><br>"
+            "<chrome_annotation>\ndef</chrome_annotation></p>"
+            "</body></html>");
+
+  // Make sure it's back to the original.
+  auto* manager = AnnotationsTextManager::FromWebState(web_state());
+  manager->RemoveDecorations();
+  CheckHtml(html);
+}
+
 // Tests on click handler.
 // Covers: OnClick.
 TEST_F(AnnotationTextManagerTest, ClickAnnotation) {

ios/web/annotations/resources/annotations.ts

diff --git a/ios/web/annotations/resources/annotations.ts b/ios/web/annotations/resources/annotations.ts
index a87cfee1..8188113 100644
--- a/ios/web/annotations/resources/annotations.ts
+++ b/ios/web/annotations/resources/annotations.ts
@@ -479,9 +479,11 @@
     element.setAttribute('data-data', replacement.data);
     element.setAttribute('data-annotation', replacement.annotationText);
     element.setAttribute('role', 'link');
-    element.innerText = replacement.text;
+    // Use textContent not innerText, since setting innerText will cause
+    // the text to be parsed and '\n' to be upgraded to <br>.
+    element.textContent = replacement.text;
 
-    if (replacement.type == 'PHONE_NUMBER' || replacement.type == 'EMAIL') {
+    if (replacement.type == 'PHONE_NUMBER' || replacement.type == 'EMAIL') {
       element.style.cssText = decorationStylesForPhoneAndEmail;
     } else {
       element.style.cssText = decorationStyles;

ios/web/annotations/resources/annotations_test.ts

diff --git a/ios/web/annotations/resources/annotations_test.ts b/ios/web/annotations/resources/annotations_test.ts
index b5fe585..32486e9a 100644
--- a/ios/web/annotations/resources/annotations_test.ts
+++ b/ios/web/annotations/resources/annotations_test.ts
@@ -10,6 +10,11 @@
 import {NON_TEXT_NODE_NAMES}
     from '//ios/web/annotations/resources/annotations_constants.js';
 
+// Simpleton tags with no closing tags (only those used in tests).
+const NO_END_TAGS_NODE_NAMES = new Set([
+  'br'
+]);
+
 /**
  * Simulate clicking annotation at given `index`.
  */
@@ -51,8 +56,10 @@
           traverse(child);
         }
       }
-      parts.push('</' + tagName + '>');
-      length += tagName.length + 2;
+      if (!NO_END_TAGS_NODE_NAMES.has(tagName)) {
+        parts.push('</' + tagName + '>');
+        length += tagName.length + 2;
+      }
     } else if (node.nodeType === Node.TEXT_NODE && node.textContent) {
       parts.push(node.textContent);
       length += node.textContent.length;

ios/web/public/test/crw_fake_web_state_delegate.h

diff --git a/ios/web/public/test/crw_fake_web_state_delegate.h b/ios/web/public/test/crw_fake_web_state_delegate.h
index 83ad8ce..7ca8880 100644
--- a/ios/web/public/test/crw_fake_web_state_delegate.h
+++ b/ios/web/public/test/crw_fake_web_state_delegate.h
@@ -25,8 +25,6 @@
 @property(nonatomic, readonly) BOOL repostFormWarningRequested;
 // Whether `javaScriptDialogPresenterForWebState:` has been called or not.
 @property(nonatomic, readonly) BOOL javaScriptDialogPresenterRequested;
-// Whether `webState:handlePermissions:decisionHandler` has been called or not.
-@property(nonatomic, readonly) BOOL permissionsRequestHandled;
 // Whether `webState:didRequestHTTPAuthForProtectionSpace:...| has been called
 // or not.
 @property(nonatomic, readonly) BOOL authenticationRequested;

ios/web/public/test/crw_fake_web_state_delegate.mm

diff --git a/ios/web/public/test/crw_fake_web_state_delegate.mm b/ios/web/public/test/crw_fake_web_state_delegate.mm
index 6f23444..77fb96c 100644
--- a/ios/web/public/test/crw_fake_web_state_delegate.mm
+++ b/ios/web/public/test/crw_fake_web_state_delegate.mm
@@ -22,7 +22,6 @@
 @synthesize webStateCreationRequested = _webStateCreationRequested;
 @synthesize webStateClosingRequested = _webStateClosingRequested;
 @synthesize repostFormWarningRequested = _repostFormWarningRequested;
-@synthesize permissionsRequestHandled = _permissionsRequestHandled;
 @synthesize authenticationRequested = _authenticationRequested;
 @synthesize isAppLaunchingAllowedForWebStateReturnValue =
     _isAppLaunchingAllowedForWebStateReturnValue;
@@ -62,15 +61,6 @@
 }
 
 - (void)webState:(web::WebState*)webState
-    handlePermissions:(NSArray<NSNumber*>*)permissions
-      decisionHandler:(void (^)(BOOL allow))decisionHandler
-    API_AVAILABLE(ios(15.0)) {
-  _webState = webState;
-  _permissionsRequestHandled = YES;
-  decisionHandler(YES);
-}
-
-- (void)webState:(web::WebState*)webState
     didRequestHTTPAuthForProtectionSpace:(NSURLProtectionSpace*)protectionSpace
                       proposedCredential:(NSURLCredential*)proposedCredential
                        completionHandler:(void (^)(NSString* username,

ios/web/public/web_state_delegate_bridge.h

diff --git a/ios/web/public/web_state_delegate_bridge.h b/ios/web/public/web_state_delegate_bridge.h
index 317b376c..3dc194b 100644
--- a/ios/web/public/web_state_delegate_bridge.h
+++ b/ios/web/public/web_state_delegate_bridge.h
@@ -46,17 +46,6 @@
 - (web::JavaScriptDialogPresenter*)javaScriptDialogPresenterForWebState:
     (web::WebState*)webState;
 
-// Called when the media permission is requested and to acquire the decision
-// handler needed to process the user's decision to grant or deny media
-// permissions.
-//
-// If the delegate doesn't implement this method, the web state would still show
-// the default prompt that asks for permissions.
-- (void)webState:(web::WebState*)webState
-    handlePermissions:(NSArray<NSNumber*>*)permissions
-      decisionHandler:(void (^)(BOOL allow))decisionHandler
-    API_AVAILABLE(ios(15.0));
-
 // Called when a request receives an authentication challenge specified by
 // `protectionSpace`, and is unable to respond using cached credentials.
 // Clients must call `handler` even if they want to cancel authentication
@@ -113,11 +102,6 @@
       base::OnceCallback<void(bool)> callback) override;
   JavaScriptDialogPresenter* GetJavaScriptDialogPresenter(
       WebState* source) override;
-  bool HandlePermissionsDecisionRequest(
-      WebState* source,
-      NSArray<NSNumber*>* permissions,
-      WebStatePermissionDecisionHandler handler)
-      API_AVAILABLE(ios(15.0)) override;
   void OnAuthRequired(WebState* source,
                       NSURLProtectionSpace* protection_space,
                       NSURLCredential* proposed_credential,

ios/web/web_state/web_state_delegate_bridge.mm

diff --git a/ios/web/web_state/web_state_delegate_bridge.mm b/ios/web/web_state/web_state_delegate_bridge.mm
index 04f2379ef..ee9334f 100644
--- a/ios/web/web_state/web_state_delegate_bridge.mm
+++ b/ios/web/web_state/web_state_delegate_bridge.mm
@@ -70,20 +70,6 @@
   return nullptr;
 }
 
-bool WebStateDelegateBridge::HandlePermissionsDecisionRequest(
-    WebState* source,
-    NSArray<NSNumber*>* permissions,
-    WebStatePermissionDecisionHandler handler) API_AVAILABLE(ios(15.0)) {
-  if ([delegate_ respondsToSelector:@selector(webState:
-                                        handlePermissions:decisionHandler:)]) {
-    [delegate_ webState:source
-        handlePermissions:permissions
-          decisionHandler:handler];
-    return true;
-  }
-  return false;
-}
-
 void WebStateDelegateBridge::OnAuthRequired(
     WebState* source,
     NSURLProtectionSpace* protection_space,

ios/web/web_state/web_state_delegate_bridge_unittest.mm

diff --git a/ios/web/web_state/web_state_delegate_bridge_unittest.mm b/ios/web/web_state/web_state_delegate_bridge_unittest.mm
index cdab4fc..7b17136 100644
--- a/ios/web/web_state/web_state_delegate_bridge_unittest.mm
+++ b/ios/web/web_state/web_state_delegate_bridge_unittest.mm
@@ -136,36 +136,6 @@
   EXPECT_TRUE([delegate_ javaScriptDialogPresenterRequested]);
 }
 
-// Tests `HandlePermissionsDecisionRequest` forwarding.
-TEST_F(WebStateDelegateBridgeTest, HandlePermissionsDecisionRequest) {
-  __block bool callback_called = false;
-  EXPECT_FALSE([delegate_ permissionsRequestHandled]);
-  EXPECT_FALSE([delegate_ webState]);
-  bool useHandlerAnswerTheRequest = bridge_->HandlePermissionsDecisionRequest(
-      &fake_web_state_, @[], ^(bool allow) {
-        EXPECT_TRUE(allow);
-        callback_called = true;
-      });
-  EXPECT_TRUE([delegate_ permissionsRequestHandled]);
-  EXPECT_EQ(&fake_web_state_, [delegate_ webState]);
-  EXPECT_TRUE(useHandlerAnswerTheRequest);
-  EXPECT_TRUE(callback_called);
-}
-
-// Tests `HandlePermissionsDecisionRequest` forwarding to delegate which does
-// not implement `webState:handlePermissions:decisionHandler:` method.
-TEST_F(WebStateDelegateBridgeTest,
-       HandlePermissionsDecisionRequestWithNoDelegateMethod) {
-  __block bool callback_called = false;
-  bool useHandlerAnswerTheRequest =
-      empty_delegate_bridge_->HandlePermissionsDecisionRequest(
-          nullptr, @[], ^(bool allow) {
-            callback_called = true;
-          });
-  EXPECT_FALSE(useHandlerAnswerTheRequest);
-  EXPECT_FALSE(callback_called);
-}
-
 // Tests `OnAuthRequired` forwarding.
 TEST_F(WebStateDelegateBridgeTest, OnAuthRequired) {
   EXPECT_FALSE([delegate_ authenticationRequested]);

media/base/media_switches.cc

diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
index 0aac2194..b09f99d 100644
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -8,6 +8,7 @@
 #include "base/feature_list.h"
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
+#include "build/chromecast_buildflags.h"
 #include "build/chromeos_buildflags.h"
 #include "components/system_media_controls/linux/buildflags/buildflags.h"
 #include "gpu/config/gpu_finch_features.h"
@@ -1227,12 +1228,12 @@
     base::FEATURE_ENABLED_BY_DEFAULT};
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
 // Spawn utility processes to perform hardware decode acceleration instead of
 // using the GPU process.
 const base::Feature MEDIA_EXPORT kUseOutOfProcessVideoDecoding{
     "UseOutOfProcessVideoDecoding", base::FEATURE_DISABLED_BY_DEFAULT};
-#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
 
 #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 // Spawn utility processes to perform hardware encode acceleration instead of
@@ -1497,6 +1498,21 @@
 }
 #endif
 
+#if BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
+bool IsOutOfProcessVideoDecodingEnabled() {
+#if BUILDFLAG(IS_CASTOS)
+  // The sandbox for OOP-VD was designed assuming that we're not on CastOS (see
+  // go/oop-vd-sandbox).
+  //
+  // TODO(b/210759684): revisit the sandbox to see if this restriction is
+  // necessary.
+  return false;
+#else
+  return base::FeatureList::IsEnabled(kUseOutOfProcessVideoDecoding);
+#endif
+}
+#endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
+
 // Return bitmask of audio formats supported by EDID.
 uint32_t GetPassthroughAudioFormats() {
 #if BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)

media/base/media_switches.h

diff --git a/media/base/media_switches.h b/media/base/media_switches.h
index b911185..87d1edfa 100644
--- a/media/base/media_switches.h
+++ b/media/base/media_switches.h
@@ -401,9 +401,12 @@
 MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessVideoDecodingToLacros);
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
+// Note: please use IsOutOfProcessVideoDecodingEnabled() to determine if OOP-VD
+// is enabled instead of directly checking this feature flag. The reason is that
+// that function may perform checks beyond the feature flag.
 MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding);
-#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
 
 #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoEncoding);
@@ -436,6 +439,10 @@
 MEDIA_EXPORT bool IsMediaFoundationD3D11VideoCaptureEnabled();
 #endif
 
+#if BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
+MEDIA_EXPORT bool IsOutOfProcessVideoDecodingEnabled();
+#endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
+
 enum class kCrosGlobalMediaControlsPinOptions {
   kPin,
   kNotPin,

media/base/win/dxgi_device_manager.cc

diff --git a/media/base/win/dxgi_device_manager.cc b/media/base/win/dxgi_device_manager.cc
index 30876d2..d61d01d 100644
--- a/media/base/win/dxgi_device_manager.cc
+++ b/media/base/win/dxgi_device_manager.cc
@@ -13,6 +13,7 @@
 #include "base/check.h"
 #include "base/logging.h"
 #include "media/base/win/mf_helpers.h"
+#include "media/base/win/mf_initializer.h"
 
 namespace media {
 
@@ -60,9 +61,7 @@
 }
 
 scoped_refptr<DXGIDeviceManager> DXGIDeviceManager::Create(CHROME_LUID luid) {
-  if (!::GetModuleHandle(L"mfplat.dll") && !::LoadLibrary(L"mfplat.dll")) {
-    // The MF DXGI Device manager is not supported when mfplat.dll isn't
-    // available.
+  if (!InitializeMediaFoundation()) {
     DLOG(ERROR) << "MF DXGI Device Manager is not available";
     return nullptr;
   }

media/base/win/mf_initializer.cc

diff --git a/media/base/win/mf_initializer.cc b/media/base/win/mf_initializer.cc
index 8fa6d65..fb943286 100644
--- a/media/base/win/mf_initializer.cc
+++ b/media/base/win/mf_initializer.cc
@@ -11,6 +11,32 @@
 
 namespace {
 
+static const char kMediaFoundationLoadFailedMessage[] =
+    "Failed to start Media Foundation, accelerated media functionality "
+    "may be disabled. If you're using Windows N, see "
+    "https://support.microsoft.com/en-us/topic/"
+    "media-feature-pack-for-windows-10-n-may-2020-ebbdf559-b84c-0fc2-"
+    "bd51-e23c9f6a4439 for information on how to install the Media "
+    "Feature Pack. Error: ";
+
+// Attempts to load the required Media Foundation libraries once. Returns the
+// status of that attempt on subsequent calls. Must be called once prior to
+// sandbox initialization or it will always fail.
+bool LoadMediaFoundationLibraries() {
+  static const bool kDidLoadSucceed = []() {
+    for (const wchar_t* mfdll : {L"mf.dll", L"mfplat.dll"}) {
+      if (!::LoadLibrary(mfdll)) {
+        LOG(ERROR) << kMediaFoundationLoadFailedMessage << "Could not load "
+                   << mfdll << ". "
+                   << logging::SystemErrorCodeToString(::GetLastError());
+        return false;
+      }
+    }
+    return true;
+  }();
+  return kDidLoadSucceed;
+}
+
 // MFShutdown() is sometimes very expensive if it's the last instance and
 // shouldn't result in excessive memory usage to leave around, so only start it
 // once and only shut it down at process exit. See https://crbug.com/1069603#c90
@@ -22,6 +48,7 @@
 class MediaFoundationSession {
  public:
   static MediaFoundationSession* GetInstance() {
+    DCHECK(LoadMediaFoundationLibraries());
     // StaticMemorySingletonTraits are preferred over DefaultSingletonTraits to
     // allow access from CONTINUE_ON_SHUTDOWN tasks. This means we don't mind a
     // task reading the value of `has_media_foundation_` even after the AtExit
@@ -51,12 +78,7 @@
     has_media_foundation_ = hr == S_OK;
 
     LOG_IF(ERROR, !has_media_foundation_)
-        << "Failed to start Media Foundation, accelerated media functionality "
-           "may be disabled. If you're using Windows N, see "
-           "https://support.microsoft.com/en-us/topic/"
-           "media-feature-pack-for-windows-10-n-may-2020-ebbdf559-b84c-0fc2-"
-           "bd51-e23c9f6a4439 for information on how to install the Media "
-           "Feature Pack. Error: "
+        << kMediaFoundationLoadFailedMessage
         << logging::SystemErrorCodeToString(hr);
   }
 
@@ -68,7 +90,12 @@
 namespace media {
 
 bool InitializeMediaFoundation() {
-  return MediaFoundationSession::GetInstance()->has_media_foundation();
+  return LoadMediaFoundationLibraries() &&
+         MediaFoundationSession::GetInstance()->has_media_foundation();
+}
+
+bool PreSandboxMediaFoundationInitialization() {
+  return LoadMediaFoundationLibraries();
 }
 
 }  // namespace media

media/base/win/mf_initializer.h

diff --git a/media/base/win/mf_initializer.h b/media/base/win/mf_initializer.h
index ba4de5e..5df1ea5 100644
--- a/media/base/win/mf_initializer.h
+++ b/media/base/win/mf_initializer.h
@@ -12,6 +12,10 @@
 // Must be called before any code that needs MediaFoundation.
 [[nodiscard]] MEDIA_EXPORT bool InitializeMediaFoundation();
 
+// Preloads DLLs required for MediaFoundation; returns false if DLLs fail to
+// load. InitializeMediaFoundation() will also return false if load fails.
+MEDIA_EXPORT bool PreSandboxMediaFoundationInitialization();
+
 }  // namespace media
 
 #endif  // MEDIA_BASE_WIN_MF_INITIALIZER_H_

media/capture/video/win/video_capture_device_factory_win.cc

diff --git a/media/capture/video/win/video_capture_device_factory_win.cc b/media/capture/video/win/video_capture_device_factory_win.cc
index 8c62d34..6986a2b 100644
--- a/media/capture/video/win/video_capture_device_factory_win.cc
+++ b/media/capture/video/win/video_capture_device_factory_win.cc
@@ -354,7 +354,7 @@
 // static
 bool VideoCaptureDeviceFactoryWin::PlatformSupportsMediaFoundation() {
   static const bool has_media_foundation =
-      LoadMediaFoundationDlls() && InitializeMediaFoundation();
+      InitializeMediaFoundation() && LoadMediaFoundationDlls();
   return has_media_foundation;
 }
 

media/gpu/chromeos/mailbox_video_frame_converter.cc

diff --git a/media/gpu/chromeos/mailbox_video_frame_converter.cc b/media/gpu/chromeos/mailbox_video_frame_converter.cc
index fbcd8428a..c633f9b 100644
--- a/media/gpu/chromeos/mailbox_video_frame_converter.cc
+++ b/media/gpu/chromeos/mailbox_video_frame_converter.cc
@@ -349,11 +349,8 @@
   mailbox_frame->set_metadata(frame->metadata());
   mailbox_frame->set_ycbcr_info(frame->ycbcr_info());
   mailbox_frame->metadata().read_lock_fences_enabled = true;
-  // We use origin_frame->metadata().is_webgpu_compatible instead of
-  // frame->metadata().is_webgpu_compatible because the PlatformVideoFramePool
-  // clears the metadata of the outer frame.
   mailbox_frame->metadata().is_webgpu_compatible =
-      enable_unsafe_webgpu_ && origin_frame->metadata().is_webgpu_compatible;
+      enable_unsafe_webgpu_ && frame->metadata().is_webgpu_compatible;
 
   output_cb_.Run(mailbox_frame);
 }

media/gpu/chromeos/platform_video_frame_pool.cc

diff --git a/media/gpu/chromeos/platform_video_frame_pool.cc b/media/gpu/chromeos/platform_video_frame_pool.cc
index 6d274fd..8ed184cf 100644
--- a/media/gpu/chromeos/platform_video_frame_pool.cc
+++ b/media/gpu/chromeos/platform_video_frame_pool.cc
@@ -43,12 +43,11 @@
   if (!frame)
     return CroStatus::Codes::kFailedToCreateVideoFrame;
 
-  if (use_protected) {
-    media::VideoFrameMetadata frame_metadata;
-    frame_metadata.protected_video = true;
-    frame_metadata.hw_protected = true;
-    frame->set_metadata(frame_metadata);
-  }
+  // A SCANOUT usage was requested for the allocated |frame|, so there's a
+  // possibility that it can be promoted to overlay, mark it so.
+  frame->metadata().allow_overlay = true;
+  frame->metadata().protected_video = use_protected;
+  frame->metadata().hw_protected = use_protected;
   return frame;
 }
 
@@ -141,18 +140,8 @@
       base::BindOnce(&PlatformVideoFramePool::OnFrameReleasedThunk, weak_this_,
                      parent_task_runner_, std::move(origin_frame)));
 
-  // Clear all metadata before returning to client, in case origin frame has any
-  // unrelated metadata.
-  wrapped_frame->clear_metadata();
-
-  // We need to put this metadata in the wrapped frame if we are in protected
-  // mode.
-  if (use_protected_) {
-    media::VideoFrameMetadata frame_metadata;
-    frame_metadata.protected_video = true;
-    frame_metadata.hw_protected = true;
-    wrapped_frame->set_metadata(frame_metadata);
-  }
+  DCHECK_EQ(wrapped_frame->metadata().protected_video, use_protected_);
+  DCHECK_EQ(wrapped_frame->metadata().hw_protected, use_protected_);
 
   return wrapped_frame;
 }

media/gpu/chromeos/platform_video_frame_pool_unittest.cc

diff --git a/media/gpu/chromeos/platform_video_frame_pool_unittest.cc b/media/gpu/chromeos/platform_video_frame_pool_unittest.cc
index 56ad1dc6..51d8bf1 100644
--- a/media/gpu/chromeos/platform_video_frame_pool_unittest.cc
+++ b/media/gpu/chromeos/platform_video_frame_pool_unittest.cc
@@ -14,6 +14,7 @@
 #include "base/test/task_environment.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
 #include "media/base/format_utils.h"
+#include "media/base/video_types.h"
 #include "media/base/video_util.h"
 #include "media/gpu/chromeos/fourcc.h"
 #include "media/video/fake_gpu_memory_buffer.h"
@@ -90,6 +91,8 @@
     EXPECT_EQ(layout_->size(), frame->coded_size());
     EXPECT_EQ(visible_rect_, frame->visible_rect());
     EXPECT_EQ(natural_size_, frame->natural_size());
+    // We can't assert any of the |frame| metadata because the frame creation
+    // callback is a fake.
 
     return frame;
   }
@@ -108,11 +111,13 @@
   gfx::Size natural_size_;
 };
 
-INSTANTIATE_TEST_SUITE_P(All,
-                         PlatformVideoFramePoolTest,
-                         testing::Values(PIXEL_FORMAT_YV12,
-                                         PIXEL_FORMAT_NV12,
-                                         PIXEL_FORMAT_P016LE));
+INSTANTIATE_TEST_SUITE_P(
+    All,
+    PlatformVideoFramePoolTest,
+    testing::Values(PIXEL_FORMAT_YV12, PIXEL_FORMAT_NV12, PIXEL_FORMAT_P016LE),
+    [](const ::testing::TestParamInfo<VideoPixelFormat>& info) {
+      return VideoPixelFormatToString(info.param);
+    });
 
 TEST_P(PlatformVideoFramePoolTest, SingleFrameReuse) {
   const auto fourcc = Fourcc::FromVideoPixelFormat(GetParam());

media/gpu/chromeos/vda_video_frame_pool.cc

diff --git a/media/gpu/chromeos/vda_video_frame_pool.cc b/media/gpu/chromeos/vda_video_frame_pool.cc
index 990d6606..a4f4fc1 100644
--- a/media/gpu/chromeos/vda_video_frame_pool.cc
+++ b/media/gpu/chromeos/vda_video_frame_pool.cc
@@ -41,7 +41,6 @@
     bool use_linear_buffers) {
   DVLOGF(3);
   DCHECK_CALLED_ON_VALID_SEQUENCE(parent_sequence_checker_);
-  DCHECK(!use_linear_buffers);
 
 #if !BUILDFLAG(USE_ARC_PROTECTED_MEDIA)
   if (use_protected) {

media/gpu/chromeos/video_decoder_pipeline.cc

diff --git a/media/gpu/chromeos/video_decoder_pipeline.cc b/media/gpu/chromeos/video_decoder_pipeline.cc
index 7a1acd5..cec76df1 100644
--- a/media/gpu/chromeos/video_decoder_pipeline.cc
+++ b/media/gpu/chromeos/video_decoder_pipeline.cc
@@ -715,8 +715,6 @@
     return;
   }
 
-  // Flag that the video frame is capable of being put in an overlay.
-  frame->metadata().allow_overlay = true;
   // Flag that the video frame was decoded in a power efficient way.
   frame->metadata().power_efficient = true;
 

media/gpu/test/video_player/decoder_wrapper.cc

diff --git a/media/gpu/test/video_player/decoder_wrapper.cc b/media/gpu/test/video_player/decoder_wrapper.cc
index 45e979fe..8820cb6 100644
--- a/media/gpu/test/video_player/decoder_wrapper.cc
+++ b/media/gpu/test/video_player/decoder_wrapper.cc
@@ -378,6 +378,9 @@
   DVLOGF(4) << current_frame_index_;
   DCHECK_CALLED_ON_VALID_SEQUENCE(worker_sequence_checker_);
   DCHECK(video_frame->metadata().power_efficient);
+  DCHECK_EQ(
+      video_frame->metadata().allow_overlay,
+      decoder_wrapper_config_.implementation != DecoderImplementation::kVDVDA);
 
   frame_renderer_->RenderFrame(video_frame);
 

media/gpu/v4l2/test/av1_decoder.cc

diff --git a/media/gpu/v4l2/test/av1_decoder.cc b/media/gpu/v4l2/test/av1_decoder.cc
index e40f14f9..2ed608a 100644
--- a/media/gpu/v4l2/test/av1_decoder.cc
+++ b/media/gpu/v4l2/test/av1_decoder.cc
@@ -578,18 +578,11 @@
   }
 
   auto v4l2_ioctl = std::make_unique<V4L2IoctlShim>(kDriverCodecFourcc);
-  uint32_t uncompressed_fourcc = V4L2_PIX_FMT_NV12;
 
-  if (!v4l2_ioctl->VerifyCapabilities(kDriverCodecFourcc,
-                                      uncompressed_fourcc)) {
-    // Fall back to MM21 for MediaTek platforms
-    uncompressed_fourcc = V4L2_PIX_FMT_MM21;
-
-    if (!v4l2_ioctl->VerifyCapabilities(kDriverCodecFourcc,
-                                        uncompressed_fourcc)) {
-      LOG(ERROR) << "Device doesn't support the provided FourCCs.";
-      return nullptr;
-    }
+  if (!v4l2_ioctl->VerifyCapabilities(kDriverCodecFourcc)) {
+    LOG(ERROR) << "Device doesn't support "
+               << media::FourccToString(kDriverCodecFourcc) << ".";
+    return nullptr;
   }
 
   const gfx::Size bitstream_coded_size = GetResolutionFromBitstream(stream);
@@ -598,14 +591,15 @@
   // (fd) & buffer with the output queue for 4K60 requirement.
   // https://buganizer.corp.google.com/issues/202214561#comment31
   auto OUTPUT_queue = std::make_unique<V4L2Queue>(
-      V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, kDriverCodecFourcc,
-      bitstream_coded_size, V4L2_MEMORY_MMAP, kNumberOfBuffersInOutputQueue);
+      V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, bitstream_coded_size, V4L2_MEMORY_MMAP,
+      kNumberOfBuffersInOutputQueue);
+  OUTPUT_queue->set_fourcc(kDriverCodecFourcc);
 
   // TODO(stevecho): enable V4L2_MEMORY_DMABUF memory for CAPTURE queue.
   // https://www.kernel.org/doc/html/v5.16/userspace-api/media/v4l/pixfmt-v4l2-mplane.html#c.V4L.v4l2_plane_pix_format
   auto CAPTURE_queue = std::make_unique<V4L2Queue>(
-      V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, uncompressed_fourcc,
-      bitstream_coded_size, V4L2_MEMORY_MMAP, kNumberOfBuffersInCaptureQueue);
+      V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, bitstream_coded_size,
+      V4L2_MEMORY_MMAP, kNumberOfBuffersInCaptureQueue);
 
   return base::WrapUnique(
       new Av1Decoder(std::move(ivf_parser), std::move(v4l2_ioctl),
@@ -1016,10 +1010,9 @@
     scoped_refptr<MmappedBuffer> repeated_frame_buffer =
         ref_frames_[current_frame_header.frame_to_show];
 
-    size = CAPTURE_queue_->display_size();
-    ConvertToYUV(y_plane, u_plane, v_plane, size,
+    ConvertToYUV(y_plane, u_plane, v_plane, OUTPUT_queue_->resolution(),
                  repeated_frame_buffer->mmapped_planes(),
-                 CAPTURE_queue_->coded_size(), CAPTURE_queue_->fourcc());
+                 CAPTURE_queue_->resolution(), CAPTURE_queue_->fourcc());
 
     // Repeated frames normally don't need to update reference frames. But in
     // this special case when the repeated frame is pointing to a key frame, all
@@ -1094,9 +1087,9 @@
   v4l2_ioctl_->DQBuf(CAPTURE_queue_, &buffer_id);
 
   scoped_refptr<MmappedBuffer> buffer = CAPTURE_queue_->GetBuffer(buffer_id);
-  size = CAPTURE_queue_->display_size();
-  ConvertToYUV(y_plane, u_plane, v_plane, size, buffer->mmapped_planes(),
-               CAPTURE_queue_->coded_size(), CAPTURE_queue_->fourcc());
+  ConvertToYUV(y_plane, u_plane, v_plane, OUTPUT_queue_->resolution(),
+               buffer->mmapped_planes(), CAPTURE_queue_->resolution(),
+               CAPTURE_queue_->fourcc());
 
   const std::set<int> reusable_buffer_ids = RefreshReferenceSlots(
       current_frame_header, current_frame, CAPTURE_queue_->GetBuffer(buffer_id),

media/gpu/v4l2/test/h264_decoder.cc

diff --git a/media/gpu/v4l2/test/h264_decoder.cc b/media/gpu/v4l2/test/h264_decoder.cc
index c5a9c9c6..8ebfe3f 100644
--- a/media/gpu/v4l2/test/h264_decoder.cc
+++ b/media/gpu/v4l2/test/h264_decoder.cc
@@ -764,32 +764,26 @@
   constexpr uint32_t kDriverCodecFourcc = V4L2_PIX_FMT_H264_SLICE;
 
   auto v4l2_ioctl = std::make_unique<V4L2IoctlShim>(kDriverCodecFourcc);
-  uint32_t uncompressed_fourcc = V4L2_PIX_FMT_NV12;
 
-  if (!v4l2_ioctl->VerifyCapabilities(kDriverCodecFourcc,
-                                      uncompressed_fourcc)) {
-    // Fall back to MM21 for MediaTek platforms
-    uncompressed_fourcc = V4L2_PIX_FMT_MM21;
-
-    if (!v4l2_ioctl->VerifyCapabilities(kDriverCodecFourcc,
-                                        uncompressed_fourcc)) {
-      LOG(ERROR) << "Device doesn't support the provided FourCCs.";
-      return nullptr;
-    }
+  if (!v4l2_ioctl->VerifyCapabilities(kDriverCodecFourcc)) {
+    LOG(ERROR) << "Device doesn't support "
+               << media::FourccToString(kDriverCodecFourcc) << ".";
+    return nullptr;
   }
 
   // TODO(stevecho): might need to consider using more than 1 file descriptor
   // (fd) & buffer with the output queue for 4K60 requirement.
   // https://buganizer.corp.google.com/issues/202214561#comment31
   auto OUTPUT_queue = std::make_unique<V4L2Queue>(
-      V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, kDriverCodecFourcc, coded_size.value(),
-      V4L2_MEMORY_MMAP, kNumberOfBuffersInOutputQueue);
+      V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, coded_size.value(), V4L2_MEMORY_MMAP,
+      kNumberOfBuffersInOutputQueue);
+  OUTPUT_queue->set_fourcc(kDriverCodecFourcc);
 
   // TODO(stevecho): enable V4L2_MEMORY_DMABUF memory for CAPTURE queue.
   // https://www.kernel.org/doc/html/v5.10/userspace-api/media/v4l/pixfmt-v4l2-mplane.html#c.V4L.v4l2_plane_pix_format
   auto CAPTURE_queue = std::make_unique<V4L2Queue>(
-      V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, uncompressed_fourcc,
-      coded_size.value(), V4L2_MEMORY_MMAP, kNumberOfBuffersInCaptureQueue);
+      V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, coded_size.value(), V4L2_MEMORY_MMAP,
+      kNumberOfBuffersInCaptureQueue);
 
   return base::WrapUnique(
       new H264Decoder(std::move(parser), std::move(v4l2_ioctl),
@@ -849,9 +843,9 @@
          "buffers";
 
   scoped_refptr<MmappedBuffer> buffer = CAPTURE_queue_->GetBuffer(buffer_id);
-  size = CAPTURE_queue_->display_size();
-  ConvertToYUV(y_plane, u_plane, v_plane, size, buffer->mmapped_planes(),
-               CAPTURE_queue_->coded_size(), CAPTURE_queue_->fourcc());
+  ConvertToYUV(y_plane, u_plane, v_plane, OUTPUT_queue_->resolution(),
+               buffer->mmapped_planes(), CAPTURE_queue_->resolution(),
+               CAPTURE_queue_->fourcc());
 
   const std::set<uint32_t> reusable_buffer_slots =
       GetReusableReferenceSlots(*CAPTURE_queue_->GetBuffer(buffer_id).get(),

media/gpu/v4l2/test/v4l2_ioctl_shim.cc

diff --git a/media/gpu/v4l2/test/v4l2_ioctl_shim.cc b/media/gpu/v4l2/test/v4l2_ioctl_shim.cc
index 6777ccae..2faafdf 100644
--- a/media/gpu/v4l2/test/v4l2_ioctl_shim.cc
+++ b/media/gpu/v4l2/test/v4l2_ioctl_shim.cc
@@ -149,14 +149,12 @@
 }
 
 V4L2Queue::V4L2Queue(enum v4l2_buf_type type,
-                     uint32_t fourcc,
-                     const gfx::Size& size,
+                     const gfx::Size& resolution,
                      enum v4l2_memory memory,
                      uint32_t num_buffers)
     : type_(type),
-      fourcc_(fourcc),
       num_buffers_(num_buffers),
-      display_size_(size),
+      resolution_(resolution),
       num_planes_(1),
       memory_(memory) {}
 
@@ -377,8 +375,8 @@
   }
 
   fmt.fmt.pix_mp.num_planes = queue->num_planes();
-  fmt.fmt.pix_mp.width = queue->display_size().width();
-  fmt.fmt.pix_mp.height = queue->display_size().height();
+  fmt.fmt.pix_mp.width = queue->resolution().width();
+  fmt.fmt.pix_mp.height = queue->resolution().height();
 
   const bool ret = Ioctl(VIDIOC_S_FMT, &fmt);
 
@@ -386,39 +384,20 @@
   LOG_ASSERT(ret) << "VIDIOC_S_FMT for " << queue->type() << " queue failed.";
 }
 
-void V4L2IoctlShim::GetFmt(const enum v4l2_buf_type type,
-                           gfx::Size* coded_size,
-                           uint32_t* num_planes,
-                           uint32_t* fourcc) const {
-  struct v4l2_format fmt;
+void V4L2IoctlShim::GetFmt(struct v4l2_format* fmt) const {
+  const bool ret = Ioctl(VIDIOC_G_FMT, fmt);
 
-  memset(&fmt, 0, sizeof(fmt));
-  fmt.type = type;
-
-  const bool ret = Ioctl(VIDIOC_G_FMT, &fmt);
-
-  coded_size->SetSize(fmt.fmt.pix_mp.width, fmt.fmt.pix_mp.height);
-  *num_planes = fmt.fmt.pix_mp.num_planes;
-  *fourcc = fmt.fmt.pix_mp.pixelformat;
-
-  LOGF(INFO) << type << " - VIDIOC_G_FMT: " << fmt.fmt.pix_mp;
+  const enum v4l2_buf_type type = static_cast<enum v4l2_buf_type>(fmt->type);
+  LOGF(INFO) << type << " - VIDIOC_G_FMT: " << fmt->fmt.pix_mp;
   LOG_ASSERT(ret) << "VIDIOC_G_FMT for " << type << " queue failed.";
 }
 
-void V4L2IoctlShim::TryFmt(const std::unique_ptr<V4L2Queue>& queue) const {
-  struct v4l2_format fmt;
+void V4L2IoctlShim::TryFmt(struct v4l2_format* fmt) const {
+  const bool ret = Ioctl(VIDIOC_TRY_FMT, fmt);
 
-  memset(&fmt, 0, sizeof(fmt));
-  fmt.type = queue->type();
-  fmt.fmt.pix_mp.pixelformat = queue->fourcc();
-  fmt.fmt.pix_mp.num_planes = queue->num_planes();
-  fmt.fmt.pix_mp.width = queue->coded_size().width();
-  fmt.fmt.pix_mp.height = queue->coded_size().height();
-
-  const bool ret = Ioctl(VIDIOC_TRY_FMT, &fmt);
-
-  LOGF(INFO) << queue->type() << " - VIDIOC_TRY_FMT: " << fmt.fmt.pix_mp;
-  LOG_ASSERT(ret) << "VIDIOC_TRY_FMT for " << queue->type() << " queue failed.";
+  const enum v4l2_buf_type type = static_cast<enum v4l2_buf_type>(fmt->type);
+  LOGF(INFO) << type << " - VIDIOC_TRY_FMT: " << fmt->fmt.pix_mp;
+  LOG_ASSERT(ret) << "VIDIOC_TRY_FMT for " << type << " queue failed.";
 }
 
 void V4L2IoctlShim::ReqBufs(std::unique_ptr<V4L2Queue>& queue) const {
@@ -704,8 +683,7 @@
   return false;
 }
 
-bool V4L2IoctlShim::VerifyCapabilities(uint32_t compressed_format,
-                                       uint32_t uncompressed_format) const {
+bool V4L2IoctlShim::VerifyCapabilities(uint32_t compressed_format) const {
   struct v4l2_capability cap;
   memset(&cap, 0, sizeof(cap));
 
@@ -722,14 +700,7 @@
       << media::FourccToString(compressed_format)
       << " is not a supported compressed OUTPUT format.";
 
-  const bool is_uncompressed_format_supported =
-      QueryFormat(V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, uncompressed_format);
-
-  LOG_IF(ERROR, !is_uncompressed_format_supported)
-      << media::FourccToString(uncompressed_format)
-      << " is not a supported uncompressed CAPTURE format.";
-
-  return is_compressed_format_supported && is_uncompressed_format_supported;
+  return is_compressed_format_supported;
 }
 
 void V4L2IoctlShim::QueryAndMmapQueueBuffers(

media/gpu/v4l2/test/v4l2_ioctl_shim.h

diff --git a/media/gpu/v4l2/test/v4l2_ioctl_shim.h b/media/gpu/v4l2/test/v4l2_ioctl_shim.h
index 349c3eb..f609f372 100644
--- a/media/gpu/v4l2/test/v4l2_ioctl_shim.h
+++ b/media/gpu/v4l2/test/v4l2_ioctl_shim.h
@@ -73,8 +73,7 @@
 class V4L2Queue {
  public:
   V4L2Queue(enum v4l2_buf_type type,
-            uint32_t fourcc,
-            const gfx::Size& size,
+            const gfx::Size& resolution,
             enum v4l2_memory memory,
             uint32_t num_buffers);
 
@@ -88,11 +87,10 @@
 
   enum v4l2_buf_type type() const { return type_; }
   uint32_t fourcc() const { return fourcc_; }
+  void set_fourcc(uint32_t fourcc) { fourcc_ = fourcc; }
 
-  gfx::Size display_size() const { return display_size_; }
-  void set_display_size(gfx::Size display_size) {
-    display_size_ = display_size;
-  }
+  gfx::Size resolution() const { return resolution_; }
+  void set_resolution(gfx::Size resolution) { resolution_ = resolution; }
 
   enum v4l2_memory memory() const { return memory_; }
 
@@ -101,9 +99,6 @@
   uint32_t num_buffers() const { return num_buffers_; }
   void set_num_buffers(uint32_t num_buffers) { num_buffers_ = num_buffers; }
 
-  gfx::Size coded_size() const { return coded_size_; }
-  void set_coded_size(gfx::Size coded_size) { coded_size_ = coded_size; }
-
   uint32_t num_planes() const { return num_planes_; }
   void set_num_planes(uint32_t num_planes) { num_planes_ = num_planes; }
 
@@ -131,14 +126,14 @@
 
  private:
   const enum v4l2_buf_type type_;
-  const uint32_t fourcc_;
+  uint32_t fourcc_;
   MmappedBuffers buffers_;
   uint32_t num_buffers_;
-  // The size of the image on the screen.
-  gfx::Size display_size_;
-  // The size of the encoded frame. Usually has an alignment of 16, 32
-  // depending on codec.
-  gfx::Size coded_size_;
+  // For the OUTPUT queue resolution refers to the coded dimensions of the
+  // video. For the CAPTURE queue resolution refers to the size of the
+  // buffer necessary for the driver to decode into and must
+  // contain the resolution of the OUTPUT queue.
+  gfx::Size resolution_;
   uint32_t num_planes_;
   const enum v4l2_memory memory_;
   // File descriptor returned by MEDIA_IOC_REQUEST_ALLOC ioctl call
@@ -172,18 +167,12 @@
   // if the configuration was successful.
   void SetFmt(const std::unique_ptr<V4L2Queue>& queue) const;
 
-  // Retrieves the format of |queue| (via VIDIOC_G_FMT) and returns true if
-  // successful, filling in |coded_size|, |num_planes|, and |fourcc| in that
-  // case.
-  void GetFmt(const enum v4l2_buf_type type,
-              gfx::Size* coded_size,
-              uint32_t* num_planes,
-              uint32_t* fourcc) const;
+  // Retrieves the format, |fmt|, (via VIDIOC_G_FMT)
+  void GetFmt(struct v4l2_format* fmt) const;
 
-  // Tries to configure |queue|. This does not modify the underlying
-  // driver state.
+  // Tries to configure |fmt|. This does not modify the underlying driver state.
   // https://www.kernel.org/doc/html/v5.10/userspace-api/media/v4l/vidioc-g-fmt.html?highlight=vidioc_try_fmt#description
-  void TryFmt(const std::unique_ptr<V4L2Queue>& queue) const;
+  void TryFmt(struct v4l2_format* fmt) const;
 
   // Allocates buffers via VIDIOC_REQBUFS for |queue|.
   void ReqBufs(std::unique_ptr<V4L2Queue>& queue) const;
@@ -230,10 +219,8 @@
   // field in |v4l2_capability| struct (obtained from VIDIOC_QUERYCAP call).
   [[nodiscard]] bool FindMediaDevice();
 
-  // Verifies |v4l_fd| supports |compressed_format| for OUTPUT queues
-  // and |uncompressed_format| for CAPTURE queues, respectively.
-  [[nodiscard]] bool VerifyCapabilities(uint32_t compressed_format,
-                                        uint32_t uncompressed_format) const;
+  // Verifies |v4l_fd| supports |compressed_format| for OUTPUT queues.
+  [[nodiscard]] bool VerifyCapabilities(uint32_t compressed_format) const;
 
   // Allocates buffers for the given |queue|.
   void QueryAndMmapQueueBuffers(std::unique_ptr<V4L2Queue>& queue) const;

media/gpu/v4l2/test/video_decoder.cc

diff --git a/media/gpu/v4l2/test/video_decoder.cc b/media/gpu/v4l2/test/video_decoder.cc
index 991811d..936fbfd 100644
--- a/media/gpu/v4l2/test/video_decoder.cc
+++ b/media/gpu/v4l2/test/video_decoder.cc
@@ -5,13 +5,18 @@
 #include "media/gpu/v4l2/test/video_decoder.h"
 
 #include <linux/videodev2.h>
+#include <algorithm>
+#include <vector>
 
 #include "base/bits.h"
+#include "base/containers/contains.h"
 #include "base/logging.h"
 #include "media/base/video_types.h"
 #include "media/gpu/v4l2/test/upstream_pix_fmt.h"
 #include "third_party/libyuv/include/libyuv.h"
 #include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace media {
 namespace v4l2_test {
@@ -40,6 +45,65 @@
 
 VideoDecoder::~VideoDecoder() = default;
 
+void VideoDecoder::NegotiateCAPTUREFormat() {
+  constexpr uint32_t kPreferredFormats[] = {V4L2_PIX_FMT_NV12,
+                                            V4L2_PIX_FMT_MM21};
+
+  struct v4l2_format fmt;
+
+  memset(&fmt, 0, sizeof(fmt));
+  fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
+
+  v4l2_ioctl_->GetFmt(&fmt);
+  uint32_t fourcc = fmt.fmt.pix_mp.pixelformat;
+
+  // Check to see if if the format returned is one that can be used. The driver
+  // may prefer a different format than what is needed. If
+  // not, negotiations need to be done to see if the preferred format can
+  // be used.
+  if (!base::Contains(kPreferredFormats, fourcc)) {
+    bool format_found = false;
+    for (const auto& preferred_fourcc : kPreferredFormats) {
+      VLOG(1) << "Trying to see if preferred format ("
+              << media::FourccToString(preferred_fourcc)
+              << ") is supported by the driver.";
+      fmt.fmt.pix_mp.pixelformat = preferred_fourcc;
+
+      v4l2_ioctl_->TryFmt(&fmt);
+      VLOG(1) << "Driver returned format ("
+              << media::FourccToString(fmt.fmt.pix_mp.pixelformat) << ").";
+
+      if (fmt.fmt.pix_mp.pixelformat == preferred_fourcc) {
+        VLOG(1) << "Preferred format ("
+                << media::FourccToString(preferred_fourcc)
+                << ") being used for CAPTURE queue.";
+        fourcc = preferred_fourcc;
+        format_found = true;
+        break;
+      }
+    }
+    if (!format_found) {
+      LOG(FATAL) << "Unable to choose preferred format, TryFmt is returning ("
+                 << media::FourccToString(fmt.fmt.pix_mp.pixelformat) << ").";
+    }
+  }
+
+  CAPTURE_queue_->set_fourcc(fourcc);
+  CAPTURE_queue_->set_resolution(
+      gfx::Size(fmt.fmt.pix_mp.width, fmt.fmt.pix_mp.height));
+  CAPTURE_queue_->set_num_planes(fmt.fmt.pix_mp.num_planes);
+
+  v4l2_ioctl_->SetFmt(CAPTURE_queue_);
+
+  LOG_ASSERT((V4L2_PIX_FMT_MM21 == fourcc &&
+              CAPTURE_queue_->num_planes() == fmt.fmt.pix_mp.num_planes) ||
+             (V4L2_PIX_FMT_NV12 == fourcc &&
+              CAPTURE_queue_->num_planes() == fmt.fmt.pix_mp.num_planes))
+      << media::FourccToString(fourcc)
+      << " does not have the correct number of planes: "
+      << fmt.fmt.pix_mp.num_planes;
+}
+
 void VideoDecoder::Initialize() {
   // TODO(stevecho): remove VIDIOC_ENUM_FRAMESIZES ioctl call
   //   after b/193237015 is resolved.
@@ -48,28 +112,11 @@
 
   v4l2_ioctl_->SetFmt(OUTPUT_queue_);
 
-  gfx::Size coded_size;
-  uint32_t num_planes;
-  uint32_t fourcc;
-  v4l2_ioctl_->GetFmt(CAPTURE_queue_->type(), &coded_size, &num_planes,
-                      &fourcc);
+  NegotiateCAPTUREFormat();
 
-  LOG_ASSERT((V4L2_PIX_FMT_MM21 == fourcc && 2 == num_planes) ||
-             (V4L2_PIX_FMT_NV12 == fourcc && 1 == num_planes))
-      << media::FourccToString(fourcc)
-      << " does not have the correct number of planes: " << num_planes;
-
-  CAPTURE_queue_->set_coded_size(coded_size);
-  CAPTURE_queue_->set_num_planes(num_planes);
-
-  // VIDIOC_TRY_FMT() ioctl is equivalent to VIDIOC_S_FMT
-  // with one exception that it does not change driver state.
-  // VIDIOC_TRY_FMT may or may not be needed; it's used by the stateful
-  // Chromium V4L2VideoDecoder backend, see b/190733055#comment78.
-  // TODO(b/190733055): try and remove it after landing all the code.
-  v4l2_ioctl_->TryFmt(CAPTURE_queue_);
-
-  v4l2_ioctl_->SetFmt(CAPTURE_queue_);
+  LOG_ASSERT(gfx::Rect(CAPTURE_queue_->resolution())
+                 .Contains(gfx::Rect(OUTPUT_queue_->resolution())))
+      << "Display size is not contained within the coded size. DRC?";
 
   // If there is a dynamic resolution change, the Initialization sequence will
   // be performed again, minus the allocation of OUTPUT queue buffers.
@@ -114,10 +161,7 @@
 
   // Set the new resolution on OUTPUT queue. The driver will then pick up
   // the new resolution to be set on the coded size for CAPTURE queue.
-  OUTPUT_queue_->set_display_size(new_resolution);
-  OUTPUT_queue_->set_coded_size(new_resolution);
-
-  CAPTURE_queue_->set_display_size(new_resolution);
+  OUTPUT_queue_->set_resolution(new_resolution);
 
   // Perform the initialization sequence again
   Initialize();

media/gpu/v4l2/test/video_decoder.h

diff --git a/media/gpu/v4l2/test/video_decoder.h b/media/gpu/v4l2/test/video_decoder.h
index 6eb4356..734d2d86 100644
--- a/media/gpu/v4l2/test/video_decoder.h
+++ b/media/gpu/v4l2/test/video_decoder.h
@@ -69,6 +69,8 @@
                                               const gfx::Size& size);
 
  protected:
+  void NegotiateCAPTUREFormat();
+
   // Helper method for converting frames to YUV.
   static void ConvertToYUV(std::vector<uint8_t>& dest_y,
                            std::vector<uint8_t>& dest_u,

media/gpu/v4l2/test/vp8_decoder.cc

diff --git a/media/gpu/v4l2/test/vp8_decoder.cc b/media/gpu/v4l2/test/vp8_decoder.cc
index 05a84d2..e0d557e 100644
--- a/media/gpu/v4l2/test/vp8_decoder.cc
+++ b/media/gpu/v4l2/test/vp8_decoder.cc
@@ -283,18 +283,11 @@
   }
 
   auto v4l2_ioctl = std::make_unique<V4L2IoctlShim>(kDriverCodecFourcc);
-  uint32_t uncompressed_fourcc = V4L2_PIX_FMT_NV12;
 
-  if (!v4l2_ioctl->VerifyCapabilities(kDriverCodecFourcc,
-                                      uncompressed_fourcc)) {
-    // Fall back to MM21 for MediaTek platforms
-    uncompressed_fourcc = V4L2_PIX_FMT_MM21;
-
-    if (!v4l2_ioctl->VerifyCapabilities(kDriverCodecFourcc,
-                                        uncompressed_fourcc)) {
-      LOG(ERROR) << "Device doesn't support the provided FourCCs.";
-      return nullptr;
-    }
+  if (!v4l2_ioctl->VerifyCapabilities(kDriverCodecFourcc)) {
+    LOG(ERROR) << "Device doesn't support "
+               << media::FourccToString(kDriverCodecFourcc) << ".";
+    return nullptr;
   }
 
   LOG(INFO) << "Ivf file header: " << file_header.width << " x "
@@ -306,15 +299,15 @@
   // (fd) & buffer with the output queue for 4K60 requirement.
   // https://buganizer.corp.google.com/issues/202214561#comment31
   auto OUTPUT_queue = std::make_unique<V4L2Queue>(
-      V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, kDriverCodecFourcc,
-      bitstream_coded_size, V4L2_MEMORY_MMAP, kNumberOfBuffersInOutputQueue);
-  OUTPUT_queue->set_coded_size(bitstream_coded_size);
+      V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, bitstream_coded_size, V4L2_MEMORY_MMAP,
+      kNumberOfBuffersInOutputQueue);
+  OUTPUT_queue->set_fourcc(kDriverCodecFourcc);
 
   // TODO(b/256543928): enable V4L2_MEMORY_DMABUF memory for CAPTURE queue.
   // https://www.kernel.org/doc/html/v5.10/userspace-api/media/v4l/pixfmt-v4l2-mplane.html#c.V4L.v4l2_plane_pix_format
   auto CAPTURE_queue = std::make_unique<V4L2Queue>(
-      V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, uncompressed_fourcc,
-      bitstream_coded_size, V4L2_MEMORY_MMAP, kNumberOfBuffersInCaptureQueue);
+      V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, bitstream_coded_size,
+      V4L2_MEMORY_MMAP, kNumberOfBuffersInCaptureQueue);
 
   return base::WrapUnique(
       new Vp8Decoder(std::move(ivf_parser), std::move(v4l2_ioctl),
@@ -560,11 +553,11 @@
 
   if (frame_hdr.IsKeyframe()) {
     is_resolution_changed_ =
-        frame_hdr.width != OUTPUT_queue_->coded_size().width() ||
-        frame_hdr.height != OUTPUT_queue_->coded_size().height();
+        frame_hdr.width != OUTPUT_queue_->resolution().width() ||
+        frame_hdr.height != OUTPUT_queue_->resolution().height();
   } else {
-    frame_hdr.width = OUTPUT_queue_->coded_size().width();
-    frame_hdr.height = OUTPUT_queue_->coded_size().height();
+    frame_hdr.width = OUTPUT_queue_->resolution().width();
+    frame_hdr.height = OUTPUT_queue_->resolution().height();
   }
 
   if (IsResolutionChanged()) {
@@ -607,9 +600,9 @@
   CAPTURE_queue_->DequeueBufferId(buffer_id);
 
   scoped_refptr<MmappedBuffer> buffer = CAPTURE_queue_->GetBuffer(buffer_id);
-  size = CAPTURE_queue_->display_size();
-  ConvertToYUV(y_plane, u_plane, v_plane, size, buffer->mmapped_planes(),
-               CAPTURE_queue_->coded_size(), CAPTURE_queue_->fourcc());
+  ConvertToYUV(y_plane, u_plane, v_plane, OUTPUT_queue_->resolution(),
+               buffer->mmapped_planes(), CAPTURE_queue_->resolution(),
+               CAPTURE_queue_->fourcc());
 
   const std::set<int> reusable_buffer_slots = RefreshReferenceSlots(
       frame_hdr, CAPTURE_queue_->GetBuffer(buffer_id).get(),

media/gpu/v4l2/test/vp9_decoder.cc

diff --git a/media/gpu/v4l2/test/vp9_decoder.cc b/media/gpu/v4l2/test/vp9_decoder.cc
index db2a9fc2..97618b9f 100644
--- a/media/gpu/v4l2/test/vp9_decoder.cc
+++ b/media/gpu/v4l2/test/vp9_decoder.cc
@@ -190,18 +190,11 @@
   }
 
   auto v4l2_ioctl = std::make_unique<V4L2IoctlShim>(kDriverCodecFourcc);
-  uint32_t uncompressed_fourcc = V4L2_PIX_FMT_NV12;
 
-  if (!v4l2_ioctl->VerifyCapabilities(kDriverCodecFourcc,
-                                      uncompressed_fourcc)) {
-    // Fall back to MM21 for MediaTek platforms
-    uncompressed_fourcc = V4L2_PIX_FMT_MM21;
-
-    if (!v4l2_ioctl->VerifyCapabilities(kDriverCodecFourcc,
-                                        uncompressed_fourcc)) {
-      LOG(ERROR) << "Device doesn't support the provided FourCCs.";
-      return nullptr;
-    }
+  if (!v4l2_ioctl->VerifyCapabilities(kDriverCodecFourcc)) {
+    LOG(ERROR) << "Device doesn't support "
+               << media::FourccToString(kDriverCodecFourcc) << ".";
+    return nullptr;
   }
 
   LOG(INFO) << "Ivf file header: " << file_header.width << " x "
@@ -211,14 +204,15 @@
   // (fd) & buffer with the output queue for 4K60 requirement.
   // https://buganizer.corp.google.com/issues/202214561#comment31
   auto OUTPUT_queue = std::make_unique<V4L2Queue>(
-      V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, kDriverCodecFourcc,
+      V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
       gfx::Size(file_header.width, file_header.height), V4L2_MEMORY_MMAP,
       kNumberOfBuffersInOutputQueue);
+  OUTPUT_queue->set_fourcc(kDriverCodecFourcc);
 
   // TODO(stevecho): enable V4L2_MEMORY_DMABUF memory for CAPTURE queue.
   // https://www.kernel.org/doc/html/v5.10/userspace-api/media/v4l/pixfmt-v4l2-mplane.html#c.V4L.v4l2_plane_pix_format
   auto CAPTURE_queue = std::make_unique<V4L2Queue>(
-      V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, uncompressed_fourcc,
+      V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
       gfx::Size(file_header.width, file_header.height), V4L2_MEMORY_MMAP,
       kNumberOfBuffersInCaptureQueue);
 
@@ -516,9 +510,10 @@
   v4l2_ioctl_->DQBuf(CAPTURE_queue_, &buffer_id);
 
   scoped_refptr<MmappedBuffer> buffer = CAPTURE_queue_->GetBuffer(buffer_id);
-  size = CAPTURE_queue_->display_size();
-  ConvertToYUV(y_plane, u_plane, v_plane, size, buffer->mmapped_planes(),
-               CAPTURE_queue_->coded_size(), CAPTURE_queue_->fourcc());
+
+  ConvertToYUV(y_plane, u_plane, v_plane, OUTPUT_queue_->resolution(),
+               buffer->mmapped_planes(), CAPTURE_queue_->resolution(),
+               CAPTURE_queue_->fourcc());
 
   const std::set<int> reusable_buffer_slots = RefreshReferenceSlots(
       frame_hdr.refresh_frame_flags, CAPTURE_queue_->GetBuffer(buffer_id),

media/gpu/v4l2/v4l2_video_decoder_backend_stateful.cc

diff --git a/media/gpu/v4l2/v4l2_video_decoder_backend_stateful.cc b/media/gpu/v4l2/v4l2_video_decoder_backend_stateful.cc
index 7cda8e4..54e708f0 100644
--- a/media/gpu/v4l2/v4l2_video_decoder_backend_stateful.cc
+++ b/media/gpu/v4l2/v4l2_video_decoder_backend_stateful.cc
@@ -399,7 +399,6 @@
                 &V4L2StatefulVideoDecoderBackend::EnqueueOutputBuffers),
             weak_this_)));
   }
-
   return frame;
 }
 

media/gpu/v4l2/v4l2_video_decoder_backend_stateless.cc

diff --git a/media/gpu/v4l2/v4l2_video_decoder_backend_stateless.cc b/media/gpu/v4l2/v4l2_video_decoder_backend_stateless.cc
index 76bc1f5..58154c9 100644
--- a/media/gpu/v4l2/v4l2_video_decoder_backend_stateless.cc
+++ b/media/gpu/v4l2/v4l2_video_decoder_backend_stateless.cc
@@ -240,6 +240,7 @@
     // driver via MMAP. The VideoFrame received from V4L2 buffer will remain
     // until deallocating V4L2Queue. But we need to know when the buffer is not
     // used by the client. So we wrap the frame here.
+    DCHECK_EQ(output_queue_->GetMemoryType(), V4L2_MEMORY_MMAP);
     scoped_refptr<VideoFrame> origin_frame = output_buf->GetVideoFrame();
     if (!origin_frame) {
       LOG(ERROR) << "There is no available VideoFrame from the V4L2 buffer.";
@@ -250,7 +251,10 @@
                                        origin_frame->visible_rect(),
                                        origin_frame->natural_size());
   } else {
-    // Try to get VideoFrame from the pool.
+    // This is used in cases when the video decoder format does not need
+    // conversion before being sent to Chrome's Media pipeline. On ChromeOS,
+    // currently only RK3399 (scarlet) supports this.
+    DCHECK_EQ(output_queue_->GetMemoryType(), V4L2_MEMORY_DMABUF);
     frame = pool->GetFrame();
     if (!frame) {
       // We allocate the same number of output buffer slot in V4L2 device and

media/gpu/windows/dxva_video_decode_accelerator_win.cc

diff --git a/media/gpu/windows/dxva_video_decode_accelerator_win.cc b/media/gpu/windows/dxva_video_decode_accelerator_win.cc
index e9fc799..4ec3a5da 100644
--- a/media/gpu/windows/dxva_video_decode_accelerator_win.cc
+++ b/media/gpu/windows/dxva_video_decode_accelerator_win.cc
@@ -136,10 +136,6 @@
     0x4721,
     {0xB3, 0xF5, 0xD4, 0x84, 0xD8, 0x56, 0x1E, 0x47}};
 
-constexpr const wchar_t* const kMediaFoundationVideoDecoderDLLs[] = {
-    L"mf.dll", L"mfplat.dll", L"msmpeg2vdec.dll",
-};
-
 uint64_t GetCurrentQPC() {
   LARGE_INTEGER perf_counter_now = {};
   // Use raw QueryPerformanceCounter to avoid grabbing locks or allocating
@@ -754,6 +750,9 @@
     }
   }
 
+  RETURN_ON_FAILURE(InitializeMediaFoundation(),
+                    "Could not initialize Media Foundation", false);
+
   // Not all versions of Windows 7 and later include Media Foundation DLLs.
   // Instead of crashing while delay loading the DLL when calling MFStartup()
   // below, probe whether we can successfully load the DLL now.
@@ -788,9 +787,6 @@
   RETURN_ON_FAILURE((state == kUninitialized),
                     "Initialize: invalid state: " << state, false);
 
-  RETURN_ON_FAILURE(InitializeMediaFoundation(),
-                    "Could not initialize Media Foundation", false);
-
   config_ = config;
 
   RETURN_ON_FAILURE(InitDecoder(config.profile), "Failed to initialize decoder",
@@ -1383,13 +1379,8 @@
                "DXVAVideoDecodeAccelerator::GetSupportedProfiles");
 
   SupportedProfiles profiles;
-  for (const wchar_t* mfdll : kMediaFoundationVideoDecoderDLLs) {
-    if (!::GetModuleHandle(mfdll)) {
-      // Windows N is missing the media foundation DLLs unless the media
-      // feature pack is installed.
-      PLOG(ERROR) << "DXVAVDA fatal error: Could not load " << mfdll;
-      return profiles;
-    }
+  if (!InitializeMediaFoundation()) {
+    return profiles;
   }
 
   const auto supported_resolutions = GetSupportedD3D11VideoDecoderResolutions(
@@ -1421,16 +1412,15 @@
 
 // static
 void DXVAVideoDecodeAccelerator::PreSandboxInitialization() {
-  for (const wchar_t* mfdll : kMediaFoundationVideoDecoderDLLs) {
-    if (!::LoadLibrary(mfdll))
-      PLOG(ERROR) << "DXVAVDA fatal error: could not LoadLibrary: " << mfdll;
+  if (!PreSandboxMediaFoundationInitialization()) {
+    return;
   }
-
-  if (!::LoadLibrary(L"dxva2.dll"))
-    PLOG(ERROR) << "DXVAVDA fatal error: could not LoadLibrary: dxva2.dll";
-
-  if (!LoadLibrary(L"msvproc.dll")) {
-    PLOG(ERROR) << "DXVAVDA fatal error: could not LoadLibrary: msvproc.dll";
+  for (const wchar_t* dll :
+       {L"msmpeg2vdec.dll", L"dxva2.dll", L"msvproc.dll"}) {
+    if (!::LoadLibrary(dll)) {
+      PLOG(ERROR) << "Fatal DXVAVDA error, could not LoadLibrary: " << dll;
+      return;
+    }
   }
 }
 

media/gpu/windows/media_foundation_video_encode_accelerator_win.cc

diff --git a/media/gpu/windows/media_foundation_video_encode_accelerator_win.cc b/media/gpu/windows/media_foundation_video_encode_accelerator_win.cc
index 9403a8a7e..45fd08c 100644
--- a/media/gpu/windows/media_foundation_video_encode_accelerator_win.cc
+++ b/media/gpu/windows/media_foundation_video_encode_accelerator_win.cc
@@ -95,11 +95,6 @@
 // //third_party/webrtc/media/engine/webrtc_video_engine.h.
 constexpr uint8_t kAV1MaxQuantizer = 56;
 
-constexpr const wchar_t* const kMediaFoundationVideoEncoderDLLs[] = {
-    L"mf.dll",
-    L"mfplat.dll",
-};
-
 static const CLSID kIntelAV1HybridEncoderCLSID = {
     0x62c053ce,
     0x5357,
@@ -290,13 +285,6 @@
     return 0;
   }
 
-  for (const wchar_t* mfdll : kMediaFoundationVideoEncoderDLLs) {
-    if (!::GetModuleHandle(mfdll)) {
-      DLOG(ERROR) << mfdll << " is required for encoding";
-      return 0;
-    }
-  }
-
   if (!InitializeMediaFoundation())
     return 0;
 
@@ -476,6 +464,10 @@
 
   SupportedProfiles profiles;
 
+  if (!InitializeMediaFoundation()) {
+    return profiles;
+  }
+
   for (auto codec : {VideoCodec::kH264, VideoCodec::kVP9, VideoCodec::kAV1,
                      VideoCodec::kHEVC}) {
     auto codec_profiles = GetSupportedProfilesForCodec(codec);
@@ -886,17 +878,6 @@
   return true;
 }
 
-// static
-bool MediaFoundationVideoEncodeAccelerator::PreSandboxInitialization() {
-  bool result = true;
-  for (const wchar_t* mfdll : kMediaFoundationVideoEncoderDLLs) {
-    if (::LoadLibrary(mfdll) == nullptr) {
-      result = false;
-    }
-  }
-  return result;
-}
-
 bool MediaFoundationVideoEncodeAccelerator::ActivateAsyncEncoder(
     IMFActivate** pp_activate,
     uint32_t encoder_count,

media/gpu/windows/media_foundation_video_encode_accelerator_win.h

diff --git a/media/gpu/windows/media_foundation_video_encode_accelerator_win.h b/media/gpu/windows/media_foundation_video_encode_accelerator_win.h
index 37d52b6..b636110 100644
--- a/media/gpu/windows/media_foundation_video_encode_accelerator_win.h
+++ b/media/gpu/windows/media_foundation_video_encode_accelerator_win.h
@@ -83,10 +83,6 @@
   IFACEMETHODIMP_(ULONG) Release() override;
   IFACEMETHODIMP QueryInterface(REFIID riid, void** ppv) override;
 
-  // Preloads dlls required for encoding. Returns true if all required dlls are
-  // correctly loaded.
-  static bool PreSandboxInitialization();
-
   enum class DriverVendor { kOther, kNvidia, kIntel, kAMD };
 
  protected:

media/gpu/windows/mf_audio_encoder.cc

diff --git a/media/gpu/windows/mf_audio_encoder.cc b/media/gpu/windows/mf_audio_encoder.cc
index 5578040..5450fbb 100644
--- a/media/gpu/windows/mf_audio_encoder.cc
+++ b/media/gpu/windows/mf_audio_encoder.cc
@@ -72,8 +72,6 @@
 constexpr int kMinSamplesForOutput = kSamplesPerFrame * 3;
 constexpr int kMinSamplesForFlush = kSamplesPerFrame * 2;
 
-constexpr const wchar_t kMfPlatDllName[] = L"mfplat.dll";
-
 EncoderStatus::Codes ValidateInputOptions(const AudioEncoder::Options& options,
                                           ChannelLayout* channel_layout,
                                           int* bitrate) {
@@ -359,17 +357,6 @@
 MFAudioEncoder::PendingData::PendingData(PendingData&&) = default;
 MFAudioEncoder::PendingData::~PendingData() = default;
 
-// static
-bool MFAudioEncoder::PreSandboxInitialization() {
-  if (!LoadLibrary(kMfPlatDllName)) {
-    PLOG(ERROR) << "MFAudioEncoder fatal error: could not LoadLibrary: "
-                << kMfPlatDllName;
-    return false;
-  }
-
-  return true;
-}
-
 MFAudioEncoder::MFAudioEncoder(
     scoped_refptr<base::SequencedTaskRunner> task_runner)
     : task_runner_(std::move(task_runner)) {

media/gpu/windows/mf_audio_encoder.h

diff --git a/media/gpu/windows/mf_audio_encoder.h b/media/gpu/windows/mf_audio_encoder.h
index 078a89b..72238b5 100644
--- a/media/gpu/windows/mf_audio_encoder.h
+++ b/media/gpu/windows/mf_audio_encoder.h
@@ -52,11 +52,6 @@
 // number of samples have been provided. This resets when `Flush()` is called.
 class MEDIA_GPU_EXPORT MFAudioEncoder : public AudioEncoder {
  public:
-  // Loads the necessary DLLs for the correct version of Windows. Will return
-  // false on Windows N SKUs. Subsequent calls to `Initialize()` will return
-  // errors if this fails.
-  static bool PreSandboxInitialization();
-
   explicit MFAudioEncoder(scoped_refptr<base::SequencedTaskRunner> task_runner);
   MFAudioEncoder(const MFAudioEncoder&) = delete;
   MFAudioEncoder& operator=(const MFAudioEncoder&) = delete;

media/mojo/services/gpu_mojo_media_client_cros.cc

diff --git a/media/mojo/services/gpu_mojo_media_client_cros.cc b/media/mojo/services/gpu_mojo_media_client_cros.cc
index 80dfc27..de17bbe 100644
--- a/media/mojo/services/gpu_mojo_media_client_cros.cc
+++ b/media/mojo/services/gpu_mojo_media_client_cros.cc
@@ -34,7 +34,7 @@
     return VideoDecoderType::kUnknown;
   }
 
-  if (base::FeatureList::IsEnabled(kUseOutOfProcessVideoDecoding)) {
+  if (IsOutOfProcessVideoDecodingEnabled()) {
     return VideoDecoderType::kOutOfProcess;
   }
 

media/mojo/services/gpu_mojo_media_client_linux.cc

diff --git a/media/mojo/services/gpu_mojo_media_client_linux.cc b/media/mojo/services/gpu_mojo_media_client_linux.cc
index 7c5eb0d..3c32df3 100644
--- a/media/mojo/services/gpu_mojo_media_client_linux.cc
+++ b/media/mojo/services/gpu_mojo_media_client_linux.cc
@@ -24,7 +24,7 @@
     return VideoDecoderType::kUnknown;
   }
 
-  if (base::FeatureList::IsEnabled(kUseOutOfProcessVideoDecoding)) {
+  if (IsOutOfProcessVideoDecodingEnabled()) {
     return VideoDecoderType::kOutOfProcess;
   }
 

net/http/transport_security_state_static.pins

diff --git a/net/http/transport_security_state_static.pins b/net/http/transport_security_state_static.pins
index f177620..51450f7b 100644
--- a/net/http/transport_security_state_static.pins
+++ b/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-04-06 12:53 UTC
+# Last updated: 2023-04-07 12:56 UTC
 PinsListTimestamp
-1680785634
+1680872161
 
 TestSPKI
 sha256/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=

remoting/codec/webrtc_video_encoder_gpu.cc

diff --git a/remoting/codec/webrtc_video_encoder_gpu.cc b/remoting/codec/webrtc_video_encoder_gpu.cc
index 70a2ca2..76108ff6 100644
--- a/remoting/codec/webrtc_video_encoder_gpu.cc
+++ b/remoting/codec/webrtc_video_encoder_gpu.cc
@@ -41,7 +41,6 @@
 
 #if BUILDFLAG(IS_WIN)
 #include "base/win/scoped_com_initializer.h"
-#include "media/gpu/windows/media_foundation_video_encode_accelerator_win.h"
 #endif
 
 namespace {
@@ -416,9 +415,6 @@
   // H.264 and run the encoder on a different thread, we use a locally scoped
   // object for now.
   base::win::ScopedCOMInitializer scoped_com_initializer;
-
-  // Ensure the required MF DLLs are loaded before we call into the VEA below.
-  media::MediaFoundationVideoEncodeAccelerator::PreSandboxInitialization();
 #endif
 
   media::VideoEncodeAccelerator::SupportedProfiles profiles =

remoting/host/host_attributes.cc

diff --git a/remoting/host/host_attributes.cc b/remoting/host/host_attributes.cc
index 3cf9ffc..1b80bd2 100644
--- a/remoting/host/host_attributes.cc
+++ b/remoting/host/host_attributes.cc
@@ -17,7 +17,6 @@
 
 #if BUILDFLAG(IS_WIN)
 #include "media/base/win/mf_initializer.h"
-#include "media/gpu/windows/media_foundation_video_encode_accelerator_win.h"
 #include "remoting/host/win/evaluate_3d_display_mode.h"
 #include "remoting/host/win/evaluate_d3d.h"
 #endif
@@ -103,9 +102,7 @@
 
   // TODO(crbug.com/1184041): Remove this and/or the entire HostAttributes class
   // so we can remove //remoting/host:common from //media/gpu's visibility list.
-  if (media::MediaFoundationVideoEncodeAccelerator
-      ::PreSandboxInitialization() &&
-      media::InitializeMediaFoundation()) {
+  if (media::InitializeMediaFoundation()) {
     result.push_back("HWEncoder");
   }
 #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)

remoting/host/it2me_desktop_environment_unittest.cc

diff --git a/remoting/host/it2me_desktop_environment_unittest.cc b/remoting/host/it2me_desktop_environment_unittest.cc
index c0c17949f..f2fd9d64 100644
--- a/remoting/host/it2me_desktop_environment_unittest.cc
+++ b/remoting/host/it2me_desktop_environment_unittest.cc
@@ -135,6 +135,13 @@
 #endif  // BUILDFLAG(IS_CHROMEOS)
   }
 
+#if BUILDFLAG(IS_CHROMEOS)
+  void TearDown() override {
+    // Wait until DeleteSoon is finished.
+    environment_.RunUntilIdle();
+  }
+#endif  // BUILDFLAG(IS_CHROMEOS)
+
   DesktopEnvironmentOptions default_options() {
     DesktopEnvironmentOptions options;
     // These options must be false or we run into crashes in HostWindowProxy.

skia/config/SkUserConfig.h

diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h
index 85d9a4d4..d041465 100644
--- a/skia/config/SkUserConfig.h
+++ b/skia/config/SkUserConfig.h
@@ -228,6 +228,8 @@
 #define SK_USE_LEGACY_XFERMODE_SPRITE_BLITTERS
 #define SK_USE_LEGACY_XFERMODE_SHADER_BLITTERS
 
+#define SK_SUPPORT_LEGACY_CONIC_CHOP
+
 // Use the original std::vector based serializer
 // Remove when new streaming support operations has been verified.
 // #define SK_SUPPORT_LEGACY_STRIKE_SERIALIZATION

testing/buildbot/chrome.json

diff --git a/testing/buildbot/chrome.json b/testing/buildbot/chrome.json
index d248966..7c389320 100644
--- a/testing/buildbot/chrome.json
+++ b/testing/buildbot/chrome.json
@@ -21,7 +21,6 @@
           "--tast-retries=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -85,7 +84,6 @@
           "--strip-chrome"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -179,7 +177,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -216,7 +213,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -255,7 +251,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -292,7 +287,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -330,7 +324,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -374,7 +367,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -453,7 +445,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -497,7 +488,6 @@
         ],
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -534,7 +524,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -571,7 +560,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -608,7 +596,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -645,7 +632,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -683,7 +669,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -720,7 +705,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -757,7 +741,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -796,7 +779,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -847,7 +829,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -885,7 +866,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.ozone_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -922,7 +902,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -959,7 +938,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -998,7 +976,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1035,7 +1012,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1072,7 +1048,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1117,7 +1092,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1162,7 +1136,6 @@
         ],
         "isolate_name": "telemetry_perf_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -1211,7 +1184,6 @@
         ],
         "isolate_name": "telemetry_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -1261,7 +1233,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.base_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1286,7 +1257,6 @@
           "--tast-retries=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -1354,7 +1324,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.base_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1379,7 +1348,6 @@
           "--tast-retries=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -1453,7 +1421,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.base_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1478,7 +1445,6 @@
           "--tast-retries=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -1546,7 +1512,6 @@
         "experiment_percentage": 0,
         "isolate_name": "telemetry_perf_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -1613,7 +1578,6 @@
           "--magic-vm-cache=magic_cros_reven_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -1710,7 +1674,6 @@
           "--flash"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_all_tast_tests eve",
@@ -1744,7 +1707,6 @@
         ],
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_variations_tast_tests betty-pi-arc",
@@ -2117,7 +2079,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2163,7 +2124,6 @@
         ],
         "isolate_name": "variations_smoke_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "variations_smoke_tests",
@@ -2200,7 +2160,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2219,7 +2178,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2238,7 +2196,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2258,7 +2215,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2277,7 +2233,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2297,7 +2252,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2316,7 +2270,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2336,7 +2289,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2355,7 +2307,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2374,7 +2325,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2393,7 +2343,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2412,7 +2361,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2431,7 +2379,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2450,7 +2397,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2469,7 +2415,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -2489,7 +2434,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2508,7 +2452,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2530,7 +2473,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.browser_tests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2553,7 +2495,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2572,7 +2513,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2591,7 +2531,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2610,7 +2549,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2629,7 +2567,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2648,7 +2585,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2667,7 +2603,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2686,7 +2621,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2705,7 +2639,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2724,7 +2657,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2743,7 +2675,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2762,7 +2693,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2782,7 +2712,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2801,7 +2730,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2820,7 +2748,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2839,7 +2766,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2858,7 +2784,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2877,7 +2802,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2896,7 +2820,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2915,7 +2838,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2934,7 +2856,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2953,7 +2874,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2972,7 +2892,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2991,7 +2910,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3010,7 +2928,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3029,7 +2946,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3048,7 +2964,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3067,7 +2982,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3086,7 +3000,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3105,7 +3018,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3127,7 +3039,6 @@
           "--gtest_filter=-SadTabViewInteractiveUITest.ReloadMultipleSadTabs"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3147,7 +3058,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3166,7 +3076,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3185,7 +3094,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3204,7 +3112,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3223,7 +3130,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3242,7 +3148,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3261,7 +3166,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3280,7 +3184,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3299,7 +3202,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3318,7 +3220,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3337,7 +3238,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3356,7 +3256,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3378,7 +3277,6 @@
           "--ozone-platform=headless"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3400,7 +3298,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.ozone_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3419,7 +3316,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3438,7 +3334,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3457,7 +3352,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3476,7 +3370,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3495,7 +3388,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3514,7 +3406,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3533,7 +3424,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3552,7 +3442,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3571,7 +3460,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3590,7 +3478,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3609,7 +3496,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3628,7 +3514,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3647,7 +3532,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3666,7 +3550,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3685,7 +3568,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3704,7 +3586,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3723,7 +3604,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3742,7 +3622,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3761,7 +3640,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3783,7 +3661,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.unit_tests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3802,7 +3679,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3822,7 +3698,6 @@
       {
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3841,7 +3716,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3860,7 +3734,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3879,7 +3752,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3898,7 +3770,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3917,7 +3788,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3936,7 +3806,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3955,7 +3824,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4034,7 +3902,6 @@
         ],
         "isolate_name": "variations_smoke_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "variations_smoke_tests",
@@ -4076,7 +3943,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4123,7 +3989,6 @@
         "experiment_percentage": 100,
         "isolate_name": "variations_smoke_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "variations_smoke_tests",

testing/buildbot/chromium.accessibility.json

diff --git a/testing/buildbot/chromium.accessibility.json b/testing/buildbot/chromium.accessibility.json
index 0d6e69a..d9019d3 100644
--- a/testing/buildbot/chromium.accessibility.json
+++ b/testing/buildbot/chromium.accessibility.json
@@ -14,7 +14,6 @@
           "--test-arg=--ozone-platform=headless"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "accessibility_content_browsertests",

testing/buildbot/chromium.android.json

diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
index 5f173e9..e610aa7 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -2708,7 +2708,6 @@
           "--avd-config=../../tools/android/avd/proto/generic_android30.textpb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "resultdb": {
@@ -6735,7 +6734,6 @@
           "--avd-config=../../tools/android/avd/proto/generic_android31.textpb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "resultdb": {
@@ -10902,7 +10900,6 @@
         ],
         "isolate_name": "private_code_failure_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "private_code_failure_test",
@@ -11188,7 +11185,6 @@
           "--avd-config=../../tools/android/avd/proto/generic_android32_foldable.textpb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "resultdb": {
@@ -15179,7 +15175,6 @@
           "--avd-config=../../tools/android/avd/proto/generic_android33.textpb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "resultdb": {
@@ -19202,7 +19197,6 @@
           "-v"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "resultdb": {
@@ -21945,7 +21939,6 @@
       {
         "isolate_name": "monochrome_public_apk_checker",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "monochrome_public_apk_checker",
@@ -26446,7 +26439,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "resultdb": {
@@ -30525,7 +30517,6 @@
         "isolate_name": "android_webview_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "android_webview_junit_tests",
@@ -30555,7 +30546,6 @@
         "isolate_name": "base_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_junit_tests",
@@ -30585,7 +30575,6 @@
         "isolate_name": "build_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "build_junit_tests",
@@ -30615,7 +30604,6 @@
         "isolate_name": "chrome_java_test_pagecontroller_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chrome_java_test_pagecontroller_junit_tests",
@@ -30646,7 +30634,6 @@
         "isolate_name": "chrome_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chrome_junit_tests",
@@ -30676,7 +30663,6 @@
         "isolate_name": "components_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_junit_tests",
@@ -30754,7 +30740,6 @@
         "isolate_name": "content_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_junit_tests",
@@ -30784,7 +30769,6 @@
         "isolate_name": "device_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "device_junit_tests",
@@ -30814,7 +30798,6 @@
         "isolate_name": "junit_unit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "junit_unit_tests",
@@ -30844,7 +30827,6 @@
         "isolate_name": "keyboard_accessory_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "keyboard_accessory_junit_tests",
@@ -30874,7 +30856,6 @@
         "isolate_name": "media_base_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "media_base_junit_tests",
@@ -30904,7 +30885,6 @@
         "isolate_name": "module_installer_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "module_installer_junit_tests",
@@ -30935,7 +30915,6 @@
         "isolate_name": "monochrome_public_apk_checker",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "monochrome_public_apk_checker",
@@ -30981,7 +30960,6 @@
         "isolate_name": "net_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "net_junit_tests",
@@ -31011,7 +30989,6 @@
         "isolate_name": "paint_preview_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "paint_preview_junit_tests",
@@ -31041,7 +31018,6 @@
         "isolate_name": "password_check_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "password_check_junit_tests",
@@ -31071,7 +31047,6 @@
         "isolate_name": "password_manager_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "password_manager_junit_tests",
@@ -31101,7 +31076,6 @@
         "isolate_name": "services_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "services_junit_tests",
@@ -31139,7 +31113,6 @@
         "isolate_name": "telemetry_perf_unittests_android_chrome",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_chromium_minidump_unittests",
@@ -31190,7 +31163,6 @@
         "isolate_name": "telemetry_perf_unittests_android_monochrome",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_monochrome_minidump_unittests",
@@ -31238,7 +31210,6 @@
         "isolate_name": "telemetry_perf_unittests_android_chrome",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -31284,7 +31255,6 @@
         "isolate_name": "touch_to_fill_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "touch_to_fill_junit_tests",
@@ -31314,7 +31284,6 @@
         "isolate_name": "ui_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_junit_tests",
@@ -31344,7 +31313,6 @@
         "isolate_name": "webapk_client_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webapk_client_junit_tests",
@@ -31374,7 +31342,6 @@
         "isolate_name": "webapk_shell_apk_h2o_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webapk_shell_apk_h2o_junit_tests",
@@ -31404,7 +31371,6 @@
         "isolate_name": "webapk_shell_apk_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webapk_shell_apk_junit_tests",
@@ -33042,7 +33008,6 @@
           "--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "resultdb": {

testing/buildbot/chromium.angle.json

diff --git a/testing/buildbot/chromium.angle.json b/testing/buildbot/chromium.angle.json
index 8576f2cc..b46514f1 100644
--- a/testing/buildbot/chromium.angle.json
+++ b/testing/buildbot/chromium.angle.json
@@ -18,7 +18,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gles_passthrough_tests",
@@ -70,7 +69,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "angle_end2end_tests iPhone X 16.2",
@@ -128,7 +126,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "angle_white_box_tests iPhone X 16.2",
@@ -184,7 +181,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -210,7 +206,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -246,7 +241,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -282,7 +276,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -321,7 +314,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gl_passthrough_tests",
@@ -360,7 +352,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -397,7 +388,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -423,7 +413,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -459,7 +448,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -495,7 +483,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -534,7 +521,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gl_passthrough_tests",
@@ -573,7 +559,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -609,7 +594,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -637,7 +621,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -676,7 +659,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -718,7 +700,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_metal_passthrough_tests",
@@ -760,7 +741,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -802,7 +782,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_metal_passthrough_tests",
@@ -844,7 +823,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_swangle_passthrough_tests",
@@ -883,7 +861,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -909,7 +886,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -946,7 +922,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -986,7 +961,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gl_passthrough_tests",
@@ -1028,7 +1002,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_metal_passthrough_tests",
@@ -1068,7 +1041,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -1109,7 +1081,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_metal_passthrough_tests",
@@ -1149,7 +1120,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_swangle_passthrough_tests",
@@ -1200,7 +1170,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -1240,7 +1209,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_d3d11_passthrough_tests",
@@ -1280,7 +1248,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d11_passthrough_tests",
@@ -1320,7 +1287,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d9_passthrough_tests",
@@ -1359,7 +1325,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_vulkan_passthrough_tests",
@@ -1405,7 +1370,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -1445,7 +1409,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_d3d11_passthrough_tests",
@@ -1485,7 +1448,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d11_passthrough_tests",
@@ -1525,7 +1487,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d9_passthrough_tests",
@@ -1564,7 +1525,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_vulkan_passthrough_tests",

testing/buildbot/chromium.cft.json

diff --git a/testing/buildbot/chromium.cft.json b/testing/buildbot/chromium.cft.json
index 6d827b3a..d4a0b53 100644
--- a/testing/buildbot/chromium.cft.json
+++ b/testing/buildbot/chromium.cft.json
@@ -9,7 +9,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27,7 +26,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45,7 +43,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -64,7 +61,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -82,7 +78,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -100,7 +95,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -118,7 +112,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -136,7 +129,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -154,7 +146,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -172,7 +163,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -190,7 +180,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -209,7 +198,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -227,7 +215,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -248,7 +235,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -270,7 +256,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -288,7 +273,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -306,7 +290,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -324,7 +307,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -342,7 +324,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -360,7 +341,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -378,7 +358,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -396,7 +375,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -414,7 +392,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -432,7 +409,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -451,7 +427,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -469,7 +444,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -487,7 +461,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -505,7 +478,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -523,7 +495,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -541,7 +512,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -559,7 +529,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -577,7 +546,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -595,7 +563,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -613,7 +580,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -631,7 +597,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -649,7 +614,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -667,7 +631,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -685,7 +648,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -703,7 +665,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -721,7 +682,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -739,7 +699,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -757,7 +716,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -775,7 +733,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -793,7 +750,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -814,7 +770,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -833,7 +788,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -851,7 +805,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -869,7 +822,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -887,7 +839,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -905,7 +856,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -923,7 +873,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -941,7 +890,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -959,7 +907,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -977,7 +924,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -995,7 +941,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1013,7 +958,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1031,7 +975,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1049,7 +992,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1067,7 +1009,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1085,7 +1026,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1103,7 +1043,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1121,7 +1060,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1139,7 +1077,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1157,7 +1094,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1175,7 +1111,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1193,7 +1128,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1211,7 +1145,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1229,7 +1162,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1247,7 +1179,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1265,7 +1196,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1283,7 +1213,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1301,7 +1230,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1319,7 +1247,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1337,7 +1264,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1355,7 +1281,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1373,7 +1298,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1391,7 +1315,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1409,7 +1332,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1427,7 +1349,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1445,7 +1366,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1463,7 +1383,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1481,7 +1400,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1499,7 +1417,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -1518,7 +1435,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1539,7 +1455,6 @@
         "isolate_name": "blink_python_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -1561,7 +1476,6 @@
         "isolate_name": "blink_pytype",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_pytype",
@@ -1627,7 +1541,6 @@
         "isolate_name": "chromedriver_py_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -1649,7 +1562,6 @@
         "isolate_name": "chromedriver_replay_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -1668,7 +1580,6 @@
         "isolate_name": "content_shell_crash_test",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -1691,7 +1602,6 @@
         "isolate_name": "flatbuffers_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -1714,7 +1624,6 @@
         "isolate_name": "fuchsia_pytype",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "fuchsia_pytype",
@@ -1737,7 +1646,6 @@
         "isolate_name": "gold_common_pytype",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gold_common_pytype",
@@ -1760,7 +1668,6 @@
         "isolate_name": "gpu_pytype",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_pytype",
@@ -1783,7 +1690,6 @@
         "isolate_name": "grit_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -1882,7 +1788,6 @@
         "isolate_name": "mojo_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -1982,7 +1887,6 @@
         "isolate_name": "telemetry_gpu_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -2010,7 +1914,6 @@
         "isolate_name": "telemetry_perf_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -2038,7 +1941,6 @@
         "isolate_name": "telemetry_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -2062,7 +1964,6 @@
         "isolate_name": "testing_pytype",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "testing_pytype",
@@ -2194,7 +2095,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2213,7 +2113,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2232,7 +2131,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2252,7 +2150,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2271,7 +2168,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2290,7 +2186,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2309,7 +2204,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2328,7 +2222,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2347,7 +2240,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2366,7 +2258,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -2386,7 +2277,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2405,7 +2295,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2428,7 +2317,6 @@
         "ci_only": true,
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2451,7 +2339,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2470,7 +2357,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2489,7 +2375,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2508,7 +2393,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2527,7 +2411,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2546,7 +2429,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2565,7 +2447,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2584,7 +2465,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2604,7 +2484,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2625,7 +2504,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2644,7 +2522,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2663,7 +2540,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2682,7 +2558,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2701,7 +2576,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2720,7 +2594,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2739,7 +2612,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2758,7 +2630,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2777,7 +2648,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2796,7 +2666,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2815,7 +2684,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2834,7 +2702,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2853,7 +2720,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2872,7 +2738,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2891,7 +2756,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2910,7 +2774,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2929,7 +2792,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2948,7 +2810,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2967,7 +2828,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2986,7 +2846,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3008,7 +2867,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3029,7 +2887,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3048,7 +2905,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3067,7 +2923,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3086,7 +2941,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3105,7 +2959,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3124,7 +2977,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3143,7 +2995,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3162,7 +3013,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3181,7 +3031,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3200,7 +3049,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3219,7 +3067,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3238,7 +3085,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3257,7 +3103,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3276,7 +3121,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3295,7 +3139,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3314,7 +3157,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3333,7 +3175,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3352,7 +3193,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3371,7 +3211,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3390,7 +3229,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3409,7 +3247,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3428,7 +3265,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3447,7 +3283,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3466,7 +3301,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3485,7 +3319,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3505,7 +3338,6 @@
         "ci_only": true,
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3525,7 +3357,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3544,7 +3375,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3563,7 +3393,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3583,7 +3412,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3602,7 +3430,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3621,7 +3448,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3640,7 +3466,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3659,7 +3484,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3678,7 +3502,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -3698,7 +3521,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3720,7 +3542,6 @@
         "isolate_name": "blink_python_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -3787,7 +3608,6 @@
         "isolate_name": "chromedriver_py_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -3810,7 +3630,6 @@
         "isolate_name": "chromedriver_replay_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -3855,7 +3674,6 @@
         "isolate_name": "content_shell_crash_test",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -3879,7 +3697,6 @@
         "isolate_name": "flatbuffers_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -3903,7 +3720,6 @@
         "isolate_name": "grit_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -3926,7 +3742,6 @@
         "isolate_name": "mojo_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -3949,7 +3764,6 @@
         "isolate_name": "telemetry_gpu_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -3977,7 +3791,6 @@
         "isolate_name": "telemetry_perf_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -4006,7 +3819,6 @@
         "isolate_name": "telemetry_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -4085,7 +3897,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4104,7 +3915,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4123,7 +3933,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -4143,7 +3952,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4162,7 +3970,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4181,7 +3988,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4200,7 +4006,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4219,7 +4024,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4238,7 +4042,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4257,7 +4060,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4276,7 +4078,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -4296,7 +4097,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4315,7 +4115,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4338,7 +4137,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4361,7 +4159,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4380,7 +4177,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4399,7 +4195,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4418,7 +4213,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4437,7 +4231,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4456,7 +4249,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4475,7 +4267,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4494,7 +4285,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4513,7 +4303,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4532,7 +4321,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4552,7 +4340,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4574,7 +4361,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4595,7 +4381,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4614,7 +4399,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4633,7 +4417,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4652,7 +4435,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4671,7 +4453,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4690,7 +4471,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4709,7 +4489,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4728,7 +4507,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4747,7 +4525,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4766,7 +4543,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4785,7 +4561,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4804,7 +4579,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4823,7 +4597,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4842,7 +4615,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4861,7 +4633,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4880,7 +4651,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4899,7 +4669,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4918,7 +4687,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4937,7 +4705,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4956,7 +4723,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4975,7 +4741,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4994,7 +4759,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5013,7 +4777,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5032,7 +4795,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5051,7 +4813,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5074,7 +4835,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5100,7 +4860,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "pixel_interactive_ui_tests",
@@ -5125,7 +4884,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5144,7 +4902,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5163,7 +4920,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5182,7 +4938,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5201,7 +4956,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5220,7 +4974,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5239,7 +4992,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5258,7 +5010,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5277,7 +5028,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5296,7 +5046,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5315,7 +5064,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5334,7 +5082,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5353,7 +5100,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5372,7 +5118,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5391,7 +5136,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5410,7 +5154,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5429,7 +5172,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5448,7 +5190,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5468,7 +5209,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5487,7 +5227,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5506,7 +5245,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5525,7 +5263,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5544,7 +5281,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5564,7 +5300,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5583,7 +5318,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5602,7 +5336,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5621,7 +5354,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5640,7 +5372,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5659,7 +5390,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5679,7 +5409,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5698,7 +5427,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5717,7 +5445,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5736,7 +5463,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5755,7 +5481,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5774,7 +5499,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5796,7 +5520,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "precommit_args": [
@@ -5820,7 +5543,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5839,7 +5561,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5858,7 +5579,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5877,7 +5597,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5896,7 +5615,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5915,7 +5633,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5934,7 +5651,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5956,7 +5672,6 @@
         "isolate_name": "blink_python_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -6025,7 +5740,6 @@
         "isolate_name": "chromedriver_py_tests",
         "isolate_profile_data": false,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -6048,7 +5762,6 @@
         "isolate_name": "chromedriver_replay_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -6093,7 +5806,6 @@
         "isolate_name": "content_shell_crash_test",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -6117,7 +5829,6 @@
         "isolate_name": "flatbuffers_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -6141,7 +5852,6 @@
         "isolate_name": "grit_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -6164,7 +5874,6 @@
         "isolate_name": "mini_installer_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mini_installer_tests",
@@ -6185,7 +5894,6 @@
         "isolate_name": "mojo_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -6209,7 +5917,6 @@
         "isolate_name": "polymer_tools_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "polymer_tools_python_unittests",
@@ -6236,7 +5943,6 @@
         "isolate_name": "telemetry_perf_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_desktop_minidump_unittests",
@@ -6259,7 +5965,6 @@
         "isolate_name": "telemetry_gpu_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",

testing/buildbot/chromium.chromiumos.json

diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index 8eea748..62812beb 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -64,7 +64,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -100,7 +99,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -138,7 +136,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -174,7 +171,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -213,7 +209,6 @@
           "--tast-shard-method=hash"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -256,7 +251,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -333,7 +327,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -376,7 +369,6 @@
         ],
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -412,7 +404,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -448,7 +439,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -484,7 +474,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -520,7 +509,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -557,7 +545,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -593,7 +580,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -629,7 +615,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -667,7 +652,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -718,7 +702,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -754,7 +737,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -790,7 +772,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -826,7 +807,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -864,7 +844,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -900,7 +879,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -936,7 +914,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -980,7 +957,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1024,7 +1000,6 @@
         ],
         "isolate_name": "telemetry_perf_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -1073,7 +1048,6 @@
         ],
         "isolate_name": "telemetry_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -1128,7 +1102,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_tests",
@@ -1194,7 +1167,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.base_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1225,7 +1197,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.base_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1263,7 +1234,6 @@
           "--use-vm"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "base_unittests amd64-generic",
@@ -1288,7 +1258,6 @@
           "--use-vm"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "cc_unittests amd64-generic",
@@ -1313,7 +1282,6 @@
           "--flash"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "cc_unittests eve",
@@ -1340,7 +1308,6 @@
           "--use-vm"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_all_tast_tests amd64-generic",
@@ -1370,7 +1337,6 @@
           "--flash"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_all_tast_tests eve",
@@ -1403,7 +1369,6 @@
         ],
         "experiment_percentage": 5,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_cq_tast_tests_eve eve",
@@ -1435,7 +1400,6 @@
           "--use-vm"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "ozone_unittests amd64-generic",
@@ -1460,7 +1424,6 @@
           "--flash"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "ozone_unittests eve",
@@ -1496,7 +1459,6 @@
         ],
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "vaapi_unittest amd64-generic",
@@ -1530,7 +1492,6 @@
         ],
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "vaapi_unittest eve",
@@ -1589,7 +1550,6 @@
         ],
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_all_tast_tests jacuzzi",
@@ -1623,7 +1583,6 @@
         "ci_only": true,
         "experiment_percentage": 5,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_cq_tast_tests_jacuzzi jacuzzi",
@@ -1714,7 +1673,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1731,7 +1689,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1752,7 +1709,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1769,7 +1725,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1786,7 +1741,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1804,7 +1758,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1821,7 +1774,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1839,7 +1791,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1856,7 +1807,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1874,7 +1824,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1891,7 +1840,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1908,7 +1856,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1925,7 +1872,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1942,7 +1888,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1959,7 +1904,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1976,7 +1920,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1993,7 +1936,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -2011,7 +1953,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2028,7 +1969,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2045,7 +1985,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2066,7 +2005,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2083,7 +2021,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2100,7 +2037,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2117,7 +2053,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2134,7 +2069,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2151,7 +2085,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2168,7 +2101,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2185,7 +2117,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2202,7 +2133,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2219,7 +2149,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2236,7 +2165,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2253,7 +2181,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2271,7 +2198,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2288,7 +2214,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2305,7 +2230,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2322,7 +2246,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2339,7 +2262,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2356,7 +2278,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2373,7 +2294,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2390,7 +2310,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2407,7 +2326,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2424,7 +2342,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2441,7 +2358,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2458,7 +2374,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2475,7 +2390,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2492,7 +2406,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2509,7 +2422,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2526,7 +2438,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2543,7 +2454,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2560,7 +2470,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2577,7 +2486,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2595,7 +2503,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2612,7 +2519,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2629,7 +2535,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2646,7 +2551,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2663,7 +2567,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2680,7 +2583,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2697,7 +2599,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2714,7 +2615,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2731,7 +2631,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2748,7 +2647,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2765,7 +2663,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2782,7 +2679,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2803,7 +2699,6 @@
           "--ozone-platform=headless"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2820,7 +2715,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2837,7 +2731,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2854,7 +2747,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2871,7 +2763,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2888,7 +2779,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2905,7 +2795,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2922,7 +2811,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2939,7 +2827,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2956,7 +2843,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2973,7 +2859,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2990,7 +2875,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3007,7 +2891,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3024,7 +2907,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3041,7 +2923,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3058,7 +2939,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3075,7 +2955,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3092,7 +2971,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3109,7 +2987,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3126,7 +3003,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3143,7 +3019,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3160,7 +3035,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3178,7 +3052,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3196,7 +3069,6 @@
       {
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3213,7 +3085,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3230,7 +3101,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3247,7 +3117,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3264,7 +3133,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3281,7 +3149,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3298,7 +3165,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3323,7 +3189,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3341,7 +3206,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3359,7 +3223,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -3378,7 +3241,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3396,7 +3258,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3415,7 +3276,6 @@
         "ci_only": true,
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3438,7 +3298,6 @@
         "experiment_percentage": 100,
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "precommit_args": [
@@ -3461,7 +3320,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3480,7 +3338,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3498,7 +3355,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3516,7 +3372,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3534,7 +3389,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3552,7 +3406,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3570,7 +3423,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3588,7 +3440,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3606,7 +3457,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -3625,7 +3475,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3643,7 +3492,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3661,7 +3509,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3685,7 +3532,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "browser_tests_require_lacros",
@@ -3712,7 +3558,6 @@
         "experiment_percentage": 100,
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "pixel_experimental_browser_tests",
@@ -3739,7 +3584,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3757,7 +3601,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3775,7 +3618,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3793,7 +3635,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3811,7 +3652,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3829,7 +3669,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3847,7 +3686,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3865,7 +3703,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3883,7 +3720,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3901,7 +3737,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3919,7 +3754,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3937,7 +3771,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3956,7 +3789,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3974,7 +3806,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3992,7 +3823,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4010,7 +3840,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4028,7 +3857,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4046,7 +3874,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4064,7 +3891,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4082,7 +3908,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4101,7 +3926,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4119,7 +3943,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4137,7 +3960,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4155,7 +3977,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4173,7 +3994,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4191,7 +4011,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4209,7 +4028,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4227,7 +4045,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4245,7 +4062,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4263,7 +4079,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4281,7 +4096,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4300,7 +4114,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4318,7 +4131,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4336,7 +4148,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4354,7 +4165,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4372,7 +4182,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4390,7 +4199,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4408,7 +4216,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4426,7 +4233,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4444,7 +4250,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4462,7 +4267,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4480,7 +4284,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4498,7 +4301,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4519,7 +4321,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4537,7 +4338,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4555,7 +4355,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4573,7 +4372,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4591,7 +4389,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4609,7 +4406,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4627,7 +4423,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4645,7 +4440,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4663,7 +4457,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4681,7 +4474,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4699,7 +4491,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4717,7 +4508,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4735,7 +4525,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4753,7 +4542,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4771,7 +4559,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4789,7 +4576,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4807,7 +4593,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4825,7 +4610,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4844,7 +4628,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4862,7 +4645,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4880,7 +4662,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4898,7 +4679,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4917,7 +4697,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4936,7 +4715,6 @@
         "experiment_percentage": 100,
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4954,7 +4732,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4972,7 +4749,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4990,7 +4766,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5008,7 +4783,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5026,7 +4800,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5044,7 +4817,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5062,7 +4834,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5102,7 +4873,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5120,7 +4890,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5138,7 +4907,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5156,7 +4924,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5174,7 +4941,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5192,7 +4958,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5210,7 +4975,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5228,7 +4992,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5246,7 +5009,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5264,7 +5026,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -5283,7 +5044,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5301,7 +5061,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5319,7 +5078,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5341,7 +5099,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5359,7 +5116,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5377,7 +5133,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5395,7 +5150,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5413,7 +5167,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5431,7 +5184,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5449,7 +5201,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5467,7 +5218,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5485,7 +5235,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5503,7 +5252,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5521,7 +5269,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5540,7 +5287,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5558,7 +5304,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5576,7 +5321,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5594,7 +5338,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5612,7 +5355,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5630,7 +5372,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5648,7 +5389,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5669,7 +5409,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5690,7 +5429,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5708,7 +5446,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5726,7 +5463,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5744,7 +5480,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5762,7 +5497,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5780,7 +5514,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5798,7 +5531,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5816,7 +5548,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5834,7 +5565,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5858,7 +5588,6 @@
         "description": "Run with ash-chrome version 113.0.5672.21",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash beta",
@@ -5886,12 +5615,11 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5700.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5701.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5700.0",
+        "description": "Run with ash-chrome version 114.0.5701.0",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash canary",
@@ -5900,8 +5628,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5700.0",
-              "revision": "version:114.0.5700.0"
+              "location": "lacros_version_skew_tests_v114.0.5701.0",
+              "revision": "version:114.0.5701.0"
             }
           ],
           "dimension_sets": [
@@ -5924,7 +5652,6 @@
         "description": "Run with ash-chrome version 114.0.5692.0",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash dev",
@@ -5957,7 +5684,6 @@
         "description": "Run with ash-chrome version 112.0.5615.62",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash stable",
@@ -5985,7 +5711,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6006,7 +5731,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests",
@@ -6030,7 +5754,6 @@
         "description": "Run with ash-chrome version 113.0.5672.21",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash beta",
@@ -6057,12 +5780,11 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5700.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5701.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5700.0",
+        "description": "Run with ash-chrome version 114.0.5701.0",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash canary",
@@ -6071,8 +5793,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5700.0",
-              "revision": "version:114.0.5700.0"
+              "location": "lacros_version_skew_tests_v114.0.5701.0",
+              "revision": "version:114.0.5701.0"
             }
           ],
           "dimension_sets": [
@@ -6094,7 +5816,6 @@
         "description": "Run with ash-chrome version 114.0.5692.0",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash dev",
@@ -6126,7 +5847,6 @@
         "description": "Run with ash-chrome version 112.0.5615.62",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash stable",
@@ -6156,7 +5876,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series",
@@ -6181,7 +5900,6 @@
         "description": "Run with ash-chrome version 113.0.5672.21",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash beta",
@@ -6209,12 +5927,11 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5700.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5701.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5700.0",
+        "description": "Run with ash-chrome version 114.0.5701.0",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash canary",
@@ -6223,8 +5940,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5700.0",
-              "revision": "version:114.0.5700.0"
+              "location": "lacros_version_skew_tests_v114.0.5701.0",
+              "revision": "version:114.0.5701.0"
             }
           ],
           "dimension_sets": [
@@ -6247,7 +5964,6 @@
         "description": "Run with ash-chrome version 114.0.5692.0",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash dev",
@@ -6280,7 +5996,6 @@
         "description": "Run with ash-chrome version 112.0.5615.62",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash stable",
@@ -6308,7 +6023,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6326,7 +6040,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6344,7 +6057,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6362,7 +6074,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6380,7 +6091,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6398,7 +6108,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6416,7 +6125,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6434,7 +6142,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6452,7 +6159,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6470,7 +6176,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6488,7 +6193,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6506,7 +6210,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6524,7 +6227,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6542,7 +6244,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6560,7 +6261,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6578,7 +6278,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6596,7 +6295,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6614,7 +6312,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6632,7 +6329,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6650,7 +6346,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6668,7 +6363,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6686,7 +6380,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6704,7 +6397,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6722,7 +6414,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6740,7 +6431,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6758,7 +6448,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6776,7 +6465,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6794,7 +6482,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6812,7 +6499,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6830,7 +6516,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6851,7 +6536,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6869,7 +6553,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6887,7 +6570,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6905,7 +6587,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6923,7 +6604,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/chromium.clang.json

diff --git a/testing/buildbot/chromium.clang.json b/testing/buildbot/chromium.clang.json
index 49a3e2e..5a3dc4be 100644
--- a/testing/buildbot/chromium.clang.json
+++ b/testing/buildbot/chromium.clang.json
@@ -10,7 +10,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27,7 +26,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44,7 +42,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -62,7 +59,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -79,7 +75,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -96,7 +91,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -113,7 +107,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -130,7 +123,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -147,7 +139,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -164,7 +155,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -181,7 +171,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -199,7 +188,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -216,7 +204,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -233,7 +220,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -254,7 +240,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -271,7 +256,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -288,7 +272,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -305,7 +288,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -322,7 +304,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -339,7 +320,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -356,7 +336,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -373,7 +352,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -390,7 +368,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -407,7 +384,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -425,7 +401,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -442,7 +417,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -459,7 +433,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -476,7 +449,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -493,7 +465,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -510,7 +481,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -527,7 +497,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -544,7 +513,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -561,7 +529,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -578,7 +545,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -595,7 +561,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -612,7 +577,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -629,7 +593,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -646,7 +609,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -663,7 +625,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -680,7 +641,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -697,7 +657,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -714,7 +673,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -731,7 +689,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -748,7 +705,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -765,7 +721,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -783,7 +738,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -800,7 +754,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -817,7 +770,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -834,7 +786,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -851,7 +802,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -868,7 +818,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -885,7 +834,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -902,7 +850,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -919,7 +866,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -936,7 +882,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -953,7 +898,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -970,7 +914,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -987,7 +930,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1004,7 +946,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1021,7 +962,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1038,7 +978,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1055,7 +994,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1072,7 +1010,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1089,7 +1026,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1106,7 +1042,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1123,7 +1058,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1140,7 +1074,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1157,7 +1090,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1174,7 +1106,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1191,7 +1122,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1208,7 +1138,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1225,7 +1154,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1242,7 +1170,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1259,7 +1186,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1276,7 +1202,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1293,7 +1218,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1310,7 +1234,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1327,7 +1250,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1344,7 +1266,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1361,7 +1282,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1378,7 +1298,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1395,7 +1314,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1412,7 +1330,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -1430,7 +1347,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1454,7 +1370,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1472,7 +1387,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1490,7 +1404,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1509,7 +1422,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1527,7 +1439,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1545,7 +1456,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1563,7 +1473,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1581,7 +1490,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1599,7 +1507,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1617,7 +1524,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1635,7 +1541,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -1654,7 +1559,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1672,7 +1576,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1690,7 +1593,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1712,7 +1614,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1730,7 +1631,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1748,7 +1648,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1766,7 +1665,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1784,7 +1682,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1802,7 +1699,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1820,7 +1716,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1838,7 +1733,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1856,7 +1750,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1874,7 +1767,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1892,7 +1784,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1910,7 +1801,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1929,7 +1819,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1947,7 +1836,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1965,7 +1853,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1983,7 +1870,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2001,7 +1887,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2019,7 +1904,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2037,7 +1921,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2055,7 +1938,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2073,7 +1955,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2091,7 +1972,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2109,7 +1989,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2127,7 +2006,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2145,7 +2023,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2163,7 +2040,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2181,7 +2057,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2199,7 +2074,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2217,7 +2091,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2235,7 +2108,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2253,7 +2125,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2271,7 +2142,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2289,7 +2159,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2307,7 +2176,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2325,7 +2193,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2343,7 +2210,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2361,7 +2227,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2380,7 +2245,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2399,7 +2263,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2417,7 +2280,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2435,7 +2297,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2453,7 +2314,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2471,7 +2331,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2489,7 +2348,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2507,7 +2365,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2525,7 +2382,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2543,7 +2399,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2561,7 +2416,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2579,7 +2433,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2598,7 +2451,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2616,7 +2468,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2634,7 +2485,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2652,7 +2502,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2670,7 +2519,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2688,7 +2536,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2706,7 +2553,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2725,7 +2571,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2743,7 +2588,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2761,7 +2605,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2779,7 +2622,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2797,7 +2639,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2816,7 +2657,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2834,7 +2674,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2852,7 +2691,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2870,7 +2708,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2888,7 +2725,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2906,7 +2742,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2924,7 +2759,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2942,7 +2776,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2960,7 +2793,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2978,7 +2810,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2996,7 +2827,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3014,7 +2844,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3032,7 +2861,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3050,7 +2878,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3068,7 +2895,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3086,7 +2912,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3104,7 +2929,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3122,7 +2946,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3140,7 +2963,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3165,7 +2987,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3183,7 +3004,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3201,7 +3021,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -3220,7 +3039,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3238,7 +3056,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3256,7 +3073,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3274,7 +3090,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3292,7 +3107,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3310,7 +3124,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3328,7 +3141,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3346,7 +3158,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -3365,7 +3176,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3383,7 +3193,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3404,7 +3213,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3422,7 +3230,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3440,7 +3247,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3458,7 +3264,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3476,7 +3281,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3494,7 +3298,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3512,7 +3315,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3530,7 +3332,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3548,7 +3349,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3566,7 +3366,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3584,7 +3383,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3602,7 +3400,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3620,7 +3417,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3638,7 +3434,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3656,7 +3451,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3674,7 +3468,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3692,7 +3485,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3710,7 +3502,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3728,7 +3519,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3746,7 +3536,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3764,7 +3553,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3782,7 +3570,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3800,7 +3587,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3818,7 +3604,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3836,7 +3621,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3854,7 +3638,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3872,7 +3655,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3890,7 +3672,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3908,7 +3689,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3926,7 +3706,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3944,7 +3723,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3962,7 +3740,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3980,7 +3757,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3998,7 +3774,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4017,7 +3792,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4035,7 +3809,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4053,7 +3826,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4071,7 +3843,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4089,7 +3860,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4107,7 +3877,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4125,7 +3894,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4143,7 +3911,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4161,7 +3928,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4179,7 +3945,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4197,7 +3962,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4216,7 +3980,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4234,7 +3997,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4252,7 +4014,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4270,7 +4031,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4288,7 +4048,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4306,7 +4065,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4324,7 +4082,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4343,7 +4100,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4361,7 +4117,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4379,7 +4134,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4397,7 +4151,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4415,7 +4168,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4434,7 +4186,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4452,7 +4203,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4470,7 +4220,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4488,7 +4237,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4506,7 +4254,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4524,7 +4271,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4542,7 +4288,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4560,7 +4305,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4578,7 +4322,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4596,7 +4339,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4614,7 +4356,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4632,7 +4373,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4650,7 +4390,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4668,7 +4407,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4686,7 +4424,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4704,7 +4441,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4722,7 +4458,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4740,7 +4475,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4946,7 +4680,6 @@
           "-v"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "resultdb": {
@@ -7536,7 +7269,6 @@
       {
         "isolate_name": "monochrome_public_apk_checker",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "monochrome_public_apk_checker",
@@ -7959,7 +7691,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7977,7 +7708,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7995,7 +7725,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8013,7 +7742,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8031,7 +7759,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8049,7 +7776,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8067,7 +7793,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8085,7 +7810,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8103,7 +7827,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8121,7 +7844,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8139,7 +7861,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8157,7 +7878,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8175,7 +7895,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8193,7 +7912,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8211,7 +7929,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8229,7 +7946,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8248,7 +7964,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8271,7 +7986,6 @@
           "--test-arg=--ozone-platform=headless"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8289,7 +8003,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8308,7 +8021,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8326,7 +8038,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8344,7 +8055,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8362,7 +8072,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8380,7 +8089,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8398,7 +8106,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8416,7 +8123,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8434,7 +8140,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8452,7 +8157,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8470,7 +8174,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8488,7 +8191,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8506,7 +8208,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8524,7 +8225,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8542,7 +8242,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8560,7 +8259,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8578,7 +8276,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8596,7 +8293,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8614,7 +8310,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8632,7 +8327,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8650,7 +8344,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8668,7 +8361,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8686,7 +8378,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8704,7 +8395,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8725,7 +8415,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.net_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8747,7 +8436,6 @@
           "--test-arg=--ozone-platform=headless"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8765,7 +8453,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8783,7 +8470,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8801,7 +8487,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8822,7 +8507,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.services_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8840,7 +8524,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8858,7 +8541,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8876,7 +8558,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8894,7 +8575,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8912,7 +8592,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8933,7 +8612,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8951,7 +8629,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8969,7 +8646,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8990,7 +8666,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.views_examples_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9011,7 +8686,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.views_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9032,7 +8706,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.viz_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9050,7 +8723,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9071,7 +8743,6 @@
           "--test-arg=--vmodule=test_navigation_listener=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9089,7 +8760,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9107,7 +8777,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9125,7 +8794,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9143,7 +8811,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9168,7 +8835,6 @@
         ],
         "isolate_name": "angle_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "angle_unittests",
@@ -9270,7 +8936,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_fuchsia",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_validating_tests",
@@ -9304,7 +8969,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_fuchsia",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -9338,7 +9002,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_fuchsia",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -9376,7 +9039,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_fuchsia",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_validating_test",
@@ -9419,7 +9081,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_fuchsia",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_validating_test",
@@ -9459,7 +9120,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_fuchsia",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_validating_tests",
@@ -9487,7 +9147,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9506,7 +9165,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9525,7 +9183,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9544,7 +9201,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9563,7 +9219,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9582,7 +9237,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9601,7 +9255,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9620,7 +9273,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9639,7 +9291,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9658,7 +9309,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9677,7 +9327,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9696,7 +9345,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9715,7 +9363,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9734,7 +9381,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9753,7 +9399,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9772,7 +9417,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9796,7 +9440,6 @@
           "--test-arg=--ozone-platform=headless"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9815,7 +9458,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9835,7 +9477,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9854,7 +9495,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9873,7 +9513,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9892,7 +9531,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9911,7 +9549,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9930,7 +9567,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9949,7 +9585,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9968,7 +9603,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9987,7 +9621,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10006,7 +9639,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10025,7 +9657,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10044,7 +9675,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10063,7 +9693,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10082,7 +9711,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10101,7 +9729,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10120,7 +9747,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10139,7 +9765,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10161,7 +9786,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.net_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10184,7 +9808,6 @@
           "--test-arg=--ozone-platform=headless"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10203,7 +9826,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10222,7 +9844,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10241,7 +9862,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10263,7 +9883,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.services_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10282,7 +9901,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10301,7 +9919,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10320,7 +9937,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10339,7 +9955,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10358,7 +9973,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10380,7 +9994,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10399,7 +10012,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10418,7 +10030,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10437,7 +10048,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10459,7 +10069,6 @@
           "--test-arg=--vmodule=test_navigation_listener=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10478,7 +10087,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10497,7 +10105,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10516,7 +10123,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10535,7 +10141,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10561,7 +10166,6 @@
         ],
         "isolate_name": "angle_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "angle_unittests",
@@ -10610,7 +10214,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10627,7 +10230,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10644,7 +10246,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -10662,7 +10263,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10679,7 +10279,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10696,7 +10295,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10713,7 +10311,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10730,7 +10327,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10747,7 +10343,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10764,7 +10359,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10781,7 +10375,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -10799,7 +10392,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10816,7 +10408,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10833,7 +10424,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10854,7 +10444,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10871,7 +10460,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10888,7 +10476,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10905,7 +10492,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10922,7 +10508,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10939,7 +10524,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10956,7 +10540,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10973,7 +10556,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10990,7 +10572,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11007,7 +10588,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11025,7 +10605,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11042,7 +10621,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11059,7 +10637,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11076,7 +10653,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11093,7 +10669,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11110,7 +10685,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11127,7 +10701,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11144,7 +10717,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11161,7 +10733,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11178,7 +10749,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11195,7 +10765,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11212,7 +10781,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11229,7 +10797,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11246,7 +10813,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11263,7 +10829,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11280,7 +10845,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11297,7 +10861,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11314,7 +10877,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11331,7 +10893,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11348,7 +10909,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11365,7 +10925,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11383,7 +10942,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11400,7 +10958,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11417,7 +10974,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11434,7 +10990,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11451,7 +11006,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11468,7 +11022,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11485,7 +11038,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11502,7 +11054,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11519,7 +11070,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11536,7 +11086,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11553,7 +11102,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11570,7 +11118,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11587,7 +11134,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11604,7 +11150,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11621,7 +11166,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11638,7 +11182,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11655,7 +11198,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11672,7 +11214,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11689,7 +11230,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11706,7 +11246,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11723,7 +11262,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11740,7 +11278,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11757,7 +11294,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11774,7 +11310,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11791,7 +11326,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11808,7 +11342,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11825,7 +11358,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11842,7 +11374,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11859,7 +11390,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11876,7 +11406,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11893,7 +11422,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11910,7 +11438,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11927,7 +11454,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11944,7 +11470,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11961,7 +11486,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11978,7 +11502,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11995,7 +11518,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12012,7 +11534,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -12030,7 +11551,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12108,7 +11628,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12128,7 +11647,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12148,7 +11666,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -12169,7 +11686,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12189,7 +11705,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12209,7 +11724,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12229,7 +11743,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12249,7 +11762,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12269,7 +11781,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12289,7 +11800,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12309,7 +11819,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -12330,7 +11839,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12350,7 +11858,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12370,7 +11877,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12392,7 +11898,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12412,7 +11917,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12432,7 +11936,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12452,7 +11955,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12472,7 +11974,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12492,7 +11993,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12512,7 +12012,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12532,7 +12031,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12552,7 +12050,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12572,7 +12069,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12593,7 +12089,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12613,7 +12108,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12633,7 +12127,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12653,7 +12146,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12673,7 +12165,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12693,7 +12184,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12713,7 +12203,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12733,7 +12222,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12753,7 +12241,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12773,7 +12260,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12793,7 +12279,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12813,7 +12298,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12833,7 +12317,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12853,7 +12336,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12873,7 +12355,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12893,7 +12374,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12913,7 +12393,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12933,7 +12412,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12953,7 +12431,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12973,7 +12450,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12994,7 +12470,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13014,7 +12489,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13034,7 +12508,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13054,7 +12527,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13074,7 +12546,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13094,7 +12565,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13114,7 +12584,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13134,7 +12603,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13154,7 +12622,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13174,7 +12641,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13194,7 +12660,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13215,7 +12680,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13235,7 +12699,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13255,7 +12718,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13275,7 +12737,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13295,7 +12756,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13315,7 +12775,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13335,7 +12794,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13355,7 +12813,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13375,7 +12832,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13395,7 +12851,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13415,7 +12870,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13435,7 +12889,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13455,7 +12908,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13475,7 +12927,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13495,7 +12946,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13515,7 +12965,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13535,7 +12984,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13555,7 +13003,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13575,7 +13022,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13595,7 +13041,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13616,7 +13061,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13636,7 +13080,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13656,7 +13099,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13676,7 +13118,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13696,7 +13137,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13716,7 +13156,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13736,7 +13175,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -13757,7 +13195,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13809,7 +13246,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13826,7 +13262,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13843,7 +13278,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -13861,7 +13295,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13878,7 +13311,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13895,7 +13327,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13912,7 +13343,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13929,7 +13359,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13946,7 +13375,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13963,7 +13391,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13980,7 +13407,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -13998,7 +13424,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14015,7 +13440,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14032,7 +13456,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14053,7 +13476,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14070,7 +13492,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14087,7 +13508,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14104,7 +13524,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14121,7 +13540,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14138,7 +13556,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14155,7 +13572,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14172,7 +13588,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14189,7 +13604,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14206,7 +13620,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14224,7 +13637,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14241,7 +13653,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14258,7 +13669,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14275,7 +13685,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14292,7 +13701,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14309,7 +13717,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14326,7 +13733,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14343,7 +13749,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14360,7 +13765,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14377,7 +13781,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14394,7 +13797,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14411,7 +13813,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14428,7 +13829,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14445,7 +13845,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14462,7 +13861,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14479,7 +13877,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14496,7 +13893,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14513,7 +13909,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14530,7 +13925,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14547,7 +13941,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14564,7 +13957,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14582,7 +13974,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14599,7 +13990,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14616,7 +14006,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14633,7 +14022,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14650,7 +14038,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14667,7 +14054,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14684,7 +14070,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14701,7 +14086,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14718,7 +14102,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14735,7 +14118,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14752,7 +14134,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14769,7 +14150,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14786,7 +14166,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14803,7 +14182,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14820,7 +14198,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14837,7 +14214,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14854,7 +14230,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14871,7 +14246,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14888,7 +14262,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14905,7 +14278,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14922,7 +14294,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14939,7 +14310,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14956,7 +14326,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14973,7 +14342,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14990,7 +14358,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15007,7 +14374,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15024,7 +14390,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15041,7 +14406,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15058,7 +14422,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15075,7 +14438,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15092,7 +14454,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15109,7 +14470,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15126,7 +14486,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15143,7 +14502,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15160,7 +14518,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15177,7 +14534,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15194,7 +14550,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -15212,7 +14567,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15259,7 +14613,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15277,7 +14630,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15295,7 +14647,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -15314,7 +14665,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15332,7 +14682,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15350,7 +14699,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15368,7 +14716,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15386,7 +14733,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15404,7 +14750,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15422,7 +14767,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15440,7 +14784,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -15459,7 +14802,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15477,7 +14819,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15495,7 +14836,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15517,7 +14857,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15535,7 +14874,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15553,7 +14891,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15571,7 +14908,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15589,7 +14925,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15607,7 +14942,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15625,7 +14959,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15643,7 +14976,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15661,7 +14993,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15679,7 +15010,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15698,7 +15028,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15716,7 +15045,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15734,7 +15062,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15752,7 +15079,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15770,7 +15096,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15788,7 +15113,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15806,7 +15130,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15824,7 +15147,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15842,7 +15164,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15860,7 +15181,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15878,7 +15198,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15896,7 +15215,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15914,7 +15232,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15932,7 +15249,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15950,7 +15266,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15968,7 +15283,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15986,7 +15300,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16004,7 +15317,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16022,7 +15334,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16040,7 +15351,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16058,7 +15368,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16077,7 +15386,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16095,7 +15403,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16113,7 +15420,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16131,7 +15437,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16149,7 +15454,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16167,7 +15471,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16185,7 +15488,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16203,7 +15505,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16221,7 +15522,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16239,7 +15539,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16257,7 +15556,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16275,7 +15573,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16293,7 +15590,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16311,7 +15607,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16329,7 +15624,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16347,7 +15641,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16365,7 +15658,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16383,7 +15675,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16401,7 +15692,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16419,7 +15709,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16437,7 +15726,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16455,7 +15743,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16473,7 +15760,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16491,7 +15777,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16509,7 +15794,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16527,7 +15811,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16545,7 +15828,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16563,7 +15845,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16581,7 +15862,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16599,7 +15879,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16617,7 +15896,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16635,7 +15913,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16653,7 +15930,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16671,7 +15947,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16689,7 +15964,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16707,7 +15981,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16725,7 +15998,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16743,7 +16015,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -16762,7 +16033,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16811,7 +16081,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16828,7 +16097,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -16846,7 +16114,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16863,7 +16130,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16880,7 +16146,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16897,7 +16162,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16914,7 +16178,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -16932,7 +16195,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16949,7 +16211,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16969,7 +16230,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16986,7 +16246,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17003,7 +16262,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17020,7 +16278,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17037,7 +16294,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17055,7 +16311,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17072,7 +16327,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17089,7 +16343,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17106,7 +16359,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17123,7 +16375,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17140,7 +16391,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17157,7 +16407,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17174,7 +16423,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17191,7 +16439,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17208,7 +16455,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17225,7 +16471,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17242,7 +16487,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17259,7 +16503,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17276,7 +16519,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17293,7 +16535,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17310,7 +16551,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17327,7 +16567,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17344,7 +16583,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17361,7 +16599,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17378,7 +16615,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17395,7 +16631,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17412,7 +16647,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17429,7 +16663,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17446,7 +16679,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17463,7 +16695,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17480,7 +16711,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17497,7 +16727,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17514,7 +16743,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17538,7 +16766,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17555,7 +16782,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17572,7 +16798,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -17590,7 +16815,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17607,7 +16831,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17624,7 +16847,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17641,7 +16863,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17658,7 +16879,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17675,7 +16895,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17692,7 +16911,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17709,7 +16927,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -17727,7 +16944,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17744,7 +16960,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17764,7 +16979,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17781,7 +16995,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17798,7 +17011,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17815,7 +17027,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17832,7 +17043,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17849,7 +17059,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17866,7 +17075,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17883,7 +17091,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17900,7 +17107,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17917,7 +17123,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17935,7 +17140,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17952,7 +17156,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17969,7 +17172,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17986,7 +17188,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18003,7 +17204,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18020,7 +17220,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18037,7 +17236,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18054,7 +17252,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18071,7 +17268,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18088,7 +17284,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18105,7 +17300,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18122,7 +17316,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18139,7 +17332,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18156,7 +17348,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18173,7 +17364,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18190,7 +17380,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18207,7 +17396,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18224,7 +17412,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18241,7 +17428,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18258,7 +17444,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18276,7 +17461,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18293,7 +17477,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18310,7 +17493,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18327,7 +17509,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18344,7 +17525,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18361,7 +17541,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18378,7 +17557,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18395,7 +17573,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18412,7 +17589,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18429,7 +17605,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18446,7 +17621,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18464,7 +17638,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18481,7 +17654,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18498,7 +17670,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18515,7 +17686,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18532,7 +17702,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18549,7 +17718,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18566,7 +17734,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18583,7 +17750,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18600,7 +17766,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18617,7 +17782,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18634,7 +17798,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18651,7 +17814,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18668,7 +17830,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18685,7 +17846,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18702,7 +17862,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18719,7 +17878,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18736,7 +17894,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18754,7 +17911,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18771,7 +17927,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18788,7 +17943,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18805,7 +17959,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18822,7 +17975,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18839,7 +17991,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18856,7 +18007,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18873,7 +18023,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18890,7 +18039,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18907,7 +18055,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -18925,7 +18072,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18972,7 +18118,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18989,7 +18134,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19006,7 +18150,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -19024,7 +18167,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19041,7 +18183,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19058,7 +18199,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19075,7 +18215,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19092,7 +18231,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19109,7 +18247,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19126,7 +18263,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19143,7 +18279,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -19161,7 +18296,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19178,7 +18312,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19195,7 +18328,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19216,7 +18348,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19233,7 +18364,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19250,7 +18380,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19267,7 +18396,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19284,7 +18412,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19301,7 +18428,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19318,7 +18444,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19335,7 +18460,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19352,7 +18476,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19369,7 +18492,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19387,7 +18509,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19404,7 +18525,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19421,7 +18541,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19438,7 +18557,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19455,7 +18573,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19472,7 +18589,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19489,7 +18605,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19506,7 +18621,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19523,7 +18637,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19540,7 +18653,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19557,7 +18669,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19574,7 +18685,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19591,7 +18701,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19608,7 +18717,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19625,7 +18733,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19642,7 +18749,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19659,7 +18765,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19676,7 +18781,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19693,7 +18797,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19710,7 +18813,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19727,7 +18829,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19745,7 +18846,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19762,7 +18862,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19779,7 +18878,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19796,7 +18894,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19813,7 +18910,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19830,7 +18926,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19847,7 +18942,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19864,7 +18958,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19881,7 +18974,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19898,7 +18990,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19915,7 +19006,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19932,7 +19022,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19949,7 +19038,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19966,7 +19054,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19983,7 +19070,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20000,7 +19086,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20017,7 +19102,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20034,7 +19118,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20051,7 +19134,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20068,7 +19150,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20085,7 +19166,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20102,7 +19182,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20119,7 +19198,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20136,7 +19214,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20153,7 +19230,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20170,7 +19246,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20187,7 +19262,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20204,7 +19278,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20221,7 +19294,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20238,7 +19310,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20255,7 +19326,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20272,7 +19342,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20289,7 +19358,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20306,7 +19374,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20323,7 +19390,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20340,7 +19406,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20357,7 +19422,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20374,7 +19438,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -20392,7 +19455,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20439,7 +19501,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20457,7 +19518,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20475,7 +19535,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -20494,7 +19553,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20512,7 +19570,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20530,7 +19587,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20548,7 +19604,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20566,7 +19621,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20584,7 +19638,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20602,7 +19655,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -20621,7 +19673,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20639,7 +19690,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20657,7 +19707,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20679,7 +19728,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20697,7 +19745,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20715,7 +19762,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20733,7 +19779,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20751,7 +19796,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20769,7 +19813,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20787,7 +19830,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20805,7 +19847,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20823,7 +19864,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20842,7 +19882,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20860,7 +19899,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20878,7 +19916,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20896,7 +19933,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20914,7 +19950,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20932,7 +19967,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20950,7 +19984,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20968,7 +20001,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20986,7 +20018,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21004,7 +20035,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21022,7 +20052,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21040,7 +20069,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21058,7 +20086,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21076,7 +20103,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21094,7 +20120,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21112,7 +20137,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21130,7 +20154,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21148,7 +20171,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21166,7 +20188,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21184,7 +20205,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21202,7 +20222,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21221,7 +20240,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21239,7 +20257,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21257,7 +20274,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21275,7 +20291,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21293,7 +20308,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21311,7 +20325,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21329,7 +20342,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21347,7 +20359,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21365,7 +20376,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21383,7 +20393,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21401,7 +20410,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21419,7 +20427,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21437,7 +20444,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21455,7 +20461,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21473,7 +20478,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21491,7 +20495,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21509,7 +20512,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21527,7 +20529,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21545,7 +20546,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21563,7 +20563,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21581,7 +20580,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21599,7 +20597,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21617,7 +20614,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21635,7 +20631,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21653,7 +20648,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21671,7 +20665,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21689,7 +20682,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21707,7 +20699,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21725,7 +20716,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21743,7 +20733,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21761,7 +20750,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21779,7 +20767,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21797,7 +20784,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21815,7 +20801,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21833,7 +20818,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21851,7 +20835,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -21870,7 +20853,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21891,7 +20873,6 @@
       {
         "isolate_name": "blink_python_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -22013,7 +20994,6 @@
         "check_flakiness_for_new_tests": false,
         "isolate_name": "chromedriver_py_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -22035,7 +21015,6 @@
       {
         "isolate_name": "chromedriver_replay_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -22078,7 +21057,6 @@
       {
         "isolate_name": "content_shell_crash_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -22101,7 +21079,6 @@
       {
         "isolate_name": "flatbuffers_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -22124,7 +21101,6 @@
       {
         "isolate_name": "grit_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -22146,7 +21122,6 @@
       {
         "isolate_name": "mac_signing_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mac_signing_tests",
@@ -22165,7 +21140,6 @@
       {
         "isolate_name": "mojo_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -22187,7 +21161,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -22213,7 +21186,6 @@
         ],
         "isolate_name": "telemetry_perf_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -22241,7 +21213,6 @@
         ],
         "isolate_name": "telemetry_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -22303,7 +21274,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22324,7 +21294,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22345,7 +21314,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -22367,7 +21335,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22388,7 +21355,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22409,7 +21375,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22430,7 +21395,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22451,7 +21415,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22472,7 +21435,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22493,7 +21455,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -22515,7 +21476,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22536,7 +21496,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22557,7 +21516,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22580,7 +21538,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22601,7 +21558,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22622,7 +21578,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22643,7 +21598,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22664,7 +21618,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22685,7 +21638,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22706,7 +21658,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22727,7 +21678,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22748,7 +21698,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22770,7 +21719,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22791,7 +21739,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22812,7 +21759,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22833,7 +21779,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22854,7 +21799,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22875,7 +21819,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22896,7 +21839,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22917,7 +21859,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22938,7 +21879,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22959,7 +21899,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22980,7 +21919,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23001,7 +21939,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23022,7 +21959,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23043,7 +21979,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23064,7 +21999,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23085,7 +22019,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23106,7 +22039,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23127,7 +22059,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23148,7 +22079,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23169,7 +22099,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23190,7 +22119,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23212,7 +22140,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23233,7 +22160,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23254,7 +22180,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23275,7 +22200,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23296,7 +22220,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23317,7 +22240,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23338,7 +22260,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23359,7 +22280,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23380,7 +22300,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23401,7 +22320,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23422,7 +22340,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23443,7 +22360,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23464,7 +22380,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23485,7 +22400,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23506,7 +22420,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23527,7 +22440,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23548,7 +22460,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23569,7 +22480,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23590,7 +22500,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23611,7 +22520,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23632,7 +22540,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23653,7 +22560,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23674,7 +22580,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23695,7 +22600,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23716,7 +22620,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23737,7 +22640,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23758,7 +22660,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23779,7 +22680,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23800,7 +22700,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23821,7 +22720,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23842,7 +22740,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23863,7 +22760,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23884,7 +22780,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23905,7 +22800,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23926,7 +22820,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -23948,7 +22841,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23973,7 +22865,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23992,7 +22883,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24011,7 +22901,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -24031,7 +22920,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24050,7 +22938,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24069,7 +22956,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24088,7 +22974,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24107,7 +22992,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24126,7 +23010,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24145,7 +23028,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -24165,7 +23047,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24184,7 +23065,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24203,7 +23083,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24226,7 +23105,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24245,7 +23123,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24264,7 +23141,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24283,7 +23159,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24302,7 +23177,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24321,7 +23195,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24340,7 +23213,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24359,7 +23231,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24378,7 +23249,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24398,7 +23268,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24417,7 +23286,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24436,7 +23304,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24455,7 +23322,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24474,7 +23340,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24493,7 +23358,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24512,7 +23376,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24531,7 +23394,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24550,7 +23412,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24569,7 +23430,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24588,7 +23448,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24607,7 +23466,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24626,7 +23484,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24645,7 +23502,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24664,7 +23520,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24683,7 +23538,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24702,7 +23556,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24721,7 +23574,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24740,7 +23592,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24759,7 +23610,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24778,7 +23628,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24798,7 +23647,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24817,7 +23665,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24836,7 +23683,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24855,7 +23701,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24874,7 +23719,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24893,7 +23737,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24912,7 +23755,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24931,7 +23773,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24950,7 +23791,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24969,7 +23809,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24988,7 +23827,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25007,7 +23845,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25026,7 +23863,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25045,7 +23881,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25064,7 +23899,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25083,7 +23917,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25102,7 +23935,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25121,7 +23953,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25140,7 +23971,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25159,7 +23989,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25178,7 +24007,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25197,7 +24025,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25216,7 +24043,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25235,7 +24061,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25254,7 +24079,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25273,7 +24097,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25292,7 +24115,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25311,7 +24133,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25330,7 +24151,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25349,7 +24169,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25368,7 +24187,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25387,7 +24205,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25406,7 +24223,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25425,7 +24241,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25444,7 +24259,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25463,7 +24277,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -25483,7 +24296,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25505,7 +24317,6 @@
       {
         "isolate_name": "blink_python_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -25631,7 +24442,6 @@
         "check_flakiness_for_new_tests": false,
         "isolate_name": "chromedriver_py_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -25654,7 +24464,6 @@
       {
         "isolate_name": "chromedriver_replay_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -25699,7 +24508,6 @@
       {
         "isolate_name": "content_shell_crash_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -25723,7 +24531,6 @@
       {
         "isolate_name": "flatbuffers_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -25747,7 +24554,6 @@
       {
         "isolate_name": "grit_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -25770,7 +24576,6 @@
       {
         "isolate_name": "mac_signing_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mac_signing_tests",
@@ -25790,7 +24595,6 @@
       {
         "isolate_name": "mojo_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -25813,7 +24617,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -25840,7 +24643,6 @@
         ],
         "isolate_name": "telemetry_perf_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -25869,7 +24671,6 @@
         ],
         "isolate_name": "telemetry_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -25925,7 +24726,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25942,7 +24742,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25959,7 +24758,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -25977,7 +24775,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25994,7 +24791,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26011,7 +24807,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26028,7 +24823,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26045,7 +24839,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26062,7 +24855,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26079,7 +24871,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26096,7 +24887,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -26114,7 +24904,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26131,7 +24920,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26148,7 +24936,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26169,7 +24956,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26186,7 +24972,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26203,7 +24988,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26220,7 +25004,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26237,7 +25020,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26254,7 +25036,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26271,7 +25052,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26288,7 +25068,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26305,7 +25084,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26322,7 +25100,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26339,7 +25116,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26356,7 +25132,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26374,7 +25149,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26391,7 +25165,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26408,7 +25181,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26425,7 +25197,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26442,7 +25213,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26459,7 +25229,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26476,7 +25245,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26493,7 +25261,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26510,7 +25277,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26527,7 +25293,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26544,7 +25309,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26561,7 +25325,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26578,7 +25341,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26595,7 +25357,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26612,7 +25373,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26629,7 +25389,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26646,7 +25405,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26663,7 +25421,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26680,7 +25437,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26697,7 +25453,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26714,7 +25469,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26731,7 +25485,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26748,7 +25501,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26765,7 +25517,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26782,7 +25533,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26800,7 +25550,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26818,7 +25567,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26835,7 +25583,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26852,7 +25599,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26869,7 +25615,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26886,7 +25631,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26903,7 +25647,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26920,7 +25663,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26937,7 +25679,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26954,7 +25695,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26971,7 +25711,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26988,7 +25727,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27005,7 +25743,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27022,7 +25759,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27039,7 +25775,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27056,7 +25791,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27073,7 +25807,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27090,7 +25823,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27108,7 +25840,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27125,7 +25856,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27142,7 +25872,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27159,7 +25888,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27176,7 +25904,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27194,7 +25921,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27211,7 +25937,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27228,7 +25953,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27245,7 +25969,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27262,7 +25985,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27279,7 +26001,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27296,7 +26017,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27313,7 +26033,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27330,7 +26049,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27347,7 +26065,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27364,7 +26081,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27381,7 +26097,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27398,7 +26113,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27415,7 +26129,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27432,7 +26145,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27449,7 +26161,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27466,7 +26177,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27483,7 +26193,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27500,7 +26209,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27541,7 +26249,6 @@
       {
         "isolate_name": "mini_installer_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mini_installer_tests",
@@ -27561,7 +26268,6 @@
         "experiment_percentage": 0,
         "isolate_name": "polymer_tools_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "polymer_tools_python_unittests",
@@ -27585,7 +26291,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27602,7 +26307,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27619,7 +26323,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -27637,7 +26340,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27654,7 +26356,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27671,7 +26372,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27688,7 +26388,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27705,7 +26404,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27722,7 +26420,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27739,7 +26436,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27756,7 +26452,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -27774,7 +26469,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27791,7 +26485,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27808,7 +26501,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27829,7 +26521,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27846,7 +26537,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27863,7 +26553,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27880,7 +26569,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27897,7 +26585,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27914,7 +26601,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27931,7 +26617,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27948,7 +26633,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27965,7 +26649,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27982,7 +26665,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27999,7 +26681,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28016,7 +26697,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28034,7 +26714,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28051,7 +26730,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28068,7 +26746,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28085,7 +26762,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28102,7 +26778,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28119,7 +26794,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28136,7 +26810,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28153,7 +26826,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28170,7 +26842,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28187,7 +26858,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28204,7 +26874,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28221,7 +26890,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28238,7 +26906,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28255,7 +26922,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28272,7 +26938,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28289,7 +26954,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28306,7 +26970,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28323,7 +26986,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28340,7 +27002,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28357,7 +27018,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28374,7 +27034,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28391,7 +27050,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28408,7 +27066,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28425,7 +27082,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28442,7 +27098,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28460,7 +27115,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28478,7 +27132,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28495,7 +27148,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28512,7 +27164,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28529,7 +27180,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28546,7 +27196,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28563,7 +27212,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28580,7 +27228,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28597,7 +27244,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28614,7 +27260,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28631,7 +27276,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28648,7 +27292,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28665,7 +27308,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28682,7 +27324,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28699,7 +27340,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28716,7 +27356,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28733,7 +27372,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28750,7 +27388,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28768,7 +27405,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28785,7 +27421,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28802,7 +27437,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28819,7 +27453,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28836,7 +27469,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28854,7 +27486,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28871,7 +27502,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28888,7 +27518,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28905,7 +27534,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28922,7 +27550,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28939,7 +27566,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28956,7 +27582,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28973,7 +27598,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28990,7 +27614,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29007,7 +27630,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29024,7 +27646,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29041,7 +27662,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29058,7 +27678,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29075,7 +27694,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29092,7 +27710,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29109,7 +27726,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29126,7 +27742,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29143,7 +27758,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29160,7 +27774,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29207,7 +27820,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29224,7 +27836,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29241,7 +27852,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -29259,7 +27869,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29276,7 +27885,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29293,7 +27901,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29310,7 +27917,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29327,7 +27933,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29344,7 +27949,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29361,7 +27965,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29378,7 +27981,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -29396,7 +27998,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29413,7 +28014,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29430,7 +28030,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29451,7 +28050,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29468,7 +28066,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29485,7 +28082,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29502,7 +28098,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29519,7 +28114,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29536,7 +28130,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29553,7 +28146,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29570,7 +28162,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29587,7 +28178,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29604,7 +28194,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29621,7 +28210,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29638,7 +28226,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29656,7 +28243,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29673,7 +28259,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29690,7 +28275,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29707,7 +28291,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29724,7 +28307,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29741,7 +28323,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29758,7 +28339,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29775,7 +28355,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29792,7 +28371,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29809,7 +28387,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29826,7 +28403,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29843,7 +28419,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29860,7 +28435,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29877,7 +28451,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29894,7 +28467,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29911,7 +28483,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29928,7 +28499,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29945,7 +28515,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29962,7 +28531,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29979,7 +28547,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29996,7 +28563,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30013,7 +28579,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30030,7 +28595,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30047,7 +28611,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30064,7 +28627,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30082,7 +28644,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30100,7 +28661,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30117,7 +28677,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30134,7 +28693,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30151,7 +28709,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30168,7 +28725,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30185,7 +28741,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30202,7 +28757,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30219,7 +28773,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30236,7 +28789,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30253,7 +28805,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30270,7 +28821,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30287,7 +28837,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30304,7 +28853,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30321,7 +28869,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30338,7 +28885,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30355,7 +28901,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30372,7 +28917,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30390,7 +28934,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30407,7 +28950,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30424,7 +28966,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30441,7 +28982,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30458,7 +28998,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30476,7 +29015,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30493,7 +29031,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30510,7 +29047,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30527,7 +29063,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30544,7 +29079,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30561,7 +29095,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30578,7 +29111,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30595,7 +29127,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30612,7 +29143,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30629,7 +29159,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30646,7 +29175,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30663,7 +29191,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30680,7 +29207,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30697,7 +29223,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30714,7 +29239,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30731,7 +29255,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30748,7 +29271,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30765,7 +29287,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30782,7 +29303,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30823,7 +29343,6 @@
       {
         "isolate_name": "mini_installer_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mini_installer_tests",
@@ -30843,7 +29362,6 @@
         "experiment_percentage": 0,
         "isolate_name": "polymer_tools_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "polymer_tools_python_unittests",
@@ -30867,7 +29385,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30885,7 +29402,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30903,7 +29419,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -30922,7 +29437,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30940,7 +29454,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30958,7 +29471,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30976,7 +29488,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30994,7 +29505,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31012,7 +29522,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31030,7 +29539,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31048,7 +29556,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -31067,7 +29574,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31085,7 +29591,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31103,7 +29608,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31125,7 +29629,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31143,7 +29646,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31161,7 +29663,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31179,7 +29680,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31197,7 +29697,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31215,7 +29714,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31233,7 +29731,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31251,7 +29748,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31269,7 +29765,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31287,7 +29782,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31305,7 +29799,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31323,7 +29816,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31342,7 +29834,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31360,7 +29851,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31378,7 +29868,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31396,7 +29885,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31414,7 +29902,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31432,7 +29919,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31450,7 +29936,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31468,7 +29953,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31486,7 +29970,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31504,7 +29987,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31522,7 +30004,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31540,7 +30021,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31558,7 +30038,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31576,7 +30055,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31594,7 +30072,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31612,7 +30089,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31630,7 +30106,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31648,7 +30123,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31666,7 +30140,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31684,7 +30157,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31702,7 +30174,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31720,7 +30191,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31738,7 +30208,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31756,7 +30225,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31774,7 +30242,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31793,7 +30260,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31812,7 +30278,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31830,7 +30295,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31848,7 +30312,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31866,7 +30329,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31884,7 +30346,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31902,7 +30363,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31920,7 +30380,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31938,7 +30397,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31956,7 +30414,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31974,7 +30431,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31992,7 +30448,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32010,7 +30465,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32028,7 +30482,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32046,7 +30499,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32064,7 +30516,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32082,7 +30533,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32100,7 +30550,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32119,7 +30568,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32137,7 +30585,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32155,7 +30602,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32173,7 +30619,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32191,7 +30636,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32210,7 +30654,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32228,7 +30671,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32246,7 +30688,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32264,7 +30705,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32282,7 +30722,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32300,7 +30739,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32318,7 +30756,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32336,7 +30773,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32354,7 +30790,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32372,7 +30807,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32390,7 +30824,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32408,7 +30841,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32426,7 +30858,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32444,7 +30875,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32462,7 +30892,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32480,7 +30909,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32498,7 +30926,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32516,7 +30943,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32534,7 +30960,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32577,7 +31002,6 @@
       {
         "isolate_name": "mini_installer_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mini_installer_tests",
@@ -32598,7 +31022,6 @@
         "experiment_percentage": 0,
         "isolate_name": "polymer_tools_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "polymer_tools_python_unittests",
@@ -32623,7 +31046,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32641,7 +31063,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32659,7 +31080,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -32678,7 +31098,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32696,7 +31115,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32714,7 +31132,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32732,7 +31149,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32750,7 +31166,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32768,7 +31183,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32786,7 +31200,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32804,7 +31217,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -32823,7 +31235,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32841,7 +31252,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32859,7 +31269,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32881,7 +31290,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32899,7 +31307,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32917,7 +31324,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32935,7 +31341,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32953,7 +31358,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32971,7 +31375,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32989,7 +31392,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33007,7 +31409,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33025,7 +31426,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33043,7 +31443,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33061,7 +31460,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33079,7 +31477,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33098,7 +31495,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33116,7 +31512,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33134,7 +31529,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33152,7 +31546,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33170,7 +31563,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33188,7 +31580,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33206,7 +31597,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33224,7 +31614,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33242,7 +31631,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33260,7 +31648,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33278,7 +31665,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33296,7 +31682,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33314,7 +31699,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33332,7 +31716,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33350,7 +31733,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33368,7 +31750,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33386,7 +31767,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33404,7 +31784,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33422,7 +31801,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33440,7 +31818,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33458,7 +31835,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33476,7 +31852,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33494,7 +31869,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33512,7 +31886,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33530,7 +31903,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33549,7 +31921,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33568,7 +31939,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33586,7 +31956,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33604,7 +31973,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33622,7 +31990,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33640,7 +32007,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33658,7 +32024,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33676,7 +32041,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33694,7 +32058,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33712,7 +32075,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33730,7 +32092,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33748,7 +32109,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33766,7 +32126,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33784,7 +32143,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33802,7 +32160,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33820,7 +32177,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33838,7 +32194,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33856,7 +32211,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33875,7 +32229,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33893,7 +32246,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33911,7 +32263,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33929,7 +32280,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33947,7 +32297,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33966,7 +32315,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33984,7 +32332,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34002,7 +32349,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34020,7 +32366,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34038,7 +32383,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34056,7 +32400,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34074,7 +32417,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34092,7 +32434,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34110,7 +32451,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34128,7 +32468,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34146,7 +32485,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34164,7 +32502,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34182,7 +32519,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34200,7 +32536,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34218,7 +32553,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34236,7 +32570,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34254,7 +32587,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34272,7 +32604,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34290,7 +32621,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34333,7 +32663,6 @@
       {
         "isolate_name": "mini_installer_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mini_installer_tests",
@@ -34354,7 +32683,6 @@
         "experiment_percentage": 0,
         "isolate_name": "polymer_tools_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "polymer_tools_python_unittests",
@@ -34379,7 +32707,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34397,7 +32724,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34415,7 +32741,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -34434,7 +32759,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34452,7 +32776,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34470,7 +32793,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34488,7 +32810,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34506,7 +32827,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34524,7 +32844,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34542,7 +32861,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34560,7 +32878,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -34579,7 +32896,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34597,7 +32913,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34615,7 +32930,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34637,7 +32951,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34655,7 +32968,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34673,7 +32985,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34691,7 +33002,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34709,7 +33019,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34727,7 +33036,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34745,7 +33053,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34763,7 +33070,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34781,7 +33087,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34799,7 +33104,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34817,7 +33121,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34835,7 +33138,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34854,7 +33156,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34872,7 +33173,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34890,7 +33190,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34908,7 +33207,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34926,7 +33224,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34944,7 +33241,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34962,7 +33258,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34980,7 +33275,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34998,7 +33292,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35016,7 +33309,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35034,7 +33326,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35052,7 +33343,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35070,7 +33360,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35088,7 +33377,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35106,7 +33394,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35124,7 +33411,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35142,7 +33428,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35160,7 +33445,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35178,7 +33462,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35196,7 +33479,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35214,7 +33496,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35232,7 +33513,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35250,7 +33530,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35268,7 +33547,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35286,7 +33564,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35305,7 +33582,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35324,7 +33600,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35342,7 +33617,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35360,7 +33634,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35378,7 +33651,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35396,7 +33668,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35414,7 +33685,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35432,7 +33702,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35450,7 +33719,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35468,7 +33736,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35486,7 +33753,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35504,7 +33770,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35522,7 +33787,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35540,7 +33804,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35558,7 +33821,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35576,7 +33838,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35594,7 +33855,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35612,7 +33872,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35631,7 +33890,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35649,7 +33907,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35667,7 +33924,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35685,7 +33941,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35703,7 +33958,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35722,7 +33976,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35740,7 +33993,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35758,7 +34010,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35776,7 +34027,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35794,7 +34044,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35812,7 +34061,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35830,7 +34078,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35848,7 +34095,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35866,7 +34112,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35884,7 +34129,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35902,7 +34146,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35920,7 +34163,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35938,7 +34180,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35956,7 +34197,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35974,7 +34214,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35992,7 +34231,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36010,7 +34248,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36028,7 +34265,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36046,7 +34282,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36089,7 +34324,6 @@
       {
         "isolate_name": "mini_installer_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mini_installer_tests",
@@ -36110,7 +34344,6 @@
         "experiment_percentage": 0,
         "isolate_name": "polymer_tools_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "polymer_tools_python_unittests",
@@ -36135,7 +34368,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36153,7 +34385,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -36172,7 +34403,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36190,7 +34420,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36208,7 +34437,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36226,7 +34454,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36244,7 +34471,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -36263,7 +34489,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36281,7 +34506,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36302,7 +34526,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36320,7 +34543,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36338,7 +34560,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36356,7 +34577,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36374,7 +34594,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36393,7 +34612,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36411,7 +34629,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36429,7 +34646,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36447,7 +34663,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36465,7 +34680,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36483,7 +34697,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36501,7 +34714,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36519,7 +34731,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36537,7 +34748,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36555,7 +34765,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36573,7 +34782,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36591,7 +34799,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36609,7 +34816,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36627,7 +34833,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36645,7 +34850,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36663,7 +34867,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36681,7 +34884,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36699,7 +34901,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36717,7 +34918,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36735,7 +34935,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36753,7 +34952,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36771,7 +34969,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36789,7 +34986,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36807,7 +35003,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36825,7 +35020,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36843,7 +35037,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36861,7 +35054,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36879,7 +35071,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36909,7 +35100,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36927,7 +35117,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36945,7 +35134,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -36964,7 +35152,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36982,7 +35169,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37000,7 +35186,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37018,7 +35203,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37036,7 +35220,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37054,7 +35237,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37072,7 +35254,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37090,7 +35271,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -37109,7 +35289,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37127,7 +35306,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37145,7 +35323,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37167,7 +35344,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37185,7 +35361,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37203,7 +35378,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37221,7 +35395,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37239,7 +35412,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37257,7 +35429,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37275,7 +35446,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37293,7 +35463,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37311,7 +35480,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37329,7 +35497,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37347,7 +35514,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37365,7 +35531,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37384,7 +35549,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37402,7 +35566,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37420,7 +35583,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37438,7 +35600,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37456,7 +35617,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37474,7 +35634,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37492,7 +35651,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37510,7 +35668,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37528,7 +35685,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37546,7 +35702,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37564,7 +35719,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37582,7 +35736,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37600,7 +35753,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37618,7 +35770,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37636,7 +35787,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37654,7 +35804,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37672,7 +35821,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37690,7 +35838,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37708,7 +35855,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37726,7 +35872,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37744,7 +35889,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37762,7 +35906,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37780,7 +35923,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37798,7 +35940,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37816,7 +35957,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37835,7 +35975,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37854,7 +35993,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37872,7 +36010,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37890,7 +36027,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37908,7 +36044,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37926,7 +36061,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37944,7 +36078,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37962,7 +36095,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37980,7 +36112,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37998,7 +36129,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38016,7 +36146,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38034,7 +36163,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38052,7 +36180,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38070,7 +36197,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38088,7 +36214,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38106,7 +36231,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38124,7 +36248,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38142,7 +36265,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38161,7 +36283,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38179,7 +36300,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38197,7 +36317,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38215,7 +36334,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38233,7 +36351,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38252,7 +36369,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38270,7 +36386,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38288,7 +36403,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38306,7 +36420,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38324,7 +36437,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38342,7 +36454,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38360,7 +36471,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38378,7 +36488,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38396,7 +36505,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38414,7 +36522,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38432,7 +36539,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38450,7 +36556,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38468,7 +36573,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38486,7 +36590,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38504,7 +36607,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38522,7 +36624,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38540,7 +36641,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38558,7 +36658,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38576,7 +36675,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38619,7 +36717,6 @@
       {
         "isolate_name": "mini_installer_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mini_installer_tests",
@@ -38640,7 +36737,6 @@
         "experiment_percentage": 0,
         "isolate_name": "polymer_tools_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "polymer_tools_python_unittests",
@@ -38665,7 +36761,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38683,7 +36778,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38701,7 +36795,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -38720,7 +36813,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38738,7 +36830,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38756,7 +36847,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38774,7 +36864,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38792,7 +36881,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38810,7 +36898,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38828,7 +36915,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38846,7 +36932,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -38865,7 +36950,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38883,7 +36967,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38901,7 +36984,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38923,7 +37005,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38941,7 +37022,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38959,7 +37039,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38977,7 +37056,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38995,7 +37073,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39013,7 +37090,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39031,7 +37107,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39049,7 +37124,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39067,7 +37141,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39085,7 +37158,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39103,7 +37175,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39121,7 +37192,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39140,7 +37210,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39158,7 +37227,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39176,7 +37244,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39194,7 +37261,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39212,7 +37278,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39230,7 +37295,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39248,7 +37312,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39266,7 +37329,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39284,7 +37346,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39302,7 +37363,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39320,7 +37380,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39338,7 +37397,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39356,7 +37414,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39374,7 +37431,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39392,7 +37448,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39410,7 +37465,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39428,7 +37482,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39446,7 +37499,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39464,7 +37516,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39482,7 +37533,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39500,7 +37550,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39518,7 +37567,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39536,7 +37584,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39554,7 +37601,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39572,7 +37618,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39591,7 +37636,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39610,7 +37654,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39628,7 +37671,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39646,7 +37688,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39664,7 +37705,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39682,7 +37722,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39700,7 +37739,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39718,7 +37756,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39736,7 +37773,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39754,7 +37790,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39772,7 +37807,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39790,7 +37824,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39808,7 +37841,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39826,7 +37858,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39844,7 +37875,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39862,7 +37892,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39880,7 +37909,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39898,7 +37926,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39917,7 +37944,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39935,7 +37961,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39953,7 +37978,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39971,7 +37995,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39989,7 +38012,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40008,7 +38030,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40026,7 +38047,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40044,7 +38064,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40062,7 +38081,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40080,7 +38098,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40098,7 +38115,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40116,7 +38132,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40134,7 +38149,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40152,7 +38166,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40170,7 +38183,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40188,7 +38200,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40206,7 +38217,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40224,7 +38234,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40242,7 +38251,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40260,7 +38268,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40278,7 +38285,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40296,7 +38302,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40314,7 +38319,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40332,7 +38336,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40375,7 +38378,6 @@
       {
         "isolate_name": "mini_installer_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mini_installer_tests",
@@ -40396,7 +38398,6 @@
         "experiment_percentage": 0,
         "isolate_name": "polymer_tools_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "polymer_tools_python_unittests",
@@ -40433,7 +38434,6 @@
         ],
         "isolate_name": "absl_hardening_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "absl_hardening_tests iPhone 6s 15.5",
@@ -40485,7 +38485,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone 6s 15.5",
@@ -40537,7 +38536,6 @@
         ],
         "isolate_name": "boringssl_crypto_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_crypto_tests iPhone 6s 15.5",
@@ -40589,7 +38587,6 @@
         ],
         "isolate_name": "boringssl_ssl_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_ssl_tests iPhone 6s 15.5",
@@ -40641,7 +38638,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone 6s 15.5",
@@ -40693,7 +38689,6 @@
         ],
         "isolate_name": "crypto_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crypto_unittests iPhone 6s 15.5",
@@ -40745,7 +38740,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone 6s 15.5",
@@ -40797,7 +38791,6 @@
         ],
         "isolate_name": "google_apis_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "google_apis_unittests iPhone 6s 15.5",
@@ -40849,7 +38842,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone 6s 15.5",
@@ -40901,7 +38893,6 @@
         ],
         "isolate_name": "ios_net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_net_unittests iPhone 6s 15.5",
@@ -40953,7 +38944,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone 6s 15.5",
@@ -41005,7 +38995,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone 6s 15.5",
@@ -41057,7 +39046,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone 6s 15.5",
@@ -41109,7 +39097,6 @@
         ],
         "isolate_name": "net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "net_unittests iPhone 6s 15.5",
@@ -41161,7 +39148,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone 6s 15.5",
@@ -41213,7 +39199,6 @@
         ],
         "isolate_name": "sql_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "sql_unittests iPhone 6s 15.5",
@@ -41265,7 +39250,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone 6s 15.5",
@@ -41317,7 +39301,6 @@
         ],
         "isolate_name": "url_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "url_unittests iPhone 6s 15.5",
@@ -41389,7 +39372,6 @@
         ],
         "isolate_name": "absl_hardening_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "absl_hardening_tests iPhone 7 15.4.1",
@@ -41436,7 +39418,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone 7 15.4.1",
@@ -41483,7 +39464,6 @@
         ],
         "isolate_name": "boringssl_crypto_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_crypto_tests iPhone 7 15.4.1",
@@ -41530,7 +39510,6 @@
         ],
         "isolate_name": "boringssl_ssl_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_ssl_tests iPhone 7 15.4.1",
@@ -41577,7 +39556,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone 7 15.4.1",
@@ -41624,7 +39602,6 @@
         ],
         "isolate_name": "crypto_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crypto_unittests iPhone 7 15.4.1",
@@ -41671,7 +39648,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone 7 15.4.1",
@@ -41718,7 +39694,6 @@
         ],
         "isolate_name": "google_apis_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "google_apis_unittests iPhone 7 15.4.1",
@@ -41765,7 +39740,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone 7 15.4.1",
@@ -41812,7 +39786,6 @@
         ],
         "isolate_name": "ios_net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_net_unittests iPhone 7 15.4.1",
@@ -41859,7 +39832,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone 7 15.4.1",
@@ -41906,7 +39878,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone 7 15.4.1",
@@ -41953,7 +39924,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone 7 15.4.1",
@@ -42000,7 +39970,6 @@
         ],
         "isolate_name": "net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "net_unittests iPhone 7 15.4.1",
@@ -42047,7 +40016,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone 7 15.4.1",
@@ -42094,7 +40062,6 @@
         ],
         "isolate_name": "sql_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "sql_unittests iPhone 7 15.4.1",
@@ -42141,7 +40108,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone 7 15.4.1",
@@ -42188,7 +40154,6 @@
         ],
         "isolate_name": "url_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "url_unittests iPhone 7 15.4.1",
@@ -42233,7 +40198,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42250,7 +40214,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42267,7 +40230,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -42285,7 +40247,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42302,7 +40263,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42319,7 +40279,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42336,7 +40295,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42353,7 +40311,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42370,7 +40327,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42387,7 +40343,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42404,7 +40359,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -42422,7 +40376,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42439,7 +40392,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42459,7 +40411,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42476,7 +40427,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42493,7 +40443,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42510,7 +40459,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42527,7 +40475,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42544,7 +40491,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42561,7 +40507,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42578,7 +40523,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42595,7 +40539,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42612,7 +40555,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42629,7 +40571,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42646,7 +40587,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42664,7 +40604,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42681,7 +40620,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42698,7 +40636,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42715,7 +40652,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42732,7 +40668,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42749,7 +40684,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42766,7 +40700,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42783,7 +40716,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42800,7 +40732,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42817,7 +40748,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42834,7 +40764,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42851,7 +40780,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42868,7 +40796,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42885,7 +40812,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42902,7 +40828,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42919,7 +40844,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42936,7 +40860,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42953,7 +40876,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42970,7 +40892,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42987,7 +40908,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43004,7 +40924,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43021,7 +40940,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43038,7 +40956,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43055,7 +40972,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43073,7 +40989,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43091,7 +41006,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43108,7 +41022,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43125,7 +41038,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43142,7 +41054,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43159,7 +41070,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43176,7 +41086,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43193,7 +41102,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43210,7 +41118,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43227,7 +41134,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43244,7 +41150,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43261,7 +41166,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43278,7 +41182,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43295,7 +41198,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43312,7 +41214,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43329,7 +41230,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43346,7 +41246,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43363,7 +41262,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43381,7 +41279,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43398,7 +41295,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43415,7 +41311,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43432,7 +41327,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43449,7 +41343,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43467,7 +41360,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43484,7 +41376,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43501,7 +41392,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43518,7 +41408,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43535,7 +41424,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43552,7 +41440,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43569,7 +41456,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43586,7 +41472,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43603,7 +41488,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43620,7 +41504,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43637,7 +41520,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43654,7 +41536,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43671,7 +41552,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43688,7 +41568,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43705,7 +41584,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43722,7 +41600,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43739,7 +41616,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43756,7 +41632,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43773,7 +41648,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/chromium.coverage.json

diff --git a/testing/buildbot/chromium.coverage.json b/testing/buildbot/chromium.coverage.json
index a3bd746d..f88136a 100644
--- a/testing/buildbot/chromium.coverage.json
+++ b/testing/buildbot/chromium.coverage.json
@@ -1010,7 +1010,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "resultdb": {
@@ -3651,7 +3650,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "resultdb": {
@@ -7729,7 +7727,6 @@
         "isolate_name": "android_webview_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "android_webview_junit_tests",
@@ -7759,7 +7756,6 @@
         "isolate_name": "base_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_junit_tests",
@@ -7789,7 +7785,6 @@
         "isolate_name": "build_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "build_junit_tests",
@@ -7819,7 +7814,6 @@
         "isolate_name": "chrome_java_test_pagecontroller_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chrome_java_test_pagecontroller_junit_tests",
@@ -7850,7 +7844,6 @@
         "isolate_name": "chrome_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chrome_junit_tests",
@@ -7880,7 +7873,6 @@
         "isolate_name": "components_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_junit_tests",
@@ -7958,7 +7950,6 @@
         "isolate_name": "content_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_junit_tests",
@@ -7988,7 +7979,6 @@
         "isolate_name": "device_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "device_junit_tests",
@@ -8018,7 +8008,6 @@
         "isolate_name": "junit_unit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "junit_unit_tests",
@@ -8048,7 +8037,6 @@
         "isolate_name": "keyboard_accessory_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "keyboard_accessory_junit_tests",
@@ -8078,7 +8066,6 @@
         "isolate_name": "media_base_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "media_base_junit_tests",
@@ -8108,7 +8095,6 @@
         "isolate_name": "module_installer_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "module_installer_junit_tests",
@@ -8139,7 +8125,6 @@
         "isolate_name": "monochrome_public_apk_checker",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "monochrome_public_apk_checker",
@@ -8185,7 +8170,6 @@
         "isolate_name": "net_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "net_junit_tests",
@@ -8215,7 +8199,6 @@
         "isolate_name": "paint_preview_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "paint_preview_junit_tests",
@@ -8245,7 +8228,6 @@
         "isolate_name": "password_check_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "password_check_junit_tests",
@@ -8275,7 +8257,6 @@
         "isolate_name": "password_manager_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "password_manager_junit_tests",
@@ -8305,7 +8286,6 @@
         "isolate_name": "services_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "services_junit_tests",
@@ -8343,7 +8323,6 @@
         "isolate_name": "telemetry_perf_unittests_android_chrome",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_chromium_minidump_unittests",
@@ -8394,7 +8373,6 @@
         "isolate_name": "telemetry_perf_unittests_android_monochrome",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_monochrome_minidump_unittests",
@@ -8442,7 +8420,6 @@
         "isolate_name": "telemetry_perf_unittests_android_chrome",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -8488,7 +8465,6 @@
         "isolate_name": "touch_to_fill_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "touch_to_fill_junit_tests",
@@ -8518,7 +8494,6 @@
         "isolate_name": "ui_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_junit_tests",
@@ -8548,7 +8523,6 @@
         "isolate_name": "webapk_client_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webapk_client_junit_tests",
@@ -8578,7 +8552,6 @@
         "isolate_name": "webapk_shell_apk_h2o_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webapk_shell_apk_h2o_junit_tests",
@@ -8608,7 +8581,6 @@
         "isolate_name": "webapk_shell_apk_junit_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webapk_shell_apk_junit_tests",
@@ -8659,7 +8631,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8680,7 +8651,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8701,7 +8671,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8722,7 +8691,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8744,7 +8712,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8765,7 +8732,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8786,7 +8752,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8807,7 +8772,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8829,7 +8793,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8851,7 +8814,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8872,7 +8834,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8893,7 +8854,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8914,7 +8874,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8935,7 +8894,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8956,7 +8914,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8977,7 +8934,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8999,7 +8955,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9023,7 +8978,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9044,7 +8998,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9066,7 +9019,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9091,7 +9043,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9113,7 +9064,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9135,7 +9085,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9156,7 +9105,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9177,7 +9125,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9198,7 +9145,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9219,7 +9165,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9240,7 +9185,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9261,7 +9205,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9282,7 +9225,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9304,7 +9246,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9325,7 +9266,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9346,7 +9286,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9368,7 +9307,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9389,7 +9327,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9411,7 +9348,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9432,7 +9368,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9453,7 +9388,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9474,7 +9408,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9496,7 +9429,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9517,7 +9449,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9538,7 +9469,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9560,7 +9490,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9582,7 +9511,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9605,7 +9533,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9626,7 +9553,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9647,7 +9573,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9668,7 +9593,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9690,7 +9614,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9712,7 +9635,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9733,7 +9655,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9754,7 +9675,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9775,7 +9695,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9796,7 +9715,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9818,7 +9736,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9839,7 +9756,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9860,7 +9776,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9882,7 +9797,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9904,7 +9818,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9926,7 +9839,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9947,7 +9859,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9970,7 +9881,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9991,7 +9901,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10012,7 +9921,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10033,7 +9941,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10054,7 +9961,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10080,7 +9986,6 @@
         "isolate_name": "angle_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "angle_unittests",
@@ -10115,7 +10020,6 @@
         "isolate_name": "absl_hardening_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "absl_hardening_tests iPhone 6s 15.5",
@@ -10169,7 +10073,6 @@
         "isolate_name": "absl_hardening_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "absl_hardening_tests iPhone 8 16.2",
@@ -10223,7 +10126,6 @@
         "isolate_name": "base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPad Air (3rd generation) 16.2",
@@ -10277,7 +10179,6 @@
         "isolate_name": "base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPad Air 2 15.5",
@@ -10331,7 +10232,6 @@
         "isolate_name": "base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -10385,7 +10285,6 @@
         "isolate_name": "base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -10439,7 +10338,6 @@
         "isolate_name": "base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone 6s 15.5",
@@ -10493,7 +10391,6 @@
         "isolate_name": "base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone 6s Plus 15.5",
@@ -10547,7 +10444,6 @@
         "isolate_name": "base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone 8 16.2",
@@ -10601,7 +10497,6 @@
         "isolate_name": "base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone 8 Plus 16.2",
@@ -10655,7 +10550,6 @@
         "isolate_name": "base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone SE (1st generation) 15.5",
@@ -10709,7 +10603,6 @@
         "isolate_name": "base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone SE (3rd generation) 16.2",
@@ -10763,7 +10656,6 @@
         "isolate_name": "boringssl_crypto_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_crypto_tests iPhone 6s 15.5",
@@ -10817,7 +10709,6 @@
         "isolate_name": "boringssl_crypto_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_crypto_tests iPhone 8 16.2",
@@ -10871,7 +10762,6 @@
         "isolate_name": "boringssl_ssl_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_ssl_tests iPhone 6s 15.5",
@@ -10925,7 +10815,6 @@
         "isolate_name": "boringssl_ssl_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_ssl_tests iPhone 8 16.2",
@@ -10979,7 +10868,6 @@
         "isolate_name": "components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPad Air (3rd generation) 16.2",
@@ -11033,7 +10921,6 @@
         "isolate_name": "components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPad Air 2 15.5",
@@ -11087,7 +10974,6 @@
         "isolate_name": "components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -11141,7 +11027,6 @@
         "isolate_name": "components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -11195,7 +11080,6 @@
         "isolate_name": "components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone 6s 15.5",
@@ -11249,7 +11133,6 @@
         "isolate_name": "components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone 6s Plus 15.5",
@@ -11303,7 +11186,6 @@
         "isolate_name": "components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone 8 16.2",
@@ -11357,7 +11239,6 @@
         "isolate_name": "components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone 8 Plus 16.2",
@@ -11411,7 +11292,6 @@
         "isolate_name": "components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone SE (1st generation) 15.5",
@@ -11465,7 +11345,6 @@
         "isolate_name": "components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone SE (3rd generation) 16.2",
@@ -11519,7 +11398,6 @@
         "isolate_name": "crashpad_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crashpad_tests iPhone 6s 15.5",
@@ -11573,7 +11451,6 @@
         "isolate_name": "crashpad_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crashpad_tests iPhone 8 16.2",
@@ -11627,7 +11504,6 @@
         "isolate_name": "crypto_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crypto_unittests iPhone 6s 15.5",
@@ -11681,7 +11557,6 @@
         "isolate_name": "crypto_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crypto_unittests iPhone 8 16.2",
@@ -11735,7 +11610,6 @@
         "isolate_name": "gfx_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPad Air (3rd generation) 16.2",
@@ -11789,7 +11663,6 @@
         "isolate_name": "gfx_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPad Air 2 15.5",
@@ -11843,7 +11716,6 @@
         "isolate_name": "gfx_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -11897,7 +11769,6 @@
         "isolate_name": "gfx_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -11951,7 +11822,6 @@
         "isolate_name": "gfx_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone 6s 15.5",
@@ -12005,7 +11875,6 @@
         "isolate_name": "gfx_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone 6s Plus 15.5",
@@ -12059,7 +11928,6 @@
         "isolate_name": "gfx_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone 8 16.2",
@@ -12113,7 +11981,6 @@
         "isolate_name": "gfx_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone 8 Plus 16.2",
@@ -12167,7 +12034,6 @@
         "isolate_name": "gfx_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone SE (1st generation) 15.5",
@@ -12221,7 +12087,6 @@
         "isolate_name": "gfx_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone SE (3rd generation) 16.2",
@@ -12275,7 +12140,6 @@
         "isolate_name": "google_apis_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "google_apis_unittests iPhone 6s 15.5",
@@ -12329,7 +12193,6 @@
         "isolate_name": "google_apis_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "google_apis_unittests iPhone 8 16.2",
@@ -12384,7 +12247,6 @@
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -12439,7 +12301,6 @@
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPad Air 2 15.5",
@@ -12494,7 +12355,6 @@
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -12549,7 +12409,6 @@
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -12604,7 +12463,6 @@
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPhone 7 15.5",
@@ -12659,7 +12517,6 @@
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPhone 8 16.2",
@@ -12714,7 +12571,6 @@
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPhone X 15.5",
@@ -12769,7 +12625,6 @@
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPhone X 16.2",
@@ -12824,7 +12679,6 @@
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -12880,7 +12734,6 @@
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPad Air 2 15.5",
@@ -12936,7 +12789,6 @@
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -12992,7 +12844,6 @@
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -13048,7 +12899,6 @@
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPhone 6s 15.5",
@@ -13104,7 +12954,6 @@
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPhone 7 15.5",
@@ -13160,7 +13009,6 @@
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPhone 8 16.2",
@@ -13216,7 +13064,6 @@
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPhone X 16.2",
@@ -13272,7 +13119,6 @@
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -13328,7 +13174,6 @@
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPad Air 2 15.5",
@@ -13384,7 +13229,6 @@
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -13440,7 +13284,6 @@
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -13496,7 +13339,6 @@
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPhone 7 15.5",
@@ -13552,7 +13394,6 @@
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPhone 8 16.2",
@@ -13608,7 +13449,6 @@
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPhone X 15.5",
@@ -13664,7 +13504,6 @@
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPhone X 16.2",
@@ -13720,7 +13559,6 @@
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -13776,7 +13614,6 @@
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPad Air 2 15.5",
@@ -13832,7 +13669,6 @@
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -13888,7 +13724,6 @@
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -13944,7 +13779,6 @@
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPhone 7 15.5",
@@ -14000,7 +13834,6 @@
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPhone 8 16.2",
@@ -14056,7 +13889,6 @@
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPhone X 15.5",
@@ -14112,7 +13944,6 @@
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPhone X 16.2",
@@ -14168,7 +13999,6 @@
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -14223,7 +14053,6 @@
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPad Air 2 15.5",
@@ -14278,7 +14107,6 @@
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -14333,7 +14161,6 @@
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -14388,7 +14215,6 @@
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPhone 7 15.5",
@@ -14443,7 +14269,6 @@
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPhone 8 16.2",
@@ -14498,7 +14323,6 @@
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPhone X 15.5",
@@ -14553,7 +14377,6 @@
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPhone X 16.2",
@@ -14608,7 +14431,6 @@
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -14664,7 +14486,6 @@
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPad Air 2 15.5",
@@ -14720,7 +14541,6 @@
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -14776,7 +14596,6 @@
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -14832,7 +14651,6 @@
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPhone 7 15.5",
@@ -14888,7 +14706,6 @@
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPhone 8 16.2",
@@ -14944,7 +14761,6 @@
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPhone X 15.5",
@@ -15000,7 +14816,6 @@
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPhone X 16.2",
@@ -15055,7 +14870,6 @@
         "isolate_name": "ios_chrome_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPad Air (3rd generation) 16.2",
@@ -15109,7 +14923,6 @@
         "isolate_name": "ios_chrome_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPad Air 2 15.5",
@@ -15163,7 +14976,6 @@
         "isolate_name": "ios_chrome_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -15217,7 +15029,6 @@
         "isolate_name": "ios_chrome_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -15271,7 +15082,6 @@
         "isolate_name": "ios_chrome_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone 6s 15.5",
@@ -15325,7 +15135,6 @@
         "isolate_name": "ios_chrome_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone 6s Plus 15.5",
@@ -15379,7 +15188,6 @@
         "isolate_name": "ios_chrome_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone 8 16.2",
@@ -15433,7 +15241,6 @@
         "isolate_name": "ios_chrome_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone 8 Plus 16.2",
@@ -15487,7 +15294,6 @@
         "isolate_name": "ios_chrome_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone SE (1st generation) 15.5",
@@ -15541,7 +15347,6 @@
         "isolate_name": "ios_chrome_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone SE (3rd generation) 16.2",
@@ -15596,7 +15401,6 @@
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -15652,7 +15456,6 @@
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPad Air 2 15.5",
@@ -15708,7 +15511,6 @@
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -15764,7 +15566,6 @@
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -15820,7 +15621,6 @@
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPhone 7 15.5",
@@ -15876,7 +15676,6 @@
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPhone 8 16.2",
@@ -15932,7 +15731,6 @@
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPhone X 15.5",
@@ -15988,7 +15786,6 @@
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPhone X 16.2",
@@ -16043,7 +15840,6 @@
         "isolate_name": "ios_components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_components_unittests iPhone 6s 15.5",
@@ -16097,7 +15893,6 @@
         "isolate_name": "ios_components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_components_unittests iPhone 8 16.2",
@@ -16151,7 +15946,6 @@
         "isolate_name": "ios_net_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_net_unittests iPhone 6s 15.5",
@@ -16206,7 +16000,6 @@
         "isolate_name": "ios_net_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_net_unittests iPhone 8 16.2",
@@ -16261,7 +16054,6 @@
         "isolate_name": "ios_remoting_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_remoting_unittests iPhone 6s 15.5",
@@ -16315,7 +16107,6 @@
         "isolate_name": "ios_remoting_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_remoting_unittests iPhone 8 16.2",
@@ -16370,7 +16161,6 @@
         "isolate_name": "ios_showcase_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -16425,7 +16215,6 @@
         "isolate_name": "ios_showcase_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPad Air 2 15.5",
@@ -16480,7 +16269,6 @@
         "isolate_name": "ios_showcase_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -16535,7 +16323,6 @@
         "isolate_name": "ios_showcase_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -16590,7 +16377,6 @@
         "isolate_name": "ios_showcase_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPhone 7 15.5",
@@ -16645,7 +16431,6 @@
         "isolate_name": "ios_showcase_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPhone 8 16.2",
@@ -16700,7 +16485,6 @@
         "isolate_name": "ios_showcase_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPhone X 15.5",
@@ -16755,7 +16539,6 @@
         "isolate_name": "ios_showcase_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPhone X 16.2",
@@ -16809,7 +16592,6 @@
         "isolate_name": "ios_testing_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_testing_unittests iPhone 6s 15.5",
@@ -16863,7 +16645,6 @@
         "isolate_name": "ios_testing_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_testing_unittests iPhone 8 16.2",
@@ -16917,7 +16698,6 @@
         "isolate_name": "ios_web_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPad Air (3rd generation) 16.2",
@@ -16971,7 +16751,6 @@
         "isolate_name": "ios_web_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPad Air 2 15.5",
@@ -17025,7 +16804,6 @@
         "isolate_name": "ios_web_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -17079,7 +16857,6 @@
         "isolate_name": "ios_web_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -17133,7 +16910,6 @@
         "isolate_name": "ios_web_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone 6s 15.5",
@@ -17187,7 +16963,6 @@
         "isolate_name": "ios_web_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone 6s Plus 15.5",
@@ -17241,7 +17016,6 @@
         "isolate_name": "ios_web_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone 8 16.2",
@@ -17295,7 +17069,6 @@
         "isolate_name": "ios_web_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone 8 Plus 16.2",
@@ -17349,7 +17122,6 @@
         "isolate_name": "ios_web_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone SE (1st generation) 15.5",
@@ -17403,7 +17175,6 @@
         "isolate_name": "ios_web_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone SE (3rd generation) 16.2",
@@ -17458,7 +17229,6 @@
         "isolate_name": "ios_web_shell_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -17513,7 +17283,6 @@
         "isolate_name": "ios_web_shell_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPad Air 2 15.5",
@@ -17568,7 +17337,6 @@
         "isolate_name": "ios_web_shell_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -17623,7 +17391,6 @@
         "isolate_name": "ios_web_shell_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -17678,7 +17445,6 @@
         "isolate_name": "ios_web_shell_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPhone 6s 15.5",
@@ -17733,7 +17499,6 @@
         "isolate_name": "ios_web_shell_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPhone 7 15.5",
@@ -17788,7 +17553,6 @@
         "isolate_name": "ios_web_shell_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPhone 8 16.2",
@@ -17843,7 +17607,6 @@
         "isolate_name": "ios_web_shell_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPhone X 16.2",
@@ -17897,7 +17660,6 @@
         "isolate_name": "ios_web_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPad Air (3rd generation) 16.2",
@@ -17951,7 +17713,6 @@
         "isolate_name": "ios_web_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPad Air 2 15.5",
@@ -18005,7 +17766,6 @@
         "isolate_name": "ios_web_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -18059,7 +17819,6 @@
         "isolate_name": "ios_web_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -18113,7 +17872,6 @@
         "isolate_name": "ios_web_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone 6s 15.5",
@@ -18167,7 +17925,6 @@
         "isolate_name": "ios_web_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone 6s Plus 15.5",
@@ -18221,7 +17978,6 @@
         "isolate_name": "ios_web_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone 8 16.2",
@@ -18275,7 +18031,6 @@
         "isolate_name": "ios_web_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone 8 Plus 16.2",
@@ -18329,7 +18084,6 @@
         "isolate_name": "ios_web_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone SE (1st generation) 15.5",
@@ -18383,7 +18137,6 @@
         "isolate_name": "ios_web_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone SE (3rd generation) 16.2",
@@ -18437,7 +18190,6 @@
         "isolate_name": "ios_web_view_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPad Air (3rd generation) 16.2",
@@ -18491,7 +18243,6 @@
         "isolate_name": "ios_web_view_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPad Air 2 15.5",
@@ -18545,7 +18296,6 @@
         "isolate_name": "ios_web_view_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -18599,7 +18349,6 @@
         "isolate_name": "ios_web_view_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -18653,7 +18402,6 @@
         "isolate_name": "ios_web_view_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone 6s 15.5",
@@ -18707,7 +18455,6 @@
         "isolate_name": "ios_web_view_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone 6s Plus 15.5",
@@ -18761,7 +18508,6 @@
         "isolate_name": "ios_web_view_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone 8 16.2",
@@ -18815,7 +18561,6 @@
         "isolate_name": "ios_web_view_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone 8 Plus 16.2",
@@ -18869,7 +18614,6 @@
         "isolate_name": "ios_web_view_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone SE (1st generation) 15.5",
@@ -18923,7 +18667,6 @@
         "isolate_name": "ios_web_view_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone SE (3rd generation) 16.2",
@@ -18977,7 +18720,6 @@
         "isolate_name": "ios_web_view_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPad Air (3rd generation) 16.2",
@@ -19031,7 +18773,6 @@
         "isolate_name": "ios_web_view_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPad Air 2 15.5",
@@ -19085,7 +18826,6 @@
         "isolate_name": "ios_web_view_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -19139,7 +18879,6 @@
         "isolate_name": "ios_web_view_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -19193,7 +18932,6 @@
         "isolate_name": "ios_web_view_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone 6s 15.5",
@@ -19247,7 +18985,6 @@
         "isolate_name": "ios_web_view_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone 6s Plus 15.5",
@@ -19301,7 +19038,6 @@
         "isolate_name": "ios_web_view_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone 8 16.2",
@@ -19355,7 +19091,6 @@
         "isolate_name": "ios_web_view_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone 8 Plus 16.2",
@@ -19409,7 +19144,6 @@
         "isolate_name": "ios_web_view_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone SE (1st generation) 15.5",
@@ -19463,7 +19197,6 @@
         "isolate_name": "ios_web_view_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone SE (3rd generation) 16.2",
@@ -19517,7 +19250,6 @@
         "isolate_name": "net_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "net_unittests iPhone 6s 15.5",
@@ -19571,7 +19303,6 @@
         "isolate_name": "net_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "net_unittests iPhone 8 16.2",
@@ -19625,7 +19356,6 @@
         "isolate_name": "services_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "services_unittests iPhone 6s 15.5",
@@ -19679,7 +19409,6 @@
         "isolate_name": "services_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "services_unittests iPhone 8 16.2",
@@ -19733,7 +19462,6 @@
         "isolate_name": "skia_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPad Air (3rd generation) 16.2",
@@ -19787,7 +19515,6 @@
         "isolate_name": "skia_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPad Air 2 15.5",
@@ -19841,7 +19568,6 @@
         "isolate_name": "skia_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -19895,7 +19621,6 @@
         "isolate_name": "skia_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -19949,7 +19674,6 @@
         "isolate_name": "skia_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone 6s 15.5",
@@ -20003,7 +19727,6 @@
         "isolate_name": "skia_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone 6s Plus 15.5",
@@ -20057,7 +19780,6 @@
         "isolate_name": "skia_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone 8 16.2",
@@ -20111,7 +19833,6 @@
         "isolate_name": "skia_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone 8 Plus 16.2",
@@ -20165,7 +19886,6 @@
         "isolate_name": "skia_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone SE (1st generation) 15.5",
@@ -20219,7 +19939,6 @@
         "isolate_name": "skia_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone SE (3rd generation) 16.2",
@@ -20273,7 +19992,6 @@
         "isolate_name": "sql_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "sql_unittests iPhone 6s 15.5",
@@ -20327,7 +20045,6 @@
         "isolate_name": "sql_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "sql_unittests iPhone 8 16.2",
@@ -20381,7 +20098,6 @@
         "isolate_name": "ui_base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPad Air (3rd generation) 16.2",
@@ -20435,7 +20151,6 @@
         "isolate_name": "ui_base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPad Air 2 15.5",
@@ -20489,7 +20204,6 @@
         "isolate_name": "ui_base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -20543,7 +20257,6 @@
         "isolate_name": "ui_base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -20597,7 +20310,6 @@
         "isolate_name": "ui_base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone 6s 15.5",
@@ -20651,7 +20363,6 @@
         "isolate_name": "ui_base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone 6s Plus 15.5",
@@ -20705,7 +20416,6 @@
         "isolate_name": "ui_base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone 8 16.2",
@@ -20759,7 +20469,6 @@
         "isolate_name": "ui_base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone 8 Plus 16.2",
@@ -20813,7 +20522,6 @@
         "isolate_name": "ui_base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone SE (1st generation) 15.5",
@@ -20867,7 +20575,6 @@
         "isolate_name": "ui_base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone SE (3rd generation) 16.2",
@@ -20921,7 +20628,6 @@
         "isolate_name": "url_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "url_unittests iPhone 6s 15.5",
@@ -20975,7 +20681,6 @@
         "isolate_name": "url_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "url_unittests iPhone 8 16.2",
@@ -21023,7 +20728,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21041,7 +20745,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21059,7 +20762,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -21078,7 +20780,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21096,7 +20797,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21115,7 +20815,6 @@
         "ci_only": true,
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21133,7 +20832,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21152,7 +20850,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21170,7 +20867,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21188,7 +20884,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21206,7 +20901,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21224,7 +20918,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21242,7 +20935,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21260,7 +20952,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21278,7 +20969,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -21297,7 +20987,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21315,7 +21004,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21333,7 +21021,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21355,7 +21042,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21373,7 +21059,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21391,7 +21076,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21409,7 +21093,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21427,7 +21110,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21445,7 +21127,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21463,7 +21144,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21481,7 +21161,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21499,7 +21178,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21517,7 +21195,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21535,7 +21212,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21553,7 +21229,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21572,7 +21247,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21590,7 +21264,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21608,7 +21281,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21626,7 +21298,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21644,7 +21315,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21662,7 +21332,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21680,7 +21349,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21698,7 +21366,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21716,7 +21383,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21734,7 +21400,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21752,7 +21417,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21770,7 +21434,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21788,7 +21451,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21806,7 +21468,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21824,7 +21485,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21842,7 +21502,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21860,7 +21519,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21878,7 +21536,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21896,7 +21553,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21915,7 +21571,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21933,7 +21588,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21951,7 +21605,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21969,7 +21622,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21987,7 +21639,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22005,7 +21656,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22023,7 +21673,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22041,7 +21690,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22059,7 +21707,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22077,7 +21724,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22095,7 +21741,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22113,7 +21758,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22134,7 +21778,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22152,7 +21795,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22170,7 +21812,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22188,7 +21829,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22206,7 +21846,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22224,7 +21863,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22242,7 +21880,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22260,7 +21897,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22278,7 +21914,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22296,7 +21931,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22314,7 +21948,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22332,7 +21965,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22350,7 +21982,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22368,7 +21999,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22386,7 +22016,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22404,7 +22033,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22422,7 +22050,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22440,7 +22067,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22459,7 +22085,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22477,7 +22102,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22495,7 +22119,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22513,7 +22136,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22531,7 +22153,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22550,7 +22171,6 @@
         "experiment_percentage": 100,
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22568,7 +22188,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22586,7 +22205,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22604,7 +22222,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22622,7 +22239,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22640,7 +22256,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22658,7 +22273,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22676,7 +22290,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22698,7 +22311,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22716,7 +22328,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22734,7 +22345,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -22753,7 +22363,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22771,7 +22380,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22789,7 +22397,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22807,7 +22414,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22825,7 +22431,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22843,7 +22448,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22861,7 +22465,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22879,7 +22482,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -22898,7 +22500,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22916,7 +22517,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22937,7 +22537,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22959,7 +22558,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22977,7 +22575,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22995,7 +22592,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23013,7 +22609,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23031,7 +22626,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23049,7 +22643,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23067,7 +22660,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23085,7 +22677,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23103,7 +22694,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23124,7 +22714,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23143,7 +22732,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23161,7 +22749,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23179,7 +22766,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23197,7 +22783,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23215,7 +22800,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23233,7 +22817,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23251,7 +22834,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23269,7 +22851,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23287,7 +22868,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23305,7 +22885,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23323,7 +22902,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23341,7 +22919,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23359,7 +22936,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23377,7 +22953,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23395,7 +22970,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23413,7 +22987,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23431,7 +23004,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23449,7 +23021,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23467,7 +23038,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23485,7 +23055,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23503,7 +23072,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23522,7 +23090,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23540,7 +23107,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23558,7 +23124,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23576,7 +23141,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23594,7 +23158,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23612,7 +23175,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23630,7 +23192,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23648,7 +23209,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23666,7 +23226,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23684,7 +23243,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23702,7 +23260,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23720,7 +23277,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23738,7 +23294,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23756,7 +23311,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23774,7 +23328,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23792,7 +23345,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23810,7 +23362,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23828,7 +23379,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23846,7 +23396,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23864,7 +23413,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23882,7 +23430,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23900,7 +23447,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23918,7 +23464,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23936,7 +23481,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23954,7 +23498,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23972,7 +23515,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23990,7 +23532,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24008,7 +23549,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24027,7 +23567,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24045,7 +23584,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24063,7 +23601,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24081,7 +23618,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24099,7 +23635,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24117,7 +23652,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24135,7 +23669,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24153,7 +23686,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24171,7 +23703,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24189,7 +23720,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -24208,7 +23738,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24229,7 +23758,6 @@
         "isolate_name": "blink_python_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -24331,7 +23859,6 @@
         "isolate_name": "chromedriver_py_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -24353,7 +23880,6 @@
         "isolate_name": "chromedriver_replay_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -24372,7 +23898,6 @@
         "isolate_name": "content_shell_crash_test",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -24395,7 +23920,6 @@
         "isolate_name": "flatbuffers_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -24418,7 +23942,6 @@
         "isolate_name": "fuchsia_pytype",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "fuchsia_pytype",
@@ -24441,7 +23964,6 @@
         "isolate_name": "grit_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -24540,7 +24062,6 @@
         "isolate_name": "mojo_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -24639,7 +24160,6 @@
         "isolate_name": "telemetry_gpu_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -24666,7 +24186,6 @@
         "isolate_name": "telemetry_perf_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -24694,7 +24213,6 @@
         "isolate_name": "telemetry_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -24851,7 +24369,6 @@
         "isolate_name": "telemetry_gpu_integration_test",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_tests",
@@ -24927,7 +24444,6 @@
         "args": [],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "js_code_coverage_browser_tests",
@@ -24954,7 +24470,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24972,7 +24487,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24990,7 +24504,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25008,7 +24521,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25026,7 +24538,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25044,7 +24555,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25062,7 +24572,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25080,7 +24589,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25098,7 +24606,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25116,7 +24623,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -25135,7 +24641,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25153,7 +24658,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25171,7 +24675,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25193,7 +24696,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25211,7 +24713,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25229,7 +24730,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25247,7 +24747,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25265,7 +24764,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25283,7 +24781,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25301,7 +24798,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25319,7 +24815,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25337,7 +24832,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25355,7 +24849,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25373,7 +24866,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25392,7 +24884,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25410,7 +24901,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25428,7 +24918,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25446,7 +24935,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25464,7 +24952,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25482,7 +24969,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25500,7 +24986,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25521,7 +25006,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25542,7 +25026,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25560,7 +25043,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25578,7 +25060,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25596,7 +25077,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25614,7 +25094,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25632,7 +25111,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25650,7 +25128,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25668,7 +25145,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25686,7 +25162,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25710,7 +25185,6 @@
         "description": "Run with ash-chrome version 113.0.5672.21",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash beta",
@@ -25738,12 +25212,11 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5700.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5701.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5700.0",
+        "description": "Run with ash-chrome version 114.0.5701.0",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash canary",
@@ -25752,8 +25225,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5700.0",
-              "revision": "version:114.0.5700.0"
+              "location": "lacros_version_skew_tests_v114.0.5701.0",
+              "revision": "version:114.0.5701.0"
             }
           ],
           "dimension_sets": [
@@ -25776,7 +25249,6 @@
         "description": "Run with ash-chrome version 114.0.5692.0",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash dev",
@@ -25809,7 +25281,6 @@
         "description": "Run with ash-chrome version 112.0.5615.62",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash stable",
@@ -25837,7 +25308,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25858,7 +25328,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests",
@@ -25882,7 +25351,6 @@
         "description": "Run with ash-chrome version 113.0.5672.21",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash beta",
@@ -25909,12 +25377,11 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5700.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5701.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5700.0",
+        "description": "Run with ash-chrome version 114.0.5701.0",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash canary",
@@ -25923,8 +25390,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5700.0",
-              "revision": "version:114.0.5700.0"
+              "location": "lacros_version_skew_tests_v114.0.5701.0",
+              "revision": "version:114.0.5701.0"
             }
           ],
           "dimension_sets": [
@@ -25946,7 +25413,6 @@
         "description": "Run with ash-chrome version 114.0.5692.0",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash dev",
@@ -25978,7 +25444,6 @@
         "description": "Run with ash-chrome version 112.0.5615.62",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash stable",
@@ -26008,7 +25473,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series",
@@ -26033,7 +25497,6 @@
         "description": "Run with ash-chrome version 113.0.5672.21",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash beta",
@@ -26061,12 +25524,11 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5700.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5701.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5700.0",
+        "description": "Run with ash-chrome version 114.0.5701.0",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash canary",
@@ -26075,8 +25537,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5700.0",
-              "revision": "version:114.0.5700.0"
+              "location": "lacros_version_skew_tests_v114.0.5701.0",
+              "revision": "version:114.0.5701.0"
             }
           ],
           "dimension_sets": [
@@ -26099,7 +25561,6 @@
         "description": "Run with ash-chrome version 114.0.5692.0",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash dev",
@@ -26132,7 +25593,6 @@
         "description": "Run with ash-chrome version 112.0.5615.62",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash stable",
@@ -26160,7 +25620,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26178,7 +25637,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26196,7 +25654,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26214,7 +25671,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26232,7 +25688,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26250,7 +25705,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26268,7 +25722,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26286,7 +25739,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26304,7 +25756,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26322,7 +25773,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26340,7 +25790,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26358,7 +25807,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26376,7 +25824,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26394,7 +25841,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26412,7 +25858,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26430,7 +25875,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26448,7 +25892,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26466,7 +25909,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26484,7 +25926,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26502,7 +25943,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26520,7 +25960,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26538,7 +25977,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26556,7 +25994,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26574,7 +26011,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26592,7 +26028,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26610,7 +26045,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26628,7 +26062,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26646,7 +26079,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26664,7 +26096,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26682,7 +26113,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26703,7 +26133,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26721,7 +26150,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26739,7 +26167,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26757,7 +26184,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26775,7 +26201,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26797,7 +26222,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26816,7 +26240,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26835,7 +26258,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -26855,7 +26277,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26874,7 +26295,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26893,7 +26313,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26912,7 +26331,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26931,7 +26349,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26950,7 +26367,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26969,7 +26385,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -26989,7 +26404,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27008,7 +26422,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27030,7 +26443,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27049,7 +26461,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27068,7 +26479,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27087,7 +26497,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27106,7 +26515,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27125,7 +26533,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27144,7 +26551,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27163,7 +26569,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27185,7 +26590,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27205,7 +26609,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27224,7 +26627,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27243,7 +26645,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27262,7 +26663,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27281,7 +26681,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27300,7 +26699,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27319,7 +26717,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27338,7 +26735,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27357,7 +26753,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27376,7 +26771,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27395,7 +26789,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27414,7 +26807,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27433,7 +26825,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27452,7 +26843,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27471,7 +26861,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27490,7 +26879,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27509,7 +26897,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27528,7 +26915,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27547,7 +26933,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27566,7 +26951,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27588,7 +26972,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27608,7 +26991,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27627,7 +27009,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27646,7 +27027,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27665,7 +27045,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27684,7 +27063,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27703,7 +27081,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27722,7 +27099,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27741,7 +27117,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27760,7 +27135,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27779,7 +27153,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27798,7 +27171,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27817,7 +27189,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27836,7 +27207,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27855,7 +27225,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27874,7 +27243,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27893,7 +27261,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27912,7 +27279,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27931,7 +27297,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27950,7 +27315,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27969,7 +27333,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27988,7 +27351,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28007,7 +27369,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28026,7 +27387,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28045,7 +27405,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28064,7 +27423,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28083,7 +27441,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28105,7 +27462,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28124,7 +27480,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28143,7 +27498,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28162,7 +27516,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28181,7 +27534,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28200,7 +27552,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28219,7 +27570,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28238,7 +27588,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28257,7 +27606,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28276,7 +27624,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -28296,7 +27643,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28320,7 +27666,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28338,7 +27683,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28356,7 +27700,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -28375,7 +27718,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28393,7 +27735,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28411,7 +27752,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28429,7 +27769,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28447,7 +27786,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28465,7 +27803,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28483,7 +27820,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28501,7 +27837,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -28520,7 +27855,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28538,7 +27872,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28556,7 +27889,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28578,7 +27910,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28596,7 +27927,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28614,7 +27944,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28632,7 +27961,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28650,7 +27978,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28668,7 +27995,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28686,7 +28012,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28704,7 +28029,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28722,7 +28046,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28740,7 +28063,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28758,7 +28080,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28776,7 +28097,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28795,7 +28115,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28813,7 +28132,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28831,7 +28149,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28849,7 +28166,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28867,7 +28183,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28885,7 +28200,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28903,7 +28217,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28921,7 +28234,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28939,7 +28251,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28957,7 +28268,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28975,7 +28285,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28993,7 +28302,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29011,7 +28319,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29029,7 +28336,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29047,7 +28353,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29065,7 +28370,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29083,7 +28387,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29101,7 +28404,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29119,7 +28421,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29137,7 +28438,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29155,7 +28455,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29173,7 +28472,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29191,7 +28489,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29209,7 +28506,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29227,7 +28523,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29246,7 +28541,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29265,7 +28559,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29283,7 +28576,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29301,7 +28593,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29319,7 +28610,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29337,7 +28627,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29355,7 +28644,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29373,7 +28661,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29391,7 +28678,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29409,7 +28695,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29427,7 +28712,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29445,7 +28729,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29463,7 +28746,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29481,7 +28763,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29499,7 +28780,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29517,7 +28797,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29535,7 +28814,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29553,7 +28831,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29571,7 +28848,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29590,7 +28866,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29608,7 +28883,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29626,7 +28900,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29644,7 +28917,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29662,7 +28934,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29681,7 +28952,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29699,7 +28969,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29717,7 +28986,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29735,7 +29003,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29753,7 +29020,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29771,7 +29037,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29789,7 +29054,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29807,7 +29071,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29825,7 +29088,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29843,7 +29105,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29861,7 +29122,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29879,7 +29139,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29897,7 +29156,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29915,7 +29173,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29933,7 +29190,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29951,7 +29207,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29969,7 +29224,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29987,7 +29241,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30005,7 +29258,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -30074,7 +29326,6 @@
         "isolate_name": "telemetry_gpu_integration_test",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_tests",

testing/buildbot/chromium.dawn.json

diff --git a/testing/buildbot/chromium.dawn.json b/testing/buildbot/chromium.dawn.json
index eab928a..2727efa 100644
--- a/testing/buildbot/chromium.dawn.json
+++ b/testing/buildbot/chromium.dawn.json
@@ -117,7 +117,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -143,7 +142,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_skip_validation_tests",
@@ -170,7 +168,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_validation_layers_tests",
@@ -197,7 +194,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_wire_tests",
@@ -223,7 +219,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -248,7 +243,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -297,7 +291,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -407,7 +400,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_tests",
@@ -446,7 +438,6 @@
         "ci_only": true,
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_with_validation_tests",
@@ -560,7 +551,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_tests",
@@ -601,7 +591,6 @@
         "ci_only": true,
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests",
@@ -637,7 +626,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -663,7 +651,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_skip_validation_tests",
@@ -690,7 +677,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_validation_layers_tests",
@@ -717,7 +703,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_wire_tests",
@@ -743,7 +728,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -768,7 +752,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -817,7 +800,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -927,7 +909,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_tests",
@@ -965,7 +946,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_with_validation_tests",
@@ -1079,7 +1059,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_tests",
@@ -1119,7 +1098,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests",
@@ -1155,7 +1133,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1181,7 +1158,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_skip_validation_tests",
@@ -1208,7 +1184,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_validation_layers_tests",
@@ -1235,7 +1210,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_wire_tests",
@@ -1261,7 +1235,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -1286,7 +1259,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1335,7 +1307,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -1445,7 +1416,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_tests",
@@ -1484,7 +1454,6 @@
         "ci_only": true,
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_with_validation_tests",
@@ -1598,7 +1567,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_tests",
@@ -1639,7 +1607,6 @@
         "ci_only": true,
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests",
@@ -1675,7 +1642,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1701,7 +1667,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_skip_validation_tests",
@@ -1728,7 +1693,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_validation_layers_tests",
@@ -1755,7 +1719,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_wire_tests",
@@ -1781,7 +1744,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -1806,7 +1768,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1855,7 +1816,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -1965,7 +1925,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_tests",
@@ -2003,7 +1962,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_with_validation_tests",
@@ -2117,7 +2075,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_tests",
@@ -2157,7 +2114,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests",
@@ -2194,7 +2150,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2222,7 +2177,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_skip_validation_tests",
@@ -2251,7 +2205,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_validation_layers_tests",
@@ -2280,7 +2233,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_wire_tests",
@@ -2308,7 +2260,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -2335,7 +2286,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2390,7 +2340,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -2548,7 +2497,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_tests",
@@ -2586,7 +2534,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2612,7 +2559,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_skip_validation_tests",
@@ -2639,7 +2585,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_validation_layers_tests",
@@ -2666,7 +2611,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_wire_tests",
@@ -2692,7 +2636,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -2717,7 +2660,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2768,7 +2710,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -2879,7 +2820,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_tests",
@@ -2918,7 +2858,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_with_validation_tests",
@@ -3033,7 +2972,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_tests",
@@ -3074,7 +3012,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests",
@@ -3110,7 +3047,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3139,7 +3075,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_skip_validation_tests",
@@ -3169,7 +3104,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_validation_layers_tests",
@@ -3199,7 +3133,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_wire_tests",
@@ -3228,7 +3161,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -3256,7 +3188,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3313,7 +3244,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -3433,7 +3363,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_tests",
@@ -3475,7 +3404,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_with_validation_tests",
@@ -3599,7 +3527,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_tests",
@@ -3643,7 +3570,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests",
@@ -3682,7 +3608,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3709,7 +3634,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_skip_validation_tests",
@@ -3737,7 +3661,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_validation_layers_tests",
@@ -3765,7 +3688,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_wire_tests",
@@ -3792,7 +3714,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -3818,7 +3739,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3871,7 +3791,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -3985,7 +3904,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_tests",
@@ -4025,7 +3943,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_with_validation_tests",
@@ -4143,7 +4060,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_tests",
@@ -4185,7 +4101,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests",
@@ -4222,7 +4137,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4250,7 +4164,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_skip_validation_tests",
@@ -4279,7 +4192,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_validation_layers_tests",
@@ -4308,7 +4220,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_wire_tests",
@@ -4336,7 +4247,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -4363,7 +4273,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4418,7 +4327,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -4576,7 +4484,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_tests",
@@ -4614,7 +4521,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4640,7 +4546,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_skip_validation_tests",
@@ -4667,7 +4572,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_validation_layers_tests",
@@ -4694,7 +4598,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_wire_tests",
@@ -4720,7 +4623,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -4745,7 +4647,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4796,7 +4697,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -4907,7 +4807,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_tests",
@@ -4946,7 +4845,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_with_validation_tests",
@@ -5061,7 +4959,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_tests",
@@ -5102,7 +4999,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests",
@@ -5138,7 +5034,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5170,7 +5065,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_skip_validation_tests",
@@ -5203,7 +5097,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_wire_tests",
@@ -5235,7 +5128,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -5266,7 +5158,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5329,7 +5220,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -5459,7 +5349,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_tests",
@@ -5590,7 +5479,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5616,7 +5504,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_skip_validation_tests",
@@ -5643,7 +5530,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_validation_layers_tests",
@@ -5670,7 +5556,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_wire_tests",
@@ -5696,7 +5581,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -5721,7 +5605,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5772,7 +5655,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -5845,7 +5727,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_tests",
@@ -5960,7 +5841,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_tests",
@@ -5996,7 +5876,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6022,7 +5901,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_skip_validation_tests",
@@ -6049,7 +5927,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_validation_layers_tests",
@@ -6076,7 +5953,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_wire_tests",
@@ -6102,7 +5978,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -6127,7 +6002,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6178,7 +6052,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -6289,7 +6162,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_tests",
@@ -6328,7 +6200,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_with_validation_tests",
@@ -6443,7 +6314,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_tests",
@@ -6484,7 +6354,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests",
@@ -6525,7 +6394,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "noop_sleep_tests",
@@ -6557,7 +6425,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6583,7 +6450,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_skip_validation_tests",
@@ -6610,7 +6476,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_validation_layers_tests",
@@ -6637,7 +6502,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_wire_tests",
@@ -6663,7 +6527,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -6688,7 +6551,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6739,7 +6601,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -6812,7 +6673,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_tests",
@@ -6927,7 +6787,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_tests",
@@ -6963,7 +6822,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6989,7 +6847,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_skip_validation_tests",
@@ -7016,7 +6873,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_validation_layers_tests",
@@ -7043,7 +6899,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_wire_tests",
@@ -7069,7 +6924,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -7094,7 +6948,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7145,7 +6998,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -7256,7 +7108,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_tests",
@@ -7295,7 +7146,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_with_validation_tests",
@@ -7410,7 +7260,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_tests",
@@ -7451,7 +7300,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests",
@@ -7489,7 +7337,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7515,7 +7362,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_skip_validation_tests",
@@ -7542,7 +7388,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_validation_layers_tests",
@@ -7569,7 +7414,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_wire_tests",
@@ -7595,7 +7439,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -7620,7 +7463,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7671,7 +7513,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -7780,7 +7621,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_tests",
@@ -7893,7 +7733,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_tests",
@@ -7929,7 +7768,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7955,7 +7793,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_skip_validation_tests",
@@ -7982,7 +7819,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_validation_layers_tests",
@@ -8009,7 +7845,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_wire_tests",
@@ -8035,7 +7870,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -8060,7 +7894,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8111,7 +7944,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -8220,7 +8052,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_tests",
@@ -8259,7 +8090,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_with_validation_tests",
@@ -8372,7 +8202,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_tests",
@@ -8413,7 +8242,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests",
@@ -8454,7 +8282,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "noop_sleep_tests",
@@ -8486,7 +8313,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8512,7 +8338,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_skip_validation_tests",
@@ -8539,7 +8364,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_validation_layers_tests",
@@ -8566,7 +8390,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_wire_tests",
@@ -8592,7 +8415,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -8617,7 +8439,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8668,7 +8489,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -8777,7 +8597,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_tests",
@@ -8890,7 +8709,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_tests",
@@ -8926,7 +8744,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8952,7 +8769,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_skip_validation_tests",
@@ -8979,7 +8795,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_validation_layers_tests",
@@ -9006,7 +8821,6 @@
           "--exclusive-device-type-preference=discrete,integrated"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "dawn_end2end_wire_tests",
@@ -9032,7 +8846,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -9057,7 +8870,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9108,7 +8920,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -9217,7 +9028,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_tests",
@@ -9256,7 +9066,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_cts_with_validation_tests",
@@ -9369,7 +9178,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_tests",
@@ -9410,7 +9218,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests",

testing/buildbot/chromium.dev.json

diff --git a/testing/buildbot/chromium.dev.json b/testing/buildbot/chromium.dev.json
index baf15d3..f34a4a81 100644
--- a/testing/buildbot/chromium.dev.json
+++ b/testing/buildbot/chromium.dev.json
@@ -54,7 +54,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -72,7 +71,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -91,7 +89,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -110,7 +107,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -128,7 +124,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -147,7 +142,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -165,7 +159,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -188,7 +181,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -206,7 +198,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -224,7 +215,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -242,7 +232,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -260,7 +249,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -278,7 +266,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -300,7 +287,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -318,7 +304,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -337,7 +322,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -355,7 +339,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -373,7 +356,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -391,7 +373,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -413,7 +394,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -430,7 +410,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -447,7 +426,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -464,7 +442,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -481,7 +458,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -498,7 +474,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -519,7 +494,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -536,7 +510,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -553,7 +526,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -570,7 +542,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -587,7 +558,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -604,7 +574,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/chromium.devtools-frontend.json

diff --git a/testing/buildbot/chromium.devtools-frontend.json b/testing/buildbot/chromium.devtools-frontend.json
index eca088b..582b410d 100644
--- a/testing/buildbot/chromium.devtools-frontend.json
+++ b/testing/buildbot/chromium.devtools-frontend.json
@@ -8,7 +8,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "blink_unit_tests",

testing/buildbot/chromium.fuchsia.fyi.json

diff --git a/testing/buildbot/chromium.fuchsia.fyi.json b/testing/buildbot/chromium.fuchsia.fyi.json
index b173536c..d859e912 100644
--- a/testing/buildbot/chromium.fuchsia.fyi.json
+++ b/testing/buildbot/chromium.fuchsia.fyi.json
@@ -12,7 +12,6 @@
           "--test-arg=--test-launcher-timeout=60000"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32,7 +31,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -54,7 +52,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.unit_tests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -80,7 +77,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -99,7 +95,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -118,7 +113,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -137,7 +131,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -156,7 +149,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -175,7 +167,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -194,7 +185,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -213,7 +203,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -232,7 +221,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -251,7 +239,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -270,7 +257,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -289,7 +275,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -308,7 +293,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -327,7 +311,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -346,7 +329,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -365,7 +347,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -389,7 +370,6 @@
           "--test-arg=--ozone-platform=headless"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -408,7 +388,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -431,7 +410,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.debug.compositor_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -450,7 +428,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -469,7 +446,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -488,7 +464,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -507,7 +482,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -526,7 +500,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -545,7 +518,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -564,7 +536,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -583,7 +554,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -602,7 +572,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -621,7 +590,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -640,7 +608,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -659,7 +626,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -681,7 +647,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.debug.media_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -700,7 +665,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -719,7 +683,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -738,7 +701,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -760,7 +722,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.net_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -783,7 +744,6 @@
           "--test-arg=--ozone-platform=headless"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -802,7 +762,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -821,7 +780,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -840,7 +798,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -862,7 +819,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.services_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -881,7 +837,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -900,7 +855,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -922,7 +876,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.debug.snapshot_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -941,7 +894,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -960,7 +912,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -982,7 +933,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1001,7 +951,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1020,7 +969,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1039,7 +987,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1061,7 +1008,6 @@
           "--test-arg=--vmodule=test_navigation_listener=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1080,7 +1026,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1099,7 +1044,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1118,7 +1062,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1137,7 +1080,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1163,7 +1105,6 @@
         ],
         "isolate_name": "angle_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "angle_unittests",
@@ -1186,7 +1127,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1204,7 +1144,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1222,7 +1161,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1243,7 +1181,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.lsan.base_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1261,7 +1198,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1279,7 +1215,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1297,7 +1232,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1315,7 +1249,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1333,7 +1266,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1351,7 +1283,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1369,7 +1300,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1387,7 +1317,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1405,7 +1334,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1423,7 +1351,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1441,7 +1368,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1459,7 +1385,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1478,7 +1403,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1501,7 +1425,6 @@
           "--test-arg=--ozone-platform=headless"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1519,7 +1442,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1538,7 +1460,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1559,7 +1480,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.lsan.content_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1577,7 +1497,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1595,7 +1514,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1613,7 +1531,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1631,7 +1548,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1652,7 +1568,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.lsan.extensions_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1670,7 +1585,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1688,7 +1602,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1706,7 +1619,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1727,7 +1639,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.lsan.gin_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1745,7 +1656,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1763,7 +1673,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1781,7 +1690,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1799,7 +1707,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1817,7 +1724,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1835,7 +1741,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1853,7 +1758,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1871,7 +1775,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1889,7 +1792,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1907,7 +1809,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1925,7 +1826,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1943,7 +1843,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1964,7 +1863,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.net_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1986,7 +1884,6 @@
           "--test-arg=--ozone-platform=headless"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2004,7 +1901,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2025,7 +1921,6 @@
           "--gtest_filter=-PagedMemoryTest.AccessUncommittedMemoryTriggersASAN"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2043,7 +1938,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2064,7 +1958,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.services_unittests.filter;../../testing/buildbot/filters/fuchsia.lsan.services_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2082,7 +1975,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2100,7 +1992,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2118,7 +2009,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2136,7 +2026,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2154,7 +2043,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2175,7 +2063,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2193,7 +2080,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2211,7 +2097,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2232,7 +2117,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.views_examples_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2253,7 +2137,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.views_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2274,7 +2157,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.viz_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2292,7 +2174,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2313,7 +2194,6 @@
           "--test-arg=--vmodule=test_navigation_listener=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2331,7 +2211,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2349,7 +2228,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2367,7 +2245,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2385,7 +2262,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2411,7 +2287,6 @@
         ],
         "isolate_name": "angle_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "angle_unittests",
@@ -2436,7 +2311,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2454,7 +2328,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2472,7 +2345,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2490,7 +2362,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2508,7 +2379,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2526,7 +2396,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2544,7 +2413,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2562,7 +2430,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2580,7 +2447,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2598,7 +2464,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2616,7 +2481,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2634,7 +2498,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2652,7 +2515,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2670,7 +2532,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2688,7 +2549,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2706,7 +2566,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2725,7 +2584,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2748,7 +2606,6 @@
           "--test-arg=--ozone-platform=headless"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2766,7 +2623,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2785,7 +2641,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2803,7 +2658,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2821,7 +2675,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2839,7 +2692,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2857,7 +2709,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2875,7 +2726,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2893,7 +2743,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2911,7 +2760,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2929,7 +2777,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2947,7 +2794,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2965,7 +2811,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2983,7 +2828,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3001,7 +2845,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3019,7 +2862,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3037,7 +2879,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3055,7 +2896,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3073,7 +2913,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3091,7 +2930,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3109,7 +2947,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3127,7 +2964,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3145,7 +2981,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3163,7 +2998,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3181,7 +3015,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3202,7 +3035,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.net_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3224,7 +3056,6 @@
           "--test-arg=--ozone-platform=headless"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3242,7 +3073,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3260,7 +3090,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3278,7 +3107,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3299,7 +3127,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.services_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3317,7 +3144,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3335,7 +3161,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3353,7 +3178,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3371,7 +3195,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3389,7 +3212,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3410,7 +3232,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3428,7 +3249,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3446,7 +3266,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3467,7 +3286,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.views_examples_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3488,7 +3306,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.views_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3509,7 +3326,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.viz_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3527,7 +3343,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3548,7 +3363,6 @@
           "--test-arg=--vmodule=test_navigation_listener=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3566,7 +3380,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3584,7 +3397,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3602,7 +3414,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3620,7 +3431,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3645,7 +3455,6 @@
         ],
         "isolate_name": "angle_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "angle_unittests",
@@ -3673,7 +3482,6 @@
           "--everlasting"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3696,7 +3504,6 @@
           "--everlasting"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3719,7 +3526,6 @@
           "--everlasting"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3742,7 +3548,6 @@
           "--everlasting"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3765,7 +3570,6 @@
           "--everlasting"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3789,7 +3593,6 @@
           "--everlasting"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3812,7 +3615,6 @@
           "--everlasting"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3840,7 +3642,6 @@
           "--test-arg=--test-launcher-timeout=60000"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3859,7 +3660,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3880,7 +3680,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.unit_tests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/chromium.fuchsia.json

diff --git a/testing/buildbot/chromium.fuchsia.json b/testing/buildbot/chromium.fuchsia.json
index 240c09c..964c447 100644
--- a/testing/buildbot/chromium.fuchsia.json
+++ b/testing/buildbot/chromium.fuchsia.json
@@ -8,7 +8,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -27,7 +26,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -46,7 +44,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -65,7 +62,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -84,7 +80,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -103,7 +98,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -122,7 +116,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -141,7 +134,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -160,7 +152,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -179,7 +170,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -198,7 +188,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -217,7 +206,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -236,7 +224,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -255,7 +242,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -274,7 +260,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -293,7 +278,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -317,7 +301,6 @@
           "--test-arg=--ozone-platform=headless"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -336,7 +319,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -356,7 +338,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -382,7 +363,6 @@
         ],
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -402,7 +382,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -421,7 +400,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -440,7 +418,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -459,7 +436,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -478,7 +454,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -497,7 +472,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -516,7 +490,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -535,7 +508,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -554,7 +526,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -573,7 +544,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -592,7 +562,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -611,7 +580,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -630,7 +598,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -649,7 +616,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -668,7 +634,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -687,7 +652,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -709,7 +673,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.net_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -732,7 +695,6 @@
           "--test-arg=--ozone-platform=headless"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -751,7 +713,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -770,7 +731,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -789,7 +749,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -811,7 +770,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.services_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -830,7 +788,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -849,7 +806,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -868,7 +824,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -887,7 +842,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -906,7 +860,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -928,7 +881,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -947,7 +899,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -966,7 +917,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -985,7 +935,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1007,7 +956,6 @@
           "--test-arg=--vmodule=test_navigation_listener=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1026,7 +974,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1045,7 +992,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1064,7 +1010,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1083,7 +1028,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1109,7 +1053,6 @@
         ],
         "isolate_name": "angle_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "angle_unittests",
@@ -1158,7 +1101,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1177,7 +1119,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1196,7 +1137,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1215,7 +1155,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1234,7 +1173,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1253,7 +1191,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1272,7 +1209,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1291,7 +1227,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1310,7 +1245,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1329,7 +1263,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1348,7 +1281,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1367,7 +1299,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1386,7 +1317,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1405,7 +1335,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1424,7 +1353,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1443,7 +1371,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1467,7 +1394,6 @@
           "--test-arg=--ozone-platform=headless"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1486,7 +1412,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1506,7 +1431,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1532,7 +1456,6 @@
         ],
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1552,7 +1475,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1571,7 +1493,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1590,7 +1511,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1609,7 +1529,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1628,7 +1547,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1647,7 +1565,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1666,7 +1583,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1685,7 +1601,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1704,7 +1619,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1723,7 +1637,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1742,7 +1655,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1761,7 +1673,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1780,7 +1691,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1799,7 +1709,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1818,7 +1727,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1837,7 +1745,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1859,7 +1766,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.net_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1882,7 +1788,6 @@
           "--test-arg=--ozone-platform=headless"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1901,7 +1806,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1920,7 +1824,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1939,7 +1842,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1961,7 +1863,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.services_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1980,7 +1881,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1999,7 +1899,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2018,7 +1917,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2037,7 +1935,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2056,7 +1953,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2078,7 +1974,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2097,7 +1992,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2116,7 +2010,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2135,7 +2028,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2157,7 +2049,6 @@
           "--test-arg=--vmodule=test_navigation_listener=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2176,7 +2067,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2195,7 +2085,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2214,7 +2103,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2233,7 +2121,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2259,7 +2146,6 @@
         ],
         "isolate_name": "angle_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "angle_unittests",
@@ -2309,7 +2195,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2328,7 +2213,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2347,7 +2231,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2366,7 +2249,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2385,7 +2267,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2404,7 +2285,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2423,7 +2303,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2442,7 +2321,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2461,7 +2339,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2480,7 +2357,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2499,7 +2375,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2518,7 +2393,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2537,7 +2411,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2556,7 +2429,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2575,7 +2447,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2594,7 +2465,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2614,7 +2484,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2638,7 +2507,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2657,7 +2525,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2677,7 +2544,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2704,7 +2570,6 @@
         "ci_only": true,
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2724,7 +2589,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2743,7 +2607,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2762,7 +2625,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2781,7 +2643,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2800,7 +2661,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2819,7 +2679,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2838,7 +2697,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2857,7 +2715,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2876,7 +2733,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2895,7 +2751,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2914,7 +2769,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2933,7 +2787,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2952,7 +2805,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2971,7 +2823,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2990,7 +2841,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3009,7 +2859,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3028,7 +2877,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3047,7 +2895,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3066,7 +2913,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3085,7 +2931,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3104,7 +2949,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3123,7 +2967,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3145,7 +2988,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3168,7 +3010,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3187,7 +3028,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3206,7 +3046,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3225,7 +3064,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3247,7 +3085,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3266,7 +3103,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3285,7 +3121,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3304,7 +3139,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3323,7 +3157,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3342,7 +3175,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3364,7 +3196,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3383,7 +3214,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3402,7 +3232,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3424,7 +3253,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3446,7 +3274,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3468,7 +3295,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3487,7 +3313,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3509,7 +3334,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3528,7 +3352,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3547,7 +3370,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3566,7 +3388,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3585,7 +3406,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3611,7 +3431,6 @@
         "isolate_name": "angle_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "angle_unittests",
@@ -3718,7 +3537,6 @@
         "isolate_name": "telemetry_gpu_integration_test_fuchsia",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_validating_tests",
@@ -3753,7 +3571,6 @@
         "isolate_name": "telemetry_gpu_integration_test_fuchsia",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -3788,7 +3605,6 @@
         "isolate_name": "telemetry_gpu_integration_test_fuchsia",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -3827,7 +3643,6 @@
         "isolate_name": "telemetry_gpu_integration_test_fuchsia",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_validating_test",
@@ -3868,7 +3683,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3886,7 +3700,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3904,7 +3717,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3922,7 +3734,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3940,7 +3751,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3958,7 +3768,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3976,7 +3785,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3994,7 +3802,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4012,7 +3819,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4030,7 +3836,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4048,7 +3853,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4066,7 +3870,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4084,7 +3887,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4102,7 +3904,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4120,7 +3921,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4138,7 +3938,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4157,7 +3956,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4180,7 +3978,6 @@
           "--test-arg=--ozone-platform=headless"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4198,7 +3995,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4217,7 +4013,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4242,7 +4037,6 @@
           "--test-arg=--test-launcher-jobs=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4261,7 +4055,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4279,7 +4072,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4297,7 +4089,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4315,7 +4106,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4333,7 +4123,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4351,7 +4140,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4369,7 +4157,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4387,7 +4174,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4405,7 +4191,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4423,7 +4208,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4441,7 +4225,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4459,7 +4242,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4477,7 +4259,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4495,7 +4276,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4513,7 +4293,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4531,7 +4310,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4549,7 +4327,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4567,7 +4344,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4585,7 +4361,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4603,7 +4378,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4621,7 +4395,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4639,7 +4412,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4660,7 +4432,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.net_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4682,7 +4453,6 @@
           "--test-arg=--ozone-platform=headless"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4700,7 +4470,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4718,7 +4487,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4736,7 +4504,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4757,7 +4524,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.services_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4775,7 +4541,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4793,7 +4558,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4811,7 +4575,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4829,7 +4592,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4847,7 +4609,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4868,7 +4629,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4886,7 +4646,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4904,7 +4663,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4925,7 +4683,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.views_examples_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4946,7 +4703,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.views_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4967,7 +4723,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.viz_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4985,7 +4740,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5006,7 +4760,6 @@
           "--test-arg=--vmodule=test_navigation_listener=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5024,7 +4777,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5042,7 +4794,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5060,7 +4811,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5078,7 +4828,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5103,7 +4852,6 @@
         ],
         "isolate_name": "angle_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "angle_unittests",
@@ -5207,7 +4955,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_fuchsia",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_validating_tests",
@@ -5241,7 +4988,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_fuchsia",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -5275,7 +5021,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_fuchsia",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -5313,7 +5058,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_fuchsia",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_validating_test",

testing/buildbot/chromium.fyi.json

diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index e9b824e..cce08e72 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -70,7 +70,6 @@
           "--disable-headless-mode"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "vulkan_swiftshader_content_browsertests",
@@ -178,7 +177,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -196,7 +194,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -214,7 +211,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -233,7 +229,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -251,7 +246,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -269,7 +263,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -287,7 +280,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -305,7 +297,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -323,7 +314,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -341,7 +331,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -360,7 +349,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -378,7 +366,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -396,7 +383,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -418,7 +404,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -436,7 +421,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -454,7 +438,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -472,7 +455,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -490,7 +472,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -508,7 +489,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -526,7 +506,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -544,7 +523,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -562,7 +540,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -581,7 +558,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -600,7 +576,6 @@
       {
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -618,7 +593,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -636,7 +610,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -654,7 +627,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -672,7 +644,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -690,7 +661,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -708,7 +678,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -726,7 +695,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -744,7 +712,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -762,7 +729,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -780,7 +746,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -798,7 +763,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -816,7 +780,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -834,7 +797,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -852,7 +814,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -870,7 +831,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -888,7 +848,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -906,7 +865,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -924,7 +882,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -943,7 +900,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -961,7 +917,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -979,7 +934,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -997,7 +951,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1015,7 +968,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1033,7 +985,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1051,7 +1002,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1069,7 +1019,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1087,7 +1036,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1105,7 +1053,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1123,7 +1070,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1141,7 +1087,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1159,7 +1104,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1177,7 +1121,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1195,7 +1138,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1213,7 +1155,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1231,7 +1172,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1249,7 +1189,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1267,7 +1206,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1285,7 +1223,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1303,7 +1240,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1321,7 +1257,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1339,7 +1274,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1357,7 +1291,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1375,7 +1308,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1393,7 +1325,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1411,7 +1342,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1429,7 +1359,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1447,7 +1376,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1465,7 +1393,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1483,7 +1410,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1501,7 +1427,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1519,7 +1444,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1537,7 +1461,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -1556,7 +1479,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1577,7 +1499,6 @@
       {
         "isolate_name": "blink_python_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -1677,7 +1598,6 @@
         "check_flakiness_for_new_tests": false,
         "isolate_name": "chromedriver_py_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -1699,7 +1619,6 @@
       {
         "isolate_name": "chromedriver_replay_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -1742,7 +1661,6 @@
       {
         "isolate_name": "content_shell_crash_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -1765,7 +1683,6 @@
       {
         "isolate_name": "flatbuffers_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -1788,7 +1705,6 @@
       {
         "isolate_name": "grit_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -1810,7 +1726,6 @@
       {
         "isolate_name": "mac_signing_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mac_signing_tests",
@@ -1829,7 +1744,6 @@
       {
         "isolate_name": "mojo_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -1851,7 +1765,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -1877,7 +1790,6 @@
         ],
         "isolate_name": "telemetry_perf_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -1905,7 +1817,6 @@
         ],
         "isolate_name": "telemetry_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -1963,7 +1874,6 @@
           "--site-per-process"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "site_per_process_android_browsertests",
@@ -1992,7 +1902,6 @@
           "--git-revision=${got_revision}"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "site_per_process_chrome_public_test_apk",
@@ -2027,7 +1936,6 @@
           "--git-revision=${got_revision}"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "site_per_process_chrome_public_unit_test_apk",
@@ -2060,7 +1968,6 @@
           "--site-per-process"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "site_per_process_components_browsertests",
@@ -2088,7 +1995,6 @@
           "--site-per-process"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "site_per_process_components_unittests",
@@ -2118,7 +2024,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/site_isolation_android.content_browsertests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "site_per_process_content_browsertests",
@@ -2147,7 +2052,6 @@
           "--site-per-process"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "site_per_process_content_shell_test_apk",
@@ -2176,7 +2080,6 @@
           "--site-per-process"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "site_per_process_content_unittests",
@@ -2204,7 +2107,6 @@
           "--site-per-process"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "site_per_process_unit_tests",
@@ -2237,7 +2139,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -2262,7 +2163,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2273,7 +2173,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2284,7 +2183,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2296,7 +2194,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2307,7 +2204,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2318,7 +2214,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2329,7 +2224,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2340,7 +2234,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2351,7 +2244,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2362,7 +2254,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2373,7 +2264,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -2385,7 +2275,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2396,7 +2285,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2407,7 +2295,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2421,7 +2308,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2432,7 +2318,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2443,7 +2328,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2454,7 +2338,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2465,7 +2348,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2476,7 +2358,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2487,7 +2368,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2498,7 +2378,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2509,7 +2388,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2520,7 +2398,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2531,7 +2408,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2542,7 +2418,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2553,7 +2428,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2564,7 +2438,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2575,7 +2448,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2586,7 +2458,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2597,7 +2468,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2608,7 +2478,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2619,7 +2488,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2630,7 +2498,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2641,7 +2508,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2652,7 +2518,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2663,7 +2528,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2674,7 +2538,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2685,7 +2548,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2696,7 +2558,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2707,7 +2568,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2718,7 +2578,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2729,7 +2588,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2740,7 +2598,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2751,7 +2608,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2762,7 +2618,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2773,7 +2628,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2784,7 +2638,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2795,7 +2648,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2806,7 +2658,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2817,7 +2668,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2828,7 +2678,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2839,7 +2688,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2850,7 +2698,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2861,7 +2708,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2872,7 +2718,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2883,7 +2728,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2894,7 +2738,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2905,7 +2748,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2916,7 +2758,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2927,7 +2768,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2938,7 +2778,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2949,7 +2788,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2960,7 +2798,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2971,7 +2808,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2982,7 +2818,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2993,7 +2828,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3004,7 +2838,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3015,7 +2848,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3026,7 +2858,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3037,7 +2868,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3048,7 +2878,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3059,7 +2888,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3070,7 +2898,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3081,7 +2908,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3092,7 +2918,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3103,7 +2928,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3114,7 +2938,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3125,7 +2948,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3136,7 +2958,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3147,7 +2968,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3158,7 +2978,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3169,7 +2988,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3180,7 +2998,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3191,7 +3008,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3202,7 +3018,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3213,7 +3028,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3224,7 +3038,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3235,7 +3048,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3246,7 +3058,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3257,7 +3068,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3268,7 +3078,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3279,7 +3088,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3290,7 +3098,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4930,7 +4737,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4966,7 +4772,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5004,7 +4809,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5040,7 +4844,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5077,7 +4880,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -5120,7 +4922,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5197,7 +4998,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5240,7 +5040,6 @@
         ],
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5276,7 +5075,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5312,7 +5110,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5348,7 +5145,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5384,7 +5180,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5421,7 +5216,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5457,7 +5251,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5493,7 +5286,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5531,7 +5323,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5581,7 +5372,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5617,7 +5407,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5653,7 +5442,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5689,7 +5477,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5727,7 +5514,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5763,7 +5549,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5799,7 +5584,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5843,7 +5627,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5887,7 +5670,6 @@
         ],
         "isolate_name": "telemetry_perf_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -5935,7 +5717,6 @@
         ],
         "isolate_name": "telemetry_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -5989,7 +5770,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_tests",
@@ -6048,7 +5828,6 @@
         ],
         "isolate_name": "absl_hardening_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "absl_hardening_tests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -6100,7 +5879,6 @@
         ],
         "isolate_name": "absl_hardening_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "absl_hardening_tests iPhone X 16.2",
@@ -6152,7 +5930,6 @@
         ],
         "isolate_name": "angle_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "angle_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -6205,7 +5982,6 @@
         ],
         "isolate_name": "angle_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "angle_unittests iPhone X 16.2",
@@ -6258,7 +6034,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -6310,7 +6085,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone X 16.2",
@@ -6362,7 +6136,6 @@
         ],
         "isolate_name": "blink_common_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_common_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -6414,7 +6187,6 @@
         ],
         "isolate_name": "blink_common_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_common_unittests iPhone X 16.2",
@@ -6466,7 +6238,6 @@
         ],
         "isolate_name": "blink_fuzzer_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_fuzzer_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -6518,7 +6289,6 @@
         ],
         "isolate_name": "blink_fuzzer_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_fuzzer_unittests iPhone X 16.2",
@@ -6570,7 +6340,6 @@
         ],
         "isolate_name": "blink_heap_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_heap_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -6622,7 +6391,6 @@
         ],
         "isolate_name": "blink_heap_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_heap_unittests iPhone X 16.2",
@@ -6674,7 +6442,6 @@
         ],
         "isolate_name": "blink_platform_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_platform_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -6726,7 +6493,6 @@
         ],
         "isolate_name": "blink_platform_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_platform_unittests iPhone X 16.2",
@@ -6778,7 +6544,6 @@
         ],
         "isolate_name": "blink_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -6830,7 +6595,6 @@
         ],
         "isolate_name": "blink_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_unittests iPhone X 16.2",
@@ -6882,7 +6646,6 @@
         ],
         "isolate_name": "boringssl_crypto_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_crypto_tests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -6934,7 +6697,6 @@
         ],
         "isolate_name": "boringssl_crypto_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_crypto_tests iPhone X 16.2",
@@ -6986,7 +6748,6 @@
         ],
         "isolate_name": "boringssl_ssl_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_ssl_tests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -7038,7 +6799,6 @@
         ],
         "isolate_name": "boringssl_ssl_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_ssl_tests iPhone X 16.2",
@@ -7090,7 +6850,6 @@
         ],
         "isolate_name": "capture_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "capture_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -7142,7 +6901,6 @@
         ],
         "isolate_name": "capture_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "capture_unittests iPhone X 16.2",
@@ -7194,7 +6952,6 @@
         ],
         "isolate_name": "cast_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "cast_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -7246,7 +7003,6 @@
         ],
         "isolate_name": "cast_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "cast_unittests iPhone X 16.2",
@@ -7298,7 +7054,6 @@
         ],
         "isolate_name": "cc_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "cc_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -7350,7 +7105,6 @@
         ],
         "isolate_name": "cc_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "cc_unittests iPhone X 16.2",
@@ -7402,7 +7156,6 @@
         ],
         "isolate_name": "color_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "color_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -7454,7 +7207,6 @@
         ],
         "isolate_name": "color_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "color_unittests iPhone X 16.2",
@@ -7506,7 +7258,6 @@
         ],
         "isolate_name": "content_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -7558,7 +7309,6 @@
         ],
         "isolate_name": "content_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_unittests iPhone X 16.2",
@@ -7610,7 +7360,6 @@
         ],
         "isolate_name": "crashpad_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crashpad_tests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -7662,7 +7411,6 @@
         ],
         "isolate_name": "crashpad_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crashpad_tests iPhone X 16.2",
@@ -7714,7 +7462,6 @@
         ],
         "isolate_name": "crypto_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crypto_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -7766,7 +7513,6 @@
         ],
         "isolate_name": "crypto_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crypto_unittests iPhone X 16.2",
@@ -7818,7 +7564,6 @@
         ],
         "isolate_name": "device_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "device_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -7870,7 +7615,6 @@
         ],
         "isolate_name": "device_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "device_unittests iPhone X 16.2",
@@ -7922,7 +7666,6 @@
         ],
         "isolate_name": "display_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "display_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -7974,7 +7717,6 @@
         ],
         "isolate_name": "display_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "display_unittests iPhone X 16.2",
@@ -8026,7 +7768,6 @@
         ],
         "isolate_name": "events_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "events_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -8078,7 +7819,6 @@
         ],
         "isolate_name": "events_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "events_unittests iPhone X 16.2",
@@ -8130,7 +7870,6 @@
         ],
         "isolate_name": "gcm_unit_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gcm_unit_tests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -8182,7 +7921,6 @@
         ],
         "isolate_name": "gcm_unit_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gcm_unit_tests iPhone X 16.2",
@@ -8234,7 +7972,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -8286,7 +8023,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone X 16.2",
@@ -8338,7 +8074,6 @@
         ],
         "isolate_name": "gin_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gin_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -8390,7 +8125,6 @@
         ],
         "isolate_name": "gin_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gin_unittests iPhone X 16.2",
@@ -8442,7 +8176,6 @@
         ],
         "isolate_name": "gl_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gl_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -8494,7 +8227,6 @@
         ],
         "isolate_name": "gl_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gl_unittests iPhone X 16.2",
@@ -8546,7 +8278,6 @@
         ],
         "isolate_name": "google_apis_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "google_apis_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -8598,7 +8329,6 @@
         ],
         "isolate_name": "google_apis_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "google_apis_unittests iPhone X 16.2",
@@ -8650,7 +8380,6 @@
         ],
         "isolate_name": "gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -8702,7 +8431,6 @@
         ],
         "isolate_name": "gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_unittests iPhone X 16.2",
@@ -8754,7 +8482,6 @@
         ],
         "isolate_name": "gwp_asan_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gwp_asan_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -8806,7 +8533,6 @@
         ],
         "isolate_name": "gwp_asan_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gwp_asan_unittests iPhone X 16.2",
@@ -8858,7 +8584,6 @@
         ],
         "isolate_name": "ipc_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ipc_tests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -8910,7 +8635,6 @@
         ],
         "isolate_name": "ipc_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ipc_tests iPhone X 16.2",
@@ -8962,7 +8686,6 @@
         ],
         "isolate_name": "latency_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "latency_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -9014,7 +8737,6 @@
         ],
         "isolate_name": "latency_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "latency_unittests iPhone X 16.2",
@@ -9066,7 +8788,6 @@
         ],
         "isolate_name": "libjingle_xmpp_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "libjingle_xmpp_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -9118,7 +8839,6 @@
         ],
         "isolate_name": "libjingle_xmpp_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "libjingle_xmpp_unittests iPhone X 16.2",
@@ -9170,7 +8890,6 @@
         ],
         "isolate_name": "liburlpattern_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "liburlpattern_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -9222,7 +8941,6 @@
         ],
         "isolate_name": "liburlpattern_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "liburlpattern_unittests iPhone X 16.2",
@@ -9274,7 +8992,6 @@
         ],
         "isolate_name": "media_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "media_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -9326,7 +9043,6 @@
         ],
         "isolate_name": "media_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "media_unittests iPhone X 16.2",
@@ -9378,7 +9094,6 @@
         ],
         "isolate_name": "midi_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "midi_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -9430,7 +9145,6 @@
         ],
         "isolate_name": "midi_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "midi_unittests iPhone X 16.2",
@@ -9482,7 +9196,6 @@
         ],
         "isolate_name": "mojo_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -9534,7 +9247,6 @@
         ],
         "isolate_name": "mojo_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_unittests iPhone X 16.2",
@@ -9587,7 +9299,6 @@
         ],
         "isolate_name": "net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "net_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -9640,7 +9351,6 @@
         ],
         "isolate_name": "net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "net_unittests iPhone X 16.2",
@@ -9692,7 +9402,6 @@
         ],
         "isolate_name": "perfetto_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "perfetto_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -9744,7 +9453,6 @@
         ],
         "isolate_name": "perfetto_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "perfetto_unittests iPhone X 16.2",
@@ -9796,7 +9504,6 @@
         ],
         "isolate_name": "services_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "services_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -9848,7 +9555,6 @@
         ],
         "isolate_name": "services_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "services_unittests iPhone X 16.2",
@@ -9900,7 +9606,6 @@
         ],
         "isolate_name": "shell_dialogs_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "shell_dialogs_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -9952,7 +9657,6 @@
         ],
         "isolate_name": "shell_dialogs_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "shell_dialogs_unittests iPhone X 16.2",
@@ -10004,7 +9708,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -10056,7 +9759,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone X 16.2",
@@ -10108,7 +9810,6 @@
         ],
         "isolate_name": "sql_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "sql_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -10160,7 +9861,6 @@
         ],
         "isolate_name": "sql_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "sql_unittests iPhone X 16.2",
@@ -10212,7 +9912,6 @@
         ],
         "isolate_name": "storage_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "storage_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -10264,7 +9963,6 @@
         ],
         "isolate_name": "storage_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "storage_unittests iPhone X 16.2",
@@ -10316,7 +10014,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -10368,7 +10065,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone X 16.2",
@@ -10420,7 +10116,6 @@
         ],
         "isolate_name": "ui_touch_selection_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_touch_selection_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -10472,7 +10167,6 @@
         ],
         "isolate_name": "ui_touch_selection_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_touch_selection_unittests iPhone X 16.2",
@@ -10524,7 +10218,6 @@
         ],
         "isolate_name": "url_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "url_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -10576,7 +10269,6 @@
         ],
         "isolate_name": "url_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "url_unittests iPhone X 16.2",
@@ -10628,7 +10320,6 @@
         ],
         "isolate_name": "viz_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "viz_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -10680,7 +10371,6 @@
         ],
         "isolate_name": "viz_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "viz_unittests iPhone X 16.2",
@@ -10732,7 +10422,6 @@
         ],
         "isolate_name": "wtf_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "wtf_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -10784,7 +10473,6 @@
         ],
         "isolate_name": "wtf_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "wtf_unittests iPhone X 16.2",
@@ -10836,7 +10524,6 @@
         ],
         "isolate_name": "zlib_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "zlib_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -10888,7 +10575,6 @@
         ],
         "isolate_name": "zlib_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "zlib_unittests iPhone X 16.2",
@@ -10946,7 +10632,6 @@
         ],
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPad Air 2 15.5",
@@ -11001,7 +10686,6 @@
         ],
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPhone 6s 15.5",
@@ -11056,7 +10740,6 @@
         ],
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPad Air 2 15.5",
@@ -11112,7 +10795,6 @@
         ],
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPhone 6s 15.5",
@@ -11168,7 +10850,6 @@
         ],
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPad Air 2 15.5",
@@ -11224,7 +10905,6 @@
         ],
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPhone 6s 15.5",
@@ -11280,7 +10960,6 @@
         ],
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPad Air 2 15.5",
@@ -11336,7 +11015,6 @@
         ],
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPhone 6s 15.5",
@@ -11392,7 +11070,6 @@
         ],
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPad Air 2 15.5",
@@ -11447,7 +11124,6 @@
         ],
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPhone 6s 15.5",
@@ -11502,7 +11178,6 @@
         ],
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPad Air 2 15.5",
@@ -11558,7 +11233,6 @@
         ],
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPhone 6s 15.5",
@@ -11614,7 +11288,6 @@
         ],
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPad Air 2 15.5",
@@ -11670,7 +11343,6 @@
         ],
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPhone 6s 15.5",
@@ -11726,7 +11398,6 @@
         ],
         "isolate_name": "ios_showcase_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPad Air 2 15.5",
@@ -11781,7 +11452,6 @@
         ],
         "isolate_name": "ios_showcase_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPhone 6s 15.5",
@@ -11836,7 +11506,6 @@
         ],
         "isolate_name": "ios_web_shell_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPad Air 2 15.5",
@@ -11891,7 +11560,6 @@
         ],
         "isolate_name": "ios_web_shell_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPhone 6s 15.5",
@@ -11951,7 +11619,6 @@
         ],
         "isolate_name": "absl_hardening_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "absl_hardening_tests iPhone 8 16.2",
@@ -12003,7 +11670,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPad Air (3rd generation) 16.2",
@@ -12055,7 +11721,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone 8 16.2",
@@ -12107,7 +11772,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone 8 Plus 16.2",
@@ -12159,7 +11823,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone SE (3rd generation) 16.2",
@@ -12211,7 +11874,6 @@
         ],
         "isolate_name": "boringssl_crypto_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_crypto_tests iPhone 8 16.2",
@@ -12263,7 +11925,6 @@
         ],
         "isolate_name": "boringssl_ssl_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_ssl_tests iPhone 8 16.2",
@@ -12315,7 +11976,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPad Air (3rd generation) 16.2",
@@ -12367,7 +12027,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone 8 16.2",
@@ -12419,7 +12078,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone 8 Plus 16.2",
@@ -12471,7 +12129,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone SE (3rd generation) 16.2",
@@ -12523,7 +12180,6 @@
         ],
         "isolate_name": "crashpad_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crashpad_tests iPhone 8 16.2",
@@ -12575,7 +12231,6 @@
         ],
         "isolate_name": "crypto_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crypto_unittests iPhone 8 16.2",
@@ -12627,7 +12282,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPad Air (3rd generation) 16.2",
@@ -12679,7 +12333,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone 8 16.2",
@@ -12731,7 +12384,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone 8 Plus 16.2",
@@ -12783,7 +12435,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone SE (3rd generation) 16.2",
@@ -12835,7 +12486,6 @@
         ],
         "isolate_name": "google_apis_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "google_apis_unittests iPhone 8 16.2",
@@ -12890,7 +12540,6 @@
         ],
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -12945,7 +12594,6 @@
         ],
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPhone 8 16.2",
@@ -13000,7 +12648,6 @@
         ],
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPhone X 16.2",
@@ -13055,7 +12702,6 @@
         ],
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPad (6th generation) 16.2",
@@ -13111,7 +12757,6 @@
         ],
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -13167,7 +12812,6 @@
         ],
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -13223,7 +12867,6 @@
         ],
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPhone X 16.2",
@@ -13279,7 +12922,6 @@
         ],
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -13335,7 +12977,6 @@
         ],
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPhone 8 16.2",
@@ -13391,7 +13032,6 @@
         ],
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPhone X 16.2",
@@ -13447,7 +13087,6 @@
         ],
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -13503,7 +13142,6 @@
         ],
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPhone 8 16.2",
@@ -13559,7 +13197,6 @@
         ],
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPhone X 16.2",
@@ -13615,7 +13252,6 @@
         ],
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -13670,7 +13306,6 @@
         ],
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPhone 8 16.2",
@@ -13725,7 +13360,6 @@
         ],
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPhone X 16.2",
@@ -13780,7 +13414,6 @@
         ],
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -13836,7 +13469,6 @@
         ],
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPhone 8 16.2",
@@ -13892,7 +13524,6 @@
         ],
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPhone X 16.2",
@@ -13945,7 +13576,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPad Air (3rd generation) 16.2",
@@ -13997,7 +13627,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone 8 16.2",
@@ -14049,7 +13678,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone 8 Plus 16.2",
@@ -14101,7 +13729,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone SE (3rd generation) 16.2",
@@ -14156,7 +13783,6 @@
         ],
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -14212,7 +13838,6 @@
         ],
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPhone 8 16.2",
@@ -14268,7 +13893,6 @@
         ],
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPhone X 16.2",
@@ -14321,7 +13945,6 @@
         ],
         "isolate_name": "ios_components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_components_unittests iPhone 8 16.2",
@@ -14373,7 +13996,6 @@
         ],
         "isolate_name": "ios_net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_net_unittests iPhone 8 16.2",
@@ -14426,7 +14048,6 @@
         ],
         "isolate_name": "ios_remoting_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_remoting_unittests iPhone 8 16.2",
@@ -14481,7 +14102,6 @@
         ],
         "isolate_name": "ios_showcase_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -14536,7 +14156,6 @@
         ],
         "isolate_name": "ios_showcase_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPhone 8 16.2",
@@ -14591,7 +14210,6 @@
         ],
         "isolate_name": "ios_showcase_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPhone X 16.2",
@@ -14643,7 +14261,6 @@
         ],
         "isolate_name": "ios_testing_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_testing_unittests iPhone 8 16.2",
@@ -14695,7 +14312,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPad Air (3rd generation) 16.2",
@@ -14747,7 +14363,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone 8 16.2",
@@ -14799,7 +14414,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone 8 Plus 16.2",
@@ -14851,7 +14465,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone SE (3rd generation) 16.2",
@@ -14906,7 +14519,6 @@
         ],
         "isolate_name": "ios_web_shell_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPad (6th generation) 16.2",
@@ -14961,7 +14573,6 @@
         ],
         "isolate_name": "ios_web_shell_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -15016,7 +14627,6 @@
         ],
         "isolate_name": "ios_web_shell_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -15071,7 +14681,6 @@
         ],
         "isolate_name": "ios_web_shell_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPhone X 16.2",
@@ -15123,7 +14732,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPad Air (3rd generation) 16.2",
@@ -15175,7 +14783,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone 8 16.2",
@@ -15227,7 +14834,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone 8 Plus 16.2",
@@ -15279,7 +14885,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone SE (3rd generation) 16.2",
@@ -15331,7 +14936,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPad Air (3rd generation) 16.2",
@@ -15383,7 +14987,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone 8 16.2",
@@ -15435,7 +15038,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone 8 Plus 16.2",
@@ -15487,7 +15089,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone SE (3rd generation) 16.2",
@@ -15539,7 +15140,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPad Air (3rd generation) 16.2",
@@ -15591,7 +15191,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone 8 16.2",
@@ -15643,7 +15242,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone 8 Plus 16.2",
@@ -15695,7 +15293,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone SE (3rd generation) 16.2",
@@ -15747,7 +15344,6 @@
         ],
         "isolate_name": "net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "net_unittests iPhone 8 16.2",
@@ -15799,7 +15395,6 @@
         ],
         "isolate_name": "services_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "services_unittests iPhone 8 16.2",
@@ -15851,7 +15446,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPad Air (3rd generation) 16.2",
@@ -15903,7 +15497,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone 8 16.2",
@@ -15955,7 +15548,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone 8 Plus 16.2",
@@ -16007,7 +15599,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone SE (3rd generation) 16.2",
@@ -16059,7 +15650,6 @@
         ],
         "isolate_name": "sql_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "sql_unittests iPhone 8 16.2",
@@ -16111,7 +15701,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPad Air (3rd generation) 16.2",
@@ -16163,7 +15752,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone 8 16.2",
@@ -16215,7 +15803,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone 8 Plus 16.2",
@@ -16267,7 +15854,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone SE (3rd generation) 16.2",
@@ -16319,7 +15905,6 @@
         ],
         "isolate_name": "url_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "url_unittests iPhone 8 16.2",
@@ -16375,7 +15960,6 @@
         ],
         "isolate_name": "cronet_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "cronet_test iPhone X 15.5",
@@ -16431,7 +16015,6 @@
         ],
         "isolate_name": "cronet_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "cronet_test iPhone X 15.5",
@@ -16487,7 +16070,6 @@
         ],
         "isolate_name": "absl_hardening_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "absl_hardening_tests iPad Air (3rd generation) 16.2",
@@ -16539,7 +16121,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPad Air (3rd generation) 16.2",
@@ -16591,7 +16172,6 @@
         ],
         "isolate_name": "boringssl_crypto_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_crypto_tests iPad Air (3rd generation) 16.2",
@@ -16643,7 +16223,6 @@
         ],
         "isolate_name": "boringssl_ssl_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_ssl_tests iPad Air (3rd generation) 16.2",
@@ -16695,7 +16274,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPad Air (3rd generation) 16.2",
@@ -16747,7 +16325,6 @@
         ],
         "isolate_name": "crashpad_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crashpad_tests iPad Air (3rd generation) 16.2",
@@ -16799,7 +16376,6 @@
         ],
         "isolate_name": "crypto_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crypto_unittests iPad Air (3rd generation) 16.2",
@@ -16851,7 +16427,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPad Air (3rd generation) 16.2",
@@ -16903,7 +16478,6 @@
         ],
         "isolate_name": "google_apis_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "google_apis_unittests iPad Air (3rd generation) 16.2",
@@ -16956,7 +16530,6 @@
         ],
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -17009,7 +16582,6 @@
         ],
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -17063,7 +16635,6 @@
         ],
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -17117,7 +16688,6 @@
         ],
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -17171,7 +16741,6 @@
         ],
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -17224,7 +16793,6 @@
         ],
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -17277,7 +16845,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPad Air (3rd generation) 16.2",
@@ -17330,7 +16897,6 @@
         ],
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -17383,7 +16949,6 @@
         ],
         "isolate_name": "ios_components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_components_unittests iPad Air (3rd generation) 16.2",
@@ -17435,7 +17000,6 @@
         ],
         "isolate_name": "ios_net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_net_unittests iPad Air (3rd generation) 16.2",
@@ -17488,7 +17052,6 @@
         ],
         "isolate_name": "ios_remoting_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_remoting_unittests iPad Air (3rd generation) 16.2",
@@ -17541,7 +17104,6 @@
         ],
         "isolate_name": "ios_showcase_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -17593,7 +17155,6 @@
         ],
         "isolate_name": "ios_testing_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_testing_unittests iPad Air (3rd generation) 16.2",
@@ -17645,7 +17206,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPad Air (3rd generation) 16.2",
@@ -17698,7 +17258,6 @@
         ],
         "isolate_name": "ios_web_shell_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -17750,7 +17309,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPad Air (3rd generation) 16.2",
@@ -17802,7 +17360,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPad Air (3rd generation) 16.2",
@@ -17854,7 +17411,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPad Air (3rd generation) 16.2",
@@ -17906,7 +17462,6 @@
         ],
         "isolate_name": "net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "net_unittests iPad Air (3rd generation) 16.2",
@@ -17958,7 +17513,6 @@
         ],
         "isolate_name": "services_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "services_unittests iPad Air (3rd generation) 16.2",
@@ -18010,7 +17564,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPad Air (3rd generation) 16.2",
@@ -18062,7 +17615,6 @@
         ],
         "isolate_name": "sql_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "sql_unittests iPad Air (3rd generation) 16.2",
@@ -18114,7 +17666,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPad Air (3rd generation) 16.2",
@@ -18166,7 +17717,6 @@
         ],
         "isolate_name": "url_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "url_unittests iPad Air (3rd generation) 16.2",
@@ -18224,7 +17774,6 @@
         ],
         "isolate_name": "absl_hardening_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "absl_hardening_tests iPad Air (3rd generation) 16.2",
@@ -18278,7 +17827,6 @@
         ],
         "isolate_name": "absl_hardening_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "absl_hardening_tests iPhone X 16.2",
@@ -18332,7 +17880,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPad Air (3rd generation) 16.2",
@@ -18386,7 +17933,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone X 16.2",
@@ -18440,7 +17986,6 @@
         ],
         "isolate_name": "boringssl_crypto_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_crypto_tests iPad Air (3rd generation) 16.2",
@@ -18494,7 +18039,6 @@
         ],
         "isolate_name": "boringssl_crypto_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_crypto_tests iPhone X 16.2",
@@ -18548,7 +18092,6 @@
         ],
         "isolate_name": "boringssl_ssl_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_ssl_tests iPad Air (3rd generation) 16.2",
@@ -18602,7 +18145,6 @@
         ],
         "isolate_name": "boringssl_ssl_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_ssl_tests iPhone X 16.2",
@@ -18656,7 +18198,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPad Air (3rd generation) 16.2",
@@ -18710,7 +18251,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone X 16.2",
@@ -18764,7 +18304,6 @@
         ],
         "isolate_name": "crashpad_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crashpad_tests iPad Air (3rd generation) 16.2",
@@ -18818,7 +18357,6 @@
         ],
         "isolate_name": "crashpad_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crashpad_tests iPhone X 16.2",
@@ -18872,7 +18410,6 @@
         ],
         "isolate_name": "crypto_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crypto_unittests iPad Air (3rd generation) 16.2",
@@ -18926,7 +18463,6 @@
         ],
         "isolate_name": "crypto_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crypto_unittests iPhone X 16.2",
@@ -18980,7 +18516,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPad Air (3rd generation) 16.2",
@@ -19034,7 +18569,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone X 16.2",
@@ -19088,7 +18622,6 @@
         ],
         "isolate_name": "google_apis_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "google_apis_unittests iPad Air (3rd generation) 16.2",
@@ -19142,7 +18675,6 @@
         ],
         "isolate_name": "google_apis_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "google_apis_unittests iPhone X 16.2",
@@ -19197,7 +18729,6 @@
         ],
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -19252,7 +18783,6 @@
         ],
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPhone X 16.2",
@@ -19307,7 +18837,6 @@
         ],
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -19363,7 +18892,6 @@
         ],
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPhone X 16.2",
@@ -19419,7 +18947,6 @@
         ],
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -19475,7 +19002,6 @@
         ],
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPhone X 16.2",
@@ -19531,7 +19057,6 @@
         ],
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -19587,7 +19112,6 @@
         ],
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPhone X 16.2",
@@ -19643,7 +19167,6 @@
         ],
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -19698,7 +19221,6 @@
         ],
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPhone X 16.2",
@@ -19753,7 +19275,6 @@
         ],
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -19809,7 +19330,6 @@
         ],
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPhone X 16.2",
@@ -19864,7 +19384,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPad Air (3rd generation) 16.2",
@@ -19918,7 +19437,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone X 16.2",
@@ -19973,7 +19491,6 @@
         ],
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -20029,7 +19546,6 @@
         ],
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPhone X 16.2",
@@ -20084,7 +19600,6 @@
         ],
         "isolate_name": "ios_components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_components_unittests iPad Air (3rd generation) 16.2",
@@ -20138,7 +19653,6 @@
         ],
         "isolate_name": "ios_components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_components_unittests iPhone X 16.2",
@@ -20192,7 +19706,6 @@
         ],
         "isolate_name": "ios_net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_net_unittests iPad Air (3rd generation) 16.2",
@@ -20247,7 +19760,6 @@
         ],
         "isolate_name": "ios_net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_net_unittests iPhone X 16.2",
@@ -20302,7 +19814,6 @@
         ],
         "isolate_name": "ios_remoting_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_remoting_unittests iPad Air (3rd generation) 16.2",
@@ -20356,7 +19867,6 @@
         ],
         "isolate_name": "ios_remoting_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_remoting_unittests iPhone X 16.2",
@@ -20411,7 +19921,6 @@
         ],
         "isolate_name": "ios_showcase_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -20466,7 +19975,6 @@
         ],
         "isolate_name": "ios_showcase_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPhone X 16.2",
@@ -20520,7 +20028,6 @@
         ],
         "isolate_name": "ios_testing_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_testing_unittests iPad Air (3rd generation) 16.2",
@@ -20574,7 +20081,6 @@
         ],
         "isolate_name": "ios_testing_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_testing_unittests iPhone X 16.2",
@@ -20628,7 +20134,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPad Air (3rd generation) 16.2",
@@ -20682,7 +20187,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone X 16.2",
@@ -20737,7 +20241,6 @@
         ],
         "isolate_name": "ios_web_shell_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -20792,7 +20295,6 @@
         ],
         "isolate_name": "ios_web_shell_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPhone X 16.2",
@@ -20846,7 +20348,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPad Air (3rd generation) 16.2",
@@ -20900,7 +20401,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone X 16.2",
@@ -20954,7 +20454,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPad Air (3rd generation) 16.2",
@@ -21008,7 +20507,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone X 16.2",
@@ -21062,7 +20560,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPad Air (3rd generation) 16.2",
@@ -21116,7 +20613,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone X 16.2",
@@ -21170,7 +20666,6 @@
         ],
         "isolate_name": "net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "net_unittests iPad Air (3rd generation) 16.2",
@@ -21224,7 +20719,6 @@
         ],
         "isolate_name": "net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "net_unittests iPhone X 16.2",
@@ -21278,7 +20772,6 @@
         ],
         "isolate_name": "services_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "services_unittests iPad Air (3rd generation) 16.2",
@@ -21332,7 +20825,6 @@
         ],
         "isolate_name": "services_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "services_unittests iPhone X 16.2",
@@ -21386,7 +20878,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPad Air (3rd generation) 16.2",
@@ -21440,7 +20931,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone X 16.2",
@@ -21494,7 +20984,6 @@
         ],
         "isolate_name": "sql_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "sql_unittests iPad Air (3rd generation) 16.2",
@@ -21548,7 +21037,6 @@
         ],
         "isolate_name": "sql_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "sql_unittests iPhone X 16.2",
@@ -21602,7 +21090,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPad Air (3rd generation) 16.2",
@@ -21656,7 +21143,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone X 16.2",
@@ -21710,7 +21196,6 @@
         ],
         "isolate_name": "url_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "url_unittests iPad Air (3rd generation) 16.2",
@@ -21764,7 +21249,6 @@
         ],
         "isolate_name": "url_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "url_unittests iPhone X 16.2",
@@ -21886,7 +21370,6 @@
         ],
         "isolate_name": "absl_hardening_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "absl_hardening_tests iPhone X 16.4",
@@ -21938,7 +21421,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPad Air (3rd generation) 16.4",
@@ -21990,7 +21472,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -22042,7 +21523,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone SE (3rd generation) 16.4",
@@ -22094,7 +21574,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone X 16.4",
@@ -22146,7 +21625,6 @@
         ],
         "isolate_name": "boringssl_crypto_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_crypto_tests iPhone X 16.4",
@@ -22198,7 +21676,6 @@
         ],
         "isolate_name": "boringssl_ssl_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_ssl_tests iPhone X 16.4",
@@ -22250,7 +21727,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPad Air (3rd generation) 16.4",
@@ -22302,7 +21778,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -22354,7 +21829,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone SE (3rd generation) 16.4",
@@ -22406,7 +21880,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone X 16.4",
@@ -22458,7 +21931,6 @@
         ],
         "isolate_name": "crashpad_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crashpad_tests iPhone X 16.4",
@@ -22510,7 +21982,6 @@
         ],
         "isolate_name": "crypto_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crypto_unittests iPhone X 16.4",
@@ -22562,7 +22033,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPad Air (3rd generation) 16.4",
@@ -22614,7 +22084,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -22666,7 +22135,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone SE (3rd generation) 16.4",
@@ -22718,7 +22186,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone X 16.4",
@@ -22770,7 +22237,6 @@
         ],
         "isolate_name": "google_apis_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "google_apis_unittests iPhone X 16.4",
@@ -22825,7 +22291,6 @@
         ],
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPad (6th generation) 16.4",
@@ -22880,7 +22345,6 @@
         ],
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPad Air (3rd generation) 16.4",
@@ -22935,7 +22399,6 @@
         ],
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -22990,7 +22453,6 @@
         ],
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPhone X 16.4",
@@ -23045,7 +22507,6 @@
         ],
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPad (6th generation) 16.4",
@@ -23101,7 +22562,6 @@
         ],
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -23157,7 +22617,6 @@
         ],
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPhone X 16.4",
@@ -23213,7 +22672,6 @@
         ],
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPad (6th generation) 16.4",
@@ -23269,7 +22727,6 @@
         ],
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPad Air (3rd generation) 16.4",
@@ -23325,7 +22782,6 @@
         ],
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -23381,7 +22837,6 @@
         ],
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPhone X 16.4",
@@ -23437,7 +22892,6 @@
         ],
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPad (6th generation) 16.4",
@@ -23493,7 +22947,6 @@
         ],
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPad Air (3rd generation) 16.4",
@@ -23549,7 +23002,6 @@
         ],
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -23605,7 +23057,6 @@
         ],
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPhone X 16.4",
@@ -23661,7 +23112,6 @@
         ],
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPad (6th generation) 16.4",
@@ -23716,7 +23166,6 @@
         ],
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPad Air (3rd generation) 16.4",
@@ -23771,7 +23220,6 @@
         ],
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -23826,7 +23274,6 @@
         ],
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPhone X 16.4",
@@ -23881,7 +23328,6 @@
         ],
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPad (6th generation) 16.4",
@@ -23937,7 +23383,6 @@
         ],
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPad Air (3rd generation) 16.4",
@@ -23993,7 +23438,6 @@
         ],
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -24049,7 +23493,6 @@
         ],
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPhone X 16.4",
@@ -24102,7 +23545,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPad Air (3rd generation) 16.4",
@@ -24154,7 +23596,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -24206,7 +23647,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone SE (3rd generation) 16.4",
@@ -24258,7 +23698,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone X 16.4",
@@ -24313,7 +23752,6 @@
         ],
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPad (6th generation) 16.4",
@@ -24369,7 +23807,6 @@
         ],
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPad Air (3rd generation) 16.4",
@@ -24425,7 +23862,6 @@
         ],
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -24481,7 +23917,6 @@
         ],
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPhone X 16.4",
@@ -24534,7 +23969,6 @@
         ],
         "isolate_name": "ios_components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_components_unittests iPhone X 16.4",
@@ -24587,7 +24021,6 @@
         ],
         "isolate_name": "ios_crash_xcuitests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_crash_xcuitests_module iPhone X 16.4",
@@ -24639,7 +24072,6 @@
         ],
         "isolate_name": "ios_net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_net_unittests iPhone X 16.4",
@@ -24692,7 +24124,6 @@
         ],
         "isolate_name": "ios_remoting_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_remoting_unittests iPhone X 16.4",
@@ -24747,7 +24178,6 @@
         ],
         "isolate_name": "ios_showcase_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPad (6th generation) 16.4",
@@ -24802,7 +24232,6 @@
         ],
         "isolate_name": "ios_showcase_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPad Air (3rd generation) 16.4",
@@ -24857,7 +24286,6 @@
         ],
         "isolate_name": "ios_showcase_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -24912,7 +24340,6 @@
         ],
         "isolate_name": "ios_showcase_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPhone X 16.4",
@@ -24965,7 +24392,6 @@
         ],
         "isolate_name": "ios_swift_interop_xcuitests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_swift_interop_xcuitests_module iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -25018,7 +24444,6 @@
         ],
         "isolate_name": "ios_swift_interop_xcuitests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_swift_interop_xcuitests_module iPhone X 16.4",
@@ -25070,7 +24495,6 @@
         ],
         "isolate_name": "ios_testing_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_testing_unittests iPhone X 16.4",
@@ -25122,7 +24546,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPad Air (3rd generation) 16.4",
@@ -25174,7 +24597,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -25226,7 +24648,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone SE (3rd generation) 16.4",
@@ -25278,7 +24699,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone X 16.4",
@@ -25333,7 +24753,6 @@
         ],
         "isolate_name": "ios_web_shell_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPad (6th generation) 16.4",
@@ -25388,7 +24807,6 @@
         ],
         "isolate_name": "ios_web_shell_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -25443,7 +24861,6 @@
         ],
         "isolate_name": "ios_web_shell_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPhone X 16.4",
@@ -25495,7 +24912,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPad Air (3rd generation) 16.4",
@@ -25547,7 +24963,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -25599,7 +25014,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone SE (3rd generation) 16.4",
@@ -25651,7 +25065,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone X 16.4",
@@ -25703,7 +25116,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPad Air (3rd generation) 16.4",
@@ -25755,7 +25167,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -25807,7 +25218,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone SE (3rd generation) 16.4",
@@ -25859,7 +25269,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone X 16.4",
@@ -25911,7 +25320,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPad Air (3rd generation) 16.4",
@@ -25963,7 +25371,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -26015,7 +25422,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone SE (3rd generation) 16.4",
@@ -26067,7 +25473,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone X 16.4",
@@ -26119,7 +25524,6 @@
         ],
         "isolate_name": "net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "net_unittests iPhone X 16.4",
@@ -26171,7 +25575,6 @@
         ],
         "isolate_name": "services_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "services_unittests iPhone X 16.4",
@@ -26223,7 +25626,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPad Air (3rd generation) 16.4",
@@ -26275,7 +25677,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -26327,7 +25728,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone SE (3rd generation) 16.4",
@@ -26379,7 +25779,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone X 16.4",
@@ -26431,7 +25830,6 @@
         ],
         "isolate_name": "sql_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "sql_unittests iPhone X 16.4",
@@ -26483,7 +25881,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPad Air (3rd generation) 16.4",
@@ -26535,7 +25932,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -26587,7 +25983,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone SE (3rd generation) 16.4",
@@ -26639,7 +26034,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone X 16.4",
@@ -26691,7 +26085,6 @@
         ],
         "isolate_name": "url_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "url_unittests iPhone X 16.4",
@@ -26757,7 +26150,6 @@
         ],
         "isolate_name": "absl_hardening_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "absl_hardening_tests iPhone X 16.4",
@@ -26811,7 +26203,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPad Air (3rd generation) 16.4",
@@ -26865,7 +26256,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -26919,7 +26309,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone SE (3rd generation) 16.4",
@@ -26973,7 +26362,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone X 16.4",
@@ -27027,7 +26415,6 @@
         ],
         "isolate_name": "boringssl_crypto_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_crypto_tests iPhone X 16.4",
@@ -27081,7 +26468,6 @@
         ],
         "isolate_name": "boringssl_ssl_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_ssl_tests iPhone X 16.4",
@@ -27135,7 +26521,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPad Air (3rd generation) 16.4",
@@ -27189,7 +26574,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -27243,7 +26627,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone SE (3rd generation) 16.4",
@@ -27297,7 +26680,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone X 16.4",
@@ -27351,7 +26733,6 @@
         ],
         "isolate_name": "crashpad_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crashpad_tests iPhone X 16.4",
@@ -27405,7 +26786,6 @@
         ],
         "isolate_name": "crypto_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crypto_unittests iPhone X 16.4",
@@ -27459,7 +26839,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPad Air (3rd generation) 16.4",
@@ -27513,7 +26892,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -27567,7 +26945,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone SE (3rd generation) 16.4",
@@ -27621,7 +26998,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone X 16.4",
@@ -27675,7 +27051,6 @@
         ],
         "isolate_name": "google_apis_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "google_apis_unittests iPhone X 16.4",
@@ -27730,7 +27105,6 @@
         ],
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPad Air (3rd generation) 16.4",
@@ -27785,7 +27159,6 @@
         ],
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -27840,7 +27213,6 @@
         ],
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPhone X 16.4",
@@ -27895,7 +27267,6 @@
         ],
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPad Air (3rd generation) 16.4",
@@ -27951,7 +27322,6 @@
         ],
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -28007,7 +27377,6 @@
         ],
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPhone X 16.4",
@@ -28063,7 +27432,6 @@
         ],
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPad Air (3rd generation) 16.4",
@@ -28119,7 +27487,6 @@
         ],
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -28175,7 +27542,6 @@
         ],
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPhone X 16.4",
@@ -28231,7 +27597,6 @@
         ],
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPad Air (3rd generation) 16.4",
@@ -28287,7 +27652,6 @@
         ],
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -28343,7 +27707,6 @@
         ],
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPhone X 16.4",
@@ -28399,7 +27762,6 @@
         ],
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPad Air (3rd generation) 16.4",
@@ -28454,7 +27816,6 @@
         ],
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -28509,7 +27870,6 @@
         ],
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPhone X 16.4",
@@ -28564,7 +27924,6 @@
         ],
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPad Air (3rd generation) 16.4",
@@ -28620,7 +27979,6 @@
         ],
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -28676,7 +28034,6 @@
         ],
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPhone X 16.4",
@@ -28731,7 +28088,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPad Air (3rd generation) 16.4",
@@ -28785,7 +28141,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -28839,7 +28194,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone SE (3rd generation) 16.4",
@@ -28893,7 +28247,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone X 16.4",
@@ -28948,7 +28301,6 @@
         ],
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPad Air (3rd generation) 16.4",
@@ -29004,7 +28356,6 @@
         ],
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -29060,7 +28411,6 @@
         ],
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPhone X 16.4",
@@ -29115,7 +28465,6 @@
         ],
         "isolate_name": "ios_components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_components_unittests iPhone X 16.4",
@@ -29170,7 +28519,6 @@
         ],
         "isolate_name": "ios_crash_xcuitests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_crash_xcuitests_module iPhone X 16.4",
@@ -29224,7 +28572,6 @@
         ],
         "isolate_name": "ios_net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_net_unittests iPhone X 16.4",
@@ -29279,7 +28626,6 @@
         ],
         "isolate_name": "ios_remoting_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_remoting_unittests iPhone X 16.4",
@@ -29334,7 +28680,6 @@
         ],
         "isolate_name": "ios_showcase_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPad Air (3rd generation) 16.4",
@@ -29389,7 +28734,6 @@
         ],
         "isolate_name": "ios_showcase_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -29444,7 +28788,6 @@
         ],
         "isolate_name": "ios_showcase_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPhone X 16.4",
@@ -29499,7 +28842,6 @@
         ],
         "isolate_name": "ios_swift_interop_xcuitests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_swift_interop_xcuitests_module iPad Air (3rd generation) 16.4",
@@ -29554,7 +28896,6 @@
         ],
         "isolate_name": "ios_swift_interop_xcuitests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_swift_interop_xcuitests_module iPhone X 16.4",
@@ -29608,7 +28949,6 @@
         ],
         "isolate_name": "ios_testing_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_testing_unittests iPhone X 16.4",
@@ -29662,7 +29002,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPad Air (3rd generation) 16.4",
@@ -29716,7 +29055,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -29770,7 +29108,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone SE (3rd generation) 16.4",
@@ -29824,7 +29161,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone X 16.4",
@@ -29879,7 +29215,6 @@
         ],
         "isolate_name": "ios_web_shell_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPad Air (3rd generation) 16.4",
@@ -29934,7 +29269,6 @@
         ],
         "isolate_name": "ios_web_shell_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -29989,7 +29323,6 @@
         ],
         "isolate_name": "ios_web_shell_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPhone X 16.4",
@@ -30043,7 +29376,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPad Air (3rd generation) 16.4",
@@ -30097,7 +29429,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -30151,7 +29482,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone SE (3rd generation) 16.4",
@@ -30205,7 +29535,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone X 16.4",
@@ -30259,7 +29588,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPad Air (3rd generation) 16.4",
@@ -30313,7 +29641,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -30367,7 +29694,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone SE (3rd generation) 16.4",
@@ -30421,7 +29747,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone X 16.4",
@@ -30475,7 +29800,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPad Air (3rd generation) 16.4",
@@ -30529,7 +29853,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -30583,7 +29906,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone SE (3rd generation) 16.4",
@@ -30637,7 +29959,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone X 16.4",
@@ -30691,7 +30012,6 @@
         ],
         "isolate_name": "net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "net_unittests iPhone X 16.4",
@@ -30745,7 +30065,6 @@
         ],
         "isolate_name": "services_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "services_unittests iPhone X 16.4",
@@ -30799,7 +30118,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPad Air (3rd generation) 16.4",
@@ -30853,7 +30171,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -30907,7 +30224,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone SE (3rd generation) 16.4",
@@ -30961,7 +30277,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone X 16.4",
@@ -31015,7 +30330,6 @@
         ],
         "isolate_name": "sql_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "sql_unittests iPhone X 16.4",
@@ -31069,7 +30383,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPad Air (3rd generation) 16.4",
@@ -31123,7 +30436,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPad Pro (12.9-inch) (3rd generation) 16.4",
@@ -31177,7 +30489,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone SE (3rd generation) 16.4",
@@ -31231,7 +30542,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone X 16.4",
@@ -31285,7 +30595,6 @@
         ],
         "isolate_name": "url_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "url_unittests iPhone X 16.4",
@@ -31341,7 +30650,6 @@
           "--use-vm"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "aura_unittests amd64-generic",
@@ -31366,7 +30674,6 @@
           "--flash"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "aura_unittests eve",
@@ -31393,7 +30700,6 @@
           "--use-vm"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "cc_unittests amd64-generic",
@@ -31418,7 +30724,6 @@
           "--flash"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "cc_unittests eve",
@@ -31445,7 +30750,6 @@
           "--use-vm"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_all_tast_tests_informational amd64-generic",
@@ -31475,7 +30779,6 @@
           "--flash"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_all_tast_tests_informational eve",
@@ -31507,7 +30810,6 @@
           "--use-vm"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_fyi_tast_tests amd64-generic",
@@ -31537,7 +30839,6 @@
           "--flash"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_fyi_tast_tests eve",
@@ -31569,7 +30870,6 @@
           "--use-vm"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "ozone_unittests amd64-generic",
@@ -31594,7 +30894,6 @@
           "--flash"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "ozone_unittests eve",
@@ -31630,7 +30929,6 @@
         ],
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "vaapi_unittest amd64-generic",
@@ -31664,7 +30962,6 @@
         ],
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "vaapi_unittest eve",
@@ -31845,7 +31142,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31866,7 +31162,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31887,7 +31182,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31908,7 +31202,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -31930,7 +31223,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31951,7 +31243,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31972,7 +31263,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -31993,7 +31283,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32015,7 +31304,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32036,7 +31324,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32057,7 +31344,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32082,7 +31368,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32099,7 +31384,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -32117,7 +31401,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32134,7 +31417,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32151,7 +31433,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32168,7 +31449,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32185,7 +31465,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -32203,7 +31482,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32220,7 +31498,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32240,7 +31517,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32257,7 +31533,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32274,7 +31549,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32291,7 +31565,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32308,7 +31581,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32326,7 +31598,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32343,7 +31614,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32360,7 +31630,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32377,7 +31646,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32394,7 +31662,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32411,7 +31678,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32428,7 +31694,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32445,7 +31710,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32462,7 +31726,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32479,7 +31742,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32496,7 +31758,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32513,7 +31774,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32530,7 +31790,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32547,7 +31806,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32564,7 +31822,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32581,7 +31838,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32598,7 +31854,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32615,7 +31870,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32632,7 +31886,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32649,7 +31902,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32666,7 +31918,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32683,7 +31934,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32700,7 +31950,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32717,7 +31966,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32734,7 +31982,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32751,7 +31998,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32768,7 +32014,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32785,7 +32030,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32882,7 +32126,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32899,7 +32142,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -32917,7 +32159,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32934,7 +32175,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32951,7 +32191,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32968,7 +32207,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -32985,7 +32223,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -33003,7 +32240,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33020,7 +32256,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33040,7 +32275,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33057,7 +32291,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33074,7 +32307,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33091,7 +32323,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33108,7 +32339,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33126,7 +32356,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33143,7 +32372,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33160,7 +32388,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33177,7 +32404,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33194,7 +32420,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33211,7 +32436,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33228,7 +32452,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33245,7 +32468,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33262,7 +32484,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33279,7 +32500,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33296,7 +32516,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33313,7 +32532,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33330,7 +32548,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33347,7 +32564,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33364,7 +32580,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33381,7 +32596,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33398,7 +32612,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33415,7 +32628,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33432,7 +32644,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33449,7 +32660,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33466,7 +32676,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33483,7 +32692,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33500,7 +32708,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33517,7 +32724,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33534,7 +32740,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33551,7 +32756,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33568,7 +32772,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33585,7 +32788,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33771,7 +32973,6 @@
           "--disable-field-trial-config"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "browser_tests_no_field_trial",
@@ -33793,7 +32994,6 @@
           "--disable-field-trial-config"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "components_browsertests_no_field_trial",
@@ -33814,7 +33014,6 @@
           "--disable-field-trial-config"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests_no_field_trial",
@@ -33835,7 +33034,6 @@
           "--disable-field-trial-config"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "sync_integration_tests_no_field_trial",
@@ -33857,7 +33055,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33874,7 +33071,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33900,7 +33096,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33918,7 +33113,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33936,7 +33130,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33954,7 +33147,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33972,7 +33164,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -33990,7 +33181,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34008,7 +33198,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34026,7 +33215,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34044,7 +33232,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34062,7 +33249,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -34081,7 +33267,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34099,7 +33284,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34117,7 +33301,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34139,7 +33322,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34157,7 +33339,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34175,7 +33356,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34193,7 +33373,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34211,7 +33390,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34229,7 +33407,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34247,7 +33424,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34265,7 +33441,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34283,7 +33458,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34301,7 +33475,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34319,7 +33492,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34338,7 +33510,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34356,7 +33527,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34374,7 +33544,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34392,7 +33561,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34410,7 +33578,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34428,7 +33595,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34446,7 +33612,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34467,7 +33632,6 @@
           "--gtest_filter=-BluetoothShellApiTest.ApiSanityCheck:BluetoothSocketApiTest.Listen:BluetoothSocketApiTest.PermissionDenied"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34488,7 +33652,6 @@
           "--gtest_filter=-NativeExtensionBindingsSystemUnittest*:BluetoothSocketApiUnittest.CreateThenClose:FeatureProviderTest.PermissionFeatureAvailability"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34506,7 +33669,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34524,7 +33686,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34542,7 +33703,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34560,7 +33720,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34578,7 +33737,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34596,7 +33754,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34614,7 +33771,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34632,7 +33788,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34656,7 +33811,6 @@
         ],
         "description": "Run with ash-chrome version 113.0.5672.21",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash beta",
@@ -34685,11 +33839,10 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5700.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5701.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5700.0",
+        "description": "Run with ash-chrome version 114.0.5701.0",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash canary",
@@ -34698,8 +33851,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5700.0",
-              "revision": "version:114.0.5700.0"
+              "location": "lacros_version_skew_tests_v114.0.5701.0",
+              "revision": "version:114.0.5701.0"
             }
           ],
           "dimension_sets": [
@@ -34722,7 +33875,6 @@
         ],
         "description": "Run with ash-chrome version 114.0.5692.0",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash dev",
@@ -34755,7 +33907,6 @@
         ],
         "description": "Run with ash-chrome version 112.0.5615.62",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash stable",
@@ -34783,7 +33934,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -34804,7 +33954,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests",
@@ -34828,7 +33977,6 @@
         ],
         "description": "Run with ash-chrome version 113.0.5672.21",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash beta",
@@ -34856,11 +34004,10 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5700.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5701.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5700.0",
+        "description": "Run with ash-chrome version 114.0.5701.0",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash canary",
@@ -34869,8 +34016,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5700.0",
-              "revision": "version:114.0.5700.0"
+              "location": "lacros_version_skew_tests_v114.0.5701.0",
+              "revision": "version:114.0.5701.0"
             }
           ],
           "dimension_sets": [
@@ -34892,7 +34039,6 @@
         ],
         "description": "Run with ash-chrome version 114.0.5692.0",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash dev",
@@ -34924,7 +34070,6 @@
         ],
         "description": "Run with ash-chrome version 112.0.5615.62",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash stable",
@@ -34954,7 +34099,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series",
@@ -34979,7 +34123,6 @@
         ],
         "description": "Run with ash-chrome version 113.0.5672.21",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash beta",
@@ -35008,11 +34151,10 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5700.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5701.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5700.0",
+        "description": "Run with ash-chrome version 114.0.5701.0",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash canary",
@@ -35021,8 +34163,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5700.0",
-              "revision": "version:114.0.5700.0"
+              "location": "lacros_version_skew_tests_v114.0.5701.0",
+              "revision": "version:114.0.5701.0"
             }
           ],
           "dimension_sets": [
@@ -35045,7 +34187,6 @@
         ],
         "description": "Run with ash-chrome version 114.0.5692.0",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash dev",
@@ -35078,7 +34219,6 @@
         ],
         "description": "Run with ash-chrome version 112.0.5615.62",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash stable",
@@ -35106,7 +34246,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35124,7 +34263,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35142,7 +34280,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35160,7 +34297,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35178,7 +34314,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35196,7 +34331,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35214,7 +34348,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35232,7 +34365,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35250,7 +34382,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35268,7 +34399,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35286,7 +34416,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35304,7 +34433,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35322,7 +34450,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35340,7 +34467,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35358,7 +34484,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35376,7 +34501,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35394,7 +34518,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35412,7 +34535,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35430,7 +34552,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35448,7 +34569,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35466,7 +34586,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35484,7 +34603,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35502,7 +34620,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35520,7 +34637,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35538,7 +34654,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35556,7 +34671,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35574,7 +34688,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35592,7 +34705,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35610,7 +34722,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35628,7 +34739,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35649,7 +34759,6 @@
           "--gtest_filter=-DesktopWidgetFocusManagerTest.AnchoredDialogInDesktopNativeWidgetAura:TextfieldTest*:"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35667,7 +34776,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35685,7 +34793,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35703,7 +34810,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35721,7 +34827,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35748,7 +34853,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35766,7 +34870,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35784,7 +34887,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35802,7 +34904,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35820,7 +34921,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35838,7 +34938,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35856,7 +34955,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35874,7 +34972,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35892,7 +34989,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35910,7 +35006,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -35929,7 +35024,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35947,7 +35041,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35965,7 +35058,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35987,7 +35079,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36005,7 +35096,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36023,7 +35113,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36041,7 +35130,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36059,7 +35147,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36077,7 +35164,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36095,7 +35181,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36113,7 +35198,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36131,7 +35215,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36149,7 +35232,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36168,7 +35250,6 @@
       {
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36187,7 +35268,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36205,7 +35285,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36223,7 +35302,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36241,7 +35319,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36259,7 +35336,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36277,7 +35353,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36295,7 +35370,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36313,7 +35387,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36331,7 +35404,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36349,7 +35421,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36367,7 +35438,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36385,7 +35455,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36403,7 +35472,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36421,7 +35489,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36439,7 +35506,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36457,7 +35523,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36475,7 +35540,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36499,7 +35563,6 @@
         ],
         "description": "Run with ash-chrome version 113.0.5672.21",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash beta",
@@ -36528,11 +35591,10 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5700.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5701.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5700.0",
+        "description": "Run with ash-chrome version 114.0.5701.0",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash canary",
@@ -36541,8 +35603,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5700.0",
-              "revision": "version:114.0.5700.0"
+              "location": "lacros_version_skew_tests_v114.0.5701.0",
+              "revision": "version:114.0.5701.0"
             }
           ],
           "dimension_sets": [
@@ -36565,7 +35627,6 @@
         ],
         "description": "Run with ash-chrome version 114.0.5692.0",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash dev",
@@ -36598,7 +35659,6 @@
         ],
         "description": "Run with ash-chrome version 112.0.5615.62",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash stable",
@@ -36626,7 +35686,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36647,7 +35706,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests",
@@ -36671,7 +35729,6 @@
         ],
         "description": "Run with ash-chrome version 113.0.5672.21",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash beta",
@@ -36699,11 +35756,10 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5700.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5701.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5700.0",
+        "description": "Run with ash-chrome version 114.0.5701.0",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash canary",
@@ -36712,8 +35768,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5700.0",
-              "revision": "version:114.0.5700.0"
+              "location": "lacros_version_skew_tests_v114.0.5701.0",
+              "revision": "version:114.0.5701.0"
             }
           ],
           "dimension_sets": [
@@ -36735,7 +35791,6 @@
         ],
         "description": "Run with ash-chrome version 114.0.5692.0",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash dev",
@@ -36767,7 +35822,6 @@
         ],
         "description": "Run with ash-chrome version 112.0.5615.62",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash stable",
@@ -36797,7 +35851,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series",
@@ -36822,7 +35875,6 @@
         ],
         "description": "Run with ash-chrome version 113.0.5672.21",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash beta",
@@ -36851,11 +35903,10 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5700.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5701.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5700.0",
+        "description": "Run with ash-chrome version 114.0.5701.0",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash canary",
@@ -36864,8 +35915,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5700.0",
-              "revision": "version:114.0.5700.0"
+              "location": "lacros_version_skew_tests_v114.0.5701.0",
+              "revision": "version:114.0.5701.0"
             }
           ],
           "dimension_sets": [
@@ -36888,7 +35939,6 @@
         ],
         "description": "Run with ash-chrome version 114.0.5692.0",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash dev",
@@ -36921,7 +35971,6 @@
         ],
         "description": "Run with ash-chrome version 112.0.5615.62",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash stable",
@@ -36949,7 +35998,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36967,7 +36015,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -36985,7 +36032,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37003,7 +36049,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37021,7 +36066,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37039,7 +36083,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37057,7 +36100,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37075,7 +36117,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37093,7 +36134,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37111,7 +36151,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37129,7 +36168,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37147,7 +36185,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37165,7 +36202,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37183,7 +36219,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37201,7 +36236,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37219,7 +36253,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37237,7 +36270,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37255,7 +36287,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37273,7 +36304,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37291,7 +36321,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37309,7 +36338,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37327,7 +36355,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37345,7 +36372,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37363,7 +36389,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37381,7 +36406,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37399,7 +36423,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37417,7 +36440,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37435,7 +36457,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37453,7 +36474,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37471,7 +36491,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37489,7 +36508,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37507,7 +36525,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37525,7 +36542,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37543,7 +36559,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37561,7 +36576,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37591,7 +36605,6 @@
         ],
         "description": "Run with ash-chrome version 113.0.5672.21",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash beta",
@@ -37619,11 +36632,10 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5700.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5701.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5700.0",
+        "description": "Run with ash-chrome version 114.0.5701.0",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash canary",
@@ -37632,8 +36644,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5700.0",
-              "revision": "version:114.0.5700.0"
+              "location": "lacros_version_skew_tests_v114.0.5701.0",
+              "revision": "version:114.0.5701.0"
             }
           ],
           "dimension_sets": [
@@ -37655,7 +36667,6 @@
         ],
         "description": "Run with ash-chrome version 114.0.5692.0",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash dev",
@@ -37687,7 +36698,6 @@
         ],
         "description": "Run with ash-chrome version 112.0.5615.62",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash stable",
@@ -37721,7 +36731,6 @@
           "--enable-features=NetworkServiceSandbox"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "browser_tests_network_sandbox",
@@ -37743,7 +36752,6 @@
           "--enable-features=NetworkServiceSandbox"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "components_browsertests_network_sandbox",
@@ -37764,7 +36772,6 @@
           "--enable-features=NetworkServiceSandbox"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "content_browsertests_network_sandbox",
@@ -37786,7 +36793,6 @@
           "--enable-features=NetworkServiceSandbox"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests_network_sandbox",
@@ -37808,7 +36814,6 @@
           "--enable-features=NetworkServiceSandbox"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "sync_integration_tests_network_sandbox",
@@ -37833,7 +36838,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37853,7 +36857,6 @@
           "--gtest_filter=ChromeTracingDelegateBrowserTest.*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37870,7 +36873,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37888,7 +36890,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37905,7 +36906,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37927,7 +36927,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37947,7 +36946,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -37967,7 +36965,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -37988,7 +36985,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38008,7 +37004,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38028,7 +37023,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38048,7 +37042,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38068,7 +37061,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38088,7 +37080,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38108,7 +37099,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38128,7 +37118,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -38149,7 +37138,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38169,7 +37157,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38189,7 +37176,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38213,7 +37199,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38233,7 +37218,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38253,7 +37237,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38273,7 +37256,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38293,7 +37275,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38313,7 +37294,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38333,7 +37313,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38353,7 +37332,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38373,7 +37351,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38393,7 +37370,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38414,7 +37390,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38434,7 +37409,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38454,7 +37428,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38474,7 +37447,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38494,7 +37466,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38514,7 +37485,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38534,7 +37504,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38554,7 +37523,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38574,7 +37542,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38594,7 +37561,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38614,7 +37580,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38634,7 +37599,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38654,7 +37618,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38674,7 +37637,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38694,7 +37656,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38714,7 +37675,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38734,7 +37694,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38754,7 +37713,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38774,7 +37732,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38794,7 +37751,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38814,7 +37770,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38835,7 +37790,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38855,7 +37809,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38875,7 +37828,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38895,7 +37847,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38915,7 +37866,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38935,7 +37885,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38955,7 +37904,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38975,7 +37923,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -38995,7 +37942,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39015,7 +37961,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39035,7 +37980,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39055,7 +37999,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39075,7 +38018,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39095,7 +38037,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39115,7 +38056,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39135,7 +38075,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39155,7 +38094,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39175,7 +38113,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39195,7 +38132,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39215,7 +38151,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39235,7 +38170,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39255,7 +38189,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39275,7 +38208,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39295,7 +38227,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39315,7 +38246,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39335,7 +38265,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39355,7 +38284,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39375,7 +38303,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39395,7 +38322,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39415,7 +38341,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39435,7 +38360,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39455,7 +38379,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39475,7 +38398,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39495,7 +38417,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39515,7 +38436,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39535,7 +38455,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39555,7 +38474,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39575,7 +38493,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -39596,7 +38513,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -39619,7 +38535,6 @@
         "isolate_name": "blink_python_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -39643,7 +38558,6 @@
         "isolate_name": "blink_pytype",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_pytype",
@@ -39750,7 +38664,6 @@
         "isolate_name": "chromedriver_py_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -39774,7 +38687,6 @@
         "isolate_name": "chromedriver_replay_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -39795,7 +38707,6 @@
         "isolate_name": "content_shell_crash_test",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -39820,7 +38731,6 @@
         "isolate_name": "flatbuffers_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -39845,7 +38755,6 @@
         "isolate_name": "fuchsia_pytype",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "fuchsia_pytype",
@@ -39870,7 +38779,6 @@
         "isolate_name": "gold_common_pytype",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gold_common_pytype",
@@ -39895,7 +38803,6 @@
         "isolate_name": "gpu_pytype",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_pytype",
@@ -39920,7 +38827,6 @@
         "isolate_name": "grit_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -40025,7 +38931,6 @@
         "isolate_name": "mojo_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -40129,7 +39034,6 @@
         "isolate_name": "telemetry_gpu_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -40159,7 +39063,6 @@
         "isolate_name": "telemetry_perf_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -40189,7 +39092,6 @@
         "isolate_name": "telemetry_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -40215,7 +39117,6 @@
         "isolate_name": "testing_pytype",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "testing_pytype",
@@ -40336,7 +39237,6 @@
       {
         "isolate_name": "upload_trace_processor",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "upload_trace_processor",
@@ -40620,7 +39520,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40641,7 +39540,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40662,7 +39560,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40683,7 +39580,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -40705,7 +39601,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40726,7 +39621,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40747,7 +39641,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40768,7 +39661,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40790,7 +39682,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40811,7 +39702,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40832,7 +39722,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40857,7 +39746,6 @@
           "--disable-field-trial-config"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "browser_tests_no_field_trial",
@@ -40881,7 +39769,6 @@
           "--disable-field-trial-config"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "components_browsertests_no_field_trial",
@@ -40904,7 +39791,6 @@
           "--disable-field-trial-config"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests_no_field_trial",
@@ -40927,7 +39813,6 @@
           "--disable-field-trial-config"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "sync_integration_tests_no_field_trial",
@@ -40956,7 +39841,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40975,7 +39859,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -40994,7 +39877,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -41014,7 +39896,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41033,7 +39914,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41052,7 +39932,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41071,7 +39950,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41090,7 +39968,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41109,7 +39986,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41128,7 +40004,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -41148,7 +40023,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41167,7 +40041,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41186,7 +40059,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41209,7 +40081,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41228,7 +40099,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41247,7 +40117,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41266,7 +40135,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41285,7 +40153,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41304,7 +40171,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41323,7 +40189,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41342,7 +40207,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41361,7 +40225,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41381,7 +40244,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41400,7 +40262,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41420,7 +40281,6 @@
       {
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41439,7 +40299,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41458,7 +40317,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41477,7 +40335,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41496,7 +40353,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41515,7 +40371,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41534,7 +40389,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41553,7 +40407,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41572,7 +40425,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41591,7 +40443,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41610,7 +40461,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41629,7 +40479,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41648,7 +40497,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41667,7 +40515,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41686,7 +40533,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41705,7 +40551,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41724,7 +40569,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41743,7 +40587,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41763,7 +40606,6 @@
       {
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41783,7 +40625,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41802,7 +40643,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41821,7 +40661,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41840,7 +40679,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41859,7 +40697,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41878,7 +40715,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41897,7 +40733,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41916,7 +40751,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41935,7 +40769,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41954,7 +40787,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41973,7 +40805,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -41992,7 +40823,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42011,7 +40841,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42030,7 +40859,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42049,7 +40877,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42068,7 +40895,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42087,7 +40913,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42106,7 +40931,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42125,7 +40949,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42144,7 +40967,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42163,7 +40985,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42182,7 +41003,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42201,7 +41021,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42220,7 +41039,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42239,7 +41057,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42258,7 +41075,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42277,7 +41093,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42296,7 +41111,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42315,7 +41129,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42334,7 +41147,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42353,7 +41165,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42372,7 +41183,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42391,7 +41201,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42410,7 +41219,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42429,7 +41237,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -42449,7 +41256,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42471,7 +41277,6 @@
       {
         "isolate_name": "blink_python_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -42574,7 +41379,6 @@
         "check_flakiness_for_new_tests": false,
         "isolate_name": "chromedriver_py_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -42597,7 +41401,6 @@
       {
         "isolate_name": "chromedriver_replay_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -42642,7 +41445,6 @@
       {
         "isolate_name": "content_shell_crash_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -42666,7 +41468,6 @@
       {
         "isolate_name": "flatbuffers_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -42690,7 +41491,6 @@
       {
         "isolate_name": "grit_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -42713,7 +41513,6 @@
       {
         "isolate_name": "mac_signing_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mac_signing_tests",
@@ -42733,7 +41532,6 @@
       {
         "isolate_name": "mojo_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -42756,7 +41554,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -42783,7 +41580,6 @@
         ],
         "isolate_name": "telemetry_perf_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -42812,7 +41608,6 @@
         ],
         "isolate_name": "telemetry_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -42868,7 +41663,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42889,7 +41683,6 @@
           "--gtest_filter=ChromeTracingDelegateBrowserTest.*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42907,7 +41700,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42926,7 +41718,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42944,7 +41735,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42970,7 +41760,6 @@
       {
         "isolate_name": "upload_trace_processor",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "upload_trace_processor",
@@ -43216,7 +42005,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43237,7 +42025,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43258,7 +42045,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43279,7 +42065,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -43301,7 +42086,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43322,7 +42106,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43343,7 +42126,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43364,7 +42146,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43386,7 +42167,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43407,7 +42187,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43428,7 +42207,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43453,7 +42231,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43474,7 +42251,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43495,7 +42271,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43516,7 +42291,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -43538,7 +42312,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43559,7 +42332,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43580,7 +42352,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43601,7 +42372,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43623,7 +42393,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43644,7 +42413,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43665,7 +42433,6 @@
           "--enable-features=PartitionAllocBackupRefPtr:enabled-processes/non-renderer"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43690,7 +42457,6 @@
           "--disable-field-trial-config"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "browser_tests_no_field_trial",
@@ -43713,7 +42479,6 @@
           "--disable-field-trial-config"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "components_browsertests_no_field_trial",
@@ -43735,7 +42500,6 @@
           "--disable-field-trial-config"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests_no_field_trial",
@@ -43757,7 +42521,6 @@
           "--disable-field-trial-config"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "sync_integration_tests_no_field_trial",
@@ -43783,7 +42546,6 @@
           "--enable-features=NetworkServiceSandbox"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "browser_tests_network_sandbox",
@@ -43806,7 +42568,6 @@
           "--enable-features=NetworkServiceSandbox"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "components_browsertests_network_sandbox",
@@ -43828,7 +42589,6 @@
           "--enable-features=NetworkServiceSandbox"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "content_browsertests_network_sandbox",
@@ -43851,7 +42611,6 @@
           "--enable-features=NetworkServiceSandbox"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests_network_sandbox",
@@ -43874,7 +42633,6 @@
           "--enable-features=NetworkServiceSandbox"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "sync_integration_tests_network_sandbox",
@@ -43900,7 +42658,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43920,7 +42677,6 @@
           "--gtest_filter=ChromeTracingDelegateBrowserTest.*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43937,7 +42693,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43955,7 +42710,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43972,7 +42726,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43997,7 +42750,6 @@
       {
         "isolate_name": "upload_trace_processor",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "upload_trace_processor",
@@ -44013,7 +42765,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44034,7 +42785,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44055,7 +42805,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -44077,7 +42826,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44098,7 +42846,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44119,7 +42866,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44140,7 +42886,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44161,7 +42906,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44182,7 +42926,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44203,7 +42946,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44224,7 +42966,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -44246,7 +42987,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44267,7 +43007,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44291,7 +43030,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44320,7 +43058,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "pixel_browser_tests",
@@ -44351,7 +43088,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44372,7 +43108,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44393,7 +43128,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44414,7 +43148,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44435,7 +43168,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44456,7 +43188,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44477,7 +43208,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44498,7 +43228,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44519,7 +43248,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44540,7 +43268,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44561,7 +43288,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44585,7 +43311,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44607,7 +43332,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44628,7 +43352,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44649,7 +43372,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44670,7 +43392,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44691,7 +43412,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44712,7 +43432,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44733,7 +43452,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44754,7 +43472,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44775,7 +43492,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44796,7 +43512,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44817,7 +43532,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44838,7 +43552,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44859,7 +43572,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44880,7 +43592,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44901,7 +43612,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44922,7 +43632,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44943,7 +43652,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44964,7 +43672,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -44985,7 +43692,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45006,7 +43712,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45027,7 +43732,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45048,7 +43752,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45069,7 +43772,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45090,7 +43792,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45111,7 +43812,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45133,7 +43833,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45161,7 +43860,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "pixel_interactive_ui_tests",
@@ -45188,7 +43886,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45209,7 +43906,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45230,7 +43926,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45251,7 +43946,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45272,7 +43966,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45293,7 +43986,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45314,7 +44006,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45335,7 +44026,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45356,7 +44046,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45377,7 +44066,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45398,7 +44086,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45419,7 +44106,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45440,7 +44126,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45461,7 +44146,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45482,7 +44166,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45503,7 +44186,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45524,7 +44206,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45545,7 +44226,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45567,7 +44247,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45588,7 +44267,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45609,7 +44287,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45630,7 +44307,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45651,7 +44327,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45673,7 +44348,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45694,7 +44368,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45715,7 +44388,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45736,7 +44408,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45757,7 +44428,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45778,7 +44448,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45799,7 +44468,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45820,7 +44488,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45841,7 +44508,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45862,7 +44528,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45883,7 +44548,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45904,7 +44568,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45928,7 +44591,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "precommit_args": [
@@ -45954,7 +44616,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45975,7 +44636,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -45996,7 +44656,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -46017,7 +44676,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -46038,7 +44696,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -46059,7 +44716,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -46080,7 +44736,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -46104,7 +44759,6 @@
         "isolate_name": "blink_python_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -46217,7 +44871,6 @@
         "isolate_name": "chromedriver_py_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -46242,7 +44895,6 @@
         "isolate_name": "chromedriver_replay_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -46291,7 +44943,6 @@
         "isolate_name": "content_shell_crash_test",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -46317,7 +44968,6 @@
         "isolate_name": "flatbuffers_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -46343,7 +44993,6 @@
         "isolate_name": "grit_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -46368,7 +45017,6 @@
         "isolate_name": "mini_installer_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mini_installer_tests",
@@ -46391,7 +45039,6 @@
         "isolate_name": "mojo_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -46417,7 +45064,6 @@
         "isolate_name": "polymer_tools_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "polymer_tools_python_unittests",
@@ -46446,7 +45092,6 @@
         "isolate_name": "telemetry_perf_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_desktop_minidump_unittests",
@@ -46471,7 +45116,6 @@
         "isolate_name": "telemetry_gpu_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",

testing/buildbot/chromium.goma.fyi.json

diff --git a/testing/buildbot/chromium.goma.fyi.json b/testing/buildbot/chromium.goma.fyi.json
index f7b17be..41407fa 100644
--- a/testing/buildbot/chromium.goma.fyi.json
+++ b/testing/buildbot/chromium.goma.fyi.json
@@ -8,7 +8,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26,7 +25,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -51,7 +49,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -69,7 +66,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -94,7 +90,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -112,7 +107,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -177,7 +171,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -194,7 +187,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -218,7 +210,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -235,7 +226,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -259,7 +249,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -276,7 +265,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -300,7 +288,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -317,7 +304,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -341,7 +327,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -359,7 +344,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -384,7 +368,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -402,7 +385,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/chromium.goma.json

diff --git a/testing/buildbot/chromium.goma.json b/testing/buildbot/chromium.goma.json
index fb15b05..ce40fffe 100644
--- a/testing/buildbot/chromium.goma.json
+++ b/testing/buildbot/chromium.goma.json
@@ -18,7 +18,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -35,7 +34,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -59,7 +57,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -76,7 +73,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -100,7 +96,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -117,7 +112,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -141,7 +135,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -158,7 +151,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -182,7 +174,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -200,7 +191,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -225,7 +215,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -243,7 +232,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -268,7 +256,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -286,7 +273,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -311,7 +297,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -329,7 +314,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/chromium.gpu.fyi.json

diff --git a/testing/buildbot/chromium.gpu.fyi.json b/testing/buildbot/chromium.gpu.fyi.json
index 35265a7..0d02b1c 100644
--- a/testing/buildbot/chromium.gpu.fyi.json
+++ b/testing/buildbot/chromium.gpu.fyi.json
@@ -8,7 +8,6 @@
           "-v"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "resultdb": {
@@ -40,7 +39,6 @@
           "--recover-devices"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_validating",
@@ -81,7 +79,6 @@
           "--recover-devices"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -121,7 +118,6 @@
           "--recover-devices"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -169,7 +165,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_validating_tests",
@@ -207,7 +202,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -245,7 +239,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -287,7 +280,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -329,7 +321,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_validating_test",
@@ -376,7 +367,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_validating_test",
@@ -420,7 +410,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_validating_tests",
@@ -458,7 +447,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -498,7 +486,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_validating_tests",
@@ -535,7 +522,6 @@
           "--recover-devices"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -586,7 +572,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_webview",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "android_webview_pixel_skia_gold_test",
@@ -628,7 +613,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_validating_tests",
@@ -665,7 +649,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -702,7 +685,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -743,7 +725,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -784,7 +765,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_validating_test",
@@ -826,7 +806,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -863,7 +842,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_validating_tests",
@@ -904,7 +882,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_validating_test",
@@ -947,7 +924,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_validating_tests",
@@ -984,7 +960,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -1021,7 +996,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests",
@@ -1060,7 +1034,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gles_passthrough_tests",
@@ -1100,7 +1073,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_validating_tests",
@@ -1146,7 +1118,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_validating_test",
@@ -1190,7 +1161,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_validating_tests",
@@ -1231,7 +1201,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gles_passthrough_tests",
@@ -1273,7 +1242,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_validating_tests",
@@ -1320,7 +1288,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_webview",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "android_webview_pixel_skia_gold_test",
@@ -1363,7 +1330,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -1401,7 +1367,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_validating_tests",
@@ -1439,7 +1404,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -1477,7 +1441,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -1519,7 +1482,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -1561,7 +1523,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -1608,7 +1569,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_validating_test",
@@ -1651,7 +1611,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -1689,7 +1648,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_validating_tests",
@@ -1731,7 +1689,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -1778,7 +1735,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_validating_test",
@@ -1822,7 +1778,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -1861,7 +1816,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_validating_tests",
@@ -1899,7 +1853,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -1937,7 +1890,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests",
@@ -1978,7 +1930,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gles_passthrough_tests",
@@ -2020,7 +1971,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_validating_tests",
@@ -2061,7 +2011,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gles_passthrough_tests",
@@ -2102,7 +2051,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_validating_tests",
@@ -2145,7 +2093,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -2183,7 +2130,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_validating_tests",
@@ -2221,7 +2167,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -2259,7 +2204,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -2301,7 +2245,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -2343,7 +2286,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -2390,7 +2332,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_validating_test",
@@ -2433,7 +2374,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -2471,7 +2411,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_validating_tests",
@@ -2513,7 +2452,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -2560,7 +2498,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_validating_test",
@@ -2604,7 +2541,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -2643,7 +2579,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_validating_tests",
@@ -2681,7 +2616,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -2719,7 +2653,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests",
@@ -2759,7 +2692,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gles_passthrough_tests",
@@ -2800,7 +2732,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_validating_tests",
@@ -2836,7 +2767,6 @@
           "-v"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "resultdb": {
@@ -2870,7 +2800,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/android.samsung_a13.gl_tests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_validating",
@@ -2912,7 +2841,6 @@
           "--recover-devices"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -2953,7 +2881,6 @@
           "--recover-devices"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -3003,7 +2930,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_validating_tests",
@@ -3043,7 +2969,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -3083,7 +3008,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -3127,7 +3051,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -3171,7 +3094,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_validating_test",
@@ -3220,7 +3142,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_validating_test",
@@ -3266,7 +3187,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_validating_tests",
@@ -3306,7 +3226,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -3348,7 +3267,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_validating_tests",
@@ -3385,7 +3303,6 @@
           "-v"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "resultdb": {
@@ -3419,7 +3336,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/android.samsung_a23.gl_tests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_validating",
@@ -3461,7 +3377,6 @@
           "--recover-devices"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -3502,7 +3417,6 @@
           "--recover-devices"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -3552,7 +3466,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_validating_tests",
@@ -3592,7 +3505,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -3632,7 +3544,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -3676,7 +3587,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -3720,7 +3630,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_validating_test",
@@ -3769,7 +3678,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_validating_test",
@@ -3815,7 +3723,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_validating_tests",
@@ -3855,7 +3762,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -3897,7 +3803,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_validating_tests",
@@ -3941,7 +3846,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_validating",
@@ -3982,7 +3886,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4031,7 +3934,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_validating_tests",
@@ -4084,7 +3986,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -4137,7 +4038,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -4194,7 +4094,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -4251,7 +4150,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_validating_test",
@@ -4309,7 +4207,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_validating_tests",
@@ -4366,7 +4263,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_validating_test",
@@ -4425,7 +4321,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_validating_tests",
@@ -4478,7 +4373,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -4531,7 +4425,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests",
@@ -4587,7 +4480,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gles_passthrough_tests",
@@ -4645,7 +4537,6 @@
         "experiment_percentage": 100,
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_validating_tests",
@@ -4701,7 +4592,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_validating_tests",
@@ -4755,7 +4645,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.kevin.gl_tests_validating.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_validating",
@@ -4785,7 +4674,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.gl_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4822,7 +4710,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_validating_tests",
@@ -4863,7 +4750,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -4904,7 +4790,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -4949,7 +4834,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -4994,7 +4878,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_validating_test",
@@ -5040,7 +4923,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_validating_tests",
@@ -5085,7 +4967,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_validating_test",
@@ -5132,7 +5013,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_validating_tests",
@@ -5173,7 +5053,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -5214,7 +5093,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests",
@@ -5258,7 +5136,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gles_passthrough_tests",
@@ -5302,7 +5179,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_validating_tests",
@@ -5353,7 +5229,6 @@
         "cros_img": "kevin-public/R114-15408.0.0",
         "extra_browser_args": "--log-level=0 --js-flags=--expose-gc --use-cmd-decoder=validating",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_validating_tests KEVIN_PUBLIC_LKGM",
@@ -5385,7 +5260,6 @@
         "cros_img": "kevin-public/R114-15408.0.0",
         "extra_browser_args": "--log-level=0 --js-flags=--expose-gc",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests KEVIN_PUBLIC_LKGM",
@@ -5417,7 +5291,6 @@
         "cros_img": "kevin-public/R114-15408.0.0",
         "extra_browser_args": "--log-level=0 --js-flags=--expose-gc",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests KEVIN_PUBLIC_LKGM",
@@ -5453,7 +5326,6 @@
         "cros_img": "kevin-public/R114-15408.0.0",
         "extra_browser_args": "--log-level=0 --js-flags=--expose-gc --force_high_performance_gpu",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests KEVIN_PUBLIC_LKGM",
@@ -5489,7 +5361,6 @@
         "cros_img": "kevin-public/R114-15408.0.0",
         "extra_browser_args": "--log-level=0 --js-flags=--expose-gc --use-cmd-decoder=validating",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_validating_test KEVIN_PUBLIC_LKGM",
@@ -5526,7 +5397,6 @@
         "cros_img": "kevin-public/R114-15408.0.0",
         "extra_browser_args": "--log-level=0 --js-flags=--expose-gc --force_higher_performance_gpu --use-cmd-decoder=validating",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_validating_tests KEVIN_PUBLIC_LKGM",
@@ -5562,7 +5432,6 @@
         "cros_img": "kevin-public/R114-15408.0.0",
         "extra_browser_args": "--log-level=0 --js-flags=--expose-gc --use-cmd-decoder=validating",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_validating_test KEVIN_PUBLIC_LKGM",
@@ -5600,7 +5469,6 @@
         "cros_img": "kevin-public/R114-15408.0.0",
         "extra_browser_args": "--log-level=0 --js-flags=--expose-gc --use-cmd-decoder=validating",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_validating_tests KEVIN_PUBLIC_LKGM",
@@ -5632,7 +5500,6 @@
         "cros_img": "kevin-public/R114-15408.0.0",
         "extra_browser_args": "--log-level=0 --js-flags=--expose-gc",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test KEVIN_PUBLIC_LKGM",
@@ -5664,7 +5531,6 @@
         "cros_img": "kevin-public/R114-15408.0.0",
         "extra_browser_args": "--log-level=0 --js-flags=--expose-gc --use-cmd-decoder=validating",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests KEVIN_PUBLIC_LKGM",
@@ -5699,7 +5565,6 @@
         "cros_img": "kevin-public/R114-15408.0.0",
         "extra_browser_args": "--log-level=0 --js-flags=--expose-gc --use-gl=angle --use-angle=gles --use-cmd-decoder=passthrough --force_high_performance_gpu",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gles_passthrough_tests KEVIN_PUBLIC_LKGM",
@@ -5734,7 +5599,6 @@
         "cros_img": "kevin-public/R114-15408.0.0",
         "extra_browser_args": "--log-level=0 --js-flags=--expose-gc --use-cmd-decoder=validating --force_high_performance_gpu",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_validating_tests KEVIN_PUBLIC_LKGM",
@@ -5768,7 +5632,6 @@
         "cros_img": "kevin-public/R114-15408.0.0",
         "extra_browser_args": "--log-level=0 --js-flags=--expose-gc --use-cmd-decoder=validating --force_high_performance_gpu",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_validating_tests KEVIN_PUBLIC_LKGM",
@@ -5813,7 +5676,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "noop_sleep_tests",
@@ -5854,7 +5716,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -5894,7 +5755,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -5934,7 +5794,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -5978,7 +5837,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -6022,7 +5880,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -6067,7 +5924,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -6111,7 +5967,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -6157,7 +6012,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -6197,7 +6051,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -6237,7 +6090,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests",
@@ -6279,7 +6131,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gles_passthrough_tests",
@@ -6316,7 +6167,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -6342,7 +6192,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6365,7 +6214,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6397,7 +6245,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -6433,7 +6280,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -6469,7 +6315,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -6509,7 +6354,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -6549,7 +6393,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -6594,7 +6437,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -6636,7 +6478,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -6672,7 +6513,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -6710,7 +6550,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -6751,7 +6590,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "noop_sleep_tests",
@@ -6788,7 +6626,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "noop_sleep_tests",
@@ -6821,7 +6658,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -6847,7 +6683,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6870,7 +6705,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6897,7 +6731,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -6926,7 +6759,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "tab_capture_end2end_tests",
@@ -6954,7 +6786,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -6981,7 +6812,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7005,7 +6835,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7030,7 +6859,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7063,7 +6891,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -7100,7 +6927,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -7137,7 +6963,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -7178,7 +7003,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -7219,7 +7043,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -7261,7 +7084,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -7302,7 +7124,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -7345,7 +7166,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -7382,7 +7202,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -7422,7 +7241,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gl_passthrough_tests",
@@ -7462,7 +7280,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -7497,7 +7314,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -7524,7 +7340,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -7550,7 +7365,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7573,7 +7387,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7597,7 +7410,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7629,7 +7441,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -7665,7 +7476,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -7701,7 +7511,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -7741,7 +7550,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -7781,7 +7589,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -7822,7 +7629,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -7862,7 +7668,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -7904,7 +7709,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -7940,7 +7744,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -7979,7 +7782,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gl_passthrough_tests",
@@ -8018,7 +7820,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -8052,7 +7853,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -8079,7 +7879,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -8105,7 +7904,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8128,7 +7926,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8152,7 +7949,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8184,7 +7980,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -8220,7 +8015,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -8256,7 +8050,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -8296,7 +8089,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -8336,7 +8128,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -8377,7 +8168,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -8417,7 +8207,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -8459,7 +8248,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -8495,7 +8283,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -8535,7 +8322,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "vulkan_pixel_skia_gold_test",
@@ -8579,7 +8365,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gl_passthrough_tests",
@@ -8618,7 +8403,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -8649,7 +8433,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -8677,7 +8460,6 @@
           "--gtest_filter=TabCaptureApiPixelTest.EndToEnd*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "tab_capture_end2end_tests",
@@ -8704,7 +8486,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -8730,7 +8511,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8754,7 +8534,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8775,7 +8554,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8800,7 +8578,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8833,7 +8610,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -8870,7 +8646,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -8907,7 +8682,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -8948,7 +8722,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -8989,7 +8762,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -9031,7 +8803,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -9072,7 +8843,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -9115,7 +8885,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -9152,7 +8921,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -9189,7 +8957,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests",
@@ -9229,7 +8996,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gl_passthrough_tests",
@@ -9269,7 +9035,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -9309,7 +9074,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_swangle_passthrough_tests",
@@ -9340,7 +9104,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -9367,7 +9130,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -9393,7 +9155,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9417,7 +9178,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9438,7 +9198,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9463,7 +9222,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9496,7 +9254,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -9533,7 +9290,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -9570,7 +9326,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -9611,7 +9366,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -9652,7 +9406,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -9698,7 +9451,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -9741,7 +9493,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -9778,7 +9529,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -9817,7 +9567,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_tests",
@@ -9859,7 +9608,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "noop_sleep_tests",
@@ -9897,7 +9645,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "noop_sleep_tests",
@@ -9925,7 +9672,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -9956,7 +9702,6 @@
           "--gtest_filter=TabCaptureApiPixelTest.EndToEnd*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "tab_capture_end2end_tests",
@@ -9986,7 +9731,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -10015,7 +9759,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10042,7 +9785,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10066,7 +9808,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10094,7 +9835,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10130,7 +9870,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -10170,7 +9909,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -10210,7 +9948,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -10254,7 +9991,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -10298,7 +10034,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -10343,7 +10078,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -10387,7 +10121,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -10433,7 +10166,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -10473,7 +10205,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -10513,7 +10244,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests",
@@ -10556,7 +10286,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gl_passthrough_tests",
@@ -10601,7 +10330,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_metal_passthrough_tests",
@@ -10644,7 +10372,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -10688,7 +10415,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_metal_passthrough_tests",
@@ -10731,7 +10457,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_swangle_passthrough_tests",
@@ -10775,7 +10500,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "noop_sleep_tests",
@@ -10805,7 +10529,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -10834,7 +10557,6 @@
           "--gtest_filter=TabCaptureApiPixelTest.EndToEnd*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "tab_capture_end2end_tests",
@@ -10862,7 +10584,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -10889,7 +10610,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10914,7 +10634,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10936,7 +10655,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10962,7 +10680,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10996,7 +10713,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -11034,7 +10750,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -11072,7 +10787,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -11114,7 +10828,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -11156,7 +10869,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -11199,7 +10911,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -11241,7 +10952,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -11285,7 +10995,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -11323,7 +11032,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -11361,7 +11069,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests",
@@ -11402,7 +11109,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gl_passthrough_tests",
@@ -11444,7 +11150,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_metal_passthrough_tests",
@@ -11485,7 +11190,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -11526,7 +11230,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_metal_passthrough_tests",
@@ -11567,7 +11270,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_swangle_passthrough_tests",
@@ -11599,7 +11301,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -11627,7 +11328,6 @@
           "--gtest_filter=TabCaptureApiPixelTest.EndToEnd*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "tab_capture_end2end_tests",
@@ -11654,7 +11354,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -11680,7 +11379,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11704,7 +11402,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11725,7 +11422,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11750,7 +11446,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11783,7 +11478,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -11820,7 +11514,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -11857,7 +11550,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -11898,7 +11590,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -11939,7 +11630,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -11981,7 +11671,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -12022,7 +11711,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -12065,7 +11753,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -12102,7 +11789,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -12139,7 +11825,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests",
@@ -12179,7 +11864,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gl_passthrough_tests",
@@ -12221,7 +11905,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_metal_passthrough_tests",
@@ -12261,7 +11944,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -12302,7 +11984,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_metal_passthrough_tests",
@@ -12342,7 +12023,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_swangle_passthrough_tests",
@@ -12373,7 +12053,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -12403,7 +12082,6 @@
           "--gtest_filter=TabCaptureApiPixelTest.EndToEnd*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "tab_capture_end2end_tests",
@@ -12432,7 +12110,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -12460,7 +12137,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12486,7 +12162,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12509,7 +12184,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12536,7 +12210,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12571,7 +12244,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -12610,7 +12282,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -12649,7 +12320,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -12692,7 +12362,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -12735,7 +12404,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -12779,7 +12447,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -12822,7 +12489,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -12867,7 +12533,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -12906,7 +12571,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -12945,7 +12609,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests",
@@ -12986,7 +12649,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -13028,7 +12690,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_swangle_passthrough_tests",
@@ -13061,7 +12722,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -13090,7 +12750,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -13118,7 +12777,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13144,7 +12802,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13167,7 +12824,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13194,7 +12850,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13229,7 +12884,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -13268,7 +12922,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -13307,7 +12960,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -13350,7 +13002,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -13393,7 +13044,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -13441,7 +13091,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -13486,7 +13135,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -13525,7 +13173,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -13566,7 +13213,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -13600,7 +13246,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -13630,7 +13275,6 @@
           "--gtest_filter=TabCaptureApiPixelTest.EndToEnd*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "tab_capture_end2end_tests",
@@ -13659,7 +13303,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -13687,7 +13330,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13713,7 +13355,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13736,7 +13377,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13763,7 +13403,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -13798,7 +13437,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -13837,7 +13475,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -13876,7 +13513,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -13919,7 +13555,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -13962,7 +13597,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -14006,7 +13640,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -14049,7 +13682,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -14094,7 +13726,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -14133,7 +13764,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -14172,7 +13802,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests",
@@ -14214,7 +13843,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_metal_passthrough_tests",
@@ -14256,7 +13884,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -14298,7 +13925,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_metal_passthrough_tests",
@@ -14340,7 +13966,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_swangle_passthrough_tests",
@@ -14373,7 +13998,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -14403,7 +14027,6 @@
           "--gtest_filter=TabCaptureApiPixelTest.EndToEnd*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "tab_capture_end2end_tests",
@@ -14432,7 +14055,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -14460,7 +14082,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14486,7 +14107,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14509,7 +14129,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14536,7 +14155,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14571,7 +14189,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -14610,7 +14227,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -14649,7 +14265,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -14692,7 +14307,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -14735,7 +14349,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -14779,7 +14392,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -14822,7 +14434,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -14867,7 +14478,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -14906,7 +14516,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -14945,7 +14554,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests",
@@ -14987,7 +14595,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gl_passthrough_tests",
@@ -15029,7 +14636,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -15071,7 +14677,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_swangle_passthrough_tests",
@@ -15104,7 +14709,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -15134,7 +14738,6 @@
           "--gtest_filter=TabCaptureApiPixelTest.EndToEnd*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "tab_capture_end2end_tests",
@@ -15163,7 +14766,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -15191,7 +14793,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15217,7 +14818,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15240,7 +14840,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15275,7 +14874,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -15314,7 +14912,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -15353,7 +14950,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -15396,7 +14992,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -15439,7 +15034,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -15487,7 +15081,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -15532,7 +15125,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -15571,7 +15163,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -15613,7 +15204,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gl_passthrough_tests",
@@ -15655,7 +15245,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -15699,7 +15288,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "noop_sleep_tests",
@@ -15736,7 +15324,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "noop_sleep_tests",
@@ -15763,7 +15350,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -15790,7 +15376,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -15816,7 +15401,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15840,7 +15424,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15865,7 +15448,6 @@
           "--use-angle=d3d9"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_d3d9_test",
@@ -15892,7 +15474,6 @@
           "--disable-gpu-sandbox"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_gl_test",
@@ -15914,7 +15495,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15938,7 +15518,6 @@
           "--ignore-runtime-requirements=*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -15972,7 +15551,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -16009,7 +15587,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -16046,7 +15623,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -16087,7 +15663,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -16128,7 +15703,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -16174,7 +15748,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -16217,7 +15790,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -16254,7 +15826,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -16293,7 +15864,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d11_passthrough_tests",
@@ -16333,7 +15903,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d9_passthrough_tests",
@@ -16372,7 +15941,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_vulkan_passthrough_tests",
@@ -16414,7 +15982,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "noop_sleep_tests",
@@ -16452,7 +16019,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "noop_sleep_tests",
@@ -16480,7 +16046,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -16509,7 +16074,6 @@
           "--gtest_filter=TabCaptureApiPixelTest.EndToEnd*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "tab_capture_end2end_tests",
@@ -16537,7 +16101,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -16564,7 +16127,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16589,7 +16151,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16615,7 +16176,6 @@
           "--use-angle=d3d9"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_d3d9_test",
@@ -16643,7 +16203,6 @@
           "--disable-gpu-sandbox"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_gl_test",
@@ -16666,7 +16225,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16691,7 +16249,6 @@
           "--ignore-runtime-requirements=*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -16726,7 +16283,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -16764,7 +16320,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -16802,7 +16357,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -16844,7 +16398,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -16886,7 +16439,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -16929,7 +16481,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -16971,7 +16522,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -17015,7 +16565,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -17053,7 +16602,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -17091,7 +16639,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests",
@@ -17132,7 +16679,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_d3d11_passthrough_tests",
@@ -17173,7 +16719,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d11_passthrough_tests",
@@ -17214,7 +16759,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d9_passthrough_tests",
@@ -17247,7 +16791,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -17275,7 +16818,6 @@
           "--gtest_filter=TabCaptureApiPixelTest.EndToEnd*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "tab_capture_end2end_tests",
@@ -17302,7 +16844,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -17328,7 +16869,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17352,7 +16892,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17377,7 +16916,6 @@
           "--use-angle=d3d9"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_d3d9_test",
@@ -17404,7 +16942,6 @@
           "--disable-gpu-sandbox"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_gl_test",
@@ -17426,7 +16963,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17450,7 +16986,6 @@
           "--ignore-runtime-requirements=*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -17484,7 +17019,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -17521,7 +17055,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -17558,7 +17091,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -17599,7 +17131,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -17640,7 +17171,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -17682,7 +17212,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -17723,7 +17252,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -17766,7 +17294,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -17803,7 +17330,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -17840,7 +17366,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests",
@@ -17880,7 +17405,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_d3d11_passthrough_tests",
@@ -17920,7 +17444,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d11_passthrough_tests",
@@ -17960,7 +17483,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d9_passthrough_tests",
@@ -17999,7 +17521,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_vulkan_passthrough_tests",
@@ -18031,7 +17552,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -18059,7 +17579,6 @@
           "--gtest_filter=TabCaptureApiPixelTest.EndToEnd*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "tab_capture_end2end_tests",
@@ -18086,7 +17605,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -18112,7 +17630,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18136,7 +17653,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18161,7 +17677,6 @@
           "--use-angle=d3d9"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_d3d9_test",
@@ -18188,7 +17703,6 @@
           "--disable-gpu-sandbox"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_gl_test",
@@ -18210,7 +17724,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18234,7 +17747,6 @@
           "--ignore-runtime-requirements=*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -18268,7 +17780,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -18305,7 +17816,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -18342,7 +17852,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -18383,7 +17892,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -18424,7 +17932,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -18502,7 +18009,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -18545,7 +18051,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -18582,7 +18087,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -18622,7 +18126,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_d3d11_passthrough_tests",
@@ -18662,7 +18165,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d11_passthrough_tests",
@@ -18702,7 +18204,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d9_passthrough_tests",
@@ -18741,7 +18242,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_vulkan_passthrough_tests",
@@ -18806,7 +18306,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -18834,7 +18333,6 @@
           "--gtest_filter=TabCaptureApiPixelTest.EndToEnd*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "tab_capture_end2end_tests",
@@ -18861,7 +18359,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -18887,7 +18384,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18911,7 +18407,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18936,7 +18431,6 @@
           "--use-angle=d3d9"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_d3d9_test",
@@ -18963,7 +18457,6 @@
           "--disable-gpu-sandbox"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_gl_test",
@@ -18985,7 +18478,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19009,7 +18501,6 @@
           "--ignore-runtime-requirements=*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -19043,7 +18534,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -19080,7 +18570,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -19117,7 +18606,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -19158,7 +18646,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -19199,7 +18686,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -19277,7 +18763,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -19320,7 +18805,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -19357,7 +18841,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -19397,7 +18880,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_d3d11_passthrough_tests",
@@ -19437,7 +18919,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d11_passthrough_tests",
@@ -19477,7 +18958,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d9_passthrough_tests",
@@ -19516,7 +18996,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_vulkan_passthrough_tests",

testing/buildbot/chromium.gpu.json

diff --git a/testing/buildbot/chromium.gpu.json b/testing/buildbot/chromium.gpu.json
index da46e57..18eee6f 100644
--- a/testing/buildbot/chromium.gpu.json
+++ b/testing/buildbot/chromium.gpu.json
@@ -15,7 +15,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_validating_tests",
@@ -52,7 +51,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -89,7 +87,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -130,7 +127,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -171,7 +167,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_validating_test",
@@ -217,7 +212,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_validating_test",
@@ -260,7 +254,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_validating_tests",
@@ -297,7 +290,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -336,7 +328,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_validating_tests",
@@ -375,7 +366,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -402,7 +392,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -428,7 +417,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -460,7 +448,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -496,7 +483,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -532,7 +518,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -572,7 +557,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -612,7 +596,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -657,7 +640,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -699,7 +681,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -735,7 +716,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -773,7 +753,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_tests",
@@ -807,7 +786,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -834,7 +812,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -860,7 +837,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -892,7 +868,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -928,7 +903,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -964,7 +938,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -1004,7 +977,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -1044,7 +1016,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -1089,7 +1060,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -1131,7 +1101,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -1167,7 +1136,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -1205,7 +1173,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_tests",
@@ -1236,7 +1203,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1263,7 +1229,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -1289,7 +1254,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1322,7 +1286,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -1359,7 +1322,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -1396,7 +1358,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -1437,7 +1398,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -1478,7 +1438,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -1524,7 +1483,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -1567,7 +1525,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -1604,7 +1561,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -1643,7 +1599,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_tests",
@@ -1675,7 +1630,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1703,7 +1657,6 @@
           "--gtest_filter=TabCaptureApiPixelTest.EndToEnd*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "tab_capture_end2end_tests",
@@ -1730,7 +1683,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -1756,7 +1708,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1789,7 +1740,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -1826,7 +1776,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -1863,7 +1812,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -1904,7 +1852,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -1945,7 +1892,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -1991,7 +1937,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -2034,7 +1979,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -2071,7 +2015,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -2110,7 +2053,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_tests",
@@ -2142,7 +2084,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2171,7 +2112,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -2199,7 +2139,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2234,7 +2173,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -2273,7 +2211,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -2312,7 +2249,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -2355,7 +2291,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -2398,7 +2333,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -2446,7 +2380,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -2491,7 +2424,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -2530,7 +2462,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -2571,7 +2502,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -2605,7 +2535,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2635,7 +2564,6 @@
           "--gtest_filter=TabCaptureApiPixelTest.EndToEnd*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "tab_capture_end2end_tests",
@@ -2664,7 +2592,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -2692,7 +2619,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2727,7 +2653,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -2766,7 +2691,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -2805,7 +2729,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -2848,7 +2771,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -2891,7 +2813,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -2939,7 +2860,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -2985,7 +2905,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -3024,7 +2943,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -3065,7 +2983,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -3099,7 +3016,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -3127,7 +3043,6 @@
           "--gtest_filter=TabCaptureApiPixelTest.EndToEnd*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "tab_capture_end2end_tests",
@@ -3154,7 +3069,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -3180,7 +3094,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3204,7 +3117,6 @@
           "--ignore-runtime-requirements=*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -3238,7 +3150,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -3275,7 +3186,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -3312,7 +3222,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -3353,7 +3262,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -3394,7 +3302,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -3440,7 +3347,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -3483,7 +3389,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -3520,7 +3425,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -3559,7 +3463,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d11_passthrough_tests",
@@ -3591,7 +3494,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -3619,7 +3521,6 @@
           "--gtest_filter=TabCaptureApiPixelTest.EndToEnd*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "tab_capture_end2end_tests",
@@ -3646,7 +3547,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -3672,7 +3572,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3696,7 +3595,6 @@
           "--ignore-runtime-requirements=*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -3730,7 +3628,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -3767,7 +3664,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -3804,7 +3700,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -3845,7 +3740,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -3886,7 +3780,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -3932,7 +3825,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -3976,7 +3868,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -4013,7 +3904,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -4052,7 +3942,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d11_passthrough_tests",

testing/buildbot/chromium.linux.json

diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index 14611dbd..ab12690 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -9,7 +9,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26,7 +25,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -44,7 +42,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -61,7 +58,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -78,7 +74,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -95,7 +90,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -112,7 +106,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -130,7 +123,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -147,7 +139,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -167,7 +158,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -184,7 +174,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -201,7 +190,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -218,7 +206,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -235,7 +222,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -252,7 +238,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -275,7 +260,6 @@
           "--test-launcher-jobs=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -286,7 +270,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -303,7 +286,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -320,7 +302,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -337,7 +318,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -357,7 +337,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/cast-linux.content_browsertests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -375,7 +354,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -392,7 +370,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -409,7 +386,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -426,7 +402,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -443,7 +418,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -460,7 +434,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -477,7 +450,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -494,7 +466,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -511,7 +482,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -528,7 +498,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -545,7 +514,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -562,7 +530,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -579,7 +546,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -596,7 +562,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -613,7 +578,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -630,7 +594,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -647,7 +610,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -664,7 +626,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -681,7 +642,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -698,7 +658,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -715,7 +674,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -732,7 +690,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -749,7 +706,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -766,7 +722,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -783,7 +738,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -800,7 +754,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -817,7 +770,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -834,7 +786,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -851,7 +802,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -877,7 +827,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -894,7 +843,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -912,7 +860,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -929,7 +876,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -946,7 +892,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -963,7 +908,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -980,7 +924,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -998,7 +941,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1015,7 +957,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1035,7 +976,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1052,7 +992,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1069,7 +1008,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1086,7 +1024,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1103,7 +1040,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1121,7 +1057,6 @@
       {
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1138,7 +1073,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1155,7 +1089,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1178,7 +1111,6 @@
           "--test-launcher-jobs=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1189,7 +1121,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1206,7 +1137,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1223,7 +1153,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1240,7 +1169,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1260,7 +1188,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/cast-linux.content_browsertests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1278,7 +1205,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1295,7 +1221,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1312,7 +1237,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1329,7 +1253,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1346,7 +1269,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1363,7 +1285,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1380,7 +1301,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1397,7 +1317,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1414,7 +1333,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1431,7 +1349,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1448,7 +1365,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1465,7 +1381,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1482,7 +1397,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1499,7 +1413,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1516,7 +1429,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1533,7 +1445,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1550,7 +1461,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1567,7 +1477,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1584,7 +1493,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1601,7 +1509,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1618,7 +1525,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1635,7 +1541,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1652,7 +1557,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1669,7 +1573,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1686,7 +1589,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1703,7 +1605,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1720,7 +1621,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1738,7 +1638,6 @@
       {
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1755,7 +1654,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1772,7 +1670,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1906,7 +1803,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1924,7 +1820,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1942,7 +1837,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1961,7 +1855,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1979,7 +1872,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1997,7 +1889,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2015,7 +1906,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2033,7 +1923,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2051,7 +1940,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2069,7 +1957,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2087,7 +1974,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -2106,7 +1992,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2124,7 +2009,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2142,7 +2026,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2164,7 +2047,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2182,7 +2064,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2200,7 +2081,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2218,7 +2098,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2236,7 +2115,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2254,7 +2132,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2272,7 +2149,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2290,7 +2166,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2308,7 +2183,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2326,7 +2200,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2345,7 +2218,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2363,7 +2235,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2381,7 +2252,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2399,7 +2269,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2417,7 +2286,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2435,7 +2303,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2453,7 +2320,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2471,7 +2337,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2489,7 +2354,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2507,7 +2371,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2525,7 +2388,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2543,7 +2405,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2561,7 +2422,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2579,7 +2439,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2597,7 +2456,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2615,7 +2473,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2633,7 +2490,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2651,7 +2507,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2669,7 +2524,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2687,7 +2541,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2705,7 +2558,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2724,7 +2576,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2742,7 +2593,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2760,7 +2610,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2778,7 +2627,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2796,7 +2644,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2814,7 +2661,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2832,7 +2678,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2850,7 +2695,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2868,7 +2712,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2886,7 +2729,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2904,7 +2746,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2922,7 +2763,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2940,7 +2780,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2958,7 +2797,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2976,7 +2814,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2994,7 +2831,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3012,7 +2848,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3030,7 +2865,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3048,7 +2882,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3066,7 +2899,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3084,7 +2916,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3102,7 +2933,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3120,7 +2950,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3138,7 +2967,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3156,7 +2984,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3174,7 +3001,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3192,7 +3018,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3210,7 +3035,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3228,7 +3052,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3246,7 +3069,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3264,7 +3086,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3282,7 +3103,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3300,7 +3120,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3318,7 +3137,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3336,7 +3154,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3354,7 +3171,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3372,7 +3188,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3390,7 +3205,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -3409,7 +3223,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3430,7 +3243,6 @@
         "isolate_name": "blink_python_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -3452,7 +3264,6 @@
         "isolate_name": "blink_pytype",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_pytype",
@@ -3555,7 +3366,6 @@
         "isolate_name": "chromedriver_py_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -3577,7 +3387,6 @@
         "isolate_name": "chromedriver_replay_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -3596,7 +3405,6 @@
         "isolate_name": "content_shell_crash_test",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -3619,7 +3427,6 @@
         "isolate_name": "flatbuffers_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -3642,7 +3449,6 @@
         "isolate_name": "fuchsia_pytype",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "fuchsia_pytype",
@@ -3665,7 +3471,6 @@
         "isolate_name": "gold_common_pytype",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gold_common_pytype",
@@ -3688,7 +3493,6 @@
         "isolate_name": "gpu_pytype",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_pytype",
@@ -3711,7 +3515,6 @@
         "isolate_name": "grit_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -3810,7 +3613,6 @@
         "isolate_name": "mojo_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -3910,7 +3712,6 @@
         "isolate_name": "telemetry_gpu_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -3938,7 +3739,6 @@
         "isolate_name": "telemetry_perf_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -3966,7 +3766,6 @@
         "isolate_name": "telemetry_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -3990,7 +3789,6 @@
         "isolate_name": "testing_pytype",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "testing_pytype",
@@ -4082,7 +3880,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4104,7 +3901,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4126,7 +3922,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -4149,7 +3944,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4171,7 +3965,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4193,7 +3986,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4215,7 +4007,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4237,7 +4028,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4259,7 +4049,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4281,7 +4070,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4303,7 +4091,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -4326,7 +4113,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4348,7 +4134,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4371,7 +4156,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.wayland_browser_tests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4396,7 +4180,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4418,7 +4201,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4440,7 +4222,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4462,7 +4243,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4484,7 +4264,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4506,7 +4285,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4528,7 +4306,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4550,7 +4327,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4572,7 +4348,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4594,7 +4369,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4617,7 +4391,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4639,7 +4412,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4661,7 +4433,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4683,7 +4454,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4705,7 +4475,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4727,7 +4496,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4749,7 +4517,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4771,7 +4538,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4793,7 +4559,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4815,7 +4580,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4837,7 +4601,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4859,7 +4622,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4881,7 +4643,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4903,7 +4664,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4925,7 +4685,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4947,7 +4706,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4969,7 +4727,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4991,7 +4748,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5013,7 +4769,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5036,7 +4791,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.interactive_ui_tests_wayland.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5059,7 +4813,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5081,7 +4834,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5103,7 +4855,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5125,7 +4876,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5147,7 +4897,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5169,7 +4918,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5191,7 +4939,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5213,7 +4960,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5235,7 +4981,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5257,7 +5002,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5279,7 +5023,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5301,7 +5044,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5323,7 +5065,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5345,7 +5086,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5367,7 +5107,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5389,7 +5128,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5411,7 +5149,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5433,7 +5170,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5455,7 +5191,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5477,7 +5212,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5499,7 +5233,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5521,7 +5254,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5543,7 +5275,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5565,7 +5296,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5587,7 +5317,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5609,7 +5338,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5631,7 +5359,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5653,7 +5380,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5675,7 +5401,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5698,7 +5423,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.unit_tests_wayland.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5720,7 +5444,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5743,7 +5466,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.wayland_views_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5765,7 +5487,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5787,7 +5508,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5809,7 +5529,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5831,7 +5550,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5853,7 +5571,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -5876,7 +5593,6 @@
           "--ozone-platform=wayland"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5897,7 +5613,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5914,7 +5629,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5931,7 +5645,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -5949,7 +5662,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5966,7 +5678,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5983,7 +5694,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6000,7 +5710,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6017,7 +5726,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6034,7 +5742,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6051,7 +5758,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6068,7 +5774,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -6086,7 +5791,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6103,7 +5807,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6120,7 +5823,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6141,7 +5843,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6158,7 +5859,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6175,7 +5875,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6192,7 +5891,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6209,7 +5907,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6226,7 +5923,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6243,7 +5939,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6260,7 +5955,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6277,7 +5971,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6294,7 +5987,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6312,7 +6004,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6329,7 +6020,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6346,7 +6036,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6363,7 +6052,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6380,7 +6068,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6397,7 +6084,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6414,7 +6100,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6431,7 +6116,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6448,7 +6132,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6465,7 +6148,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6482,7 +6164,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6499,7 +6180,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6516,7 +6196,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6533,7 +6212,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6550,7 +6228,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6567,7 +6244,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6584,7 +6260,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6601,7 +6276,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6618,7 +6292,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6635,7 +6308,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6652,7 +6324,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6670,7 +6341,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6687,7 +6357,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6704,7 +6373,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6721,7 +6389,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6738,7 +6405,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6755,7 +6421,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6772,7 +6437,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6789,7 +6453,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6806,7 +6469,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6823,7 +6485,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6840,7 +6501,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6858,7 +6518,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6875,7 +6534,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6892,7 +6550,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6909,7 +6566,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6926,7 +6582,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6943,7 +6598,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6960,7 +6614,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6977,7 +6630,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6994,7 +6646,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7011,7 +6662,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7028,7 +6678,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7045,7 +6694,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7062,7 +6710,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7079,7 +6726,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7096,7 +6742,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7113,7 +6758,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7130,7 +6774,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7147,7 +6790,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7164,7 +6806,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7181,7 +6822,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7198,7 +6838,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7215,7 +6854,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7232,7 +6870,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7249,7 +6886,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7266,7 +6902,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7283,7 +6918,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7300,7 +6934,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -7318,7 +6951,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7338,7 +6970,6 @@
       {
         "isolate_name": "blink_python_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -7433,7 +7064,6 @@
       {
         "isolate_name": "content_shell_crash_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -7455,7 +7085,6 @@
       {
         "isolate_name": "flatbuffers_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -7477,7 +7106,6 @@
       {
         "isolate_name": "grit_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -7535,7 +7163,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -7562,7 +7189,6 @@
         ],
         "isolate_name": "telemetry_perf_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -7589,7 +7215,6 @@
         ],
         "isolate_name": "telemetry_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -7662,7 +7287,6 @@
           "--enable-features=ForceWebRequestProxyForTest"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "network_service_web_request_proxy_browser_tests",
@@ -7688,7 +7312,6 @@
           "--disable-features=BackForwardCache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "bf_cache_browser_tests",
@@ -7710,7 +7333,6 @@
           "--disable-features=BackForwardCache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "bf_cache_content_browsertests",
@@ -7732,7 +7354,6 @@
           "--disable-features=BackForwardCache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "bf_cache_content_unittests",
@@ -7755,7 +7376,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/bfcache.unit_tests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "bf_cache_unit_tests",

testing/buildbot/chromium.mac.json

diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index d78f5e5..117c17eb9 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -35,7 +35,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -53,7 +52,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -71,7 +69,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -90,7 +87,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -108,7 +104,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -126,7 +121,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -144,7 +138,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -162,7 +155,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -180,7 +172,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -198,7 +189,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -217,7 +207,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -235,7 +224,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -256,7 +244,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -274,7 +261,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -292,7 +278,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -310,7 +295,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -328,7 +312,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -346,7 +329,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -364,7 +346,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -382,7 +363,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -401,7 +381,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -420,7 +399,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -438,7 +416,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -456,7 +433,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -474,7 +450,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -492,7 +467,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -510,7 +484,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -528,7 +501,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -546,7 +518,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -564,7 +535,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -582,7 +552,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -600,7 +569,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -618,7 +586,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -636,7 +603,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -654,7 +620,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -672,7 +637,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -690,7 +654,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -708,7 +671,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -726,7 +688,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -744,7 +705,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -762,7 +722,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -780,7 +739,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -799,7 +757,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -817,7 +774,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -835,7 +791,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -853,7 +808,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -871,7 +825,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -889,7 +842,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -907,7 +859,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -925,7 +876,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -943,7 +893,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -961,7 +910,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -979,7 +927,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -997,7 +944,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1015,7 +961,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1033,7 +978,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1051,7 +995,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1069,7 +1012,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1087,7 +1029,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1105,7 +1046,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1123,7 +1063,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1141,7 +1080,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1159,7 +1097,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1177,7 +1114,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1195,7 +1131,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1213,7 +1148,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1231,7 +1165,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1249,7 +1182,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1267,7 +1199,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1285,7 +1216,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1303,7 +1233,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1321,7 +1250,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1339,7 +1267,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1357,7 +1284,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1375,7 +1301,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1393,7 +1318,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1411,7 +1335,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -1430,7 +1353,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1451,7 +1373,6 @@
       {
         "isolate_name": "blink_python_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -1551,7 +1472,6 @@
         "check_flakiness_for_new_tests": false,
         "isolate_name": "chromedriver_py_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -1573,7 +1493,6 @@
       {
         "isolate_name": "chromedriver_replay_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -1616,7 +1535,6 @@
       {
         "isolate_name": "content_shell_crash_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -1639,7 +1557,6 @@
       {
         "isolate_name": "flatbuffers_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -1662,7 +1579,6 @@
       {
         "isolate_name": "grit_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -1684,7 +1600,6 @@
       {
         "isolate_name": "mac_signing_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mac_signing_tests",
@@ -1703,7 +1618,6 @@
       {
         "isolate_name": "mojo_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -1725,7 +1639,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -1752,7 +1665,6 @@
         ],
         "isolate_name": "telemetry_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -1803,7 +1715,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1821,7 +1732,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1839,7 +1749,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1858,7 +1767,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1876,7 +1784,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1894,7 +1801,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1912,7 +1818,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1930,7 +1835,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1948,7 +1852,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1966,7 +1869,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -1985,7 +1887,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2003,7 +1904,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2021,7 +1921,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2043,7 +1942,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2061,7 +1959,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2079,7 +1976,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2097,7 +1993,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2115,7 +2010,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2133,7 +2027,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2151,7 +2044,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2169,7 +2061,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2187,7 +2078,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2206,7 +2096,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2224,7 +2113,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2242,7 +2130,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2260,7 +2147,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2278,7 +2164,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2296,7 +2181,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2314,7 +2198,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2332,7 +2215,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2350,7 +2232,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2368,7 +2249,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2386,7 +2266,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2404,7 +2283,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2422,7 +2300,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2440,7 +2317,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2458,7 +2334,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2476,7 +2351,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2494,7 +2368,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2512,7 +2385,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2530,7 +2402,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2548,7 +2419,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2566,7 +2436,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2585,7 +2454,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2603,7 +2471,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2621,7 +2488,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2639,7 +2505,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2657,7 +2522,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2675,7 +2539,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2693,7 +2556,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2711,7 +2573,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2729,7 +2590,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2747,7 +2607,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2765,7 +2624,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2783,7 +2641,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2801,7 +2658,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2819,7 +2675,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2837,7 +2692,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2855,7 +2709,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2873,7 +2726,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2891,7 +2743,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2909,7 +2760,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2927,7 +2777,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2945,7 +2794,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2963,7 +2811,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2981,7 +2828,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2999,7 +2845,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3017,7 +2862,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3035,7 +2879,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3053,7 +2896,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3071,7 +2913,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3089,7 +2930,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3107,7 +2947,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3125,7 +2964,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3143,7 +2981,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3161,7 +2998,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3179,7 +3015,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3197,7 +3032,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -3216,7 +3050,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3237,7 +3070,6 @@
       {
         "isolate_name": "blink_python_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -3337,7 +3169,6 @@
         "check_flakiness_for_new_tests": false,
         "isolate_name": "chromedriver_py_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -3359,7 +3190,6 @@
       {
         "isolate_name": "chromedriver_replay_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -3402,7 +3232,6 @@
       {
         "isolate_name": "content_shell_crash_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -3425,7 +3254,6 @@
       {
         "isolate_name": "flatbuffers_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -3448,7 +3276,6 @@
       {
         "isolate_name": "grit_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -3470,7 +3297,6 @@
       {
         "isolate_name": "mac_signing_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mac_signing_tests",
@@ -3489,7 +3315,6 @@
       {
         "isolate_name": "mojo_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -3511,7 +3336,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -3537,7 +3361,6 @@
         ],
         "isolate_name": "telemetry_perf_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -3565,7 +3388,6 @@
         ],
         "isolate_name": "telemetry_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -3616,7 +3438,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3634,7 +3455,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3652,7 +3472,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -3671,7 +3490,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3689,7 +3507,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3707,7 +3524,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3725,7 +3541,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3743,7 +3558,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3761,7 +3575,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3779,7 +3592,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -3798,7 +3610,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3816,7 +3627,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3837,7 +3647,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3855,7 +3664,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3873,7 +3681,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3891,7 +3698,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3909,7 +3715,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3927,7 +3732,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3945,7 +3749,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3963,7 +3766,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3981,7 +3783,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4000,7 +3801,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4018,7 +3818,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4036,7 +3835,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4054,7 +3852,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4072,7 +3869,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4090,7 +3886,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4108,7 +3903,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4126,7 +3920,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4144,7 +3937,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4162,7 +3954,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4180,7 +3971,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4198,7 +3988,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4216,7 +4005,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4234,7 +4022,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4252,7 +4039,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4270,7 +4056,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4288,7 +4073,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4306,7 +4090,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4324,7 +4107,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4342,7 +4124,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4360,7 +4141,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4379,7 +4159,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4397,7 +4176,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4415,7 +4193,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4433,7 +4210,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4451,7 +4227,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4469,7 +4244,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4487,7 +4261,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4505,7 +4278,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4523,7 +4295,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4541,7 +4312,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4559,7 +4329,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4577,7 +4346,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4595,7 +4363,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4613,7 +4380,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4631,7 +4397,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4649,7 +4414,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4667,7 +4431,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4685,7 +4448,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4703,7 +4465,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4721,7 +4482,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4739,7 +4499,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4757,7 +4516,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4775,7 +4533,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4793,7 +4550,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4811,7 +4567,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4829,7 +4584,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4847,7 +4601,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4865,7 +4618,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4883,7 +4635,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4901,7 +4652,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4919,7 +4669,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4937,7 +4686,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4955,7 +4703,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4973,7 +4720,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4991,7 +4737,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -5010,7 +4755,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5031,7 +4775,6 @@
       {
         "isolate_name": "blink_python_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -5131,7 +4874,6 @@
         "check_flakiness_for_new_tests": false,
         "isolate_name": "chromedriver_py_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -5153,7 +4895,6 @@
       {
         "isolate_name": "chromedriver_replay_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -5196,7 +4937,6 @@
       {
         "isolate_name": "content_shell_crash_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -5219,7 +4959,6 @@
       {
         "isolate_name": "flatbuffers_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -5242,7 +4981,6 @@
       {
         "isolate_name": "grit_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -5264,7 +5002,6 @@
       {
         "isolate_name": "mac_signing_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mac_signing_tests",
@@ -5283,7 +5020,6 @@
       {
         "isolate_name": "mojo_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -5305,7 +5041,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -5332,7 +5067,6 @@
         ],
         "isolate_name": "telemetry_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -5384,7 +5118,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5403,7 +5136,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5422,7 +5154,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -5442,7 +5173,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5461,7 +5191,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5480,7 +5209,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5499,7 +5227,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5518,7 +5245,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5537,7 +5263,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5556,7 +5281,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -5576,7 +5300,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5595,7 +5318,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5615,7 +5337,6 @@
         "ci_only": true,
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5638,7 +5359,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5657,7 +5377,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5676,7 +5395,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5695,7 +5413,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5714,7 +5431,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5733,7 +5449,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5752,7 +5467,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5771,7 +5485,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5790,7 +5503,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5810,7 +5522,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5829,7 +5540,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5848,7 +5558,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5867,7 +5576,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5886,7 +5594,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5905,7 +5612,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5924,7 +5630,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5943,7 +5648,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5962,7 +5666,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5981,7 +5684,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6000,7 +5702,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6019,7 +5720,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6038,7 +5738,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6057,7 +5756,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6076,7 +5774,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6095,7 +5792,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6114,7 +5810,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6133,7 +5828,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6152,7 +5846,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6171,7 +5864,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6190,7 +5882,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6211,7 +5902,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6230,7 +5920,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6249,7 +5938,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6268,7 +5956,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6287,7 +5974,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6306,7 +5992,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6325,7 +6010,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6344,7 +6028,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6363,7 +6046,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6382,7 +6064,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6401,7 +6082,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6420,7 +6100,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6439,7 +6118,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6458,7 +6136,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6477,7 +6154,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6496,7 +6172,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6515,7 +6190,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6534,7 +6208,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6553,7 +6226,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6572,7 +6244,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6591,7 +6262,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6610,7 +6280,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6629,7 +6298,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6648,7 +6316,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6667,7 +6334,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6686,7 +6352,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6706,7 +6371,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6725,7 +6389,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6744,7 +6407,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6763,7 +6425,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6782,7 +6443,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6801,7 +6461,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6820,7 +6479,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6839,7 +6497,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6858,7 +6515,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -6878,7 +6534,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6900,7 +6555,6 @@
         "isolate_name": "blink_python_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -7003,7 +6657,6 @@
         "isolate_name": "chromedriver_py_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -7026,7 +6679,6 @@
         "isolate_name": "chromedriver_replay_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -7071,7 +6723,6 @@
         "isolate_name": "content_shell_crash_test",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -7095,7 +6746,6 @@
         "isolate_name": "flatbuffers_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -7119,7 +6769,6 @@
         "isolate_name": "grit_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -7142,7 +6791,6 @@
         "isolate_name": "mac_signing_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mac_signing_tests",
@@ -7162,7 +6810,6 @@
         "isolate_name": "mojo_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -7185,7 +6832,6 @@
         "isolate_name": "telemetry_gpu_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -7213,7 +6859,6 @@
         "isolate_name": "telemetry_perf_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -7242,7 +6887,6 @@
         "isolate_name": "telemetry_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -7295,7 +6939,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7314,7 +6957,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7333,7 +6975,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -7353,7 +6994,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7372,7 +7012,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7391,7 +7030,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7410,7 +7048,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7429,7 +7066,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7448,7 +7084,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7467,7 +7102,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -7487,7 +7121,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7506,7 +7139,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7526,7 +7158,6 @@
         "ci_only": true,
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7549,7 +7180,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7568,7 +7198,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7587,7 +7216,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7606,7 +7234,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7625,7 +7252,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7644,7 +7270,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7663,7 +7288,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7682,7 +7306,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7702,7 +7325,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7723,7 +7345,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7742,7 +7363,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7761,7 +7381,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7780,7 +7399,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7799,7 +7417,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7818,7 +7435,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7837,7 +7453,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7856,7 +7471,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7875,7 +7489,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7894,7 +7507,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7913,7 +7525,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7932,7 +7543,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7951,7 +7561,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7970,7 +7579,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7989,7 +7597,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8008,7 +7615,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8027,7 +7633,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8046,7 +7651,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8065,7 +7669,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8084,7 +7687,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8103,7 +7705,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8124,7 +7725,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8143,7 +7743,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8162,7 +7761,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8181,7 +7779,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8200,7 +7797,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8219,7 +7815,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8238,7 +7833,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8257,7 +7851,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8276,7 +7869,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8295,7 +7887,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8314,7 +7905,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8333,7 +7923,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8352,7 +7941,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8371,7 +7959,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8390,7 +7977,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8409,7 +7995,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8428,7 +8013,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8447,7 +8031,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8466,7 +8049,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8485,7 +8067,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8504,7 +8085,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8523,7 +8103,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8542,7 +8121,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8561,7 +8139,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8580,7 +8157,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8600,7 +8176,6 @@
         "ci_only": true,
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8620,7 +8195,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8639,7 +8213,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8658,7 +8231,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8678,7 +8250,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8697,7 +8268,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8716,7 +8286,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8735,7 +8304,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8754,7 +8322,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8773,7 +8340,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -8793,7 +8359,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8815,7 +8380,6 @@
         "isolate_name": "blink_python_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -8920,7 +8484,6 @@
         "isolate_name": "chromedriver_py_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -8943,7 +8506,6 @@
         "isolate_name": "chromedriver_replay_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -8988,7 +8550,6 @@
         "isolate_name": "content_shell_crash_test",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -9012,7 +8573,6 @@
         "isolate_name": "flatbuffers_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -9036,7 +8596,6 @@
         "isolate_name": "grit_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -9059,7 +8618,6 @@
         "isolate_name": "mac_signing_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mac_signing_tests",
@@ -9079,7 +8637,6 @@
         "isolate_name": "mojo_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -9102,7 +8659,6 @@
         "isolate_name": "telemetry_gpu_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -9130,7 +8686,6 @@
         "isolate_name": "telemetry_perf_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -9159,7 +8714,6 @@
         "isolate_name": "telemetry_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -9211,7 +8765,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9229,7 +8782,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9247,7 +8799,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -9266,7 +8817,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9284,7 +8834,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9302,7 +8851,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9320,7 +8868,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9338,7 +8885,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9356,7 +8902,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9374,7 +8919,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -9393,7 +8937,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9411,7 +8954,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9432,7 +8974,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9450,7 +8991,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9468,7 +9008,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9486,7 +9025,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9504,7 +9042,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9522,7 +9059,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9540,7 +9076,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9558,7 +9093,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9576,7 +9110,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9595,7 +9128,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9613,7 +9145,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9631,7 +9162,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9649,7 +9179,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9667,7 +9196,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9685,7 +9213,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9703,7 +9230,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9721,7 +9247,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9739,7 +9264,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9757,7 +9281,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9775,7 +9298,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9793,7 +9315,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9811,7 +9332,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9829,7 +9349,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9847,7 +9366,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9865,7 +9383,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9883,7 +9400,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9901,7 +9417,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9919,7 +9434,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9937,7 +9451,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9956,7 +9469,6 @@
       {
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9975,7 +9487,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9993,7 +9504,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10011,7 +9521,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10029,7 +9538,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10047,7 +9555,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10065,7 +9572,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10083,7 +9589,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10101,7 +9606,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10119,7 +9623,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10137,7 +9640,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10155,7 +9657,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10173,7 +9674,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10191,7 +9691,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10209,7 +9708,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10227,7 +9725,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10245,7 +9742,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10263,7 +9759,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10281,7 +9776,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10299,7 +9793,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10317,7 +9810,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10335,7 +9827,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10353,7 +9844,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10371,7 +9861,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10389,7 +9878,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10407,7 +9895,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10425,7 +9912,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10443,7 +9929,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10462,7 +9947,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10480,7 +9964,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10498,7 +9981,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10517,7 +9999,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10535,7 +10016,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10553,7 +10033,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10571,7 +10050,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10589,7 +10067,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10607,7 +10084,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -10626,7 +10102,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10647,7 +10122,6 @@
       {
         "isolate_name": "blink_python_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -10747,7 +10221,6 @@
       {
         "isolate_name": "content_shell_crash_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -10770,7 +10243,6 @@
       {
         "isolate_name": "flatbuffers_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -10793,7 +10265,6 @@
       {
         "isolate_name": "grit_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -10846,7 +10317,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -10873,7 +10343,6 @@
         ],
         "isolate_name": "telemetry_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -10958,7 +10427,6 @@
         "isolate_name": "absl_hardening_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "absl_hardening_tests iPhone 8 16.2",
@@ -11012,7 +10480,6 @@
         "isolate_name": "base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -11066,7 +10533,6 @@
         "isolate_name": "base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone X 16.2",
@@ -11120,7 +10586,6 @@
         "isolate_name": "boringssl_crypto_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_crypto_tests iPhone 8 16.2",
@@ -11174,7 +10639,6 @@
         "isolate_name": "boringssl_ssl_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_ssl_tests iPhone 8 16.2",
@@ -11228,7 +10692,6 @@
         "isolate_name": "components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -11282,7 +10745,6 @@
         "isolate_name": "components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone X 16.2",
@@ -11336,7 +10798,6 @@
         "isolate_name": "crashpad_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crashpad_tests iPhone 8 16.2",
@@ -11390,7 +10851,6 @@
         "isolate_name": "crypto_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crypto_unittests iPhone 8 16.2",
@@ -11444,7 +10904,6 @@
         "isolate_name": "gfx_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -11498,7 +10957,6 @@
         "isolate_name": "gfx_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone X 16.2",
@@ -11552,7 +11010,6 @@
         "isolate_name": "google_apis_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "google_apis_unittests iPhone 8 16.2",
@@ -11607,7 +11064,6 @@
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPhone 8 16.2",
@@ -11662,7 +11118,6 @@
         "isolate_name": "ios_chrome_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -11716,7 +11171,6 @@
         "isolate_name": "ios_chrome_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone X 16.2",
@@ -11770,7 +11224,6 @@
         "isolate_name": "ios_components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_components_unittests iPhone 8 16.2",
@@ -11824,7 +11277,6 @@
         "isolate_name": "ios_net_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_net_unittests iPhone 8 16.2",
@@ -11879,7 +11331,6 @@
         "isolate_name": "ios_remoting_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_remoting_unittests iPhone 8 16.2",
@@ -11933,7 +11384,6 @@
         "isolate_name": "ios_testing_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_testing_unittests iPhone 8 16.2",
@@ -11987,7 +11437,6 @@
         "isolate_name": "ios_web_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -12041,7 +11490,6 @@
         "isolate_name": "ios_web_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone X 16.2",
@@ -12096,7 +11544,6 @@
         "isolate_name": "ios_web_shell_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPhone 8 16.2",
@@ -12150,7 +11597,6 @@
         "isolate_name": "ios_web_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -12204,7 +11650,6 @@
         "isolate_name": "ios_web_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone X 16.2",
@@ -12258,7 +11703,6 @@
         "isolate_name": "ios_web_view_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -12312,7 +11756,6 @@
         "isolate_name": "ios_web_view_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone X 16.2",
@@ -12366,7 +11809,6 @@
         "isolate_name": "ios_web_view_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -12420,7 +11862,6 @@
         "isolate_name": "ios_web_view_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone X 16.2",
@@ -12474,7 +11915,6 @@
         "isolate_name": "net_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "net_unittests iPhone 8 16.2",
@@ -12528,7 +11968,6 @@
         "isolate_name": "services_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "services_unittests iPhone 8 16.2",
@@ -12582,7 +12021,6 @@
         "isolate_name": "skia_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -12636,7 +12074,6 @@
         "isolate_name": "skia_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone X 16.2",
@@ -12690,7 +12127,6 @@
         "isolate_name": "sql_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "sql_unittests iPhone 8 16.2",
@@ -12744,7 +12180,6 @@
         "isolate_name": "ui_base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -12798,7 +12233,6 @@
         "isolate_name": "ui_base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone X 16.2",
@@ -12852,7 +12286,6 @@
         "isolate_name": "url_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "url_unittests iPhone 8 16.2",
@@ -12913,7 +12346,6 @@
         "isolate_name": "absl_hardening_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "absl_hardening_tests iPhone 6s 15.5",
@@ -12967,7 +12399,6 @@
         "isolate_name": "base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -13021,7 +12452,6 @@
         "isolate_name": "base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone 6s 15.5",
@@ -13075,7 +12505,6 @@
         "isolate_name": "base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone 8 16.2",
@@ -13129,7 +12558,6 @@
         "isolate_name": "base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone SE (1st generation) 15.5",
@@ -13183,7 +12611,6 @@
         "isolate_name": "boringssl_crypto_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_crypto_tests iPhone 6s 15.5",
@@ -13237,7 +12664,6 @@
         "isolate_name": "boringssl_ssl_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_ssl_tests iPhone 6s 15.5",
@@ -13291,7 +12717,6 @@
         "isolate_name": "components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -13345,7 +12770,6 @@
         "isolate_name": "components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone 6s 15.5",
@@ -13399,7 +12823,6 @@
         "isolate_name": "components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone 8 16.2",
@@ -13453,7 +12876,6 @@
         "isolate_name": "components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone SE (1st generation) 15.5",
@@ -13507,7 +12929,6 @@
         "isolate_name": "crashpad_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crashpad_tests iPhone 6s 15.5",
@@ -13561,7 +12982,6 @@
         "isolate_name": "crypto_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crypto_unittests iPhone 6s 15.5",
@@ -13615,7 +13035,6 @@
         "isolate_name": "gfx_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -13669,7 +13088,6 @@
         "isolate_name": "gfx_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone 6s 15.5",
@@ -13723,7 +13141,6 @@
         "isolate_name": "gfx_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone 8 16.2",
@@ -13777,7 +13194,6 @@
         "isolate_name": "gfx_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone SE (1st generation) 15.5",
@@ -13831,7 +13247,6 @@
         "isolate_name": "google_apis_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "google_apis_unittests iPhone 6s 15.5",
@@ -13886,7 +13301,6 @@
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPad Air 2 15.5",
@@ -13941,7 +13355,6 @@
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -13996,7 +13409,6 @@
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPhone 7 15.5",
@@ -14051,7 +13463,6 @@
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPhone X 16.2",
@@ -14106,7 +13517,6 @@
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -14162,7 +13572,6 @@
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -14218,7 +13627,6 @@
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPhone 6s 15.5",
@@ -14274,7 +13682,6 @@
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPhone 8 16.2",
@@ -14330,7 +13737,6 @@
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPad Air 2 15.5",
@@ -14386,7 +13792,6 @@
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -14442,7 +13847,6 @@
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPhone 7 15.5",
@@ -14498,7 +13902,6 @@
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPhone X 16.2",
@@ -14554,7 +13957,6 @@
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPad Air 2 15.5",
@@ -14610,7 +14012,6 @@
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -14666,7 +14067,6 @@
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPhone 7 15.5",
@@ -14722,7 +14122,6 @@
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPhone X 16.2",
@@ -14778,7 +14177,6 @@
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPad Air 2 15.5",
@@ -14833,7 +14231,6 @@
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -14888,7 +14285,6 @@
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPhone 7 15.5",
@@ -14943,7 +14339,6 @@
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPhone X 16.2",
@@ -14998,7 +14393,6 @@
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPad Air 2 15.5",
@@ -15054,7 +14448,6 @@
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -15110,7 +14503,6 @@
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPhone 7 15.5",
@@ -15166,7 +14558,6 @@
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPhone X 16.2",
@@ -15221,7 +14612,6 @@
         "isolate_name": "ios_chrome_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -15275,7 +14665,6 @@
         "isolate_name": "ios_chrome_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone 6s 15.5",
@@ -15329,7 +14718,6 @@
         "isolate_name": "ios_chrome_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone 8 16.2",
@@ -15383,7 +14771,6 @@
         "isolate_name": "ios_chrome_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone SE (1st generation) 15.5",
@@ -15438,7 +14825,6 @@
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPad Air 2 15.5",
@@ -15494,7 +14880,6 @@
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -15550,7 +14935,6 @@
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPhone 7 15.5",
@@ -15606,7 +14990,6 @@
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPhone X 16.2",
@@ -15661,7 +15044,6 @@
         "isolate_name": "ios_components_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_components_unittests iPhone 6s 15.5",
@@ -15715,7 +15097,6 @@
         "isolate_name": "ios_net_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_net_unittests iPhone 6s 15.5",
@@ -15770,7 +15151,6 @@
         "isolate_name": "ios_remoting_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_remoting_unittests iPhone 6s 15.5",
@@ -15825,7 +15205,6 @@
         "isolate_name": "ios_showcase_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPad Air 2 15.5",
@@ -15880,7 +15259,6 @@
         "isolate_name": "ios_showcase_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -15935,7 +15313,6 @@
         "isolate_name": "ios_showcase_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPhone 7 15.5",
@@ -15990,7 +15367,6 @@
         "isolate_name": "ios_showcase_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPhone X 16.2",
@@ -16044,7 +15420,6 @@
         "isolate_name": "ios_testing_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_testing_unittests iPhone 6s 15.5",
@@ -16098,7 +15473,6 @@
         "isolate_name": "ios_web_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -16152,7 +15526,6 @@
         "isolate_name": "ios_web_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone 6s 15.5",
@@ -16206,7 +15579,6 @@
         "isolate_name": "ios_web_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone 8 16.2",
@@ -16260,7 +15632,6 @@
         "isolate_name": "ios_web_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone SE (1st generation) 15.5",
@@ -16315,7 +15686,6 @@
         "isolate_name": "ios_web_shell_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPad Air (3rd generation) 16.2",
@@ -16370,7 +15740,6 @@
         "isolate_name": "ios_web_shell_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -16425,7 +15794,6 @@
         "isolate_name": "ios_web_shell_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPhone 6s 15.5",
@@ -16480,7 +15848,6 @@
         "isolate_name": "ios_web_shell_eg2tests_module",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPhone 8 16.2",
@@ -16534,7 +15901,6 @@
         "isolate_name": "ios_web_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -16588,7 +15954,6 @@
         "isolate_name": "ios_web_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone 6s 15.5",
@@ -16642,7 +16007,6 @@
         "isolate_name": "ios_web_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone 8 16.2",
@@ -16696,7 +16060,6 @@
         "isolate_name": "ios_web_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone SE (1st generation) 15.5",
@@ -16750,7 +16113,6 @@
         "isolate_name": "ios_web_view_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -16804,7 +16166,6 @@
         "isolate_name": "ios_web_view_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone 6s 15.5",
@@ -16858,7 +16219,6 @@
         "isolate_name": "ios_web_view_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone 8 16.2",
@@ -16912,7 +16272,6 @@
         "isolate_name": "ios_web_view_inttests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone SE (1st generation) 15.5",
@@ -16966,7 +16325,6 @@
         "isolate_name": "ios_web_view_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -17020,7 +16378,6 @@
         "isolate_name": "ios_web_view_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone 6s 15.5",
@@ -17074,7 +16431,6 @@
         "isolate_name": "ios_web_view_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone 8 16.2",
@@ -17128,7 +16484,6 @@
         "isolate_name": "ios_web_view_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone SE (1st generation) 15.5",
@@ -17182,7 +16537,6 @@
         "isolate_name": "net_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "net_unittests iPhone 6s 15.5",
@@ -17236,7 +16590,6 @@
         "isolate_name": "services_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "services_unittests iPhone 6s 15.5",
@@ -17290,7 +16643,6 @@
         "isolate_name": "skia_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -17344,7 +16696,6 @@
         "isolate_name": "skia_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone 6s 15.5",
@@ -17398,7 +16749,6 @@
         "isolate_name": "skia_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone 8 16.2",
@@ -17452,7 +16802,6 @@
         "isolate_name": "skia_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone SE (1st generation) 15.5",
@@ -17506,7 +16855,6 @@
         "isolate_name": "sql_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "sql_unittests iPhone 6s 15.5",
@@ -17560,7 +16908,6 @@
         "isolate_name": "ui_base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -17614,7 +16961,6 @@
         "isolate_name": "ui_base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone 6s 15.5",
@@ -17668,7 +17014,6 @@
         "isolate_name": "ui_base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone 8 16.2",
@@ -17722,7 +17067,6 @@
         "isolate_name": "ui_base_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone SE (1st generation) 15.5",
@@ -17776,7 +17120,6 @@
         "isolate_name": "url_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "url_unittests iPhone 6s 15.5",
@@ -17836,7 +17179,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPad Air (3rd generation) 16.2",
@@ -17888,7 +17230,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPad Air 2 15.5",
@@ -17940,7 +17281,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone 6s Plus 15.5",
@@ -17992,7 +17332,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone SE (3rd generation) 16.2",
@@ -18044,7 +17383,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPad Air (3rd generation) 16.2",
@@ -18096,7 +17434,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPad Air 2 15.5",
@@ -18148,7 +17485,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone 6s Plus 15.5",
@@ -18200,7 +17536,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone SE (3rd generation) 16.2",
@@ -18252,7 +17587,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPad Air (3rd generation) 16.2",
@@ -18304,7 +17638,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPad Air 2 15.5",
@@ -18356,7 +17689,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone 6s Plus 15.5",
@@ -18408,7 +17740,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone SE (3rd generation) 16.2",
@@ -18463,7 +17794,6 @@
         ],
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -18518,7 +17848,6 @@
         ],
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -18574,7 +17903,6 @@
         ],
         "isolate_name": "ios_chrome_bookmarks_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_bookmarks_eg2tests_module iPhone X 15.5",
@@ -18629,7 +17957,6 @@
         ],
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPad Air 2 15.5",
@@ -18685,7 +18012,6 @@
         ],
         "isolate_name": "ios_chrome_integration_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_integration_eg2tests_module iPhone 7 15.5",
@@ -18741,7 +18067,6 @@
         ],
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -18797,7 +18122,6 @@
         ],
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -18854,7 +18178,6 @@
         ],
         "isolate_name": "ios_chrome_settings_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_settings_eg2tests_module iPhone X 15.5",
@@ -18910,7 +18233,6 @@
         ],
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -18966,7 +18288,6 @@
         ],
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -19023,7 +18344,6 @@
         ],
         "isolate_name": "ios_chrome_signin_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_signin_eg2tests_module iPhone X 15.5",
@@ -19079,7 +18399,6 @@
         ],
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -19134,7 +18453,6 @@
         ],
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -19190,7 +18508,6 @@
         ],
         "isolate_name": "ios_chrome_smoke_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_smoke_eg2tests_module iPhone X 15.5",
@@ -19245,7 +18562,6 @@
         ],
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -19301,7 +18617,6 @@
         ],
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -19358,7 +18673,6 @@
         ],
         "isolate_name": "ios_chrome_ui_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_ui_eg2tests_module iPhone X 15.5",
@@ -19411,7 +18725,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPad Air (3rd generation) 16.2",
@@ -19463,7 +18776,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPad Air 2 15.5",
@@ -19515,7 +18827,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone 6s Plus 15.5",
@@ -19567,7 +18878,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone SE (3rd generation) 16.2",
@@ -19622,7 +18932,6 @@
         ],
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -19678,7 +18987,6 @@
         ],
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -19735,7 +19043,6 @@
         ],
         "isolate_name": "ios_chrome_web_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_web_eg2tests_module iPhone X 15.5",
@@ -19789,7 +19096,6 @@
         ],
         "isolate_name": "ios_crash_xcuitests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_crash_xcuitests_module iPhone 7 15.5",
@@ -19844,7 +19150,6 @@
         ],
         "isolate_name": "ios_showcase_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 15.5",
@@ -19899,7 +19204,6 @@
         ],
         "isolate_name": "ios_showcase_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPad Pro (12.9-inch) (3rd generation) 16.2",
@@ -19955,7 +19259,6 @@
         ],
         "isolate_name": "ios_showcase_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_showcase_eg2tests_module iPhone X 15.5",
@@ -20007,7 +19310,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPad Air (3rd generation) 16.2",
@@ -20059,7 +19361,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPad Air 2 15.5",
@@ -20111,7 +19412,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone 6s Plus 15.5",
@@ -20163,7 +19463,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone SE (3rd generation) 16.2",
@@ -20218,7 +19517,6 @@
         ],
         "isolate_name": "ios_web_shell_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPad Air 2 15.5",
@@ -20273,7 +19571,6 @@
         ],
         "isolate_name": "ios_web_shell_eg2tests_module",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_shell_eg2tests_module iPhone 7 15.5",
@@ -20325,7 +19622,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPad Air (3rd generation) 16.2",
@@ -20377,7 +19673,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPad Air 2 15.5",
@@ -20429,7 +19724,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone 6s Plus 15.5",
@@ -20481,7 +19775,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone SE (3rd generation) 16.2",
@@ -20533,7 +19826,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPad Air (3rd generation) 16.2",
@@ -20585,7 +19877,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPad Air 2 15.5",
@@ -20637,7 +19928,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone 6s Plus 15.5",
@@ -20689,7 +19979,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone SE (3rd generation) 16.2",
@@ -20741,7 +20030,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPad Air (3rd generation) 16.2",
@@ -20793,7 +20081,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPad Air 2 15.5",
@@ -20845,7 +20132,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone 6s Plus 15.5",
@@ -20897,7 +20183,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone SE (3rd generation) 16.2",
@@ -20949,7 +20234,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPad Air (3rd generation) 16.2",
@@ -21001,7 +20285,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPad Air 2 15.5",
@@ -21053,7 +20336,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone 6s Plus 15.5",
@@ -21105,7 +20387,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone SE (3rd generation) 16.2",
@@ -21157,7 +20438,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPad Air (3rd generation) 16.2",
@@ -21209,7 +20489,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPad Air 2 15.5",
@@ -21261,7 +20540,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone 6s Plus 15.5",
@@ -21313,7 +20591,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone SE (3rd generation) 16.2",
@@ -21372,7 +20649,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21390,7 +20666,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21408,7 +20683,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -21427,7 +20701,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21445,7 +20718,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21463,7 +20735,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21481,7 +20752,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21499,7 +20769,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21517,7 +20786,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21535,7 +20803,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -21554,7 +20821,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21572,7 +20838,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21593,7 +20858,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21611,7 +20875,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21629,7 +20892,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21647,7 +20909,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21665,7 +20926,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21683,7 +20943,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21701,7 +20960,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21719,7 +20977,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21737,7 +20994,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21756,7 +21012,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21774,7 +21029,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21792,7 +21046,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21810,7 +21063,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21828,7 +21080,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21846,7 +21097,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21864,7 +21114,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21882,7 +21131,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21900,7 +21148,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21918,7 +21165,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21936,7 +21182,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21954,7 +21199,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21972,7 +21216,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21990,7 +21233,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22008,7 +21250,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22026,7 +21267,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22044,7 +21284,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22062,7 +21301,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22080,7 +21318,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22098,7 +21335,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22117,7 +21353,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22135,7 +21370,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22153,7 +21387,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22171,7 +21404,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22189,7 +21421,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22207,7 +21438,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22225,7 +21455,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22243,7 +21472,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22261,7 +21489,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22279,7 +21506,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22297,7 +21523,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22315,7 +21540,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22333,7 +21557,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22351,7 +21574,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22369,7 +21591,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22387,7 +21608,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22405,7 +21625,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22423,7 +21642,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22441,7 +21659,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22459,7 +21676,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22477,7 +21693,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22495,7 +21710,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22513,7 +21727,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22531,7 +21744,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22549,7 +21761,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22567,7 +21778,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22585,7 +21795,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22603,7 +21812,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22621,7 +21829,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22639,7 +21846,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22657,7 +21863,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22675,7 +21880,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22693,7 +21897,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22711,7 +21914,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -22730,7 +21932,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22751,7 +21952,6 @@
       {
         "isolate_name": "blink_python_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -22851,7 +22051,6 @@
         "check_flakiness_for_new_tests": false,
         "isolate_name": "chromedriver_py_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -22873,7 +22072,6 @@
       {
         "isolate_name": "chromedriver_replay_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -22916,7 +22114,6 @@
       {
         "isolate_name": "content_shell_crash_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -22939,7 +22136,6 @@
       {
         "isolate_name": "flatbuffers_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -22962,7 +22158,6 @@
       {
         "isolate_name": "mac_signing_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mac_signing_tests",
@@ -22981,7 +22176,6 @@
       {
         "isolate_name": "mojo_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -23003,7 +22197,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -23029,7 +22222,6 @@
         ],
         "isolate_name": "telemetry_perf_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -23081,7 +22273,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23100,7 +22291,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23119,7 +22309,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -23139,7 +22328,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23158,7 +22346,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23177,7 +22364,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23196,7 +22382,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23215,7 +22400,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23234,7 +22418,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23253,7 +22436,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -23273,7 +22455,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23292,7 +22473,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23314,7 +22494,6 @@
         ],
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23333,7 +22512,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23352,7 +22530,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23371,7 +22548,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23390,7 +22566,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23409,7 +22584,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23428,7 +22602,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23447,7 +22620,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23466,7 +22638,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23486,7 +22657,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23505,7 +22675,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23524,7 +22693,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23543,7 +22711,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23562,7 +22729,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23581,7 +22747,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23600,7 +22765,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23619,7 +22783,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23638,7 +22801,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23657,7 +22819,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23676,7 +22837,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23695,7 +22855,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23714,7 +22873,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23733,7 +22891,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23752,7 +22909,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23771,7 +22927,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23790,7 +22945,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23809,7 +22963,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23828,7 +22981,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23847,7 +22999,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23867,7 +23018,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23886,7 +23036,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23905,7 +23054,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23924,7 +23072,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23943,7 +23090,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23962,7 +23108,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -23981,7 +23126,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24000,7 +23144,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24019,7 +23162,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24038,7 +23180,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24057,7 +23198,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24076,7 +23216,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24095,7 +23234,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24114,7 +23252,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24133,7 +23270,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24152,7 +23288,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24171,7 +23306,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24190,7 +23324,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24209,7 +23342,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24228,7 +23360,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24247,7 +23378,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24266,7 +23396,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24285,7 +23414,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24304,7 +23432,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24323,7 +23450,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24342,7 +23468,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24361,7 +23486,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24380,7 +23504,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24399,7 +23522,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24418,7 +23540,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24437,7 +23558,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24456,7 +23576,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24475,7 +23594,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24494,7 +23612,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -24514,7 +23631,6 @@
       {
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24536,7 +23652,6 @@
         "ci_only": true,
         "isolate_name": "blink_python_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -24639,7 +23754,6 @@
         "ci_only": true,
         "isolate_name": "chromedriver_py_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -24662,7 +23776,6 @@
         "ci_only": true,
         "isolate_name": "chromedriver_replay_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -24707,7 +23820,6 @@
         "ci_only": true,
         "isolate_name": "content_shell_crash_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -24731,7 +23843,6 @@
         "ci_only": true,
         "isolate_name": "flatbuffers_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -24755,7 +23866,6 @@
         "ci_only": true,
         "isolate_name": "mac_signing_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mac_signing_tests",
@@ -24775,7 +23885,6 @@
         "ci_only": true,
         "isolate_name": "mojo_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -24798,7 +23907,6 @@
         "ci_only": true,
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -24825,7 +23933,6 @@
         "ci_only": true,
         "isolate_name": "telemetry_perf_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",

testing/buildbot/chromium.memory.fyi.json

diff --git a/testing/buildbot/chromium.memory.fyi.json b/testing/buildbot/chromium.memory.fyi.json
index ba529df..5f4c460 100644
--- a/testing/buildbot/chromium.memory.fyi.json
+++ b/testing/buildbot/chromium.memory.fyi.json
@@ -6,7 +6,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -24,7 +23,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -42,7 +40,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -61,7 +58,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -79,7 +75,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -97,7 +92,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -115,7 +109,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -133,7 +126,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -151,7 +143,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -169,7 +160,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -187,7 +177,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -206,7 +195,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -224,7 +212,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -242,7 +229,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -264,7 +250,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -282,7 +267,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -300,7 +284,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -318,7 +301,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -336,7 +318,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -354,7 +335,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -372,7 +352,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -390,7 +369,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -408,7 +386,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -426,7 +403,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -445,7 +421,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -463,7 +438,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -481,7 +455,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -499,7 +472,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -517,7 +489,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -535,7 +506,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -553,7 +523,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -571,7 +540,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -589,7 +557,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -607,7 +574,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -625,7 +591,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -643,7 +608,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -661,7 +625,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -679,7 +642,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -697,7 +659,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -715,7 +676,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -733,7 +693,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -751,7 +710,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -769,7 +727,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -787,7 +744,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -805,7 +761,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -824,7 +779,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -842,7 +796,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -860,7 +813,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -878,7 +830,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -896,7 +847,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -914,7 +864,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -932,7 +881,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -950,7 +898,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -968,7 +915,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -986,7 +932,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1004,7 +949,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1022,7 +966,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1040,7 +983,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1058,7 +1000,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1076,7 +1017,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1094,7 +1034,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1112,7 +1051,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1130,7 +1068,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1148,7 +1085,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1166,7 +1102,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1184,7 +1119,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1202,7 +1136,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1220,7 +1153,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1238,7 +1170,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1256,7 +1187,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1274,7 +1204,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1292,7 +1221,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1310,7 +1238,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1328,7 +1255,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1346,7 +1272,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1364,7 +1289,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1382,7 +1306,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1400,7 +1323,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1418,7 +1340,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1436,7 +1357,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1454,7 +1374,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1472,7 +1391,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1490,7 +1408,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -1509,7 +1426,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1533,7 +1449,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1554,7 +1469,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1575,7 +1489,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1596,7 +1509,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1617,7 +1529,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1638,7 +1549,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1659,7 +1569,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1680,7 +1589,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1701,7 +1609,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1722,7 +1629,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1743,7 +1649,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1764,7 +1669,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1785,7 +1689,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1806,7 +1709,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/chromium.memory.json

diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json
index 0b86d77..a110bc8 100644
--- a/testing/buildbot/chromium.memory.json
+++ b/testing/buildbot/chromium.memory.json
@@ -8,7 +8,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28,7 +27,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -48,7 +46,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -69,7 +66,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -89,7 +85,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -109,7 +104,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -129,7 +123,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -149,7 +142,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -169,7 +161,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -189,7 +180,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -209,7 +199,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -231,7 +220,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -251,7 +239,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -272,7 +259,6 @@
         ],
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -294,7 +280,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -314,7 +299,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -334,7 +318,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -354,7 +337,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -374,7 +356,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -394,7 +375,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -414,7 +394,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -434,7 +413,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -455,7 +433,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -475,7 +452,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -496,7 +472,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -517,7 +492,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -537,7 +511,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -557,7 +530,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -577,7 +549,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -597,7 +568,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -617,7 +587,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -637,7 +606,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -657,7 +625,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -677,7 +644,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -697,7 +663,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -717,7 +682,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -737,7 +701,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -757,7 +720,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -780,7 +742,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -804,7 +765,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -824,7 +784,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -844,7 +803,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -864,7 +822,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -884,7 +841,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -904,7 +860,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -924,7 +879,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -945,7 +899,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -965,7 +918,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -985,7 +937,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1005,7 +956,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1025,7 +975,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1045,7 +994,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1065,7 +1013,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1085,7 +1032,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1105,7 +1051,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1125,7 +1070,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1145,7 +1089,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1166,7 +1109,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1186,7 +1128,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1206,7 +1147,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1226,7 +1166,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1246,7 +1185,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1266,7 +1204,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1286,7 +1223,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1306,7 +1242,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1326,7 +1261,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1346,7 +1280,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1366,7 +1299,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1387,7 +1319,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1407,7 +1338,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1427,7 +1357,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1447,7 +1376,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1467,7 +1395,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1487,7 +1414,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1508,7 +1434,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1528,7 +1453,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1548,7 +1472,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1569,7 +1492,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1589,7 +1511,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1609,7 +1530,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1629,7 +1549,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1649,7 +1568,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1669,7 +1587,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1689,7 +1606,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -1710,7 +1626,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1734,7 +1649,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1755,7 +1669,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1775,7 +1688,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1796,7 +1708,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1818,7 +1729,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1835,7 +1745,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1852,7 +1761,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1870,7 +1778,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1887,7 +1794,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1904,7 +1810,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1921,7 +1826,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1938,7 +1842,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1955,7 +1858,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1972,7 +1874,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1989,7 +1890,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -2007,7 +1907,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2024,7 +1923,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2041,7 +1939,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2062,7 +1959,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2079,7 +1975,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2096,7 +1991,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2113,7 +2007,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2130,7 +2023,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2147,7 +2039,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2164,7 +2055,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2181,7 +2071,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2198,7 +2087,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2215,7 +2103,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2233,7 +2120,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2250,7 +2136,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2267,7 +2152,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2284,7 +2168,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2301,7 +2184,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2318,7 +2200,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2335,7 +2216,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2352,7 +2232,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2369,7 +2248,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2386,7 +2264,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2403,7 +2280,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2420,7 +2296,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2437,7 +2312,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2454,7 +2328,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2476,7 +2349,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -2497,7 +2369,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2514,7 +2385,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2531,7 +2401,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2548,7 +2417,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2565,7 +2433,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2582,7 +2449,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2599,7 +2465,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2617,7 +2482,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2634,7 +2498,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2651,7 +2514,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2668,7 +2530,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2685,7 +2546,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2702,7 +2562,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2719,7 +2578,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2736,7 +2594,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2753,7 +2610,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2770,7 +2626,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2787,7 +2642,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2804,7 +2658,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2821,7 +2674,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2838,7 +2690,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2855,7 +2706,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2872,7 +2722,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2889,7 +2738,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2906,7 +2754,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2923,7 +2770,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2940,7 +2786,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2957,7 +2802,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2974,7 +2818,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2991,7 +2834,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3008,7 +2850,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3025,7 +2866,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3042,7 +2882,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3059,7 +2898,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3076,7 +2914,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3093,7 +2930,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3110,7 +2946,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3127,7 +2962,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3144,7 +2978,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3161,7 +2994,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3178,7 +3010,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3195,7 +3026,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3212,7 +3042,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3229,7 +3058,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3246,7 +3074,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -3264,7 +3091,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3288,7 +3114,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3308,7 +3133,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3328,7 +3152,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -3349,7 +3172,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3369,7 +3191,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3390,7 +3211,6 @@
         ],
         "ci_only": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3410,7 +3230,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3431,7 +3250,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3451,7 +3269,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3471,7 +3288,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3491,7 +3307,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3511,7 +3326,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3531,7 +3345,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3551,7 +3364,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3571,7 +3383,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -3592,7 +3403,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3612,7 +3422,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3632,7 +3441,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3654,7 +3462,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3674,7 +3481,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3694,7 +3500,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3714,7 +3519,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3734,7 +3538,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3754,7 +3557,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3774,7 +3576,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3794,7 +3595,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3814,7 +3614,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3834,7 +3633,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3855,7 +3653,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3875,7 +3672,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3896,7 +3692,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3916,7 +3711,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3936,7 +3730,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3956,7 +3749,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3976,7 +3768,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3996,7 +3787,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4016,7 +3806,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4036,7 +3825,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4056,7 +3844,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4076,7 +3863,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4096,7 +3882,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4116,7 +3901,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4136,7 +3920,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4156,7 +3939,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4176,7 +3958,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4196,7 +3977,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4216,7 +3996,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4236,7 +4015,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4258,7 +4036,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4278,7 +4055,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4298,7 +4074,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4318,7 +4093,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4338,7 +4112,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4358,7 +4131,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4378,7 +4150,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4398,7 +4169,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4418,7 +4188,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4438,7 +4207,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4458,7 +4226,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4478,7 +4245,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4500,7 +4266,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4520,7 +4285,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4540,7 +4304,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4560,7 +4323,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4580,7 +4342,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4600,7 +4361,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4620,7 +4380,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4640,7 +4399,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4660,7 +4418,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4680,7 +4437,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4700,7 +4456,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4720,7 +4475,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4740,7 +4494,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4760,7 +4513,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4780,7 +4532,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4800,7 +4551,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4820,7 +4570,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4840,7 +4589,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4860,7 +4608,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4880,7 +4627,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4900,7 +4646,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4920,7 +4665,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4941,7 +4685,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4962,7 +4705,6 @@
         ],
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4982,7 +4724,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5002,7 +4743,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5022,7 +4762,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5042,7 +4781,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5062,7 +4800,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5082,7 +4819,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5102,7 +4838,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5126,7 +4861,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5147,7 +4881,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5168,7 +4901,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -5190,7 +4922,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5211,7 +4942,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5232,7 +4962,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5254,7 +4983,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5275,7 +5003,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5296,7 +5023,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5317,7 +5043,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5338,7 +5063,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5359,7 +5083,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5380,7 +5103,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5401,7 +5123,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -5423,7 +5144,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5444,7 +5164,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5466,7 +5185,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.msan.browser_tests.oobe_negative.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5490,7 +5208,6 @@
         ],
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "oobe_only_browser_tests",
@@ -5514,7 +5231,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5535,7 +5251,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5556,7 +5271,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5577,7 +5291,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5598,7 +5311,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5619,7 +5331,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5640,7 +5351,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5661,7 +5371,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5682,7 +5391,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5703,7 +5411,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5724,7 +5431,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5745,7 +5451,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5767,7 +5472,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5789,7 +5493,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5810,7 +5513,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5831,7 +5533,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5852,7 +5553,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5873,7 +5573,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5894,7 +5593,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5915,7 +5613,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5936,7 +5633,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5957,7 +5653,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5978,7 +5673,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5999,7 +5693,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6020,7 +5713,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6041,7 +5733,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6062,7 +5753,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6083,7 +5773,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6104,7 +5793,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6125,7 +5813,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6147,7 +5834,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6168,7 +5854,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6189,7 +5874,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6210,7 +5894,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6231,7 +5914,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6252,7 +5934,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6273,7 +5954,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6294,7 +5974,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6315,7 +5994,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6336,7 +6014,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6357,7 +6034,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6378,7 +6054,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6401,7 +6076,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6422,7 +6096,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6443,7 +6116,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6464,7 +6136,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6485,7 +6156,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6506,7 +6176,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6527,7 +6196,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6548,7 +6216,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6569,7 +6236,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6590,7 +6256,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6611,7 +6276,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6632,7 +6296,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6653,7 +6316,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6674,7 +6336,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6695,7 +6356,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6716,7 +6376,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6737,7 +6396,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6758,7 +6416,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6779,7 +6436,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6800,7 +6456,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6821,7 +6476,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6843,7 +6497,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6865,7 +6518,6 @@
         ],
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6886,7 +6538,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6907,7 +6558,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6928,7 +6578,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6949,7 +6598,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6970,7 +6618,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6991,7 +6638,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7012,7 +6658,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7037,7 +6682,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7058,7 +6702,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7079,7 +6722,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -7101,7 +6743,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7122,7 +6763,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7143,7 +6783,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7164,7 +6803,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7185,7 +6823,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7206,7 +6843,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7227,7 +6863,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7248,7 +6883,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -7270,7 +6904,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7291,7 +6924,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7312,7 +6944,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7335,7 +6966,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7356,7 +6986,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7377,7 +7006,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7398,7 +7026,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7419,7 +7046,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7440,7 +7066,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7461,7 +7086,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7482,7 +7106,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7503,7 +7126,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7524,7 +7146,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7546,7 +7167,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7567,7 +7187,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7588,7 +7207,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7609,7 +7227,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7630,7 +7247,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7651,7 +7267,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7672,7 +7287,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7693,7 +7307,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7714,7 +7327,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7735,7 +7347,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7756,7 +7367,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7777,7 +7387,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7798,7 +7407,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7819,7 +7427,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7840,7 +7447,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7861,7 +7467,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7882,7 +7487,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7903,7 +7507,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7924,7 +7527,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7945,7 +7547,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7966,7 +7567,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -7988,7 +7588,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8009,7 +7608,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8030,7 +7628,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8051,7 +7648,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8072,7 +7668,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8093,7 +7688,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8114,7 +7708,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8135,7 +7728,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8156,7 +7748,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8177,7 +7768,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8198,7 +7788,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8219,7 +7808,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8240,7 +7828,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8261,7 +7848,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8282,7 +7868,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8303,7 +7888,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8324,7 +7908,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8345,7 +7928,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8366,7 +7948,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8387,7 +7968,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8408,7 +7988,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8429,7 +8008,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8450,7 +8028,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8471,7 +8048,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8492,7 +8068,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8513,7 +8088,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8534,7 +8108,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8555,7 +8128,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8576,7 +8148,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8597,7 +8168,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8618,7 +8188,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8639,7 +8208,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8660,7 +8228,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8681,7 +8248,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8702,7 +8268,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8723,7 +8288,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8744,7 +8308,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -8766,7 +8329,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8791,7 +8353,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8811,7 +8372,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8831,7 +8391,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -8852,7 +8411,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8872,7 +8430,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8892,7 +8449,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8912,7 +8468,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8932,7 +8487,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8952,7 +8506,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8972,7 +8525,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -8992,7 +8544,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -9014,7 +8565,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9034,7 +8584,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9055,7 +8604,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9075,7 +8623,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9095,7 +8642,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9116,7 +8662,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9136,7 +8681,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9156,7 +8700,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9176,7 +8719,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9197,7 +8739,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9218,7 +8759,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9238,7 +8778,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9269,7 +8808,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "vulkan_swiftshader_content_browsertests",
@@ -9290,7 +8828,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9310,7 +8847,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9330,7 +8866,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9350,7 +8885,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9370,7 +8904,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9390,7 +8923,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9410,7 +8942,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9430,7 +8961,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9450,7 +8980,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9470,7 +8999,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9490,7 +9018,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9510,7 +9037,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9530,7 +9056,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9550,7 +9075,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9573,7 +9097,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gl_tests_passthrough",
@@ -9597,7 +9120,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9617,7 +9139,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9637,7 +9158,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9657,7 +9177,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9677,7 +9196,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9697,7 +9215,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9717,7 +9234,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9738,7 +9254,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9758,7 +9273,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9778,7 +9292,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9798,7 +9311,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9818,7 +9330,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9838,7 +9349,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9858,7 +9368,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9878,7 +9387,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9898,7 +9406,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9918,7 +9425,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9939,7 +9445,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9959,7 +9464,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9979,7 +9483,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -9999,7 +9502,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10019,7 +9521,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10039,7 +9540,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10059,7 +9559,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10079,7 +9578,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10099,7 +9597,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10119,7 +9616,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10139,7 +9635,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10159,7 +9654,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10179,7 +9673,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10199,7 +9692,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10219,7 +9711,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10239,7 +9730,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10259,7 +9749,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10280,7 +9769,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10300,7 +9788,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10320,7 +9807,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10341,7 +9827,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10361,7 +9846,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10381,7 +9865,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10401,7 +9884,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10421,7 +9903,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10441,7 +9922,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10461,7 +9941,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -10482,7 +9961,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10506,7 +9984,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10527,7 +10004,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10548,7 +10024,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -10570,7 +10045,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10591,7 +10065,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10612,7 +10085,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10633,7 +10105,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10654,7 +10125,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10675,7 +10145,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10696,7 +10165,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -10718,7 +10186,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10739,7 +10206,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10762,7 +10228,6 @@
         ],
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10785,7 +10250,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10806,7 +10270,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10827,7 +10290,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10848,7 +10310,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10869,7 +10330,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10890,7 +10350,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10911,7 +10370,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10932,7 +10390,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10954,7 +10411,6 @@
         ],
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10976,7 +10432,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -10997,7 +10452,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11018,7 +10472,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11039,7 +10492,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11060,7 +10512,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11081,7 +10532,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11102,7 +10552,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11123,7 +10572,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11144,7 +10592,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11165,7 +10612,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11186,7 +10632,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11207,7 +10652,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11228,7 +10672,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11249,7 +10692,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11270,7 +10712,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11291,7 +10732,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11312,7 +10752,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11333,7 +10772,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11354,7 +10792,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11375,7 +10812,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11397,7 +10833,6 @@
         ],
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11419,7 +10854,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11440,7 +10874,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11461,7 +10894,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11482,7 +10914,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11503,7 +10934,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11524,7 +10954,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11545,7 +10974,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11566,7 +10994,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11587,7 +11014,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11608,7 +11034,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11629,7 +11054,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11650,7 +11074,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11671,7 +11094,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11692,7 +11114,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11713,7 +11134,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11734,7 +11154,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11755,7 +11174,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11776,7 +11194,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11797,7 +11214,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11818,7 +11234,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11839,7 +11254,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11860,7 +11274,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11881,7 +11294,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11902,7 +11314,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11923,7 +11334,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11944,7 +11354,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11966,7 +11375,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -11987,7 +11395,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12008,7 +11415,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12029,7 +11435,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12050,7 +11455,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12071,7 +11475,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12092,7 +11495,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12113,7 +11515,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -12134,7 +11535,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -12156,7 +11556,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -14932,7 +14331,6 @@
         ],
         "isolate_name": "absl_hardening_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "absl_hardening_tests iPad Air 2 15.5",
@@ -14984,7 +14382,6 @@
         ],
         "isolate_name": "absl_hardening_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "absl_hardening_tests iPhone X 15.5",
@@ -15036,7 +14433,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPad Air 2 15.5",
@@ -15088,7 +14484,6 @@
         ],
         "isolate_name": "base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "base_unittests iPhone X 15.5",
@@ -15140,7 +14535,6 @@
         ],
         "isolate_name": "boringssl_crypto_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_crypto_tests iPad Air 2 15.5",
@@ -15192,7 +14586,6 @@
         ],
         "isolate_name": "boringssl_crypto_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_crypto_tests iPhone X 15.5",
@@ -15244,7 +14637,6 @@
         ],
         "isolate_name": "boringssl_ssl_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_ssl_tests iPad Air 2 15.5",
@@ -15296,7 +14688,6 @@
         ],
         "isolate_name": "boringssl_ssl_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "boringssl_ssl_tests iPhone X 15.5",
@@ -15348,7 +14739,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPad Air 2 15.5",
@@ -15400,7 +14790,6 @@
         ],
         "isolate_name": "components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "components_unittests iPhone X 15.5",
@@ -15452,7 +14841,6 @@
         ],
         "isolate_name": "crashpad_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crashpad_tests iPad Air 2 15.5",
@@ -15504,7 +14892,6 @@
         ],
         "isolate_name": "crashpad_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crashpad_tests iPhone X 15.5",
@@ -15556,7 +14943,6 @@
         ],
         "isolate_name": "crypto_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crypto_unittests iPad Air 2 15.5",
@@ -15608,7 +14994,6 @@
         ],
         "isolate_name": "crypto_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "crypto_unittests iPhone X 15.5",
@@ -15660,7 +15045,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPad Air 2 15.5",
@@ -15712,7 +15096,6 @@
         ],
         "isolate_name": "gfx_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gfx_unittests iPhone X 15.5",
@@ -15764,7 +15147,6 @@
         ],
         "isolate_name": "google_apis_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "google_apis_unittests iPad Air 2 15.5",
@@ -15816,7 +15198,6 @@
         ],
         "isolate_name": "google_apis_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "google_apis_unittests iPhone X 15.5",
@@ -15868,7 +15249,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPad Air 2 15.5",
@@ -15920,7 +15300,6 @@
         ],
         "isolate_name": "ios_chrome_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_chrome_unittests iPhone X 15.5",
@@ -15972,7 +15351,6 @@
         ],
         "isolate_name": "ios_components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_components_unittests iPad Air 2 15.5",
@@ -16024,7 +15402,6 @@
         ],
         "isolate_name": "ios_components_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_components_unittests iPhone X 15.5",
@@ -16076,7 +15453,6 @@
         ],
         "isolate_name": "ios_net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_net_unittests iPad Air 2 15.5",
@@ -16129,7 +15505,6 @@
         ],
         "isolate_name": "ios_net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_net_unittests iPhone X 15.5",
@@ -16182,7 +15557,6 @@
         ],
         "isolate_name": "ios_remoting_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_remoting_unittests iPad Air 2 15.5",
@@ -16234,7 +15608,6 @@
         ],
         "isolate_name": "ios_remoting_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_remoting_unittests iPhone X 15.5",
@@ -16286,7 +15659,6 @@
         ],
         "isolate_name": "ios_testing_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_testing_unittests iPad Air 2 15.5",
@@ -16338,7 +15710,6 @@
         ],
         "isolate_name": "ios_testing_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_testing_unittests iPhone X 15.5",
@@ -16390,7 +15761,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPad Air 2 15.5",
@@ -16442,7 +15812,6 @@
         ],
         "isolate_name": "ios_web_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_inttests iPhone X 15.5",
@@ -16494,7 +15863,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPad Air 2 15.5",
@@ -16546,7 +15914,6 @@
         ],
         "isolate_name": "ios_web_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_unittests iPhone X 15.5",
@@ -16598,7 +15965,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPad Air 2 15.5",
@@ -16650,7 +16016,6 @@
         ],
         "isolate_name": "ios_web_view_inttests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_inttests iPhone X 15.5",
@@ -16702,7 +16067,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPad Air 2 15.5",
@@ -16754,7 +16118,6 @@
         ],
         "isolate_name": "ios_web_view_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_web_view_unittests iPhone X 15.5",
@@ -16806,7 +16169,6 @@
         ],
         "isolate_name": "net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "net_unittests iPad Air 2 15.5",
@@ -16858,7 +16220,6 @@
         ],
         "isolate_name": "net_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "net_unittests iPhone X 15.5",
@@ -16910,7 +16271,6 @@
         ],
         "isolate_name": "services_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "services_unittests iPad Air 2 15.5",
@@ -16962,7 +16322,6 @@
         ],
         "isolate_name": "services_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "services_unittests iPhone X 15.5",
@@ -17014,7 +16373,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPad Air 2 15.5",
@@ -17066,7 +16424,6 @@
         ],
         "isolate_name": "skia_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "skia_unittests iPhone X 15.5",
@@ -17118,7 +16475,6 @@
         ],
         "isolate_name": "sql_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "sql_unittests iPad Air 2 15.5",
@@ -17170,7 +16526,6 @@
         ],
         "isolate_name": "sql_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "sql_unittests iPhone X 15.5",
@@ -17222,7 +16577,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPad Air 2 15.5",
@@ -17274,7 +16628,6 @@
         ],
         "isolate_name": "ui_base_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ui_base_unittests iPhone X 15.5",
@@ -17326,7 +16679,6 @@
         ],
         "isolate_name": "url_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "url_unittests iPad Air 2 15.5",
@@ -17378,7 +16730,6 @@
         ],
         "isolate_name": "url_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "url_unittests iPhone X 15.5",
@@ -17432,7 +16783,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17455,7 +16805,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17478,7 +16827,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17501,7 +16849,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17524,7 +16871,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17547,7 +16893,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17570,7 +16915,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17593,7 +16937,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17616,7 +16959,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17639,7 +16981,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -17663,7 +17004,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17686,7 +17026,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17710,7 +17049,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17735,7 +17073,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17758,7 +17095,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17781,7 +17117,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17804,7 +17139,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17827,7 +17161,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17850,7 +17183,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17873,7 +17205,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17896,7 +17227,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17919,7 +17249,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17942,7 +17271,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17965,7 +17293,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -17989,7 +17316,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18012,7 +17338,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18035,7 +17360,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18058,7 +17382,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18081,7 +17404,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18104,7 +17426,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18127,7 +17448,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18151,7 +17471,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18175,7 +17494,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18198,7 +17516,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18221,7 +17538,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18244,7 +17560,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18267,7 +17582,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18290,7 +17604,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18313,7 +17626,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18336,7 +17648,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18359,7 +17670,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18386,7 +17696,6 @@
         "description": "Run with ash-chrome version 113.0.5672.21",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash beta",
@@ -18414,15 +17723,14 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5700.0/test_ash_chrome",
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5701.0/test_ash_chrome",
           "--test-launcher-print-test-stdio=always",
           "--combine-ash-logs-on-bots",
           "--asan-symbolize-output"
         ],
-        "description": "Run with ash-chrome version 114.0.5700.0",
+        "description": "Run with ash-chrome version 114.0.5701.0",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash canary",
@@ -18431,8 +17739,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5700.0",
-              "revision": "version:114.0.5700.0"
+              "location": "lacros_version_skew_tests_v114.0.5701.0",
+              "revision": "version:114.0.5701.0"
             }
           ],
           "dimension_sets": [
@@ -18458,7 +17766,6 @@
         "description": "Run with ash-chrome version 114.0.5692.0",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash dev",
@@ -18494,7 +17801,6 @@
         "description": "Run with ash-chrome version 112.0.5615.62",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "interactive_ui_tests Lacros version skew testing ash stable",
@@ -18527,7 +17833,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18551,7 +17856,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests",
@@ -18578,7 +17882,6 @@
         "description": "Run with ash-chrome version 113.0.5672.21",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash beta",
@@ -18605,15 +17908,14 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5700.0/test_ash_chrome",
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5701.0/test_ash_chrome",
           "--test-launcher-print-test-stdio=always",
           "--combine-ash-logs-on-bots",
           "--asan-symbolize-output"
         ],
-        "description": "Run with ash-chrome version 114.0.5700.0",
+        "description": "Run with ash-chrome version 114.0.5701.0",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash canary",
@@ -18622,8 +17924,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5700.0",
-              "revision": "version:114.0.5700.0"
+              "location": "lacros_version_skew_tests_v114.0.5701.0",
+              "revision": "version:114.0.5701.0"
             }
           ],
           "dimension_sets": [
@@ -18648,7 +17950,6 @@
         "description": "Run with ash-chrome version 114.0.5692.0",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash dev",
@@ -18683,7 +17984,6 @@
         "description": "Run with ash-chrome version 112.0.5615.62",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests Lacros version skew testing ash stable",
@@ -18716,7 +18016,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series",
@@ -18744,7 +18043,6 @@
         "description": "Run with ash-chrome version 113.0.5672.21",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash beta",
@@ -18772,15 +18070,14 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5700.0/test_ash_chrome",
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5701.0/test_ash_chrome",
           "--test-launcher-print-test-stdio=always",
           "--combine-ash-logs-on-bots",
           "--asan-symbolize-output"
         ],
-        "description": "Run with ash-chrome version 114.0.5700.0",
+        "description": "Run with ash-chrome version 114.0.5701.0",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash canary",
@@ -18789,8 +18086,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5700.0",
-              "revision": "version:114.0.5700.0"
+              "location": "lacros_version_skew_tests_v114.0.5701.0",
+              "revision": "version:114.0.5701.0"
             }
           ],
           "dimension_sets": [
@@ -18816,7 +18113,6 @@
         "description": "Run with ash-chrome version 114.0.5692.0",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash dev",
@@ -18852,7 +18148,6 @@
         "description": "Run with ash-chrome version 112.0.5615.62",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash stable",
@@ -18885,7 +18180,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18908,7 +18202,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18931,7 +18224,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18954,7 +18246,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -18977,7 +18268,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19000,7 +18290,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19023,7 +18312,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19046,7 +18334,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19069,7 +18356,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19092,7 +18378,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19115,7 +18400,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19138,7 +18422,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19161,7 +18444,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19184,7 +18466,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19207,7 +18488,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19230,7 +18510,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19253,7 +18532,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19276,7 +18554,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19299,7 +18576,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19322,7 +18598,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19345,7 +18620,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19368,7 +18642,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19391,7 +18664,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19414,7 +18686,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19437,7 +18708,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19460,7 +18730,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19483,7 +18752,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19506,7 +18774,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19529,7 +18796,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19552,7 +18818,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19576,7 +18841,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19599,7 +18863,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19622,7 +18885,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19645,7 +18907,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19668,7 +18929,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19689,7 +18949,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19706,7 +18965,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19723,7 +18981,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -19741,7 +18998,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19758,7 +19014,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19775,7 +19030,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19792,7 +19046,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19809,7 +19062,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19826,7 +19078,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19843,7 +19094,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19860,7 +19110,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -19878,7 +19127,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19895,7 +19143,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19912,7 +19159,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19933,7 +19179,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19950,7 +19195,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19967,7 +19211,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -19984,7 +19227,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20001,7 +19243,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20018,7 +19259,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20035,7 +19275,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20052,7 +19291,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20069,7 +19307,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20086,7 +19323,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20104,7 +19340,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20121,7 +19356,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20138,7 +19372,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20155,7 +19388,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20172,7 +19404,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20189,7 +19420,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20206,7 +19436,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20223,7 +19452,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20240,7 +19468,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20257,7 +19484,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20274,7 +19500,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20291,7 +19516,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20308,7 +19532,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20325,7 +19548,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20342,7 +19564,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20359,7 +19580,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20376,7 +19596,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20393,7 +19612,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20410,7 +19628,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20427,7 +19644,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20444,7 +19660,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20462,7 +19677,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20479,7 +19693,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20496,7 +19709,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20513,7 +19725,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20530,7 +19741,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20547,7 +19757,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20564,7 +19773,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20581,7 +19789,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20598,7 +19805,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20615,7 +19821,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20632,7 +19837,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20649,7 +19853,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20666,7 +19869,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20683,7 +19885,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20700,7 +19901,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20717,7 +19917,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20734,7 +19933,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20751,7 +19949,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20768,7 +19965,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20785,7 +19981,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20802,7 +19997,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20819,7 +20013,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20836,7 +20029,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20853,7 +20045,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20870,7 +20061,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20887,7 +20077,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20904,7 +20093,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20921,7 +20109,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20938,7 +20125,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20955,7 +20141,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20972,7 +20157,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20989,7 +20173,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21006,7 +20189,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21023,7 +20205,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21040,7 +20221,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21057,7 +20237,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21074,7 +20253,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21091,7 +20269,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests",
@@ -21109,7 +20286,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21130,7 +20306,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21147,7 +20322,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21164,7 +20338,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -21182,7 +20355,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21199,7 +20371,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21216,7 +20387,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21233,7 +20403,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21250,7 +20419,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21267,7 +20435,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21284,7 +20451,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21301,7 +20467,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -21319,7 +20484,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21336,7 +20500,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21356,7 +20519,6 @@
           "--test-launcher-jobs=3"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21377,7 +20539,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21394,7 +20555,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21411,7 +20571,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21428,7 +20587,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21445,7 +20603,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21462,7 +20619,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21479,7 +20635,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21496,7 +20651,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21513,7 +20667,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21530,7 +20683,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21548,7 +20700,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21568,7 +20719,6 @@
           "--test-launcher-jobs=3"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21586,7 +20736,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21603,7 +20752,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21620,7 +20768,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21637,7 +20784,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21654,7 +20800,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21671,7 +20816,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21688,7 +20832,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21705,7 +20848,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21722,7 +20864,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21739,7 +20880,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21756,7 +20896,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21773,7 +20912,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21790,7 +20928,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21807,7 +20944,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21824,7 +20960,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21841,7 +20976,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21858,7 +20992,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21875,7 +21008,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21892,7 +21024,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21909,7 +21040,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21926,7 +21056,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21943,7 +21072,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21960,7 +21088,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21977,7 +21104,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21994,7 +21120,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22015,7 +21140,6 @@
           "--test-launcher-jobs=3"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22033,7 +21157,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22050,7 +21173,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22067,7 +21189,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22084,7 +21205,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22101,7 +21221,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22118,7 +21237,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22135,7 +21253,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22152,7 +21269,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22169,7 +21285,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22186,7 +21301,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22203,7 +21317,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22221,7 +21334,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22238,7 +21350,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22255,7 +21366,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22272,7 +21382,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22289,7 +21398,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22306,7 +21414,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22323,7 +21430,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22341,7 +21447,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22358,7 +21463,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22375,7 +21479,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22392,7 +21495,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22409,7 +21511,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22427,7 +21528,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22444,7 +21544,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22461,7 +21560,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22478,7 +21576,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22495,7 +21592,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22515,7 +21611,6 @@
           "--test-launcher-jobs=3"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22533,7 +21628,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22550,7 +21644,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22567,7 +21660,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22584,7 +21676,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22601,7 +21692,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22618,7 +21708,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22635,7 +21724,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22652,7 +21740,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22669,7 +21756,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22686,7 +21772,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22703,7 +21788,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22720,7 +21804,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -22737,7 +21820,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/chromium.rust.json

diff --git a/testing/buildbot/chromium.rust.json b/testing/buildbot/chromium.rust.json
index f69837d..0faa92c 100644
--- a/testing/buildbot/chromium.rust.json
+++ b/testing/buildbot/chromium.rust.json
@@ -9,7 +9,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -29,7 +28,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -49,7 +47,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "test_cpp_including_rust_unittests",
@@ -70,7 +67,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "test_serde_json_lenient",
@@ -99,7 +95,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -119,7 +114,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -139,7 +133,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "test_cpp_including_rust_unittests",
@@ -160,7 +153,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "test_serde_json_lenient",
@@ -189,7 +181,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -209,7 +200,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -229,7 +219,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "test_cpp_including_rust_unittests",
@@ -250,7 +239,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "test_serde_json_lenient",
@@ -281,7 +269,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -298,7 +285,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -315,7 +301,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -332,7 +317,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "test_cpp_including_rust_unittests",
@@ -350,7 +334,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "test_serde_json_lenient",
@@ -371,7 +354,6 @@
       {
         "isolate_name": "build_rust_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "build_rust_tests",
@@ -390,7 +372,6 @@
       {
         "isolate_name": "mojo_rust_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_rust_tests",
@@ -418,7 +399,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -435,7 +415,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -452,7 +431,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -469,7 +447,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "test_cpp_including_rust_unittests",
@@ -487,7 +464,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "test_serde_json_lenient",
@@ -508,7 +484,6 @@
       {
         "isolate_name": "build_rust_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "build_rust_tests",
@@ -527,7 +502,6 @@
       {
         "isolate_name": "mojo_rust_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_rust_tests",
@@ -562,7 +536,6 @@
           "--xctest"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -604,7 +577,6 @@
           "--xctest"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -646,7 +618,6 @@
           "--xctest"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -688,7 +659,6 @@
           "--xctest"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "test_cpp_including_rust_unittests",
@@ -731,7 +701,6 @@
           "--xctest"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "test_serde_json_lenient",
@@ -777,7 +746,6 @@
         ],
         "isolate_name": "build_rust_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "build_rust_tests",
@@ -821,7 +789,6 @@
         ],
         "isolate_name": "mojo_rust_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_rust_tests",
@@ -867,7 +834,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -885,7 +851,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -903,7 +868,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -921,7 +885,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "test_cpp_including_rust_unittests",
@@ -940,7 +903,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "test_serde_json_lenient",
@@ -962,7 +924,6 @@
       {
         "isolate_name": "build_rust_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "build_rust_tests",
@@ -982,7 +943,6 @@
       {
         "isolate_name": "mojo_rust_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_rust_tests",
@@ -1011,7 +971,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1029,7 +988,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1047,7 +1005,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1065,7 +1022,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "test_cpp_including_rust_unittests",
@@ -1084,7 +1040,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "test_serde_json_lenient",
@@ -1106,7 +1061,6 @@
       {
         "isolate_name": "build_rust_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "build_rust_tests",
@@ -1126,7 +1080,6 @@
       {
         "isolate_name": "mojo_rust_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_rust_tests",

testing/buildbot/chromium.swangle.json

diff --git a/testing/buildbot/chromium.swangle.json b/testing/buildbot/chromium.swangle.json
index 4fb5ad1a..e85c51cdf 100644
--- a/testing/buildbot/chromium.swangle.json
+++ b/testing/buildbot/chromium.swangle.json
@@ -18,7 +18,6 @@
         "isolate_name": "telemetry_gpu_integration_test",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_swangle_passthrough_tests",
@@ -52,7 +51,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -79,7 +77,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -106,7 +103,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -133,7 +129,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -160,7 +155,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -187,7 +181,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -215,7 +208,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -242,7 +234,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -269,7 +260,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -296,7 +286,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -324,7 +313,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -351,7 +339,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -378,7 +365,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -405,7 +391,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -436,7 +421,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -463,7 +447,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -490,7 +473,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -517,7 +499,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -544,7 +525,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -571,7 +551,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -599,7 +578,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -626,7 +604,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -653,7 +630,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -680,7 +656,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -708,7 +683,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -735,7 +709,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -762,7 +735,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -789,7 +761,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -828,7 +799,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_swangle_passthrough_tests",
@@ -870,7 +840,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_swangle_passthrough_tests",
@@ -903,7 +872,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -929,7 +897,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -955,7 +922,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -981,7 +947,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1007,7 +972,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1033,7 +997,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1060,7 +1023,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1086,7 +1048,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1112,7 +1073,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1138,7 +1098,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1165,7 +1124,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1191,7 +1149,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1217,7 +1174,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1243,7 +1199,6 @@
           "--gtest_filter=*Vulkan_SwiftShader*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1273,7 +1228,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1299,7 +1253,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1325,7 +1278,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1351,7 +1303,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1377,7 +1328,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1403,7 +1353,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1430,7 +1379,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1456,7 +1404,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1482,7 +1429,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1508,7 +1454,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1535,7 +1480,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1561,7 +1505,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1587,7 +1530,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1613,7 +1555,6 @@
           "--gtest_filter=*Vulkan_SwiftShader*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1643,7 +1584,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1669,7 +1609,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1695,7 +1634,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1721,7 +1659,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1747,7 +1684,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1773,7 +1709,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1800,7 +1735,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1826,7 +1760,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1852,7 +1785,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1878,7 +1810,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1905,7 +1836,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1931,7 +1861,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1957,7 +1886,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -1983,7 +1911,6 @@
           "--gtest_filter=*Vulkan_SwiftShader*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2013,7 +1940,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2039,7 +1965,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2065,7 +1990,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2091,7 +2015,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2117,7 +2040,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2143,7 +2065,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2170,7 +2091,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2196,7 +2116,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2222,7 +2141,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2248,7 +2166,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2275,7 +2192,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2301,7 +2217,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2327,7 +2242,6 @@
           "--use-angle=swiftshader"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2353,7 +2267,6 @@
           "--gtest_filter=*Vulkan_SwiftShader*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {

testing/buildbot/chromium.updater.json

diff --git a/testing/buildbot/chromium.updater.json b/testing/buildbot/chromium.updater.json
index 545a7a0..9b94149 100644
--- a/testing/buildbot/chromium.updater.json
+++ b/testing/buildbot/chromium.updater.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -28,7 +27,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -76,7 +74,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -95,7 +92,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -118,7 +114,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -137,7 +132,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -160,7 +154,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -179,7 +172,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -202,7 +194,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -221,7 +212,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -244,7 +234,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -263,7 +252,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -286,7 +274,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -305,7 +292,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -328,7 +314,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -347,7 +332,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -370,7 +354,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -389,7 +372,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -412,7 +394,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -431,7 +412,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -454,7 +434,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -473,7 +452,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -496,7 +474,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -515,7 +492,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -538,7 +514,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -557,7 +532,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -580,7 +554,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -599,7 +572,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -622,7 +594,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -641,7 +612,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -674,7 +644,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -694,7 +663,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -718,7 +686,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -738,7 +705,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -762,7 +728,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -782,7 +747,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -806,7 +770,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -826,7 +789,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -849,7 +811,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -869,7 +830,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -893,7 +853,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -913,7 +872,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -936,7 +894,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -956,7 +913,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -979,7 +935,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -999,7 +954,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/chromium.webrtc.fyi.json

diff --git a/testing/buildbot/chromium.webrtc.fyi.json b/testing/buildbot/chromium.webrtc.fyi.json
index 18f098ae..87390401 100644
--- a/testing/buildbot/chromium.webrtc.fyi.json
+++ b/testing/buildbot/chromium.webrtc.fyi.json
@@ -205,7 +205,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -228,7 +227,6 @@
           "--test-launcher-jobs=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "browser_tests_functional",
@@ -250,7 +248,6 @@
           "--gtest_filter=WebRtc*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -273,7 +270,6 @@
           "--test-launcher-jobs=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "content_browsertests_sequential",
@@ -298,7 +294,6 @@
           "--test-launcher-timeout=120000"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "content_browsertests_stress",
@@ -320,7 +315,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc.content_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -341,7 +335,6 @@
           "--gtest_filter=Webrtc*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -381,7 +374,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -404,7 +396,6 @@
           "--test-launcher-jobs=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "browser_tests_functional",
@@ -426,7 +417,6 @@
           "--gtest_filter=WebRtc*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -449,7 +439,6 @@
           "--test-launcher-jobs=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "content_browsertests_sequential",
@@ -474,7 +463,6 @@
           "--test-launcher-timeout=120000"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "content_browsertests_stress",
@@ -496,7 +484,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc.content_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -517,7 +504,6 @@
           "--gtest_filter=Webrtc*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -557,7 +543,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -580,7 +565,6 @@
           "--test-launcher-jobs=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "browser_tests_functional",
@@ -602,7 +586,6 @@
           "--gtest_filter=WebRtc*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -625,7 +608,6 @@
           "--test-launcher-jobs=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "content_browsertests_sequential",
@@ -650,7 +632,6 @@
           "--test-launcher-timeout=120000"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "content_browsertests_stress",
@@ -672,7 +653,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc.content_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -693,7 +673,6 @@
           "--gtest_filter=Webrtc*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -728,7 +707,6 @@
         ],
         "isolate_name": "ios_remoting_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_remoting_unittests iPad Air (3rd generation) 16.2",
@@ -780,7 +758,6 @@
         ],
         "isolate_name": "ios_remoting_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "ios_remoting_unittests iPhone X 16.2",

testing/buildbot/chromium.webrtc.json

diff --git a/testing/buildbot/chromium.webrtc.json b/testing/buildbot/chromium.webrtc.json
index 96c89a0..abd0884 100644
--- a/testing/buildbot/chromium.webrtc.json
+++ b/testing/buildbot/chromium.webrtc.json
@@ -109,7 +109,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -131,7 +130,6 @@
           "--test-launcher-jobs=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "browser_tests_functional",
@@ -155,7 +153,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -176,7 +173,6 @@
           "--gtest_filter=WebRtc*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -198,7 +194,6 @@
           "--test-launcher-jobs=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "content_browsertests_sequential",
@@ -222,7 +217,6 @@
           "--test-launcher-timeout=120000"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "content_browsertests_stress",
@@ -243,7 +237,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc.content_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -263,7 +256,6 @@
           "--gtest_filter=Webrtc*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -298,7 +290,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -321,7 +312,6 @@
           "--test-launcher-jobs=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "browser_tests_functional",
@@ -343,7 +333,6 @@
           "--gtest_filter=WebRtc*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -366,7 +355,6 @@
           "--test-launcher-jobs=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "content_browsertests_sequential",
@@ -391,7 +379,6 @@
           "--test-launcher-timeout=120000"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "content_browsertests_stress",
@@ -413,7 +400,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc.content_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -434,7 +420,6 @@
           "--gtest_filter=Webrtc*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -470,7 +455,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -492,7 +476,6 @@
           "--test-launcher-jobs=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "browser_tests_functional",
@@ -516,7 +499,6 @@
           "--test-launcher-print-test-stdio=always"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -537,7 +519,6 @@
           "--gtest_filter=WebRtc*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -559,7 +540,6 @@
           "--test-launcher-jobs=1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "content_browsertests_sequential",
@@ -583,7 +563,6 @@
           "--test-launcher-timeout=120000"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "content_browsertests_stress",
@@ -604,7 +583,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc.content_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -624,7 +602,6 @@
           "--gtest_filter=Webrtc*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/chromium.win.json

diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
index cfc8be3..e8ea79e 100644
--- a/testing/buildbot/chromium.win.json
+++ b/testing/buildbot/chromium.win.json
@@ -131,7 +131,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -150,7 +149,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -169,7 +167,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -189,7 +186,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -208,7 +204,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -227,7 +222,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -246,7 +240,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -265,7 +258,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -284,7 +276,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -303,7 +294,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -322,7 +312,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -342,7 +331,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -361,7 +349,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -383,7 +370,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -410,7 +396,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "pixel_browser_tests",
@@ -439,7 +424,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -458,7 +442,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -477,7 +460,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -496,7 +478,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -515,7 +496,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -534,7 +514,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -553,7 +532,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -572,7 +550,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -591,7 +568,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -610,7 +586,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -630,7 +605,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -652,7 +626,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -673,7 +646,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -692,7 +664,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -711,7 +682,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -730,7 +700,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -749,7 +718,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -768,7 +736,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -787,7 +754,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -806,7 +772,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -825,7 +790,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -844,7 +808,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -863,7 +826,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -882,7 +844,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -901,7 +862,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -920,7 +880,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -939,7 +898,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -958,7 +916,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -977,7 +934,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -996,7 +952,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1015,7 +970,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1034,7 +988,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1053,7 +1006,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1072,7 +1024,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1091,7 +1042,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1110,7 +1060,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1129,7 +1078,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1149,7 +1097,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1175,7 +1122,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "pixel_interactive_ui_tests",
@@ -1200,7 +1146,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1219,7 +1164,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1238,7 +1182,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1257,7 +1200,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1276,7 +1218,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1295,7 +1236,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1314,7 +1254,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1333,7 +1272,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1352,7 +1290,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1371,7 +1308,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1390,7 +1326,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1409,7 +1344,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1428,7 +1362,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1447,7 +1380,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1466,7 +1398,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1485,7 +1416,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1504,7 +1434,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1523,7 +1452,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1543,7 +1471,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1562,7 +1489,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1581,7 +1507,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1600,7 +1525,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1619,7 +1543,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1639,7 +1562,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1658,7 +1580,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1677,7 +1598,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1696,7 +1616,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1715,7 +1634,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1734,7 +1652,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1754,7 +1671,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1773,7 +1689,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1792,7 +1707,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1811,7 +1725,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1830,7 +1743,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1849,7 +1761,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1871,7 +1782,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "precommit_args": [
@@ -1895,7 +1805,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1914,7 +1823,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1933,7 +1841,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1952,7 +1859,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1971,7 +1877,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1990,7 +1895,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2009,7 +1913,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2031,7 +1934,6 @@
         "isolate_name": "blink_python_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -2140,7 +2042,6 @@
         "isolate_name": "chromedriver_py_tests",
         "isolate_profile_data": false,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -2163,7 +2064,6 @@
         "isolate_name": "chromedriver_replay_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -2208,7 +2108,6 @@
         "isolate_name": "content_shell_crash_test",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -2232,7 +2131,6 @@
         "isolate_name": "flatbuffers_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -2256,7 +2154,6 @@
         "isolate_name": "grit_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -2279,7 +2176,6 @@
         "isolate_name": "mini_installer_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mini_installer_tests",
@@ -2300,7 +2196,6 @@
         "isolate_name": "mojo_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -2324,7 +2219,6 @@
         "isolate_name": "polymer_tools_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "polymer_tools_python_unittests",
@@ -2351,7 +2245,6 @@
         "isolate_name": "telemetry_perf_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_desktop_minidump_unittests",
@@ -2374,7 +2267,6 @@
         "isolate_name": "telemetry_gpu_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -2425,7 +2317,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2443,7 +2334,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2461,7 +2351,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -2480,7 +2369,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2498,7 +2386,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2516,7 +2403,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2534,7 +2420,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2552,7 +2437,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2570,7 +2454,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2588,7 +2471,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2606,7 +2488,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -2625,7 +2506,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2643,7 +2523,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2664,7 +2543,6 @@
           "--gtest_filter=-*UsingRealWebcam*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2682,7 +2560,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2700,7 +2577,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2718,7 +2594,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2736,7 +2611,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2754,7 +2628,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2772,7 +2645,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2790,7 +2662,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2808,7 +2679,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2826,7 +2696,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2844,7 +2713,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2866,7 +2734,6 @@
         ],
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2885,7 +2752,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2903,7 +2769,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2921,7 +2786,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2939,7 +2803,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2957,7 +2820,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2975,7 +2837,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2993,7 +2854,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3011,7 +2871,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3029,7 +2888,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3047,7 +2905,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3065,7 +2922,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3084,7 +2940,6 @@
       {
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3102,7 +2957,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3120,7 +2974,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3138,7 +2991,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3156,7 +3008,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3174,7 +3025,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3192,7 +3042,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3210,7 +3059,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3228,7 +3076,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3246,7 +3093,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3264,7 +3110,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3282,7 +3127,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3300,7 +3144,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3318,7 +3161,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3338,7 +3180,6 @@
       {
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3357,7 +3198,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3375,7 +3215,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3393,7 +3232,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3411,7 +3249,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3429,7 +3266,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3447,7 +3283,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3465,7 +3300,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3483,7 +3317,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3501,7 +3334,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3519,7 +3351,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3537,7 +3368,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3555,7 +3385,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3573,7 +3402,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3591,7 +3419,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3609,7 +3436,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3627,7 +3453,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3645,7 +3470,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3663,7 +3487,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3682,7 +3505,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3700,7 +3522,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3718,7 +3539,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3736,7 +3556,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3754,7 +3573,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3773,7 +3591,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3791,7 +3608,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3809,7 +3625,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3827,7 +3642,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3845,7 +3659,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3864,7 +3677,6 @@
       {
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3882,7 +3694,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3900,7 +3711,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3918,7 +3728,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3936,7 +3745,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3954,7 +3762,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3972,7 +3779,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3990,7 +3796,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4008,7 +3813,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4026,7 +3830,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4044,7 +3847,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4062,7 +3864,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4080,7 +3881,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4098,7 +3898,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4119,7 +3918,6 @@
       {
         "isolate_name": "blink_python_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -4141,7 +3939,6 @@
       {
         "isolate_name": "chromedriver_replay_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -4185,7 +3982,6 @@
         "experiment_percentage": 100,
         "isolate_name": "content_shell_crash_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -4208,7 +4004,6 @@
       {
         "isolate_name": "flatbuffers_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -4231,7 +4026,6 @@
       {
         "isolate_name": "grit_python_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -4285,7 +4079,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -4313,7 +4106,6 @@
         "experiment_percentage": 100,
         "isolate_name": "telemetry_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -4365,7 +4157,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4384,7 +4175,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4403,7 +4193,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -4423,7 +4212,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4442,7 +4230,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4461,7 +4248,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4480,7 +4266,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4499,7 +4284,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4518,7 +4302,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4537,7 +4320,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4556,7 +4338,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -4576,7 +4357,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4595,7 +4375,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4617,7 +4396,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4641,7 +4419,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4660,7 +4437,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4679,7 +4455,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4698,7 +4473,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4717,7 +4491,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4736,7 +4509,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4755,7 +4527,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4774,7 +4545,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4793,7 +4563,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4812,7 +4581,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4831,7 +4599,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4853,7 +4620,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4873,7 +4639,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4892,7 +4657,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4911,7 +4675,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4930,7 +4693,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4949,7 +4711,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4968,7 +4729,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -4987,7 +4747,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5006,7 +4765,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5025,7 +4783,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5044,7 +4801,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5063,7 +4819,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5082,7 +4837,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5101,7 +4855,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5120,7 +4873,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5139,7 +4891,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5158,7 +4909,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5177,7 +4927,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5196,7 +4945,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5215,7 +4963,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5234,7 +4981,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5253,7 +4999,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5272,7 +5017,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5291,7 +5035,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5310,7 +5053,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5329,7 +5071,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5349,7 +5090,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5375,7 +5115,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "pixel_interactive_ui_tests",
@@ -5400,7 +5139,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5419,7 +5157,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5438,7 +5175,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5457,7 +5193,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5476,7 +5211,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5495,7 +5229,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5514,7 +5247,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5533,7 +5265,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5552,7 +5283,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5571,7 +5301,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5590,7 +5319,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5609,7 +5337,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5628,7 +5355,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5647,7 +5373,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5666,7 +5391,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5685,7 +5409,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5704,7 +5427,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5723,7 +5445,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5743,7 +5464,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5762,7 +5482,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5781,7 +5500,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5800,7 +5518,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5819,7 +5536,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5839,7 +5555,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5858,7 +5573,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5877,7 +5591,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5896,7 +5609,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5915,7 +5627,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5934,7 +5645,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5953,7 +5663,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5972,7 +5681,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -5991,7 +5699,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6010,7 +5717,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6029,7 +5735,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6048,7 +5753,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6070,7 +5774,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "precommit_args": [
@@ -6094,7 +5797,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6113,7 +5815,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6132,7 +5833,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6151,7 +5851,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6170,7 +5869,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6189,7 +5887,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6208,7 +5905,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -6230,7 +5926,6 @@
         "isolate_name": "blink_python_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -6337,7 +6032,6 @@
         "isolate_name": "chromedriver_py_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -6360,7 +6054,6 @@
         "isolate_name": "chromedriver_replay_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -6405,7 +6098,6 @@
         "isolate_name": "content_shell_crash_test",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -6429,7 +6121,6 @@
         "isolate_name": "flatbuffers_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -6453,7 +6144,6 @@
         "isolate_name": "grit_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -6476,7 +6166,6 @@
         "isolate_name": "mini_installer_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mini_installer_tests",
@@ -6497,7 +6186,6 @@
         "isolate_name": "mojo_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -6521,7 +6209,6 @@
         "isolate_name": "polymer_tools_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "polymer_tools_python_unittests",
@@ -6548,7 +6235,6 @@
         "isolate_name": "telemetry_perf_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_desktop_minidump_unittests",
@@ -6571,7 +6257,6 @@
         "isolate_name": "telemetry_gpu_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",

testing/buildbot/client.devtools-frontend.integration.json

diff --git a/testing/buildbot/client.devtools-frontend.integration.json b/testing/buildbot/client.devtools-frontend.integration.json
index fb30115..f2948983 100644
--- a/testing/buildbot/client.devtools-frontend.integration.json
+++ b/testing/buildbot/client.devtools-frontend.integration.json
@@ -8,7 +8,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "blink_unit_tests",
@@ -29,7 +28,6 @@
           "--gtest_filter=*DevTools*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "devtools_browser_tests",
@@ -158,7 +156,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "blink_unit_tests",
@@ -179,7 +176,6 @@
           "--gtest_filter=*DevTools*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "devtools_browser_tests",

testing/buildbot/client.v8.chromium.json

diff --git a/testing/buildbot/client.v8.chromium.json b/testing/buildbot/client.v8.chromium.json
index ae5d87c..a95fd8c 100644
--- a/testing/buildbot/client.v8.chromium.json
+++ b/testing/buildbot/client.v8.chromium.json
@@ -8,7 +8,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25,7 +24,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -43,7 +41,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -60,7 +57,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -77,7 +73,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -94,7 +89,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -111,7 +105,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -128,7 +121,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -145,7 +137,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -162,7 +153,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -179,7 +169,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -196,7 +185,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -213,7 +201,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -230,7 +217,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -247,7 +233,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -264,7 +249,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -281,7 +265,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -298,7 +281,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -315,7 +297,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -332,7 +313,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -349,7 +329,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -366,7 +345,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -383,7 +361,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -400,7 +377,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -417,7 +393,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -434,7 +409,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -451,7 +425,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -471,7 +444,6 @@
       {
         "isolate_name": "content_shell_crash_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -493,7 +465,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -519,7 +490,6 @@
         ],
         "isolate_name": "telemetry_perf_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -546,7 +516,6 @@
         ],
         "isolate_name": "telemetry_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -575,7 +544,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -592,7 +560,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -610,7 +577,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -627,7 +593,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -644,7 +609,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -661,7 +625,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -678,7 +641,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -695,7 +657,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -712,7 +673,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -729,7 +689,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -746,7 +705,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -763,7 +721,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -780,7 +737,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -797,7 +753,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -814,7 +769,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -831,7 +785,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -848,7 +801,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -865,7 +817,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -882,7 +833,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -900,7 +850,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -917,7 +866,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -934,7 +882,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -951,7 +898,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -968,7 +914,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -985,7 +930,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1002,7 +946,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1019,7 +962,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1039,7 +981,6 @@
       {
         "isolate_name": "content_shell_crash_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -1061,7 +1002,6 @@
       {
         "isolate_name": "telemetry_gpu_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -1087,7 +1027,6 @@
         ],
         "isolate_name": "telemetry_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",

testing/buildbot/client.v8.fyi.json

diff --git a/testing/buildbot/client.v8.fyi.json b/testing/buildbot/client.v8.fyi.json
index 3beb186..54fa0d28 100644
--- a/testing/buildbot/client.v8.fyi.json
+++ b/testing/buildbot/client.v8.fyi.json
@@ -15,7 +15,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_validating_tests",
@@ -51,7 +50,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -87,7 +85,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -127,7 +124,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_validating_test",
@@ -172,7 +168,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_validating_test",
@@ -214,7 +209,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_validating_tests",
@@ -250,7 +244,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -288,7 +281,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gles_passthrough_tests",
@@ -327,7 +319,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_validating_tests",
@@ -375,7 +366,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -410,7 +400,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -445,7 +434,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -484,7 +472,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -524,7 +511,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -563,7 +549,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -604,7 +589,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -639,7 +623,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -678,7 +661,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "vulkan_pixel_skia_gold_test",
@@ -720,7 +702,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -760,7 +741,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -795,7 +775,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -830,7 +809,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -869,7 +847,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -909,7 +886,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -948,7 +924,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -989,7 +964,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -1024,7 +998,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -1063,7 +1036,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "vulkan_pixel_skia_gold_test",
@@ -1105,7 +1077,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -1145,7 +1116,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -1181,7 +1151,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -1217,7 +1186,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -1257,7 +1225,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -1298,7 +1265,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -1338,7 +1304,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -1380,7 +1345,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -1416,7 +1380,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -1452,7 +1415,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests",
@@ -1490,7 +1452,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests",
@@ -1529,7 +1490,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_metal_passthrough_tests",
@@ -1568,7 +1528,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_swangle_passthrough_tests",
@@ -1609,7 +1568,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "blink_unit_tests",
@@ -1708,7 +1666,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "blink_unit_tests",
@@ -1813,7 +1770,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "blink_unit_tests",
@@ -1914,7 +1870,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "blink_unit_tests",
@@ -2152,7 +2107,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -2188,7 +2142,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -2224,7 +2177,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -2264,7 +2216,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -2309,7 +2260,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -2351,7 +2301,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -2387,7 +2336,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -2425,7 +2373,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d11_passthrough_tests",
@@ -2464,7 +2411,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d9_passthrough_tests",
@@ -2502,7 +2448,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_vulkan_passthrough_tests",

testing/buildbot/generate_buildbot_json.py

diff --git a/testing/buildbot/generate_buildbot_json.py b/testing/buildbot/generate_buildbot_json.py
index 4912a82..6fb6bee 100755
--- a/testing/buildbot/generate_buildbot_json.py
+++ b/testing/buildbot/generate_buildbot_json.py
@@ -855,7 +855,6 @@
 
       result['merge'] = {
           'script': '//testing/merge_scripts/%s.py' % merge_script,
-          'args': [],
       }
     return result
 
@@ -885,7 +884,6 @@
       # this default.
       result['merge'] = {
         'script': '//testing/merge_scripts/standard_isolated_script_merge.py',
-        'args': [],
       }
     return result
 

testing/buildbot/generate_buildbot_json_unittest.py

diff --git a/testing/buildbot/generate_buildbot_json_unittest.py b/testing/buildbot/generate_buildbot_json_unittest.py
index ab3eef8..df9c12d 100755
--- a/testing/buildbot/generate_buildbot_json_unittest.py
+++ b/testing/buildbot/generate_buildbot_json_unittest.py
@@ -3075,7 +3075,6 @@
       {
         "test": "foo_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3093,7 +3092,6 @@
           "--recover-devices"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3120,7 +3118,6 @@
           "--recover-devices"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -3153,7 +3150,6 @@
   "Fake Android M Tester": [
     {
       "merge": {
-        "args": [],
         "script": "//testing/merge_scripts/standard_gtest_merge.py"
       },
       "test": "foo_test",
@@ -3170,7 +3166,6 @@
         "--recover-devices"
       ],
       "merge": {
-        "args": [],
         "script": "//testing/merge_scripts/standard_gtest_merge.py"
       },
       "swarming": {
@@ -3195,7 +3190,6 @@
         "--recover-devices"
       ],
       "merge": {
-        "args": [],
         "script": "//testing/merge_scripts/standard_gtest_merge.py"
       },
       "swarming": {
@@ -3233,7 +3227,6 @@
         "--recover-devices"
       ],
       "merge": {
-        "args": [],
         "script": "//testing/merge_scripts/standard_gtest_merge.py"
       },
       "swarming": {
@@ -3267,7 +3260,6 @@
       "--recover-devices"
     ],
     "merge": {
-      "args": [],
       "script": "//testing/merge_scripts/standard_gtest_merge.py"
     },
     "swarming": {

testing/buildbot/internal.chrome.fyi.json

diff --git a/testing/buildbot/internal.chrome.fyi.json b/testing/buildbot/internal.chrome.fyi.json
index 1e741c3..db5e79c 100644
--- a/testing/buildbot/internal.chrome.fyi.json
+++ b/testing/buildbot/internal.chrome.fyi.json
@@ -28,7 +28,6 @@
         ],
         "isolate_name": "variations_smoke_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "variations_smoke_tests",
@@ -63,7 +62,6 @@
         ],
         "isolate_name": "variations_smoke_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "variations_smoke_tests",
@@ -113,7 +111,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -135,7 +132,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -157,7 +153,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "swarming": {
@@ -180,7 +175,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -202,7 +196,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -224,7 +217,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -246,7 +238,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -268,7 +259,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -290,7 +280,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -312,7 +301,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -334,7 +322,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "webkit_unit_tests",
@@ -357,7 +344,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -379,7 +365,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -404,7 +389,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -434,7 +418,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "pixel_browser_tests",
@@ -466,7 +449,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -488,7 +470,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -510,7 +491,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -532,7 +512,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -554,7 +533,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -576,7 +554,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -598,7 +575,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -620,7 +596,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -642,7 +617,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -664,7 +638,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -686,7 +659,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -708,7 +680,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -731,7 +702,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -753,7 +723,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -775,7 +744,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -797,7 +765,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -819,7 +786,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -841,7 +807,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -863,7 +828,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -885,7 +849,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -907,7 +870,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -929,7 +891,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -951,7 +912,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -973,7 +933,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -995,7 +954,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1017,7 +975,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1039,7 +996,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1061,7 +1017,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1083,7 +1038,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1105,7 +1059,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1127,7 +1080,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1149,7 +1101,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1171,7 +1122,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1193,7 +1143,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1215,7 +1164,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1237,7 +1185,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1259,7 +1206,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1282,7 +1228,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1311,7 +1256,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "pixel_interactive_ui_tests",
@@ -1339,7 +1283,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1361,7 +1304,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1383,7 +1325,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1405,7 +1346,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1427,7 +1367,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1449,7 +1388,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1471,7 +1409,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1493,7 +1430,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1515,7 +1451,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1537,7 +1472,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1559,7 +1493,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1581,7 +1514,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1603,7 +1535,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1625,7 +1556,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1647,7 +1577,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1669,7 +1598,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1691,7 +1619,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1714,7 +1641,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1736,7 +1662,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1758,7 +1683,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1780,7 +1704,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1802,7 +1725,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1825,7 +1747,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1847,7 +1768,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1869,7 +1789,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1891,7 +1810,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1913,7 +1831,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1935,7 +1852,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1957,7 +1873,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -1979,7 +1894,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2004,7 +1918,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2026,7 +1939,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2048,7 +1960,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2070,7 +1981,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2095,7 +2005,6 @@
         ],
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "precommit_args": [
@@ -2122,7 +2031,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2144,7 +2052,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2166,7 +2073,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2188,7 +2094,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2210,7 +2115,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2232,7 +2136,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2254,7 +2157,6 @@
       {
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -2279,7 +2181,6 @@
         "isolate_name": "blink_python_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "blink_python_tests",
@@ -2391,7 +2292,6 @@
         "isolate_name": "chromedriver_py_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_py_tests",
@@ -2417,7 +2317,6 @@
         "isolate_name": "chromedriver_replay_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "chromedriver_replay_unittests",
@@ -2468,7 +2367,6 @@
         "isolate_name": "content_shell_crash_test",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "content_shell_crash_test",
@@ -2495,7 +2393,6 @@
         "isolate_name": "flatbuffers_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "flatbuffers_unittests",
@@ -2522,7 +2419,6 @@
         "isolate_name": "grit_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "grit_python_unittests",
@@ -2548,7 +2444,6 @@
         "isolate_name": "mini_installer_tests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mini_installer_tests",
@@ -2572,7 +2467,6 @@
         "isolate_name": "mojo_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mojo_python_unittests",
@@ -2599,7 +2493,6 @@
         "isolate_name": "polymer_tools_python_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "polymer_tools_python_unittests",
@@ -2629,7 +2522,6 @@
         "isolate_name": "telemetry_perf_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_desktop_minidump_unittests",
@@ -2655,7 +2547,6 @@
         "isolate_name": "telemetry_gpu_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_gpu_unittests",
@@ -2685,7 +2576,6 @@
         "isolate_name": "telemetry_perf_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -2717,7 +2607,6 @@
         "isolate_name": "telemetry_unittests",
         "isolate_profile_data": true,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -2788,7 +2677,6 @@
         ],
         "isolate_name": "variations_smoke_tests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "variations_smoke_tests",

testing/buildbot/internal.chromeos.fyi.json

diff --git a/testing/buildbot/internal.chromeos.fyi.json b/testing/buildbot/internal.chromeos.fyi.json
index 113cbbe..1f32a93 100644
--- a/testing/buildbot/internal.chromeos.fyi.json
+++ b/testing/buildbot/internal.chromeos.fyi.json
@@ -12,7 +12,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -49,7 +48,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -88,7 +86,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -125,7 +122,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -163,7 +159,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {
@@ -207,7 +202,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -286,7 +280,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -330,7 +323,6 @@
         ],
         "experiment_percentage": 100,
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -367,7 +359,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -404,7 +395,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -441,7 +431,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -478,7 +467,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -516,7 +504,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -553,7 +540,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -590,7 +576,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -629,7 +614,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -680,7 +664,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -718,7 +701,6 @@
           "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.ozone_unittests.filter"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -755,7 +737,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -792,7 +773,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -831,7 +811,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -868,7 +847,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -905,7 +883,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -950,7 +927,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -995,7 +971,6 @@
         ],
         "isolate_name": "telemetry_perf_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_perf_unittests",
@@ -1044,7 +1019,6 @@
         ],
         "isolate_name": "telemetry_unittests",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "telemetry_unittests",
@@ -1094,7 +1068,6 @@
           "--magic-vm-cache=magic_cros_vm_cache"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "resultdb": {

testing/buildbot/tryserver.chromium.android.json

diff --git a/testing/buildbot/tryserver.chromium.android.json b/testing/buildbot/tryserver.chromium.android.json
index 876cd03..dd5aaf5 100644
--- a/testing/buildbot/tryserver.chromium.android.json
+++ b/testing/buildbot/tryserver.chromium.android.json
@@ -134,7 +134,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_webview",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "android_webview_pixel_skia_gold_test",
@@ -176,7 +175,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests",
@@ -213,7 +211,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_validating_tests",
@@ -250,7 +247,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests",
@@ -287,7 +283,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests",
@@ -328,7 +323,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests",
@@ -369,7 +363,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test",
@@ -415,7 +408,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_validating_test",
@@ -457,7 +449,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests",
@@ -494,7 +485,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_validating_tests",
@@ -535,7 +525,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test",
@@ -581,7 +570,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_validating_test",
@@ -624,7 +612,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests",
@@ -662,7 +649,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_validating_tests",
@@ -699,7 +685,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test",
@@ -736,7 +721,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests",
@@ -776,7 +760,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gles_passthrough_tests",
@@ -817,7 +800,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_validating_tests",
@@ -857,7 +839,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gles_passthrough_tests",
@@ -897,7 +878,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_validating_tests",

testing/buildbot/tryserver.chromium.linux.json

diff --git a/testing/buildbot/tryserver.chromium.linux.json b/testing/buildbot/tryserver.chromium.linux.json
index b1e4db1c..1772cc3a 100644
--- a/testing/buildbot/tryserver.chromium.linux.json
+++ b/testing/buildbot/tryserver.chromium.linux.json
@@ -89,7 +89,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_test GTX 1660",
@@ -113,7 +112,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_test UHD 630",
@@ -150,7 +148,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests GTX 1660",
@@ -190,7 +187,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests UHD 630",
@@ -226,7 +222,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests GTX 1660",
@@ -262,7 +257,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests UHD 630",
@@ -298,7 +292,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test GTX 1660",
@@ -334,7 +327,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test UHD 630",
@@ -370,7 +362,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests GTX 1660",
@@ -406,7 +397,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests UHD 630",
@@ -445,7 +435,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gl_passthrough_tests GTX 1660",
@@ -485,7 +474,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gl_passthrough_tests UHD 630",
@@ -524,7 +512,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests GTX 1660",
@@ -563,7 +550,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests UHD 630",

testing/buildbot/tryserver.chromium.mac.json

diff --git a/testing/buildbot/tryserver.chromium.mac.json b/testing/buildbot/tryserver.chromium.mac.json
index ed867f97..33aa00c 100644
--- a/testing/buildbot/tryserver.chromium.mac.json
+++ b/testing/buildbot/tryserver.chromium.mac.json
@@ -8,7 +8,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_test 10de:0fe9",
@@ -35,7 +34,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_test 8086:3e9b",
@@ -58,7 +56,6 @@
       {
         "args": [],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gpu_unittests 10de:0fe9",
@@ -83,7 +80,6 @@
       {
         "args": [],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gpu_unittests 8086:3e9b",
@@ -109,7 +105,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "services_unittests 10de:0fe9",
@@ -137,7 +132,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "services_unittests 8086:3e9b",
@@ -171,7 +165,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "context_lost_passthrough_tests 8086:3e9b",
@@ -208,7 +201,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "gpu_process_launch_tests 8086:3e9b",
@@ -245,7 +237,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "hardware_accelerated_feature_tests 8086:3e9b",
@@ -286,7 +277,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests 10de:0fe9",
@@ -329,7 +319,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests 8086:3e9b",
@@ -370,7 +359,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "maps_pixel_passthrough_test 8086:3e9b",
@@ -412,7 +400,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests 10de:0fe9",
@@ -451,7 +438,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests 8086:3e9b",
@@ -492,7 +478,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "pixel_skia_gold_passthrough_test 8086:3e9b",
@@ -535,7 +520,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "screenshot_sync_passthrough_tests 8086:3e9b",
@@ -572,7 +556,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test 10de:0fe9",
@@ -611,7 +594,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test 8086:3e9b",
@@ -648,7 +630,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests 10de:0fe9",
@@ -687,7 +668,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests 8086:3e9b",
@@ -727,7 +707,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_gl_passthrough_tests 8086:3e9b",
@@ -767,7 +746,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_gl_passthrough_tests 8086:3e9b",
@@ -807,7 +785,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_metal_passthrough_tests 8086:3e9b",
@@ -847,7 +824,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_swangle_passthrough_tests 8086:3e9b",

testing/buildbot/tryserver.chromium.win.json

diff --git a/testing/buildbot/tryserver.chromium.win.json b/testing/buildbot/tryserver.chromium.win.json
index fc16f43..e5dbbe9b 100644
--- a/testing/buildbot/tryserver.chromium.win.json
+++ b/testing/buildbot/tryserver.chromium.win.json
@@ -9,7 +9,6 @@
           "--use-angle=d3d9"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_d3d9_test 10de:2184",
@@ -35,7 +34,6 @@
           "--use-angle=d3d9"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_d3d9_test 8086:9bc5",
@@ -63,7 +61,6 @@
           "--disable-gpu-sandbox"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_gl_test 10de:2184",
@@ -90,7 +87,6 @@
           "--disable-gpu-sandbox"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_gl_test 8086:9bc5",
@@ -116,7 +112,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_test 10de:2184",
@@ -141,7 +136,6 @@
           "--use-gpu-in-tests"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gles2_conform_test 8086:9bc5",
@@ -165,7 +159,6 @@
       {
         "args": [],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gpu_unittests 10de:2184",
@@ -188,7 +181,6 @@
       {
         "args": [],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "gpu_unittests 8086:9bc5",
@@ -214,7 +206,6 @@
           "--ignore-runtime-requirements=*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests 10de:2184",
@@ -239,7 +230,6 @@
           "--ignore-runtime-requirements=*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "xr_browser_tests 8086:9bc5",
@@ -278,7 +268,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests 10de:2184",
@@ -319,7 +308,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "info_collection_tests 8086:9bc5",
@@ -357,7 +345,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests 10de:2184",
@@ -394,7 +381,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "mediapipe_passthrough_tests 8086:9bc5",
@@ -464,7 +450,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test 10de:2184",
@@ -501,7 +486,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "trace_test 8086:9bc5",
@@ -539,7 +523,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests 10de:2184",
@@ -576,7 +559,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webcodecs_tests 8086:9bc5",
@@ -617,7 +599,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_d3d11_passthrough_tests 10de:2184",
@@ -658,7 +639,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl2_conformance_d3d11_passthrough_tests 8086:9bc5",
@@ -699,7 +679,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d11_passthrough_tests 10de:2184",
@@ -739,7 +718,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d11_passthrough_tests 8086:9bc5",
@@ -780,7 +758,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d9_passthrough_tests 10de:2184",
@@ -820,7 +797,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_d3d9_passthrough_tests 8086:9bc5",
@@ -860,7 +836,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_vulkan_passthrough_tests 10de:2184",
@@ -899,7 +874,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "webgl_conformance_vulkan_passthrough_tests 8086:9bc5",

testing/buildbot/tryserver.devtools-frontend.json

diff --git a/testing/buildbot/tryserver.devtools-frontend.json b/testing/buildbot/tryserver.devtools-frontend.json
index a504114..0f05121 100644
--- a/testing/buildbot/tryserver.devtools-frontend.json
+++ b/testing/buildbot/tryserver.devtools-frontend.json
@@ -8,7 +8,6 @@
           "--gtest_filter=*DevTools*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "devtools_browser_tests",
@@ -102,7 +101,6 @@
           "--gtest_filter=*DevTools*"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "devtools_browser_tests",

testing/buildbot/unittest_expectations/test_android_output_options/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_android_output_options/chromium.ci.json b/testing/buildbot/unittest_expectations/test_android_output_options/chromium.ci.json
index 4d05edf..e2379958 100644
--- a/testing/buildbot/unittest_expectations/test_android_output_options/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_android_output_options/chromium.ci.json
@@ -17,7 +17,6 @@
           "--recover-devices"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -55,7 +54,6 @@
           "--recover-devices"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -79,7 +77,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_android_output_options/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_android_output_options/chromium.test.json b/testing/buildbot/unittest_expectations/test_android_output_options/chromium.test.json
index 4d05edf..e2379958 100644
--- a/testing/buildbot/unittest_expectations/test_android_output_options/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_android_output_options/chromium.test.json
@@ -17,7 +17,6 @@
           "--recover-devices"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -55,7 +54,6 @@
           "--recover-devices"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -79,7 +77,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_both_test_suite_and_variants_with_description/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_both_test_suite_and_variants_with_description/chromium.ci.json b/testing/buildbot/unittest_expectations/test_both_test_suite_and_variants_with_description/chromium.ci.json
index a4c8105..e7444d5 100644
--- a/testing/buildbot/unittest_expectations/test_both_test_suite_and_variants_with_description/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_both_test_suite_and_variants_with_description/chromium.ci.json
@@ -7,7 +7,6 @@
         "args": [],
         "description": "This is a swarming test.\\nVariant description.",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "swarming_test a_variant",

testing/buildbot/unittest_expectations/test_both_test_suite_and_variants_with_description/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_both_test_suite_and_variants_with_description/chromium.test.json b/testing/buildbot/unittest_expectations/test_both_test_suite_and_variants_with_description/chromium.test.json
index 20b04ae..8d2722e 100644
--- a/testing/buildbot/unittest_expectations/test_both_test_suite_and_variants_with_description/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_both_test_suite_and_variants_with_description/chromium.test.json
@@ -7,7 +7,6 @@
         "args": [],
         "description": "This is a swarming test.\nVariant description.",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "swarming_test a_variant",

testing/buildbot/unittest_expectations/test_builder/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_builder/chromium.ci.json b/testing/buildbot/unittest_expectations/test_builder/chromium.ci.json
index ca0b66f..ed7e2b9 100644
--- a/testing/buildbot/unittest_expectations/test_builder/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_builder/chromium.ci.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_builder/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_builder/chromium.test.json b/testing/buildbot/unittest_expectations/test_builder/chromium.test.json
index fb699930..5c15d9a 100644
--- a/testing/buildbot/unittest_expectations/test_builder/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_builder/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_builder_non_swarming/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_builder_non_swarming/chromium.ci.json b/testing/buildbot/unittest_expectations/test_builder_non_swarming/chromium.ci.json
index d8a6300..7910247 100644
--- a/testing/buildbot/unittest_expectations/test_builder_non_swarming/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_builder_non_swarming/chromium.ci.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_builder_non_swarming/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_builder_non_swarming/chromium.test.json b/testing/buildbot/unittest_expectations/test_builder_non_swarming/chromium.test.json
index f3d60a1..b42f573 100644
--- a/testing/buildbot/unittest_expectations/test_builder_non_swarming/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_builder_non_swarming/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_builder_with_no_dimension_fails/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_builder_with_no_dimension_fails/chromium.test.json b/testing/buildbot/unittest_expectations/test_builder_with_no_dimension_fails/chromium.test.json
index fd4508c..7aa27e4 100644
--- a/testing/buildbot/unittest_expectations/test_builder_with_no_dimension_fails/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_builder_with_no_dimension_fails/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_builder_with_no_os_dimension_fails/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_builder_with_no_os_dimension_fails/chromium.test.json b/testing/buildbot/unittest_expectations/test_builder_with_no_os_dimension_fails/chromium.test.json
index 3f1ae4e7..ff52d76 100644
--- a/testing/buildbot/unittest_expectations/test_builder_with_no_os_dimension_fails/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_builder_with_no_os_dimension_fails/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_chromeos_trigger_script_output/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_chromeos_trigger_script_output/chromium.ci.json b/testing/buildbot/unittest_expectations/test_chromeos_trigger_script_output/chromium.ci.json
index 0e749e5..ca46e6b 100644
--- a/testing/buildbot/unittest_expectations/test_chromeos_trigger_script_output/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_chromeos_trigger_script_output/chromium.ci.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_chromeos_trigger_script_output/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_chromeos_trigger_script_output/chromium.test.json b/testing/buildbot/unittest_expectations/test_chromeos_trigger_script_output/chromium.test.json
index 22a305b2..5aef15d 100644
--- a/testing/buildbot/unittest_expectations/test_chromeos_trigger_script_output/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_chromeos_trigger_script_output/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_dimension/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_dimension/chromium.ci.json b/testing/buildbot/unittest_expectations/test_dimension/chromium.ci.json
index fc50d2f..8c06dd26 100644
--- a/testing/buildbot/unittest_expectations/test_dimension/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_dimension/chromium.ci.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_dimension/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_dimension/chromium.test.json b/testing/buildbot/unittest_expectations/test_dimension/chromium.test.json
index b736707..bf0e583 100644
--- a/testing/buildbot/unittest_expectations/test_dimension/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_dimension/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_dimension_gpu/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_dimension_gpu/chromium.ci.json b/testing/buildbot/unittest_expectations/test_dimension_gpu/chromium.ci.json
index 23f732c0..6e2e1679 100644
--- a/testing/buildbot/unittest_expectations/test_dimension_gpu/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_dimension_gpu/chromium.ci.json
@@ -15,7 +15,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_test",

testing/buildbot/unittest_expectations/test_dimension_gpu/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_dimension_gpu/chromium.test.json b/testing/buildbot/unittest_expectations/test_dimension_gpu/chromium.test.json
index f4b8bda..5f10696 100644
--- a/testing/buildbot/unittest_expectations/test_dimension_gpu/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_dimension_gpu/chromium.test.json
@@ -15,7 +15,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_test",

testing/buildbot/unittest_expectations/test_dimension_sets_application/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_dimension_sets_application/chromium.ci.json b/testing/buildbot/unittest_expectations/test_dimension_sets_application/chromium.ci.json
index 64f2ab95..0bc5a157 100644
--- a/testing/buildbot/unittest_expectations/test_dimension_sets_application/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_dimension_sets_application/chromium.ci.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_dimension_sets_application/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_dimension_sets_application/chromium.test.json b/testing/buildbot/unittest_expectations/test_dimension_sets_application/chromium.test.json
index 1f67b2c6..03f9b2f 100644
--- a/testing/buildbot/unittest_expectations/test_dimension_sets_application/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_dimension_sets_application/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_enable_features_arg_merges/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_enable_features_arg_merges/chromium.test.json b/testing/buildbot/unittest_expectations/test_enable_features_arg_merges/chromium.test.json
index 60583a04..94f27f1f 100644
--- a/testing/buildbot/unittest_expectations/test_enable_features_arg_merges/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_enable_features_arg_merges/chromium.test.json
@@ -8,7 +8,6 @@
           "--enable-features=Foo,Bar,Baz"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_good_structure_no_configs/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_good_structure_no_configs/chromium.ci.json b/testing/buildbot/unittest_expectations/test_good_structure_no_configs/chromium.ci.json
index 530832f..93f9b17d 100644
--- a/testing/buildbot/unittest_expectations/test_good_structure_no_configs/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_good_structure_no_configs/chromium.ci.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -15,7 +14,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_good_structure_no_configs/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_good_structure_no_configs/chromium.test.json b/testing/buildbot/unittest_expectations/test_good_structure_no_configs/chromium.test.json
index a3f113e9..7c6b4384 100644
--- a/testing/buildbot/unittest_expectations/test_good_structure_no_configs/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_good_structure_no_configs/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20,7 +19,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_good_structure_with_description/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_good_structure_with_description/chromium.ci.json b/testing/buildbot/unittest_expectations/test_good_structure_with_description/chromium.ci.json
index d4b08d8..54fc637 100644
--- a/testing/buildbot/unittest_expectations/test_good_structure_with_description/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_good_structure_with_description/chromium.ci.json
@@ -6,7 +6,6 @@
       {
         "description": "This is a bar test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -16,7 +15,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_good_structure_with_description/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_good_structure_with_description/chromium.test.json b/testing/buildbot/unittest_expectations/test_good_structure_with_description/chromium.test.json
index 99663dcc..75856c45 100644
--- a/testing/buildbot/unittest_expectations/test_good_structure_with_description/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_good_structure_with_description/chromium.test.json
@@ -6,7 +6,6 @@
       {
         "description": "This is a bar test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21,7 +20,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_good_waterfall_output/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_good_waterfall_output/chromium.test.json b/testing/buildbot/unittest_expectations/test_good_waterfall_output/chromium.test.json
index a3f113e9..7c6b4384 100644
--- a/testing/buildbot/unittest_expectations/test_good_waterfall_output/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_good_waterfall_output/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20,7 +19,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_gpu_telemetry_tests/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests/chromium.ci.json b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests/chromium.ci.json
index 47ea4cf..9a22c96 100644
--- a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests/chromium.ci.json
@@ -15,7 +15,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_tests",

testing/buildbot/unittest_expectations/test_gpu_telemetry_tests/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests/chromium.test.json b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests/chromium.test.json
index a56382e..42eea7d8 100644
--- a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests/chromium.test.json
@@ -15,7 +15,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_tests",

testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android/chromium.ci.json b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android/chromium.ci.json
index 1567982..f8df6631 100644
--- a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android/chromium.ci.json
@@ -15,7 +15,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_tests",

testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android/chromium.test.json b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android/chromium.test.json
index 23074e3e..5e6a4934 100644
--- a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android/chromium.test.json
@@ -15,7 +15,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_chrome",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_tests",

testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android_webview/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android_webview/chromium.ci.json b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android_webview/chromium.ci.json
index 8a4eede2..244debb 100644
--- a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android_webview/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android_webview/chromium.ci.json
@@ -15,7 +15,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_webview",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_tests",

testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android_webview/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android_webview/chromium.test.json b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android_webview/chromium.test.json
index 65caf60..d03d20e 100644
--- a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android_webview/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_android_webview/chromium.test.json
@@ -15,7 +15,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_android_webview",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_tests",

testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_cast_streaming/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_cast_streaming/chromium.ci.json b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_cast_streaming/chromium.ci.json
index 193fccc..d00ccbc 100644
--- a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_cast_streaming/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_cast_streaming/chromium.ci.json
@@ -15,7 +15,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_fuchsia",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_tests",

testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_cast_streaming/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_cast_streaming/chromium.test.json b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_cast_streaming/chromium.test.json
index abb4464d..8f84d94d 100644
--- a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_cast_streaming/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_cast_streaming/chromium.test.json
@@ -15,7 +15,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_fuchsia",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_tests",

testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_fuchsia/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_fuchsia/chromium.ci.json b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_fuchsia/chromium.ci.json
index 497eb4b..ee89738 100644
--- a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_fuchsia/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_fuchsia/chromium.ci.json
@@ -15,7 +15,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_fuchsia",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_tests",

testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_fuchsia/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_fuchsia/chromium.test.json b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_fuchsia/chromium.test.json
index eddb743..a68ec32 100644
--- a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_fuchsia/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_fuchsia/chromium.test.json
@@ -15,7 +15,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test_fuchsia",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_tests",

testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_skylab/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_skylab/chromium.ci.json b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_skylab/chromium.ci.json
index a044890..48f64ac 100644
--- a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_skylab/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_skylab/chromium.ci.json
@@ -15,7 +15,6 @@
         "autotest_name": "chromium_Graphics",
         "extra_browser_args": "--log-level=0 --js-flags=--expose-gc",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_tests",

testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_skylab/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_skylab/chromium.test.json b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_skylab/chromium.test.json
index a044890..48f64ac 100644
--- a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_skylab/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_skylab/chromium.test.json
@@ -15,7 +15,6 @@
         "autotest_name": "chromium_Graphics",
         "extra_browser_args": "--log-level=0 --js-flags=--expose-gc",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_tests",

testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_with_variants/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_with_variants/chromium.test.json b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_with_variants/chromium.test.json
index 53b264d..763da9d 100644
--- a/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_with_variants/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_gpu_telemetry_tests_with_variants/chromium.test.json
@@ -19,7 +19,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "swarming_test a_variant",
@@ -51,7 +50,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "swarming_test ab",

testing/buildbot/unittest_expectations/test_gtest_as_isolated_Script/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_gtest_as_isolated_Script/chromium.ci.json b/testing/buildbot/unittest_expectations/test_gtest_as_isolated_Script/chromium.ci.json
index 2fa218e..08061e6 100644
--- a/testing/buildbot/unittest_expectations/test_gtest_as_isolated_Script/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_gtest_as_isolated_Script/chromium.ci.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "script": "foo.py",

testing/buildbot/unittest_expectations/test_gtest_as_isolated_Script/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_gtest_as_isolated_Script/chromium.test.json b/testing/buildbot/unittest_expectations/test_gtest_as_isolated_Script/chromium.test.json
index 738f319..e9e4431 100644
--- a/testing/buildbot/unittest_expectations/test_gtest_as_isolated_Script/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_gtest_as_isolated_Script/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "script": "foo.py",

testing/buildbot/unittest_expectations/test_intel_gpu_telemetry_tests/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_intel_gpu_telemetry_tests/chromium.ci.json b/testing/buildbot/unittest_expectations/test_intel_gpu_telemetry_tests/chromium.ci.json
index 6e5f54b..1995b95 100644
--- a/testing/buildbot/unittest_expectations/test_intel_gpu_telemetry_tests/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_intel_gpu_telemetry_tests/chromium.ci.json
@@ -19,7 +19,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_tests",

testing/buildbot/unittest_expectations/test_intel_gpu_telemetry_tests/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_intel_gpu_telemetry_tests/chromium.test.json b/testing/buildbot/unittest_expectations/test_intel_gpu_telemetry_tests/chromium.test.json
index e7d6d079..4bd7a54 100644
--- a/testing/buildbot/unittest_expectations/test_intel_gpu_telemetry_tests/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_intel_gpu_telemetry_tests/chromium.test.json
@@ -19,7 +19,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_tests",

testing/buildbot/unittest_expectations/test_intel_uhd_gpu_telemetry_tests/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_intel_uhd_gpu_telemetry_tests/chromium.ci.json b/testing/buildbot/unittest_expectations/test_intel_uhd_gpu_telemetry_tests/chromium.ci.json
index c04585e..92e9e5f 100644
--- a/testing/buildbot/unittest_expectations/test_intel_uhd_gpu_telemetry_tests/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_intel_uhd_gpu_telemetry_tests/chromium.ci.json
@@ -19,7 +19,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_tests",

testing/buildbot/unittest_expectations/test_intel_uhd_gpu_telemetry_tests/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_intel_uhd_gpu_telemetry_tests/chromium.test.json b/testing/buildbot/unittest_expectations/test_intel_uhd_gpu_telemetry_tests/chromium.test.json
index df409eda..6fb110d4 100644
--- a/testing/buildbot/unittest_expectations/test_intel_uhd_gpu_telemetry_tests/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_intel_uhd_gpu_telemetry_tests/chromium.test.json
@@ -19,7 +19,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_tests",

testing/buildbot/unittest_expectations/test_isolated_script_tests/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_isolated_script_tests/chromium.ci.json b/testing/buildbot/unittest_expectations/test_isolated_script_tests/chromium.ci.json
index eeb3b29..45b9c68c 100644
--- a/testing/buildbot/unittest_expectations/test_isolated_script_tests/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_isolated_script_tests/chromium.ci.json
@@ -6,7 +6,6 @@
       {
         "isolate_name": "foo_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_test",

testing/buildbot/unittest_expectations/test_isolated_script_tests/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_isolated_script_tests/chromium.test.json b/testing/buildbot/unittest_expectations/test_isolated_script_tests/chromium.test.json
index ac062a1..c64fe35 100644
--- a/testing/buildbot/unittest_expectations/test_isolated_script_tests/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_isolated_script_tests/chromium.test.json
@@ -6,7 +6,6 @@
       {
         "isolate_name": "foo_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_test",

testing/buildbot/unittest_expectations/test_linux_args/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_linux_args/chromium.test.json b/testing/buildbot/unittest_expectations/test_linux_args/chromium.test.json
index 29ab429..266cab544 100644
--- a/testing/buildbot/unittest_expectations/test_linux_args/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_linux_args/chromium.test.json
@@ -8,7 +8,6 @@
           "--no-xvfb"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_list/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_list/chromium.ci.json b/testing/buildbot/unittest_expectations/test_list/chromium.ci.json
index fc50d2f..8c06dd26 100644
--- a/testing/buildbot/unittest_expectations/test_list/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_list/chromium.ci.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_list/chromium.tet.json

diff --git a/testing/buildbot/unittest_expectations/test_list/chromium.tet.json b/testing/buildbot/unittest_expectations/test_list/chromium.tet.json
index fc50d2f..8c06dd26 100644
--- a/testing/buildbot/unittest_expectations/test_list/chromium.tet.json
+++ b/testing/buildbot/unittest_expectations/test_list/chromium.tet.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_mac_builder_with_no_cpu_dimension_in_isolated_script_fails/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_mac_builder_with_no_cpu_dimension_in_isolated_script_fails/chromium.test.json b/testing/buildbot/unittest_expectations/test_mac_builder_with_no_cpu_dimension_in_isolated_script_fails/chromium.test.json
index 8bb616f1..5d7d7ad 100644
--- a/testing/buildbot/unittest_expectations/test_mac_builder_with_no_cpu_dimension_in_isolated_script_fails/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_mac_builder_with_no_cpu_dimension_in_isolated_script_fails/chromium.test.json
@@ -6,7 +6,6 @@
       {
         "isolate_name": "foo_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_test",

testing/buildbot/unittest_expectations/test_mixin_append_args/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_mixin_append_args/chromium.ci.json b/testing/buildbot/unittest_expectations/test_mixin_append_args/chromium.ci.json
index 53317b0d..b79b80b 100644
--- a/testing/buildbot/unittest_expectations/test_mixin_append_args/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_mixin_append_args/chromium.ci.json
@@ -9,7 +9,6 @@
           "--mixin-argument"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_mixin_append_args/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_mixin_append_args/chromium.test.json b/testing/buildbot/unittest_expectations/test_mixin_append_args/chromium.test.json
index f9270c8..2c7fdb0 100644
--- a/testing/buildbot/unittest_expectations/test_mixin_append_args/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_mixin_append_args/chromium.test.json
@@ -9,7 +9,6 @@
           "--mixin-argument"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_mixin_append_linux_args/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_mixin_append_linux_args/chromium.ci.json b/testing/buildbot/unittest_expectations/test_mixin_append_linux_args/chromium.ci.json
index 8ddd5eb..58f0b3b 100644
--- a/testing/buildbot/unittest_expectations/test_mixin_append_linux_args/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_mixin_append_linux_args/chromium.ci.json
@@ -10,7 +10,6 @@
           "--linux-mixin-argument"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_mixin_append_linux_args/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_mixin_append_linux_args/chromium.test.json b/testing/buildbot/unittest_expectations/test_mixin_append_linux_args/chromium.test.json
index 26db1b7..4f1f451a 100644
--- a/testing/buildbot/unittest_expectations/test_mixin_append_linux_args/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_mixin_append_linux_args/chromium.test.json
@@ -10,7 +10,6 @@
           "--linux-mixin-argument"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_mixin_append_swarming_named_caches/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_mixin_append_swarming_named_caches/chromium.ci.json b/testing/buildbot/unittest_expectations/test_mixin_append_swarming_named_caches/chromium.ci.json
index 78b361d..0a65554 100644
--- a/testing/buildbot/unittest_expectations/test_mixin_append_swarming_named_caches/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_mixin_append_swarming_named_caches/chromium.ci.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_mixin_append_swarming_named_caches/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_mixin_append_swarming_named_caches/chromium.test.json b/testing/buildbot/unittest_expectations/test_mixin_append_swarming_named_caches/chromium.test.json
index dccd83c..15f4088c 100644
--- a/testing/buildbot/unittest_expectations/test_mixin_append_swarming_named_caches/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_mixin_append_swarming_named_caches/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_noop_exception_does_nothing/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_noop_exception_does_nothing/chromium.test.json b/testing/buildbot/unittest_expectations/test_noop_exception_does_nothing/chromium.test.json
index a3f113e9..7c6b4384 100644
--- a/testing/buildbot/unittest_expectations/test_noop_exception_does_nothing/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_noop_exception_does_nothing/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -20,7 +19,6 @@
       },
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_nvidia_gpu_telemetry_tests/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_nvidia_gpu_telemetry_tests/chromium.ci.json b/testing/buildbot/unittest_expectations/test_nvidia_gpu_telemetry_tests/chromium.ci.json
index 8a0b6fb..79c654d3b 100644
--- a/testing/buildbot/unittest_expectations/test_nvidia_gpu_telemetry_tests/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_nvidia_gpu_telemetry_tests/chromium.ci.json
@@ -19,7 +19,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_tests",

testing/buildbot/unittest_expectations/test_nvidia_gpu_telemetry_tests/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_nvidia_gpu_telemetry_tests/chromium.test.json b/testing/buildbot/unittest_expectations/test_nvidia_gpu_telemetry_tests/chromium.test.json
index 27f7593..e1f2f83a 100644
--- a/testing/buildbot/unittest_expectations/test_nvidia_gpu_telemetry_tests/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_nvidia_gpu_telemetry_tests/chromium.test.json
@@ -19,7 +19,6 @@
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
         "name": "foo_tests",

testing/buildbot/unittest_expectations/test_relative_pyl_file_dir/relative/path/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_relative_pyl_file_dir/relative/path/chromium.ci.json b/testing/buildbot/unittest_expectations/test_relative_pyl_file_dir/relative/path/chromium.ci.json
index cedfb49f..66ddd4ec 100644
--- a/testing/buildbot/unittest_expectations/test_relative_pyl_file_dir/relative/path/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_relative_pyl_file_dir/relative/path/chromium.ci.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25,7 +24,6 @@
           "--variation"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "variation_test",

testing/buildbot/unittest_expectations/test_relative_pyl_file_dir/relative/path/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_relative_pyl_file_dir/relative/path/chromium.test.json b/testing/buildbot/unittest_expectations/test_relative_pyl_file_dir/relative/path/chromium.test.json
index cedfb49f..66ddd4ec 100644
--- a/testing/buildbot/unittest_expectations/test_relative_pyl_file_dir/relative/path/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_relative_pyl_file_dir/relative/path/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25,7 +24,6 @@
           "--variation"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "variation_test",

testing/buildbot/unittest_expectations/test_remove_mixin_builder_remove_waterfall/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_remove_mixin_builder_remove_waterfall/chromium.ci.json b/testing/buildbot/unittest_expectations/test_remove_mixin_builder_remove_waterfall/chromium.ci.json
index 07ced91..51fbe56 100644
--- a/testing/buildbot/unittest_expectations/test_remove_mixin_builder_remove_waterfall/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_remove_mixin_builder_remove_waterfall/chromium.ci.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_remove_mixin_builder_remove_waterfall/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_remove_mixin_builder_remove_waterfall/chromium.test.json b/testing/buildbot/unittest_expectations/test_remove_mixin_builder_remove_waterfall/chromium.test.json
index 326b35b..2d27b84b 100644
--- a/testing/buildbot/unittest_expectations/test_remove_mixin_builder_remove_waterfall/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_remove_mixin_builder_remove_waterfall/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_builder/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_builder/chromium.ci.json b/testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_builder/chromium.ci.json
index 07ced91..51fbe56 100644
--- a/testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_builder/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_builder/chromium.ci.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_builder/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_builder/chromium.test.json b/testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_builder/chromium.test.json
index 326b35b..2d27b84b 100644
--- a/testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_builder/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_builder/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_waterfall/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_waterfall/chromium.ci.json b/testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_waterfall/chromium.ci.json
index 07ced91..51fbe56 100644
--- a/testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_waterfall/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_waterfall/chromium.ci.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_waterfall/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_waterfall/chromium.test.json b/testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_waterfall/chromium.test.json
index 326b35b..2d27b84b 100644
--- a/testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_waterfall/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_remove_mixin_test_remove_waterfall/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_replacement_valid_remove_no_value/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_replacement_valid_remove_no_value/chromium.ci.json b/testing/buildbot/unittest_expectations/test_replacement_valid_remove_no_value/chromium.ci.json
index d7879285..93db90d 100644
--- a/testing/buildbot/unittest_expectations/test_replacement_valid_remove_no_value/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_replacement_valid_remove_no_value/chromium.ci.json
@@ -6,7 +6,6 @@
       {
         "args": [],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_replacement_valid_remove_no_value/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_replacement_valid_remove_no_value/chromium.test.json b/testing/buildbot/unittest_expectations/test_replacement_valid_remove_no_value/chromium.test.json
index eca7ff3..360aca5f 100644
--- a/testing/buildbot/unittest_expectations/test_replacement_valid_remove_no_value/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_replacement_valid_remove_no_value/chromium.test.json
@@ -6,7 +6,6 @@
       {
         "args": [],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_replacement_valid_remove_value/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_replacement_valid_remove_value/chromium.ci.json b/testing/buildbot/unittest_expectations/test_replacement_valid_remove_value/chromium.ci.json
index d7879285..93db90d 100644
--- a/testing/buildbot/unittest_expectations/test_replacement_valid_remove_value/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_replacement_valid_remove_value/chromium.ci.json
@@ -6,7 +6,6 @@
       {
         "args": [],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_replacement_valid_remove_value/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_replacement_valid_remove_value/chromium.test.json b/testing/buildbot/unittest_expectations/test_replacement_valid_remove_value/chromium.test.json
index eca7ff3..360aca5f 100644
--- a/testing/buildbot/unittest_expectations/test_replacement_valid_remove_value/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_replacement_valid_remove_value/chromium.test.json
@@ -6,7 +6,6 @@
       {
         "args": [],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_replacement_valid_replace_value/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_replacement_valid_replace_value/chromium.ci.json b/testing/buildbot/unittest_expectations/test_replacement_valid_replace_value/chromium.ci.json
index df76174..53b3fe90 100644
--- a/testing/buildbot/unittest_expectations/test_replacement_valid_replace_value/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_replacement_valid_replace_value/chromium.ci.json
@@ -8,7 +8,6 @@
           "--enable-features=Bar,Baz"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_replacement_valid_replace_value/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_replacement_valid_replace_value/chromium.test.json b/testing/buildbot/unittest_expectations/test_replacement_valid_replace_value/chromium.test.json
index ac4653e..ebfba27b 100644
--- a/testing/buildbot/unittest_expectations/test_replacement_valid_replace_value/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_replacement_valid_replace_value/chromium.test.json
@@ -8,7 +8,6 @@
           "--enable-features=Bar,Baz"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_replacement_valid_replace_value_separate_entries/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_replacement_valid_replace_value_separate_entries/chromium.ci.json b/testing/buildbot/unittest_expectations/test_replacement_valid_replace_value_separate_entries/chromium.ci.json
index a46bde6..a571424 100644
--- a/testing/buildbot/unittest_expectations/test_replacement_valid_replace_value_separate_entries/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_replacement_valid_replace_value_separate_entries/chromium.ci.json
@@ -9,7 +9,6 @@
           "Bar,Baz"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_replacement_valid_replace_value_separate_entries/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_replacement_valid_replace_value_separate_entries/chromium.test.json b/testing/buildbot/unittest_expectations/test_replacement_valid_replace_value_separate_entries/chromium.test.json
index e9d42fa..75eff45 100644
--- a/testing/buildbot/unittest_expectations/test_replacement_valid_replace_value_separate_entries/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_replacement_valid_replace_value_separate_entries/chromium.test.json
@@ -9,7 +9,6 @@
           "Bar,Baz"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_reusing_gtest_targets/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_reusing_gtest_targets/chromium.test.json b/testing/buildbot/unittest_expectations/test_reusing_gtest_targets/chromium.test.json
index cedfb49f..66ddd4ec 100644
--- a/testing/buildbot/unittest_expectations/test_reusing_gtest_targets/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_reusing_gtest_targets/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -25,7 +24,6 @@
           "--variation"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "variation_test",

testing/buildbot/unittest_expectations/test_test_arg_merges/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_test_arg_merges/chromium.test.json b/testing/buildbot/unittest_expectations/test_test_arg_merges/chromium.test.json
index 5cdfb976..cc2f9f9 100644
--- a/testing/buildbot/unittest_expectations/test_test_arg_merges/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_test_arg_merges/chromium.test.json
@@ -9,7 +9,6 @@
           "--bar"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_test_filtering/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_test_filtering/chromium.test.json b/testing/buildbot/unittest_expectations/test_test_filtering/chromium.test.json
index b4fa4e8..aeff4fc 100644
--- a/testing/buildbot/unittest_expectations/test_test_filtering/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_test_filtering/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_test_modifications/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_test_modifications/chromium.ci.json b/testing/buildbot/unittest_expectations/test_test_modifications/chromium.ci.json
index 9afa610..467b6fb 100644
--- a/testing/buildbot/unittest_expectations/test_test_modifications/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_test_modifications/chromium.ci.json
@@ -8,7 +8,6 @@
           "--bar"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_test_modifications/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_test_modifications/chromium.test.json b/testing/buildbot/unittest_expectations/test_test_modifications/chromium.test.json
index 4999103f..f91ad230 100644
--- a/testing/buildbot/unittest_expectations/test_test_modifications/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_test_modifications/chromium.test.json
@@ -8,7 +8,6 @@
           "--bar"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_test_suite/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_test_suite/chromium.ci.json b/testing/buildbot/unittest_expectations/test_test_suite/chromium.ci.json
index 41baa0fa..82a533b8 100644
--- a/testing/buildbot/unittest_expectations/test_test_suite/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_test_suite/chromium.ci.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_test_suite/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_test_suite/chromium.test.json b/testing/buildbot/unittest_expectations/test_test_suite/chromium.test.json
index 8f6e621..e23fce4b 100644
--- a/testing/buildbot/unittest_expectations/test_test_suite/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_test_suite/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_test_with_explicit_none/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_test_with_explicit_none/chromium.ci.json b/testing/buildbot/unittest_expectations/test_test_with_explicit_none/chromium.ci.json
index 4020eff..b6687b38 100644
--- a/testing/buildbot/unittest_expectations/test_test_with_explicit_none/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_test_with_explicit_none/chromium.ci.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_test_with_explicit_none/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_test_with_explicit_none/chromium.test.json b/testing/buildbot/unittest_expectations/test_test_with_explicit_none/chromium.test.json
index ec3bfd3..7e0c9703 100644
--- a/testing/buildbot/unittest_expectations/test_test_with_explicit_none/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_test_with_explicit_none/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_ungenerated_output_files_are_caught/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_ungenerated_output_files_are_caught/chromium.test.json b/testing/buildbot/unittest_expectations/test_ungenerated_output_files_are_caught/chromium.test.json
index 9e13eb9..cf596fe5 100644
--- a/testing/buildbot/unittest_expectations/test_ungenerated_output_files_are_caught/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_ungenerated_output_files_are_caught/chromium.test.json
@@ -6,7 +6,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_unused/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_unused/chromium.ci.json b/testing/buildbot/unittest_expectations/test_unused/chromium.ci.json
index fc50d2f..8c06dd26 100644
--- a/testing/buildbot/unittest_expectations/test_unused/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_unused/chromium.ci.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_unused/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_unused/chromium.test.json b/testing/buildbot/unittest_expectations/test_unused/chromium.test.json
index fc50d2f..8c06dd26 100644
--- a/testing/buildbot/unittest_expectations/test_unused/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_unused/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_valid_function/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_valid_function/chromium.ci.json b/testing/buildbot/unittest_expectations/test_valid_function/chromium.ci.json
index c4a45ac4..f94cb4d1 100644
--- a/testing/buildbot/unittest_expectations/test_valid_function/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_valid_function/chromium.ci.json
@@ -8,7 +8,6 @@
           "--magic-substitution-success"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_valid_function/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_valid_function/chromium.test.json b/testing/buildbot/unittest_expectations/test_valid_function/chromium.test.json
index d8d87bb2..8ac9073 100644
--- a/testing/buildbot/unittest_expectations/test_valid_function/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_valid_function/chromium.test.json
@@ -8,7 +8,6 @@
           "--magic-substitution-success"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_variant_test_suite_with_test_key/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_variant_test_suite_with_test_key/chromium.ci.json b/testing/buildbot/unittest_expectations/test_variant_test_suite_with_test_key/chromium.ci.json
index bd218b6c..43868b3 100644
--- a/testing/buildbot/unittest_expectations/test_variant_test_suite_with_test_key/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_variant_test_suite_with_test_key/chromium.ci.json
@@ -11,7 +11,6 @@
           "1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "swarming_test a_variant",

testing/buildbot/unittest_expectations/test_variant_test_suite_with_test_key/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_variant_test_suite_with_test_key/chromium.test.json b/testing/buildbot/unittest_expectations/test_variant_test_suite_with_test_key/chromium.test.json
index 7c6c6fe..2716f1ce 100644
--- a/testing/buildbot/unittest_expectations/test_variant_test_suite_with_test_key/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_variant_test_suite_with_test_key/chromium.test.json
@@ -11,7 +11,6 @@
           "1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "swarming_test a_variant",

testing/buildbot/unittest_expectations/test_variants_pyl_ref/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_variants_pyl_ref/chromium.ci.json b/testing/buildbot/unittest_expectations/test_variants_pyl_ref/chromium.ci.json
index 5fc36d75..9883c4aa 100644
--- a/testing/buildbot/unittest_expectations/test_variants_pyl_ref/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_variants_pyl_ref/chromium.ci.json
@@ -11,7 +11,6 @@
           "1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "swarming_test a_variant",

testing/buildbot/unittest_expectations/test_variants_pyl_ref/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_variants_pyl_ref/chromium.test.json b/testing/buildbot/unittest_expectations/test_variants_pyl_ref/chromium.test.json
index dcc9cea..276b9b7 100644
--- a/testing/buildbot/unittest_expectations/test_variants_pyl_ref/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_variants_pyl_ref/chromium.test.json
@@ -11,7 +11,6 @@
           "1"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "swarming_test a_variant",

testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_args/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_args/chromium.ci.json b/testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_args/chromium.ci.json
index 32c89a5..6f7c1dd 100644
--- a/testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_args/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_args/chromium.ci.json
@@ -9,7 +9,6 @@
           "--anarg"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "args_test args",
@@ -24,7 +23,6 @@
           "--iam"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "args_test mixins",
@@ -44,7 +42,6 @@
           "--iam"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "args_test swarming",

testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_args/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_args/chromium.test.json b/testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_args/chromium.test.json
index c9a664e6..0181ae7e 100644
--- a/testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_args/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_args/chromium.test.json
@@ -9,7 +9,6 @@
           "--anarg"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "args_test args",
@@ -29,7 +28,6 @@
           "--iam"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "args_test mixins",
@@ -50,7 +48,6 @@
           "--iam"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "args_test swarming",

testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_mixins/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_mixins/chromium.ci.json b/testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_mixins/chromium.ci.json
index e20f1da..c12e9def 100644
--- a/testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_mixins/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_mixins/chromium.ci.json
@@ -8,7 +8,6 @@
           "--anarg"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "mixins_test args",
@@ -23,7 +22,6 @@
       {
         "args": [],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "mixins_test mixins",
@@ -43,7 +41,6 @@
       {
         "args": [],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "mixins_test swarming",

testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_mixins/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_mixins/chromium.test.json b/testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_mixins/chromium.test.json
index b35f2fa..2d4bafd 100644
--- a/testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_mixins/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_variants_swarming_dict_merge_mixins/chromium.test.json
@@ -8,7 +8,6 @@
           "--anarg"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "mixins_test args",
@@ -28,7 +27,6 @@
       {
         "args": [],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "mixins_test mixins",
@@ -49,7 +47,6 @@
       {
         "args": [],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "mixins_test swarming",

testing/buildbot/unittest_expectations/test_variants_swarming_dict_swarming/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_variants_swarming_dict_swarming/chromium.ci.json b/testing/buildbot/unittest_expectations/test_variants_swarming_dict_swarming/chromium.ci.json
index dc6814f..a8727144 100644
--- a/testing/buildbot/unittest_expectations/test_variants_swarming_dict_swarming/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_variants_swarming_dict_swarming/chromium.ci.json
@@ -8,7 +8,6 @@
           "--anarg"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "swarming_test args",
@@ -27,7 +26,6 @@
       {
         "args": [],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "swarming_test mixins",
@@ -47,7 +45,6 @@
       {
         "args": [],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "swarming_test swarming",

testing/buildbot/unittest_expectations/test_variants_swarming_dict_swarming/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_variants_swarming_dict_swarming/chromium.test.json b/testing/buildbot/unittest_expectations/test_variants_swarming_dict_swarming/chromium.test.json
index 5009958..fdb0929 100644
--- a/testing/buildbot/unittest_expectations/test_variants_swarming_dict_swarming/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_variants_swarming_dict_swarming/chromium.test.json
@@ -8,7 +8,6 @@
           "--anarg"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "swarming_test args",
@@ -28,7 +27,6 @@
       {
         "args": [],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "swarming_test mixins",
@@ -49,7 +47,6 @@
       {
         "args": [],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "swarming_test swarming",

testing/buildbot/unittest_expectations/test_variants_with_description/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_variants_with_description/chromium.ci.json b/testing/buildbot/unittest_expectations/test_variants_with_description/chromium.ci.json
index cfc8327..4f4618d 100644
--- a/testing/buildbot/unittest_expectations/test_variants_with_description/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_variants_with_description/chromium.ci.json
@@ -7,7 +7,6 @@
         "args": [],
         "description": "Variant description.",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "swarming_test a_variant",

testing/buildbot/unittest_expectations/test_variants_with_description/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_variants_with_description/chromium.test.json b/testing/buildbot/unittest_expectations/test_variants_with_description/chromium.test.json
index dc41e2c6..be2510ac 100644
--- a/testing/buildbot/unittest_expectations/test_variants_with_description/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_variants_with_description/chromium.test.json
@@ -7,7 +7,6 @@
         "args": [],
         "description": "Variant description.",
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "name": "swarming_test a_variant",

testing/buildbot/unittest_expectations/test_waterfall/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_waterfall/chromium.ci.json b/testing/buildbot/unittest_expectations/test_waterfall/chromium.ci.json
index fccbf41..bfe10f6 100644
--- a/testing/buildbot/unittest_expectations/test_waterfall/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_waterfall/chromium.ci.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_waterfall/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_waterfall/chromium.test.json b/testing/buildbot/unittest_expectations/test_waterfall/chromium.test.json
index ff06f7f..a66718a 100644
--- a/testing/buildbot/unittest_expectations/test_waterfall/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_waterfall/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_waterfall_args/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_waterfall_args/chromium.ci.json b/testing/buildbot/unittest_expectations/test_waterfall_args/chromium.ci.json
index 58443968..69f06b5e 100644
--- a/testing/buildbot/unittest_expectations/test_waterfall_args/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_waterfall_args/chromium.ci.json
@@ -8,7 +8,6 @@
           "--this-is-an-argument"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -21,7 +20,6 @@
           "--this-is-an-argument"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_waterfall_args/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_waterfall_args/chromium.test.json b/testing/buildbot/unittest_expectations/test_waterfall_args/chromium.test.json
index 4783875..7599ab2 100644
--- a/testing/buildbot/unittest_expectations/test_waterfall_args/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_waterfall_args/chromium.test.json
@@ -8,7 +8,6 @@
           "--this-is-an-argument"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {
@@ -26,7 +25,6 @@
           "--this-is-an-argument"
         ],
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_waterfall_exception_overrides/chromium.ci.json

diff --git a/testing/buildbot/unittest_expectations/test_waterfall_exception_overrides/chromium.ci.json b/testing/buildbot/unittest_expectations/test_waterfall_exception_overrides/chromium.ci.json
index 481b2cf..97a3da94 100644
--- a/testing/buildbot/unittest_expectations/test_waterfall_exception_overrides/chromium.ci.json
+++ b/testing/buildbot/unittest_expectations/test_waterfall_exception_overrides/chromium.ci.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/unittest_expectations/test_waterfall_exception_overrides/chromium.test.json

diff --git a/testing/buildbot/unittest_expectations/test_waterfall_exception_overrides/chromium.test.json b/testing/buildbot/unittest_expectations/test_waterfall_exception_overrides/chromium.test.json
index b23554a..a6d153d 100644
--- a/testing/buildbot/unittest_expectations/test_waterfall_exception_overrides/chromium.test.json
+++ b/testing/buildbot/unittest_expectations/test_waterfall_exception_overrides/chromium.test.json
@@ -5,7 +5,6 @@
     "gtest_tests": [
       {
         "merge": {
-          "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
         "swarming": {

testing/buildbot/variants.pyl

diff --git a/testing/buildbot/variants.pyl b/testing/buildbot/variants.pyl
index b11cfa4..92663d7 100644
--- a/testing/buildbot/variants.pyl
+++ b/testing/buildbot/variants.pyl
@@ -22,16 +22,16 @@
   },
   'LACROS_VERSION_SKEW_CANARY': {
     'args': [
-      '--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5700.0/test_ash_chrome',
+      '--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5701.0/test_ash_chrome',
     ],
-    'description': 'Run with ash-chrome version 114.0.5700.0',
+    'description': 'Run with ash-chrome version 114.0.5701.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_v114.0.5700.0',
-          'revision': 'version:114.0.5700.0',
+          'location': 'lacros_version_skew_tests_v114.0.5701.0',
+          'revision': 'version:114.0.5701.0',
         },
       ],
     },

testing/variations/fieldtrial_testing_config.json

diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
index d265778..9e90fc46 100644
--- a/testing/variations/fieldtrial_testing_config.json
+++ b/testing/variations/fieldtrial_testing_config.json
@@ -5087,6 +5087,25 @@
             ]
         }
     ],
+    "ExtensionTelemetryPotentialPasswordTheftSignalStudy": [
+        {
+            "platforms": [
+                "chromeos",
+                "chromeos_lacros",
+                "linux",
+                "mac",
+                "windows"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled",
+                    "enable_features": [
+                        "SafeBrowsingExtensionTelemetryPotentialPasswordTheft"
+                    ]
+                }
+            ]
+        }
+    ],
     "ExtensionsMenuInAppMenu": [
         {
             "platforms": [

third_party/blink/public/strings/translations/blink_strings_th.xtb

diff --git a/third_party/blink/public/strings/translations/blink_strings_th.xtb b/third_party/blink/public/strings/translations/blink_strings_th.xtb
index 0d9e2ad..5e83ec6 100644
--- a/third_party/blink/public/strings/translations/blink_strings_th.xtb
+++ b/third_party/blink/public/strings/translations/blink_strings_th.xtb
@@ -152,7 +152,7 @@
 <translation id="8131955114056917397">0.25</translation>
 <translation id="8199524924445686405">ปปปป</translation>
 <translation id="8261464734335370856">มีการสะกดผิด</translation>
-<translation id="8284326494547611709">คำบรรยาย</translation>
+<translation id="8284326494547611709">คำบรรยายแทนเสียง</translation>
 <translation id="835897206747267392">ค่าไม่ถูกต้อง</translation>
 <translation id="839593075537728968">ค่าต้องอยู่ระหว่าง <ph name="MINIMUM_TIME" /> ถึง <ph name="MAXIMUM_TIME" /></translation>
 <translation id="8403857369060869934">เวลาที่ผ่านไป: <ph name="ELAPSED_TIME" /></translation>

third_party/blink/renderer/bindings/bindings.gni

diff --git a/third_party/blink/renderer/bindings/bindings.gni b/third_party/blink/renderer/bindings/bindings.gni
index 562b101..684e12c 100644
--- a/third_party/blink/renderer/bindings/bindings.gni
+++ b/third_party/blink/renderer/bindings/bindings.gni
@@ -13,6 +13,7 @@
     get_path_info([
                     "core/v8/active_script_wrappable.cc",
                     "core/v8/active_script_wrappable.h",
+                    "core/v8/active_script_wrappable_creation_key.h",
                     "core/v8/array_value.cc",
                     "core/v8/array_value.h",
                     "core/v8/binding_security.cc",

third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h

diff --git a/third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h b/third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h
index 6dc3233..8d51d0d0 100644
--- a/third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h
+++ b/third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h
@@ -5,6 +5,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_ACTIVE_SCRIPT_WRAPPABLE_H_
 #define THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_ACTIVE_SCRIPT_WRAPPABLE_H_
 
+#include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable_creation_key.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/platform/bindings/active_script_wrappable_base.h"
 namespace blink {
@@ -15,21 +16,27 @@
 // asynchronous activity, even if they are not referenced in the JavaScript or
 // Blink heap.
 //
-// This is useful for ScriptWrappable objects that are not held alive by regular
-// references from the object graph. E.g., XMLHttpRequest may have a pending
-// activity that may be visible (e.g. firing event listeners or resolving
-// promises) and should thus not be collected.
+// This can be useful for ScriptWrappable objects that are not held alive by
+// regular references from the object graph. E.g., XMLHttpRequest may have a
+// pending activity that may be visible (e.g. firing event listeners or
+// resolving promises) and should thus not be collected.
 //
-// Such objects should derive from ActiveScriptWrappable<T>, and override
-// ScriptWrappable::HasPendingActivity:
-//   bool HasPendingActivity() const final;
-// which returns true if there may be pending activity which requires the
-// wrappable remain alive.
+// Alternatively, it is generally less error prone though to attach the
+// wrappable object to the regular Blink heap. ActiveScriptWrappable negatively
+// affects garbage collection performance and is thus preferred to keep objects
+// alive through other means, e.g. normal Member<> pointers. When not easily
+// feasibly, a new ActiveScriptWrappable should be allow-listed in
+// ActiveScriptWrappableCreationKey as a friend.
 //
-// To avoid leaking objects after the context is destroyed, users of
-// ActiveScriptWrappable<T> also have to provide a GetExecutionContext() method
-// that returns the ExecutionContext or nullptr. A nullptr or already destroyed
-// context results in ignoring HasPendingActivity().
+// The objects should derive from ActiveScriptWrappable<T>, and override
+// `ScriptWrappable::HasPendingActivity()`. The method is not allowed to
+// allocate.
+//
+// Caveat:
+// - To avoid leaking objects after the context is destroyed, users of
+//   ActiveScriptWrappable<T> also have to provide a `GetExecutionContext()`
+//   method that returns the ExecutionContext or nullptr. A nullptr or already
+//   destroyed context results in ignoring `HasPendingActivity()`.
 //
 // Automatically activates the ASW behavior after construction. For lazy
 // initialization, see LazyActiveScriptWrappable below.
@@ -46,6 +53,9 @@
     RegisterActiveScriptWrappable();
   }
 
+ protected:
+  explicit ActiveScriptWrappable(ActiveScriptWrappableCreationKey) {}
+
   bool IsContextDestroyed() const final {
     return IsContextDestroyedForActiveScriptWrappable(
         static_cast<const T*>(this)->GetExecutionContext());
@@ -54,9 +64,6 @@
   bool DispatchHasPendingActivity() const final {
     return static_cast<const T*>(this)->HasPendingActivity();
   }
-
- protected:
-  ActiveScriptWrappable() = default;
 };
 
 // Same as ActiveScriptWrappable with the difference the the object is not
@@ -87,7 +94,7 @@
   }
 
  protected:
-  LazyActiveScriptWrappable() = default;
+  explicit LazyActiveScriptWrappable(ActiveScriptWrappableCreationKey) {}
 };
 
 // Helper for ActiveScriptWrappable<T>::IsContextDestroyed();

third_party/blink/renderer/bindings/core/v8/active_script_wrappable_creation_key.h

diff --git a/third_party/blink/renderer/bindings/core/v8/active_script_wrappable_creation_key.h b/third_party/blink/renderer/bindings/core/v8/active_script_wrappable_creation_key.h
new file mode 100644
index 0000000..6fac5de
--- /dev/null
+++ b/third_party/blink/renderer/bindings/core/v8/active_script_wrappable_creation_key.h
@@ -0,0 +1,123 @@
+// Copyright 2023 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_ACTIVE_SCRIPT_WRAPPABLE_CREATION_KEY_H_
+#define THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_ACTIVE_SCRIPT_WRAPPABLE_CREATION_KEY_H_
+
+namespace blink {
+
+// Creation key needed to instantiate ActiveScriptWrappable objects.
+//
+// By adding your class as friend below you acknowledge that you have checked
+// alternatives for keeping the object alive, see class comment of
+// `ActiveScriptWrappable`.
+class ActiveScriptWrappableCreationKey final {
+ private:
+  // NOLINTNEXTLINE: No =default to disallow aggregate initialization.
+  ActiveScriptWrappableCreationKey() {}
+
+  friend class AbortSignal;
+  friend class Animation;
+  friend class AudioScheduledSourceNode;
+  friend class AudioWorkletNode;
+  friend class BackgroundFetchRegistration;
+  friend class BaseAudioContext;
+  friend class BatteryManager;
+  friend class BeforeInstallPromptEvent;
+  friend class BluetoothDevice;
+  friend class BluetoothRemoteGATTCharacteristic;
+  friend class BroadcastChannel;
+  friend class CacheStorage;
+  friend class CanvasRenderingContext;
+  template <typename Traits>
+  friend class DecoderTemplate;
+  friend class DedicatedWorker;
+  friend class DocumentTransition;
+  friend class DOMFileSystem;
+  friend class DOMWebSocket;
+  friend class EditContext;
+  template <typename Traits>
+  friend class EncoderBase;
+  friend class EventSource;
+  friend class FetchEvent;
+  friend class FileReader;
+  friend class FileSystemDirectoryIterator;
+  friend class FileWriter;
+  friend class FontFace;
+  template <typename NativeFrameType>
+  friend class FrameQueueUnderlyingSource;
+  friend class Geolocation;
+  friend class HIDDevice;
+  friend class HTMLImageElement;
+  friend class HTMLInputElement;
+  friend class HTMLMediaElement;
+  friend class HTMLPlugInElement;
+  friend class IDBDatabase;
+  friend class IDBRequest;
+  friend class IDBTransaction;
+  friend class IdleDetector;
+  friend class ImageDecoderExternal;
+  friend class IntersectionObserver;
+  friend class MediaElementAudioSourceNode;
+  friend class MediaDevices;
+  friend class MediaKeys;
+  friend class MediaKeySession;
+  friend class MediaQueryList;
+  friend class MediaSource;
+  friend class MediaRecorder;
+  friend class MediaStream;
+  friend class MediaStreamAudioSourceNode;
+  friend class MediaStreamTrack;
+  friend class MessagePort;
+  friend class MIDIAccess;
+  friend class MIDIPort;
+  friend class MojoInterfaceInterceptor;
+  friend class MojoWatcher;
+  friend class MutationObserver;
+  friend class NavigatorManagedData;
+  friend class NDEFReader;
+  friend class NetworkInformation;
+  friend class Notification;
+  friend class PaymentRequest;
+  friend class PaymentResponse;
+  friend class PerformanceObserver;
+  friend class PermissionStatus;
+  friend class PictureInPictureWindow;
+  friend class PresentationAvailability;
+  friend class PresentationRequest;
+  friend class ReadableStreamDefaultReader;
+  friend class RemotePlayback;
+  friend class ReportingObserver;
+  friend class Request;
+  friend class ResizeObserver;
+  friend class Response;
+  friend class RTCDataChannel;
+  friend class RTCIceTransport;
+  friend class RTCPeerConnection;
+  friend class ScriptProcessorNode;
+  friend class Sensor;
+  friend class SerialPort;
+  friend class ServiceWorker;
+  friend class ServiceWorkerRegistration;
+  friend class SharedWorker;
+  friend class SmartCardReader;
+  friend class SmartCardReaderPresenceObserver;
+  friend class SourceBuffer;
+  friend class SpeechRecognition;
+  friend class SVGImageElement;
+  friend class TCPSocket;
+  friend class UDPSocket;
+  friend class ViewTransition;
+  friend class WakeLockSentinel;
+  friend class WebSocketStream;
+  friend class WebTransport;
+  friend class WorkerGlobalScope;
+  friend class WorkletGlobalScope;
+  friend class XMLHttpRequest;
+  friend class XRSession;
+};
+
+}  // namespace blink
+
+#endif  // THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_ACTIVE_SCRIPT_WRAPPABLE_CREATION_KEY_H_

third_party/blink/renderer/core/animation/animation.cc

diff --git a/third_party/blink/renderer/core/animation/animation.cc b/third_party/blink/renderer/core/animation/animation.cc
index 78497ef..85a5b0f 100644
--- a/third_party/blink/renderer/core/animation/animation.cc
+++ b/third_party/blink/renderer/core/animation/animation.cc
@@ -269,7 +269,8 @@
 Animation::Animation(ExecutionContext* execution_context,
                      AnimationTimeline* timeline,
                      AnimationEffect* content)
-    : ExecutionContextLifecycleObserver(nullptr),
+    : ActiveScriptWrappable<Animation>({}),
+      ExecutionContextLifecycleObserver(nullptr),
       reported_play_state_(kIdle),
       playback_rate_(1),
       start_time_(),
@@ -2074,10 +2075,15 @@
   // If the scroll source is not composited, fall back to main thread.
   // TODO(crbug.com/476553): Once all ScrollNodes including uncomposited ones
   // are in the compositor, the animation should be composited.
-  if (timeline_ && timeline_->IsScrollTimeline() &&
+  // TODO(crbug.com/1414885): In CompositeScrollAfterPaint, the composited
+  // scrolling status is unknown at this time, so we have to require the above
+  // TODO to be implemented, with crbug.com/1416223 fixed.
+  if (!RuntimeEnabledFeatures::CompositeScrollAfterPaintEnabled() &&
+      timeline_ && timeline_->IsScrollTimeline() &&
       !CompositorAnimations::CheckUsesCompositedScrolling(
-          To<ScrollTimeline>(*timeline_).ResolvedSource()))
+          To<ScrollTimeline>(*timeline_).ResolvedSource())) {
     reasons |= CompositorAnimations::kTimelineSourceHasInvalidCompositingState;
+  }
 
   // An Animation without an effect cannot produce a visual, so there is no
   // reason to composite it.

third_party/blink/renderer/core/animation/animation_test.cc

diff --git a/third_party/blink/renderer/core/animation/animation_test.cc b/third_party/blink/renderer/core/animation/animation_test.cc
index fa9958f..fdb30f6 100644
--- a/third_party/blink/renderer/core/animation/animation_test.cc
+++ b/third_party/blink/renderer/core/animation/animation_test.cc
@@ -1913,7 +1913,9 @@
 
   auto* scroller =
       To<LayoutBoxModelObject>(GetLayoutObjectByElementId("scroller"));
-  ASSERT_TRUE(scroller->UsesCompositedScrolling());
+  if (!RuntimeEnabledFeatures::CompositeScrollAfterPaintEnabled()) {
+    ASSERT_TRUE(scroller->UsesCompositedScrolling());
+  }
 
   // Create ScrollTimeline
   ScrollTimelineOptions* options = ScrollTimelineOptions::Create();
@@ -2314,8 +2316,11 @@
 
   UpdateAllLifecyclePhasesForTest();
   scroll_animation->play();
-  EXPECT_EQ(scroll_animation->CheckCanStartAnimationOnCompositor(nullptr),
-            CompositorAnimations::kTimelineSourceHasInvalidCompositingState);
+  EXPECT_EQ(
+      scroll_animation->CheckCanStartAnimationOnCompositor(nullptr),
+      RuntimeEnabledFeatures::CompositeScrollAfterPaintEnabled()
+          ? CompositorAnimations::kNoFailure
+          : CompositorAnimations::kTimelineSourceHasInvalidCompositingState);
 }
 
 #if BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)

third_party/blink/renderer/core/css/font_face.cc

diff --git a/third_party/blink/renderer/core/css/font_face.cc b/third_party/blink/renderer/core/css/font_face.cc
index 4936d69..06a3082 100644
--- a/third_party/blink/renderer/core/css/font_face.cc
+++ b/third_party/blink/renderer/core/css/font_face.cc
@@ -243,7 +243,8 @@
 FontFace::FontFace(ExecutionContext* context,
                    const StyleRuleFontFace* style_rule,
                    bool is_user_style)
-    : ExecutionContextClient(context),
+    : ActiveScriptWrappable<FontFace>({}),
+      ExecutionContextClient(context),
       style_rule_(style_rule),
       status_(kUnloaded),
       is_user_style_(is_user_style) {}
@@ -251,7 +252,10 @@
 FontFace::FontFace(ExecutionContext* context,
                    const AtomicString& family,
                    const FontFaceDescriptors* descriptors)
-    : ExecutionContextClient(context), family_(family), status_(kUnloaded) {
+    : ActiveScriptWrappable<FontFace>({}),
+      ExecutionContextClient(context),
+      family_(family),
+      status_(kUnloaded) {
   SetPropertyFromString(context, descriptors->style(),
                         AtRuleDescriptorID::FontStyle);
   SetPropertyFromString(context, descriptors->weight(),

third_party/blink/renderer/core/css/media_query_list.cc

diff --git a/third_party/blink/renderer/core/css/media_query_list.cc b/third_party/blink/renderer/core/css/media_query_list.cc
index a978614b..6fdd1b02 100644
--- a/third_party/blink/renderer/core/css/media_query_list.cc
+++ b/third_party/blink/renderer/core/css/media_query_list.cc
@@ -36,7 +36,8 @@
 MediaQueryList::MediaQueryList(ExecutionContext* context,
                                MediaQueryMatcher* matcher,
                                MediaQuerySet* media)
-    : ExecutionContextLifecycleObserver(context),
+    : ActiveScriptWrappable<MediaQueryList>({}),
+      ExecutionContextLifecycleObserver(context),
       matcher_(matcher),
       media_(media),
       matches_dirty_(true),

third_party/blink/renderer/core/dom/abort_signal.cc

diff --git a/third_party/blink/renderer/core/dom/abort_signal.cc b/third_party/blink/renderer/core/dom/abort_signal.cc
index ec6f17d..10ed36c 100644
--- a/third_party/blink/renderer/core/dom/abort_signal.cc
+++ b/third_party/blink/renderer/core/dom/abort_signal.cc
@@ -161,7 +161,8 @@
     : AbortSignal(execution_context, SignalType::kInternal) {}
 
 AbortSignal::AbortSignal(ExecutionContext* execution_context,
-                         SignalType signal_type) {
+                         SignalType signal_type)
+    : LazyActiveScriptWrappable<AbortSignal>({}) {
   DCHECK_NE(signal_type, SignalType::kComposite);
   InitializeCommon(execution_context, signal_type);
 
@@ -172,7 +173,8 @@
 }
 
 AbortSignal::AbortSignal(ScriptState* script_state,
-                         HeapVector<Member<AbortSignal>>& source_signals) {
+                         HeapVector<Member<AbortSignal>>& source_signals)
+    : LazyActiveScriptWrappable<AbortSignal>({}) {
   DCHECK(RuntimeEnabledFeatures::AbortSignalCompositionEnabled());
   InitializeCommon(ExecutionContext::From(script_state),
                    SignalType::kComposite);

third_party/blink/renderer/core/dom/mutation_observer.cc

diff --git a/third_party/blink/renderer/core/dom/mutation_observer.cc b/third_party/blink/renderer/core/dom/mutation_observer.cc
index 9e1e464d..c3ac35441 100644
--- a/third_party/blink/renderer/core/dom/mutation_observer.cc
+++ b/third_party/blink/renderer/core/dom/mutation_observer.cc
@@ -191,7 +191,8 @@
 
 MutationObserver::MutationObserver(ExecutionContext* execution_context,
                                    Delegate* delegate)
-    : ExecutionContextLifecycleStateObserver(execution_context),
+    : ActiveScriptWrappable<MutationObserver>({}),
+      ExecutionContextLifecycleStateObserver(execution_context),
       delegate_(delegate) {
   priority_ = g_observer_priority++;
   UpdateStateIfNeeded();

third_party/blink/renderer/core/editing/ime/edit_context.cc

diff --git a/third_party/blink/renderer/core/editing/ime/edit_context.cc b/third_party/blink/renderer/core/editing/ime/edit_context.cc
index e946cd2..bde0f54 100644
--- a/third_party/blink/renderer/core/editing/ime/edit_context.cc
+++ b/third_party/blink/renderer/core/editing/ime/edit_context.cc
@@ -35,7 +35,8 @@
 namespace blink {
 
 EditContext::EditContext(ScriptState* script_state, const EditContextInit* dict)
-    : ExecutionContextClient(ExecutionContext::From(script_state)) {
+    : ActiveScriptWrappable<EditContext>({}),
+      ExecutionContextClient(ExecutionContext::From(script_state)) {
   DCHECK(IsMainThread());
 
   if (dict->hasText())

third_party/blink/renderer/core/fetch/request.cc

diff --git a/third_party/blink/renderer/core/fetch/request.cc b/third_party/blink/renderer/core/fetch/request.cc
index 65c65104..ab8c93b 100644
--- a/third_party/blink/renderer/core/fetch/request.cc
+++ b/third_party/blink/renderer/core/fetch/request.cc
@@ -856,11 +856,11 @@
                  FetchRequestData* request,
                  Headers* headers,
                  AbortSignal* signal)
-    : Body(ExecutionContext::From(script_state)),
+    : ActiveScriptWrappable<Request>({}),
+      Body(ExecutionContext::From(script_state)),
       request_(request),
       headers_(headers),
-      signal_(signal) {
-}
+      signal_(signal) {}
 
 Request::Request(ScriptState* script_state, FetchRequestData* request)
     : Request(script_state,

third_party/blink/renderer/core/fetch/response.cc

diff --git a/third_party/blink/renderer/core/fetch/response.cc b/third_party/blink/renderer/core/fetch/response.cc
index ba8c4e94..0f11686 100644
--- a/third_party/blink/renderer/core/fetch/response.cc
+++ b/third_party/blink/renderer/core/fetch/response.cc
@@ -559,7 +559,10 @@
 Response::Response(ExecutionContext* context,
                    FetchResponseData* response,
                    Headers* headers)
-    : Body(context), response_(response), headers_(headers) {}
+    : ActiveScriptWrappable<Response>({}),
+      Body(context),
+      response_(response),
+      headers_(headers) {}
 
 bool Response::HasBody() const {
   return response_->InternalBuffer();

third_party/blink/renderer/core/fileapi/file_reader.cc

diff --git a/third_party/blink/renderer/core/fileapi/file_reader.cc b/third_party/blink/renderer/core/fileapi/file_reader.cc
index 9010da3a..17f54131 100644
--- a/third_party/blink/renderer/core/fileapi/file_reader.cc
+++ b/third_party/blink/renderer/core/fileapi/file_reader.cc
@@ -197,7 +197,8 @@
 }
 
 FileReader::FileReader(ExecutionContext* context)
-    : ExecutionContextLifecycleObserver(context),
+    : ActiveScriptWrappable<FileReader>({}),
+      ExecutionContextLifecycleObserver(context),
       state_(kEmpty),
       loading_state_(kLoadingStateNone),
       still_firing_events_(false),

third_party/blink/renderer/core/frame/reporting_observer.cc

diff --git a/third_party/blink/renderer/core/frame/reporting_observer.cc b/third_party/blink/renderer/core/frame/reporting_observer.cc
index 7b931cd..89c04a3 100644
--- a/third_party/blink/renderer/core/frame/reporting_observer.cc
+++ b/third_party/blink/renderer/core/frame/reporting_observer.cc
@@ -25,7 +25,8 @@
 ReportingObserver::ReportingObserver(ExecutionContext* execution_context,
                                      V8ReportingObserverCallback* callback,
                                      ReportingObserverOptions* options)
-    : ExecutionContextClient(execution_context),
+    : ActiveScriptWrappable<ReportingObserver>({}),
+      ExecutionContextClient(execution_context),
       execution_context_(execution_context),
       callback_(callback),
       options_(options),

third_party/blink/renderer/core/html/canvas/canvas_rendering_context.cc

diff --git a/third_party/blink/renderer/core/html/canvas/canvas_rendering_context.cc b/third_party/blink/renderer/core/html/canvas/canvas_rendering_context.cc
index 32f8195..9d24c520 100644
--- a/third_party/blink/renderer/core/html/canvas/canvas_rendering_context.cc
+++ b/third_party/blink/renderer/core/html/canvas/canvas_rendering_context.cc
@@ -41,7 +41,8 @@
     CanvasRenderingContextHost* host,
     const CanvasContextCreationAttributesCore& attrs,
     CanvasRenderingAPI canvas_rendering_API)
-    : host_(host),
+    : ActiveScriptWrappable<CanvasRenderingContext>({}),
+      host_(host),
       color_params_(attrs.color_space, attrs.pixel_format, attrs.alpha),
       creation_attributes_(attrs),
       canvas_rendering_type_(canvas_rendering_API) {}

third_party/blink/renderer/core/html/fenced_frame/html_fenced_frame_element.cc

diff --git a/third_party/blink/renderer/core/html/fenced_frame/html_fenced_frame_element.cc b/third_party/blink/renderer/core/html/fenced_frame/html_fenced_frame_element.cc
index ae0ffaa..59a1654 100644
--- a/third_party/blink/renderer/core/html/fenced_frame/html_fenced_frame_element.cc
+++ b/third_party/blink/renderer/core/html/fenced_frame/html_fenced_frame_element.cc
@@ -415,20 +415,7 @@
 
 void HTMLFencedFrameElement::ParseAttribute(
     const AttributeModificationParams& params) {
-  if (params.name == html_names::kSrcAttr) {
-    if (config_) {
-      DCHECK(config_->url());
-      GetDocument().AddConsoleMessage(MakeGarbageCollected<ConsoleMessage>(
-          mojom::blink::ConsoleMessageSource::kJavaScript,
-          mojom::blink::ConsoleMessageLevel::kWarning,
-          "Changing the `src` attribute on a fenced frame has no effect after "
-          "it has already been installed a config with a specified url."));
-      return;
-    }
-
-    KURL url = GetNonEmptyURLAttribute(html_names::kSrcAttr);
-    Navigate(url);
-  } else if (params.name == html_names::kSandboxAttr) {
+  if (params.name == html_names::kSandboxAttr) {
     sandbox_->DidUpdateAttributeValue(params.old_value, params.new_value);
 
     network::mojom::blink::WebSandboxFlags current_flags =
@@ -467,10 +454,6 @@
   }
 }
 
-bool HTMLFencedFrameElement::IsURLAttribute(const Attribute& attribute) const {
-  return attribute.GetName() == html_names::kSrcAttr;
-}
-
 bool HTMLFencedFrameElement::IsPresentationAttribute(
     const QualifiedName& name) const {
   if (name == html_names::kWidthAttr || name == html_names::kHeightAttr)
@@ -506,7 +489,7 @@
   // prerendering. If this function is called while prerendering we won't have a
   // delegate and will bail early, but this should still be correct since,
   // post-activation, CreateDelegateAndNavigate will be run which will navigate
-  // to the most current src.
+  // to the most current config.
   if (!frame_delegate_)
     return;
 
@@ -646,7 +629,7 @@
   // prerendering, but we should only actually create the delegate once. Note,
   // this will also mean that we skip calling Navigate() again, but the result
   // should still be correct since the first Navigate call will use the
-  // up-to-date src.
+  // up-to-date config.
   if (frame_delegate_)
     return;
   if (GetDocument().IsPrerendering()) {
@@ -660,8 +643,6 @@
 
   if (config_) {
     NavigateToConfig();
-  } else {
-    Navigate(GetNonEmptyURLAttribute(html_names::kSrcAttr));
   }
 }
 

third_party/blink/renderer/core/html/fenced_frame/html_fenced_frame_element.h

diff --git a/third_party/blink/renderer/core/html/fenced_frame/html_fenced_frame_element.h b/third_party/blink/renderer/core/html/fenced_frame/html_fenced_frame_element.h
index 14be157e..202cfc6 100644
--- a/third_party/blink/renderer/core/html/fenced_frame/html_fenced_frame_element.h
+++ b/third_party/blink/renderer/core/html/fenced_frame/html_fenced_frame_element.h
@@ -92,14 +92,14 @@
     return mode_;
   }
 
-  // The frame size is "frozen" when the `src` attribute is set.
+  // The frame size is "frozen" when the `config` attribute is set.
   // The frozen state is kept in this element so that it can survive across
   // reattaches.
   // The size is in layout size (i.e., DSF multiplied.)
   const absl::optional<PhysicalSize> FrozenFrameSize() const;
   // True if the frame size should be frozen when the next resize completed.
-  // When `src` is set but layout is not completed yet, the frame size is frozen
-  // after the first layout.
+  // When `config` is set but layout is not completed yet, the frame size is
+  // frozen after the first layout.
   bool ShouldFreezeFrameSizeOnNextLayoutForTesting() const {
     return should_freeze_frame_size_on_next_layout_;
   }
@@ -144,7 +144,6 @@
 
   // Element overrides.
   void ParseAttribute(const AttributeModificationParams&) override;
-  bool IsURLAttribute(const Attribute&) const override;
   bool IsPresentationAttribute(const QualifiedName&) const override;
   void CollectStyleForPresentationAttribute(
       const QualifiedName&,

third_party/blink/renderer/core/html/fenced_frame/html_fenced_frame_element.idl

diff --git a/third_party/blink/renderer/core/html/fenced_frame/html_fenced_frame_element.idl b/third_party/blink/renderer/core/html/fenced_frame/html_fenced_frame_element.idl
index 9b493b4..a931f4a 100644
--- a/third_party/blink/renderer/core/html/fenced_frame/html_fenced_frame_element.idl
+++ b/third_party/blink/renderer/core/html/fenced_frame/html_fenced_frame_element.idl
@@ -6,7 +6,6 @@
 
 [Exposed=Window, HTMLConstructor, RuntimeEnabled=FencedFrames]
 interface HTMLFencedFrameElement : HTMLElement {
-    [CEReactions, Reflect, URL] attribute USVString src;
     [CEReactions, RuntimeEnabled=FencedFramesAPIChanges, MeasureAs=FencedFrameConfigAttribute] attribute FencedFrameConfig? config;
     [CEReactions, Reflect] attribute DOMString width;
     [CEReactions, Reflect] attribute DOMString height;

third_party/blink/renderer/core/html/forms/html_input_element.cc

diff --git a/third_party/blink/renderer/core/html/forms/html_input_element.cc b/third_party/blink/renderer/core/html/forms/html_input_element.cc
index 7d5f4ea..8e926a8 100644
--- a/third_party/blink/renderer/core/html/forms/html_input_element.cc
+++ b/third_party/blink/renderer/core/html/forms/html_input_element.cc
@@ -125,6 +125,7 @@
 HTMLInputElement::HTMLInputElement(Document& document,
                                    const CreateElementFlags flags)
     : TextControlElement(html_names::kInputTag, document),
+      LazyActiveScriptWrappable<HTMLInputElement>({}),
       size_(kDefaultSize),
       has_dirty_value_(false),
       is_checked_(false),

third_party/blink/renderer/core/html/html_image_element.cc

diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_party/blink/renderer/core/html/html_image_element.cc
index 3e939b03..3c8d5da 100644
--- a/third_party/blink/renderer/core/html/html_image_element.cc
+++ b/third_party/blink/renderer/core/html/html_image_element.cc
@@ -99,6 +99,7 @@
 
 HTMLImageElement::HTMLImageElement(Document& document, bool created_by_parser)
     : HTMLElement(html_names::kImgTag, document),
+      ActiveScriptWrappable<HTMLImageElement>({}),
       image_loader_(MakeGarbageCollected<HTMLImageLoader>(this)),
       image_device_pixel_ratio_(1.0f),
       source_(nullptr),

third_party/blink/renderer/core/html/html_plugin_element.cc

diff --git a/third_party/blink/renderer/core/html/html_plugin_element.cc b/third_party/blink/renderer/core/html/html_plugin_element.cc
index 006a54ab..9cd1afb 100644
--- a/third_party/blink/renderer/core/html/html_plugin_element.cc
+++ b/third_party/blink/renderer/core/html/html_plugin_element.cc
@@ -127,6 +127,7 @@
                                      Document& doc,
                                      const CreateElementFlags flags)
     : HTMLFrameOwnerElement(tag_name, doc),
+      ActiveScriptWrappable<HTMLPlugInElement>({}),
       is_delaying_load_event_(false),
       // needs_plugin_update_(!IsCreatedByParser) allows HTMLObjectElement to
       // delay EmbeddedContentView updates until after all children are

third_party/blink/renderer/core/html/media/html_media_element.cc

diff --git a/third_party/blink/renderer/core/html/media/html_media_element.cc b/third_party/blink/renderer/core/html/media/html_media_element.cc
index 3a562d8..e2348c37 100644
--- a/third_party/blink/renderer/core/html/media/html_media_element.cc
+++ b/third_party/blink/renderer/core/html/media/html_media_element.cc
@@ -442,6 +442,7 @@
 HTMLMediaElement::HTMLMediaElement(const QualifiedName& tag_name,
                                    Document& document)
     : HTMLElement(tag_name, document),
+      ActiveScriptWrappable<HTMLMediaElement>({}),
       ExecutionContextLifecycleStateObserver(GetExecutionContext()),
       load_timer_(document.GetTaskRunner(TaskType::kInternalMedia),
                   this,

third_party/blink/renderer/core/inspector/dom_editor.cc

diff --git a/third_party/blink/renderer/core/inspector/dom_editor.cc b/third_party/blink/renderer/core/inspector/dom_editor.cc
index fbe844f2..190e951 100644
--- a/third_party/blink/renderer/core/inspector/dom_editor.cc
+++ b/third_party/blink/renderer/core/inspector/dom_editor.cc
@@ -44,8 +44,6 @@
 
 namespace blink {
 
-using protocol::Response;
-
 class DOMEditor::RemoveChildAction final : public InspectorHistory::Action {
  public:
   RemoveChildAction(ContainerNode* parent_node, Node* node)
@@ -413,7 +411,7 @@
       MakeGarbageCollected<SetNodeValueAction>(node, value), exception_state);
 }
 
-static Response ToResponse(ExceptionState& exception_state) {
+static protocol::Response ToResponse(ExceptionState& exception_state) {
   if (exception_state.HadException()) {
     String name_prefix = IsDOMExceptionCode(exception_state.Code())
                              ? DOMException::GetErrorName(
@@ -421,48 +419,51 @@
                                    " "
                              : g_empty_string;
     String msg = name_prefix + exception_state.Message();
-    return Response::ServerError(msg.Utf8());
+    return protocol::Response::ServerError(msg.Utf8());
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response DOMEditor::InsertBefore(ContainerNode* parent_node,
-                                 Node* node,
-                                 Node* anchor_node) {
+protocol::Response DOMEditor::InsertBefore(ContainerNode* parent_node,
+                                           Node* node,
+                                           Node* anchor_node) {
   DummyExceptionStateForTesting exception_state;
   InsertBefore(parent_node, node, anchor_node, exception_state);
   return ToResponse(exception_state);
 }
 
-Response DOMEditor::RemoveChild(ContainerNode* parent_node, Node* node) {
+protocol::Response DOMEditor::RemoveChild(ContainerNode* parent_node,
+                                          Node* node) {
   DummyExceptionStateForTesting exception_state;
   RemoveChild(parent_node, node, exception_state);
   return ToResponse(exception_state);
 }
 
-Response DOMEditor::SetAttribute(Element* element,
-                                 const String& name,
-                                 const String& value) {
+protocol::Response DOMEditor::SetAttribute(Element* element,
+                                           const String& name,
+                                           const String& value) {
   DummyExceptionStateForTesting exception_state;
   SetAttribute(element, name, value, exception_state);
   return ToResponse(exception_state);
 }
 
-Response DOMEditor::RemoveAttribute(Element* element, const String& name) {
+protocol::Response DOMEditor::RemoveAttribute(Element* element,
+                                              const String& name) {
   DummyExceptionStateForTesting exception_state;
   RemoveAttribute(element, name, exception_state);
   return ToResponse(exception_state);
 }
 
-Response DOMEditor::SetOuterHTML(Node* node,
-                                 const String& html,
-                                 Node** new_node) {
+protocol::Response DOMEditor::SetOuterHTML(Node* node,
+                                           const String& html,
+                                           Node** new_node) {
   DummyExceptionStateForTesting exception_state;
   SetOuterHTML(node, html, new_node, exception_state);
   return ToResponse(exception_state);
 }
 
-Response DOMEditor::SetNodeValue(Node* parent_node, const String& value) {
+protocol::Response DOMEditor::SetNodeValue(Node* parent_node,
+                                           const String& value) {
   DummyExceptionStateForTesting exception_state;
   SetNodeValue(parent_node, value, exception_state);
   return ToResponse(exception_state);

third_party/blink/renderer/core/inspector/inspector_animation_agent.cc

diff --git a/third_party/blink/renderer/core/inspector/inspector_animation_agent.cc b/third_party/blink/renderer/core/inspector/inspector_animation_agent.cc
index c05a4b37..c65eeac2 100644
--- a/third_party/blink/renderer/core/inspector/inspector_animation_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_animation_agent.cc
@@ -61,8 +61,6 @@
 
 }  // namespace
 
-using protocol::Response;
-
 InspectorAnimationAgent::InspectorAnimationAgent(
     InspectedFrames* inspected_frames,
     InspectorCSSAgent* css_agent,
@@ -83,13 +81,13 @@
   }
 }
 
-Response InspectorAnimationAgent::enable() {
+protocol::Response InspectorAnimationAgent::enable() {
   enabled_.Set(true);
   instrumenting_agents_->AddInspectorAnimationAgent(this);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorAnimationAgent::disable() {
+protocol::Response InspectorAnimationAgent::disable() {
   setPlaybackRate(1.0);
   for (const auto& clone : id_to_animation_clone_.Values())
     clone->cancel();
@@ -98,7 +96,7 @@
   id_to_animation_.clear();
   id_to_animation_clone_.clear();
   cleared_animations_.clear();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorAnimationAgent::DidCommitLoadForLocalFrame(LocalFrame* frame) {
@@ -222,22 +220,25 @@
   return animation_object;
 }
 
-Response InspectorAnimationAgent::getPlaybackRate(double* playback_rate) {
+protocol::Response InspectorAnimationAgent::getPlaybackRate(
+    double* playback_rate) {
   *playback_rate = ReferenceTimeline().PlaybackRate();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorAnimationAgent::setPlaybackRate(double playback_rate) {
+protocol::Response InspectorAnimationAgent::setPlaybackRate(
+    double playback_rate) {
   for (LocalFrame* frame : *inspected_frames_)
     frame->GetDocument()->Timeline().SetPlaybackRate(playback_rate);
   playback_rate_.Set(playback_rate);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorAnimationAgent::getCurrentTime(const String& id,
-                                                 double* current_time) {
+protocol::Response InspectorAnimationAgent::getCurrentTime(
+    const String& id,
+    double* current_time) {
   blink::Animation* animation = nullptr;
-  Response response = AssertAnimation(id, animation);
+  protocol::Response response = AssertAnimation(id, animation);
   if (!response.IsSuccess())
     return response;
 
@@ -266,20 +267,22 @@
       }
     }
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorAnimationAgent::setPaused(
+protocol::Response InspectorAnimationAgent::setPaused(
     std::unique_ptr<protocol::Array<String>> animation_ids,
     bool paused) {
   for (const String& animation_id : *animation_ids) {
     blink::Animation* animation = nullptr;
-    Response response = AssertAnimation(animation_id, animation);
+    protocol::Response response = AssertAnimation(animation_id, animation);
     if (!response.IsSuccess())
       return response;
     blink::Animation* clone = AnimationClone(animation);
-    if (!clone)
-      return Response::ServerError("Failed to clone detached animation");
+    if (!clone) {
+      return protocol::Response::ServerError(
+          "Failed to clone detached animation");
+    }
     if (paused && !clone->Paused()) {
       // Ensure we restore a current time if the animation is limited.
       absl::optional<AnimationTimeDelta> current_time;
@@ -303,7 +306,7 @@
       clone->Unpause();
     }
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 blink::Animation* InspectorAnimationAgent::AnimationClone(
@@ -352,26 +355,28 @@
   return clone;
 }
 
-Response InspectorAnimationAgent::seekAnimations(
+protocol::Response InspectorAnimationAgent::seekAnimations(
     std::unique_ptr<protocol::Array<String>> animation_ids,
     double current_time) {
   for (const String& animation_id : *animation_ids) {
     blink::Animation* animation = nullptr;
-    Response response = AssertAnimation(animation_id, animation);
+    protocol::Response response = AssertAnimation(animation_id, animation);
     if (!response.IsSuccess())
       return response;
     blink::Animation* clone = AnimationClone(animation);
-    if (!clone)
-      return Response::ServerError("Failed to clone a detached animation.");
+    if (!clone) {
+      return protocol::Response::ServerError(
+          "Failed to clone a detached animation.");
+    }
     if (!clone->Paused())
       clone->play();
     clone->SetCurrentTimeInternal(
         ANIMATION_TIME_DELTA_FROM_MILLISECONDS(current_time));
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorAnimationAgent::releaseAnimations(
+protocol::Response InspectorAnimationAgent::releaseAnimations(
     std::unique_ptr<protocol::Array<String>> animation_ids) {
   for (const String& animation_id : *animation_ids) {
     auto it = id_to_animation_.find(animation_id);
@@ -386,14 +391,15 @@
     id_to_animation_.erase(animation_id);
     cleared_animations_.insert(animation_id);
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorAnimationAgent::setTiming(const String& animation_id,
-                                            double duration,
-                                            double delay) {
+protocol::Response InspectorAnimationAgent::setTiming(
+    const String& animation_id,
+    double duration,
+    double delay) {
   blink::Animation* animation = nullptr;
-  Response response = AssertAnimation(animation_id, animation);
+  protocol::Response response = AssertAnimation(animation_id, animation);
   if (!response.IsSuccess())
     return response;
 
@@ -406,15 +412,15 @@
           duration));
   timing->setDelay(MakeGarbageCollected<Timing::V8Delay>(delay));
   animation->effect()->updateTiming(timing, exception_state);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorAnimationAgent::resolveAnimation(
+protocol::Response InspectorAnimationAgent::resolveAnimation(
     const String& animation_id,
     std::unique_ptr<v8_inspector::protocol::Runtime::API::RemoteObject>*
         result) {
   blink::Animation* animation = nullptr;
-  Response response = AssertAnimation(animation_id, animation);
+  protocol::Response response = AssertAnimation(animation_id, animation);
   if (!response.IsSuccess())
     return response;
 
@@ -427,8 +433,10 @@
   Document* document = element->ownerDocument();
   LocalFrame* frame = document ? document->GetFrame() : nullptr;
   ScriptState* script_state = ToScriptStateForMainWorld(frame);
-  if (!script_state)
-    return Response::ServerError("Element not associated with a document.");
+  if (!script_state) {
+    return protocol::Response::ServerError(
+        "Element not associated with a document.");
+  }
 
   ScriptState::Scope scope(script_state);
   static const char kAnimationObjectGroup[] = "animation";
@@ -440,9 +448,11 @@
            script_state->GetIsolate()),
       ToV8InspectorStringView(kAnimationObjectGroup),
       false /* generatePreview */);
-  if (!*result)
-    return Response::ServerError("Element not associated with a document.");
-  return Response::Success();
+  if (!*result) {
+    return protocol::Response::ServerError(
+        "Element not associated with a document.");
+  }
+  return protocol::Response::Success();
 }
 
 String InspectorAnimationAgent::CreateCSSId(blink::Animation& animation) {
@@ -537,15 +547,17 @@
       ReferenceTimeline().PlaybackRate());
 }
 
-Response InspectorAnimationAgent::AssertAnimation(const String& id,
-                                                  blink::Animation*& result) {
+protocol::Response InspectorAnimationAgent::AssertAnimation(
+    const String& id,
+    blink::Animation*& result) {
   auto it = id_to_animation_.find(id);
   if (it == id_to_animation_.end()) {
     result = nullptr;
-    return Response::ServerError("Could not find animation with given id");
+    return protocol::Response::ServerError(
+        "Could not find animation with given id");
   }
   result = it->value;
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 DocumentTimeline& InspectorAnimationAgent::ReferenceTimeline() {

third_party/blink/renderer/core/inspector/inspector_audits_agent.cc

diff --git a/third_party/blink/renderer/core/inspector/inspector_audits_agent.cc b/third_party/blink/renderer/core/inspector/inspector_audits_agent.cc
index 2ddfcf37..440c745 100644
--- a/third_party/blink/renderer/core/inspector/inspector_audits_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_audits_agent.cc
@@ -26,7 +26,6 @@
 namespace blink {
 
 using protocol::Maybe;
-using protocol::Response;
 
 namespace encoding_enum = protocol::Audits::GetEncodedResponse::EncodingEnum;
 
@@ -141,7 +140,7 @@
 
   String body;
   bool is_base64_encoded;
-  Response response =
+  protocol::Response response =
       network_agent_->GetResponseBody(request_id, &body, &is_base64_encoded);
   if (!response.IsSuccess())
     return response;
@@ -149,14 +148,15 @@
   Vector<char> base64_decoded_buffer;
   if (!is_base64_encoded || !Base64Decode(body, base64_decoded_buffer) ||
       base64_decoded_buffer.size() == 0) {
-    return Response::ServerError("Failed to decode original image");
+    return protocol::Response::ServerError("Failed to decode original image");
   }
 
   Vector<unsigned char> encoded_image;
   if (!EncodeAsImage(base64_decoded_buffer.data(), base64_decoded_buffer.size(),
                      encoding, quality.fromMaybe(kDefaultEncodeQuality),
                      &encoded_image)) {
-    return Response::ServerError("Could not encode image with given settings");
+    return protocol::Response::ServerError(
+        "Could not encode image with given settings");
   }
 
   *out_original_size = static_cast<int>(base64_decoded_buffer.size());
@@ -165,7 +165,7 @@
   if (!size_only.fromMaybe(false)) {
     *out_body = protocol::Binary::fromVector(std::move(encoded_image));
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorAuditsAgent::CheckContrastForDocument(Document* document,
@@ -180,38 +180,41 @@
   GetFrontend()->flush();
 }
 
-Response InspectorAuditsAgent::checkContrast(protocol::Maybe<bool> report_aaa) {
-  if (!inspected_frames_)
-    return Response::ServerError("Inspected frames are not available");
+protocol::Response InspectorAuditsAgent::checkContrast(
+    protocol::Maybe<bool> report_aaa) {
+  if (!inspected_frames_) {
+    return protocol::Response::ServerError(
+        "Inspected frames are not available");
+  }
 
   auto* main_window = inspected_frames_->Root()->DomWindow();
   if (!main_window)
-    return Response::ServerError("Document is not available");
+    return protocol::Response::ServerError("Document is not available");
 
   CheckContrastForDocument(main_window->document(),
                            report_aaa.fromMaybe(false));
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorAuditsAgent::enable() {
+protocol::Response InspectorAuditsAgent::enable() {
   if (enabled_.Get()) {
-    return Response::Success();
+    return protocol::Response::Success();
   }
 
   enabled_.Set(true);
   InnerEnable();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorAuditsAgent::disable() {
+protocol::Response InspectorAuditsAgent::disable() {
   if (!enabled_.Get()) {
-    return Response::Success();
+    return protocol::Response::Success();
   }
 
   enabled_.Clear();
   instrumenting_agents_->RemoveInspectorAuditsAgent(this);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorAuditsAgent::Restore() {

third_party/blink/renderer/core/inspector/inspector_css_agent.cc

diff --git a/third_party/blink/renderer/core/inspector/inspector_css_agent.cc b/third_party/blink/renderer/core/inspector/inspector_css_agent.cc
index a2d550c..4d10c121 100644
--- a/third_party/blink/renderer/core/inspector/inspector_css_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_css_agent.cc
@@ -127,8 +127,6 @@
 
 namespace blink {
 
-using protocol::Response;
-
 namespace {
 
 int g_frontend_operation_counter = 0;
@@ -650,8 +648,8 @@
 
 void InspectorCSSAgent::enable(std::unique_ptr<EnableCallback> prp_callback) {
   if (!dom_agent_->Enabled()) {
-    prp_callback->sendFailure(
-        Response::ServerError("DOM agent needs to be enabled first."));
+    prp_callback->sendFailure(protocol::Response::ServerError(
+        "DOM agent needs to be enabled first."));
     return;
   }
   enable_requested_.Set(true);
@@ -699,7 +697,7 @@
   }
 }
 
-Response InspectorCSSAgent::disable() {
+protocol::Response InspectorCSSAgent::disable() {
   Reset();
   dom_agent_->RemoveDOMListener(this);
   instrumenting_agents_->RemoveInspectorCSSAgent(this);
@@ -709,7 +707,7 @@
   coverage_enabled_.Set(false);
   local_fonts_enabled_.Set(true);
   SetCoverageEnabled(false);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorCSSAgent::DidCommitLoadForLocalFrame(LocalFrame* frame) {
@@ -901,7 +899,7 @@
     *result = true;
 }
 
-Response InspectorCSSAgent::getMediaQueries(
+protocol::Response InspectorCSSAgent::getMediaQueries(
     std::unique_ptr<protocol::Array<protocol::CSS::CSSMedia>>* medias) {
   *medias = std::make_unique<protocol::Array<protocol::CSS::CSSMedia>>();
   for (auto& style : id_to_inspector_style_sheet_) {
@@ -916,7 +914,7 @@
         CollectMediaQueriesFromRule(rule, medias->get());
     }
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 std::unique_ptr<protocol::CSS::CSSLayerData>
@@ -941,11 +939,12 @@
   return layer_data;
 }
 
-Response InspectorCSSAgent::getLayersForNode(
+protocol::Response InspectorCSSAgent::getLayersForNode(
     int node_id,
     std::unique_ptr<protocol::CSS::CSSLayerData>* root_layer) {
   Element* element = nullptr;
-  const Response response = dom_agent_->AssertElement(node_id, element);
+  const protocol::Response response =
+      dom_agent_->AssertElement(node_id, element);
   if (!response.IsSuccess())
     return response;
 
@@ -959,12 +958,12 @@
   // GetScopedStyleResolver returns a nullptr if the tree scope has no
   // stylesheets.
   if (!scoped_resolver)
-    return Response::Success();
+    return protocol::Response::Success();
 
   const CascadeLayerMap* layer_map = scoped_resolver->GetCascadeLayerMap();
 
   if (!layer_map)
-    return Response::Success();
+    return protocol::Response::Success();
 
   const CascadeLayer* root = layer_map->GetRootLayer();
   unsigned max_order = 0;
@@ -975,10 +974,10 @@
   (*root_layer)->setOrder(max_order + 1);
   (*root_layer)->setSubLayers(std::move(sublayers_data));
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorCSSAgent::getMatchedStylesForNode(
+protocol::Response InspectorCSSAgent::getMatchedStylesForNode(
     int node_id,
     Maybe<protocol::CSS::CSSStyle>* inline_style,
     Maybe<protocol::CSS::CSSStyle>* attributes_style,
@@ -994,7 +993,7 @@
     Maybe<protocol::Array<protocol::CSS::CSSPositionFallbackRule>>*
         css_position_fallback_rules,
     Maybe<int>* parentLayoutNodeId) {
-  Response response = AssertEnabled();
+  protocol::Response response = AssertEnabled();
   if (!response.IsSuccess())
     return response;
 
@@ -1009,12 +1008,12 @@
   AtomicString view_transition_name = g_null_atom;
   element = GetPseudoIdAndTag(element, element_pseudo_id, view_transition_name);
   if (!element)
-    return Response::ServerError("Pseudo element has no parent");
+    return protocol::Response::ServerError("Pseudo element has no parent");
 
   Document& document = element->GetDocument();
   // A non-active document has no styles.
   if (!document.IsActive())
-    return Response::ServerError("Document is not active");
+    return protocol::Response::ServerError("Document is not active");
 
   // The source text of mutable stylesheets needs to be updated
   // to sync the latest changes.
@@ -1052,7 +1051,7 @@
 
   // Pseudo elements.
   if (element_pseudo_id)
-    return Response::Success();
+    return protocol::Response::Success();
 
   InspectorStyleSheetForInlineStyle* inline_style_sheet =
       AsInspectorStyleSheet(element);
@@ -1117,7 +1116,7 @@
       *parentLayoutNodeId = boundNodeId;
   }
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 template <class CSSRuleCollection>
@@ -1305,11 +1304,11 @@
   return css_keyframes_rules;
 }
 
-Response InspectorCSSAgent::getInlineStylesForNode(
+protocol::Response InspectorCSSAgent::getInlineStylesForNode(
     int node_id,
     Maybe<protocol::CSS::CSSStyle>* inline_style,
     Maybe<protocol::CSS::CSSStyle>* attributes_style) {
-  Response response = AssertEnabled();
+  protocol::Response response = AssertEnabled();
   if (!response.IsSuccess())
     return response;
   Element* element = nullptr;
@@ -1320,26 +1319,28 @@
   InspectorStyleSheetForInlineStyle* style_sheet =
       AsInspectorStyleSheet(element);
   if (!style_sheet)
-    return Response::ServerError("Element is not a style sheet");
+    return protocol::Response::ServerError("Element is not a style sheet");
 
   *inline_style = style_sheet->BuildObjectForStyle(element->style());
   *attributes_style = BuildObjectForAttributesStyle(element);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorCSSAgent::getComputedStyleForNode(
+protocol::Response InspectorCSSAgent::getComputedStyleForNode(
     int node_id,
     std::unique_ptr<protocol::Array<protocol::CSS::CSSComputedStyleProperty>>*
         style) {
-  Response response = AssertEnabled();
+  protocol::Response response = AssertEnabled();
   if (!response.IsSuccess())
     return response;
   Node* node = nullptr;
   response = dom_agent_->AssertNode(node_id, node);
   if (!response.IsSuccess())
     return response;
-  if (!node->ownerDocument())
-    return Response::ServerError("Node does not have an owner document");
+  if (!node->ownerDocument()) {
+    return protocol::Response::ServerError(
+        "Node does not have an owner document");
+  }
 
   auto* computed_style_info =
       MakeGarbageCollected<CSSComputedStyleDeclaration>(node, true);
@@ -1364,7 +1365,7 @@
                                .setValue(it.value->CssText())
                                .build());
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorCSSAgent::CollectPlatformFontsForLayoutObject(
@@ -1409,11 +1410,11 @@
   }
 }
 
-Response InspectorCSSAgent::getPlatformFontsForNode(
+protocol::Response InspectorCSSAgent::getPlatformFontsForNode(
     int node_id,
     std::unique_ptr<protocol::Array<protocol::CSS::PlatformFontUsage>>*
         platform_fonts) {
-  Response response = AssertEnabled();
+  protocol::Response response = AssertEnabled();
   if (!response.IsSuccess())
     return response;
   Node* node = nullptr;
@@ -1441,40 +1442,41 @@
                            .setGlyphCount(font.value)
                            .build());
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorCSSAgent::getStyleSheetText(const String& style_sheet_id,
-                                              String* result) {
+protocol::Response InspectorCSSAgent::getStyleSheetText(
+    const String& style_sheet_id,
+    String* result) {
   InspectorStyleSheetBase* inspector_style_sheet = nullptr;
-  Response response =
+  protocol::Response response =
       AssertStyleSheetForId(style_sheet_id, inspector_style_sheet);
   if (!response.IsSuccess())
     return response;
 
   inspector_style_sheet->GetText(result);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorCSSAgent::collectClassNames(
+protocol::Response InspectorCSSAgent::collectClassNames(
     const String& style_sheet_id,
     std::unique_ptr<protocol::Array<String>>* class_names) {
   InspectorStyleSheet* inspector_style_sheet = nullptr;
-  Response response =
+  protocol::Response response =
       AssertInspectorStyleSheetForId(style_sheet_id, inspector_style_sheet);
   if (!response.IsSuccess())
     return response;
   *class_names = inspector_style_sheet->CollectClassNames();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorCSSAgent::setStyleSheetText(
+protocol::Response InspectorCSSAgent::setStyleSheetText(
     const String& style_sheet_id,
     const String& text,
     protocol::Maybe<String>* source_map_url) {
   FrontendOperationScope scope;
   InspectorStyleSheetBase* inspector_style_sheet = nullptr;
-  Response response =
+  protocol::Response response =
       AssertStyleSheetForId(style_sheet_id, inspector_style_sheet);
   if (!response.IsSuccess())
     return response;
@@ -1488,27 +1490,27 @@
     return response;
   if (!inspector_style_sheet->SourceMapURL().empty())
     *source_map_url = inspector_style_sheet->SourceMapURL();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-static Response JsonRangeToSourceRange(
+static protocol::Response JsonRangeToSourceRange(
     InspectorStyleSheetBase* inspector_style_sheet,
     protocol::CSS::SourceRange* range,
     SourceRange* source_range) {
   if (range->getStartLine() < 0) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "range.startLine must be a non-negative integer");
   }
   if (range->getStartColumn() < 0) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "range.startColumn must be a non-negative integer");
   }
   if (range->getEndLine() < 0) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "range.endLine must be a non-negative integer");
   }
   if (range->getEndColumn() < 0) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "range.endColumn must be a non-negative integer");
   }
 
@@ -1520,23 +1522,25 @@
       inspector_style_sheet->LineNumberAndColumnToOffset(
           range->getEndLine(), range->getEndColumn(), &end_offset);
   if (!success)
-    return Response::ServerError("Specified range is out of bounds");
+    return protocol::Response::ServerError("Specified range is out of bounds");
 
-  if (start_offset > end_offset)
-    return Response::ServerError("Range start must not succeed its end");
+  if (start_offset > end_offset) {
+    return protocol::Response::ServerError(
+        "Range start must not succeed its end");
+  }
   source_range->start = start_offset;
   source_range->end = end_offset;
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorCSSAgent::setRuleSelector(
+protocol::Response InspectorCSSAgent::setRuleSelector(
     const String& style_sheet_id,
     std::unique_ptr<protocol::CSS::SourceRange> range,
     const String& selector,
     std::unique_ptr<protocol::CSS::SelectorList>* result) {
   FrontendOperationScope scope;
   InspectorStyleSheet* inspector_style_sheet = nullptr;
-  Response response =
+  protocol::Response response =
       AssertInspectorStyleSheetForId(style_sheet_id, inspector_style_sheet);
   if (!response.IsSuccess())
     return response;
@@ -1555,7 +1559,7 @@
     CSSStyleRule* rule = InspectorCSSAgent::AsCSSStyleRule(action->TakeRule());
     inspector_style_sheet = InspectorStyleSheetForRule(rule);
     if (!inspector_style_sheet) {
-      return Response::ServerError(
+      return protocol::Response::ServerError(
           "Failed to get inspector style sheet for rule.");
     }
     *result = inspector_style_sheet->BuildObjectForSelectorList(rule);
@@ -1563,14 +1567,14 @@
   return InspectorDOMAgent::ToResponse(exception_state);
 }
 
-Response InspectorCSSAgent::setKeyframeKey(
+protocol::Response InspectorCSSAgent::setKeyframeKey(
     const String& style_sheet_id,
     std::unique_ptr<protocol::CSS::SourceRange> range,
     const String& key_text,
     std::unique_ptr<protocol::CSS::Value>* result) {
   FrontendOperationScope scope;
   InspectorStyleSheet* inspector_style_sheet = nullptr;
-  Response response =
+  protocol::Response response =
       AssertInspectorStyleSheetForId(style_sheet_id, inspector_style_sheet);
   if (!response.IsSuccess())
     return response;
@@ -1589,7 +1593,7 @@
     auto* rule = To<CSSKeyframeRule>(action->TakeRule());
     inspector_style_sheet = BindStyleSheet(rule->parentStyleSheet());
     if (!inspector_style_sheet) {
-      return Response::ServerError(
+      return protocol::Response::ServerError(
           "Failed to get inspector style sheet for rule.");
     }
     CSSRuleSourceData* source_data =
@@ -1603,20 +1607,20 @@
   return InspectorDOMAgent::ToResponse(exception_state);
 }
 
-Response InspectorCSSAgent::MultipleStyleTextsActions(
+protocol::Response InspectorCSSAgent::MultipleStyleTextsActions(
     std::unique_ptr<protocol::Array<protocol::CSS::StyleDeclarationEdit>> edits,
     HeapVector<Member<StyleSheetAction>>* actions) {
   size_t n = edits->size();
   if (n == 0)
-    return Response::ServerError("Edits should not be empty");
+    return protocol::Response::ServerError("Edits should not be empty");
 
   for (size_t i = 0; i < n; ++i) {
     protocol::CSS::StyleDeclarationEdit* edit = (*edits)[i].get();
     InspectorStyleSheetBase* inspector_style_sheet = nullptr;
-    Response response =
+    protocol::Response response =
         AssertStyleSheetForId(edit->getStyleSheetId(), inspector_style_sheet);
     if (!response.IsSuccess()) {
-      return Response::ServerError(
+      return protocol::Response::ServerError(
           String::Format("StyleSheet not found for edit #%zu of %zu", i + 1, n)
               .Utf8());
     }
@@ -1643,15 +1647,16 @@
       actions->push_back(action);
     }
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorCSSAgent::setStyleTexts(
+protocol::Response InspectorCSSAgent::setStyleTexts(
     std::unique_ptr<protocol::Array<protocol::CSS::StyleDeclarationEdit>> edits,
     std::unique_ptr<protocol::Array<protocol::CSS::CSSStyle>>* result) {
   FrontendOperationScope scope;
   HeapVector<Member<StyleSheetAction>> actions;
-  Response response = MultipleStyleTextsActions(std::move(edits), &actions);
+  protocol::Response response =
+      MultipleStyleTextsActions(std::move(edits), &actions);
   if (!response.IsSuccess())
     return response;
 
@@ -1670,7 +1675,7 @@
         revert->Undo(undo_exception_state);
         DCHECK(!undo_exception_state.HadException());
       }
-      return Response::ServerError(
+      return protocol::Response::ServerError(
           String::Format("Failed applying edit #%d: ", i).Utf8() +
           InspectorDOMAgent::ToResponse(exception_state).Message());
     }
@@ -1682,10 +1687,10 @@
     dom_agent_->History()->AppendPerformedAction(action);
   }
   *result = std::move(serialized_styles);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorCSSAgent::SetStyleText(
+protocol::Response InspectorCSSAgent::SetStyleText(
     InspectorStyleSheetBase* inspector_style_sheet,
     const SourceRange& range,
     const String& text,
@@ -1699,7 +1704,7 @@
     bool success = dom_agent_->History()->Perform(action, exception_state);
     if (success) {
       result = inline_style_sheet->InlineStyle();
-      return Response::Success();
+      return protocol::Response::Success();
     }
   } else {
     ModifyRuleAction* action = MakeGarbageCollected<ModifyRuleAction>(
@@ -1710,25 +1715,25 @@
       CSSRule* rule = action->TakeRule();
       if (auto* style_rule = DynamicTo<CSSStyleRule>(rule)) {
         result = style_rule->style();
-        return Response::Success();
+        return protocol::Response::Success();
       }
       if (auto* keyframe_rule = DynamicTo<CSSKeyframeRule>(rule)) {
         result = keyframe_rule->style();
-        return Response::Success();
+        return protocol::Response::Success();
       }
     }
   }
   return InspectorDOMAgent::ToResponse(exception_state);
 }
 
-Response InspectorCSSAgent::setMediaText(
+protocol::Response InspectorCSSAgent::setMediaText(
     const String& style_sheet_id,
     std::unique_ptr<protocol::CSS::SourceRange> range,
     const String& text,
     std::unique_ptr<protocol::CSS::CSSMedia>* result) {
   FrontendOperationScope scope;
   InspectorStyleSheet* inspector_style_sheet = nullptr;
-  Response response =
+  protocol::Response response =
       AssertInspectorStyleSheetForId(style_sheet_id, inspector_style_sheet);
   if (!response.IsSuccess())
     return response;
@@ -1755,14 +1760,14 @@
   return InspectorDOMAgent::ToResponse(exception_state);
 }
 
-Response InspectorCSSAgent::setContainerQueryText(
+protocol::Response InspectorCSSAgent::setContainerQueryText(
     const String& style_sheet_id,
     std::unique_ptr<protocol::CSS::SourceRange> range,
     const String& text,
     std::unique_ptr<protocol::CSS::CSSContainerQuery>* result) {
   FrontendOperationScope scope;
   InspectorStyleSheet* inspector_style_sheet = nullptr;
-  Response response =
+  protocol::Response response =
       AssertInspectorStyleSheetForId(style_sheet_id, inspector_style_sheet);
   if (!response.IsSuccess())
     return response;
@@ -1785,14 +1790,14 @@
   return InspectorDOMAgent::ToResponse(exception_state);
 }
 
-Response InspectorCSSAgent::setScopeText(
+protocol::Response InspectorCSSAgent::setScopeText(
     const String& style_sheet_id,
     std::unique_ptr<protocol::CSS::SourceRange> range,
     const String& text,
     std::unique_ptr<protocol::CSS::CSSScope>* result) {
   FrontendOperationScope scope;
   InspectorStyleSheet* inspector_style_sheet = nullptr;
-  Response response =
+  protocol::Response response =
       AssertInspectorStyleSheetForId(style_sheet_id, inspector_style_sheet);
   if (!response.IsSuccess())
     return response;
@@ -1814,14 +1819,14 @@
   return InspectorDOMAgent::ToResponse(exception_state);
 }
 
-Response InspectorCSSAgent::setSupportsText(
+protocol::Response InspectorCSSAgent::setSupportsText(
     const String& style_sheet_id,
     std::unique_ptr<protocol::CSS::SourceRange> range,
     const String& text,
     std::unique_ptr<protocol::CSS::CSSSupports>* result) {
   FrontendOperationScope scope;
   InspectorStyleSheet* inspector_style_sheet = nullptr;
-  Response response =
+  protocol::Response response =
       AssertInspectorStyleSheetForId(style_sheet_id, inspector_style_sheet);
   if (!response.IsSuccess())
     return response;
@@ -1844,36 +1849,36 @@
   return InspectorDOMAgent::ToResponse(exception_state);
 }
 
-Response InspectorCSSAgent::createStyleSheet(
+protocol::Response InspectorCSSAgent::createStyleSheet(
     const String& frame_id,
     protocol::CSS::StyleSheetId* out_style_sheet_id) {
   LocalFrame* frame =
       IdentifiersFactory::FrameById(inspected_frames_, frame_id);
   if (!frame)
-    return Response::ServerError("Frame not found");
+    return protocol::Response::ServerError("Frame not found");
 
   Document* document = frame->GetDocument();
   if (!document)
-    return Response::ServerError("Frame does not have a document");
+    return protocol::Response::ServerError("Frame does not have a document");
 
   InspectorStyleSheet* inspector_style_sheet = ViaInspectorStyleSheet(document);
   if (!inspector_style_sheet)
-    return Response::ServerError("No target stylesheet found");
+    return protocol::Response::ServerError("No target stylesheet found");
 
   UpdateActiveStyleSheets(document);
 
   *out_style_sheet_id = inspector_style_sheet->Id();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorCSSAgent::addRule(
+protocol::Response InspectorCSSAgent::addRule(
     const String& style_sheet_id,
     const String& rule_text,
     std::unique_ptr<protocol::CSS::SourceRange> location,
     std::unique_ptr<protocol::CSS::CSSRule>* result) {
   FrontendOperationScope scope;
   InspectorStyleSheet* inspector_style_sheet = nullptr;
-  Response response =
+  protocol::Response response =
       AssertInspectorStyleSheetForId(style_sheet_id, inspector_style_sheet);
   if (!response.IsSuccess())
     return response;
@@ -1892,13 +1897,13 @@
 
   CSSStyleRule* rule = action->TakeRule();
   *result = BuildObjectForRule(rule);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorCSSAgent::forcePseudoState(
+protocol::Response InspectorCSSAgent::forcePseudoState(
     int node_id,
     std::unique_ptr<protocol::Array<String>> forced_pseudo_classes) {
-  Response response = AssertEnabled();
+  protocol::Response response = AssertEnabled();
   if (!response.IsSuccess())
     return response;
   Element* element = nullptr;
@@ -1914,7 +1919,7 @@
       it == node_id_to_forced_pseudo_state_.end() ? 0 : it->value;
   bool need_style_recalc = forced_pseudo_state != current_forced_pseudo_state;
   if (!need_style_recalc)
-    return Response::Success();
+    return protocol::Response::Success();
 
   if (forced_pseudo_state)
     node_id_to_forced_pseudo_state_.Set(node_id, forced_pseudo_state);
@@ -1943,7 +1948,7 @@
 
   element->GetDocument().GetStyleEngine().MarkAllElementsForStyleRecalc(
       StyleChangeReasonForTracing::Create(style_change_reason::kInspector));
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorCSSAgent::IncrementFocusedCountForAncestors(Element* element) {
@@ -2466,30 +2471,33 @@
                                                                : nullptr;
 }
 
-Response InspectorCSSAgent::AssertEnabled() {
-  return enable_completed_ ? Response::Success()
-                           : Response::ServerError("CSS agent was not enabled");
+protocol::Response InspectorCSSAgent::AssertEnabled() {
+  return enable_completed_
+             ? protocol::Response::Success()
+             : protocol::Response::ServerError("CSS agent was not enabled");
 }
 
-Response InspectorCSSAgent::AssertInspectorStyleSheetForId(
+protocol::Response InspectorCSSAgent::AssertInspectorStyleSheetForId(
     const String& style_sheet_id,
     InspectorStyleSheet*& result) {
-  Response response = AssertEnabled();
+  protocol::Response response = AssertEnabled();
   if (!response.IsSuccess())
     return response;
   IdToInspectorStyleSheet::iterator it =
       id_to_inspector_style_sheet_.find(style_sheet_id);
-  if (it == id_to_inspector_style_sheet_.end())
-    return Response::ServerError("No style sheet with given id found");
+  if (it == id_to_inspector_style_sheet_.end()) {
+    return protocol::Response::ServerError(
+        "No style sheet with given id found");
+  }
   result = it->value.Get();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorCSSAgent::AssertStyleSheetForId(
+protocol::Response InspectorCSSAgent::AssertStyleSheetForId(
     const String& style_sheet_id,
     InspectorStyleSheetBase*& result) {
   InspectorStyleSheet* style_sheet = nullptr;
-  Response response =
+  protocol::Response response =
       AssertInspectorStyleSheetForId(style_sheet_id, style_sheet);
   if (response.IsSuccess()) {
     result = style_sheet;
@@ -2497,10 +2505,12 @@
   }
   IdToInspectorStyleSheetForInlineStyle::iterator it =
       id_to_inspector_style_sheet_for_inline_style_.find(style_sheet_id);
-  if (it == id_to_inspector_style_sheet_for_inline_style_.end())
-    return Response::ServerError("No style sheet with given id found");
+  if (it == id_to_inspector_style_sheet_for_inline_style_.end()) {
+    return protocol::Response::ServerError(
+        "No style sheet with given id found");
+  }
   result = it->value.Get();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 protocol::CSS::StyleSheetOrigin InspectorCSSAgent::DetectOrigin(
@@ -2754,31 +2764,31 @@
   return found_style ? found_style : styles.at(0).Get();
 }
 
-Response InspectorCSSAgent::setEffectivePropertyValueForNode(
+protocol::Response InspectorCSSAgent::setEffectivePropertyValueForNode(
     int node_id,
     const String& property_name,
     const String& value) {
   Element* element = nullptr;
-  Response response = dom_agent_->AssertElement(node_id, element);
+  protocol::Response response = dom_agent_->AssertElement(node_id, element);
   if (!response.IsSuccess())
     return response;
   if (element->GetPseudoId())
-    return Response::ServerError("Elements is pseudo");
+    return protocol::Response::ServerError("Elements is pseudo");
 
   if (!element->GetDocument().IsActive()) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "Can't edit a node from a non-active document");
   }
 
   absl::optional<CSSPropertyName> css_property_name =
       CSSPropertyName::From(element->GetExecutionContext(), property_name);
   if (!css_property_name.has_value())
-    return Response::ServerError("Invalid property name");
+    return protocol::Response::ServerError("Invalid property name");
 
   CSSStyleDeclaration* style =
       FindEffectiveDeclaration(*css_property_name, MatchingStyles(element));
   if (!style)
-    return Response::ServerError("Can't find a style to edit");
+    return protocol::Response::ServerError("Can't find a style to edit");
 
   bool force_important = false;
   InspectorStyleSheetBase* inspector_style_sheet = nullptr;
@@ -2797,7 +2807,7 @@
   }
 
   if (!source_data)
-    return Response::ServerError("Can't find a source to edit");
+    return protocol::Response::ServerError("Can't find a source to edit");
 
   Vector<StylePropertyShorthand, 4> shorthands;
   getMatchingShorthandsForLonghand(css_property_name->Id(), &shorthands);
@@ -2863,13 +2873,13 @@
                       result_style);
 }
 
-Response InspectorCSSAgent::getBackgroundColors(
+protocol::Response InspectorCSSAgent::getBackgroundColors(
     int node_id,
     Maybe<protocol::Array<String>>* background_colors,
     Maybe<String>* computed_font_size,
     Maybe<String>* computed_font_weight) {
   Element* element = nullptr;
-  Response response = dom_agent_->AssertElement(node_id, element);
+  protocol::Response response = dom_agent_->AssertElement(node_id, element);
   if (!response.IsSuccess())
     return response;
 
@@ -2891,7 +2901,7 @@
     *computed_font_size = fs;
   if (!fw.empty())
     *computed_font_weight = fw;
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 // static
@@ -2920,7 +2930,7 @@
   resource_container_->EraseStyleElementContent(DOMNodeIds::IdForNode(element));
 }
 
-Response InspectorCSSAgent::startRuleUsageTracking() {
+protocol::Response InspectorCSSAgent::startRuleUsageTracking() {
   coverage_enabled_.Set(true);
   SetCoverageEnabled(true);
 
@@ -2930,15 +2940,15 @@
     document->UpdateStyleAndLayoutTree();
   }
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorCSSAgent::stopRuleUsageTracking(
+protocol::Response InspectorCSSAgent::stopRuleUsageTracking(
     std::unique_ptr<protocol::Array<protocol::CSS::RuleUsage>>* result) {
   for (Document* document : dom_agent_->Documents())
     document->UpdateStyleAndLayoutTree();
   double timestamp;
-  Response response = takeCoverageDelta(result, &timestamp);
+  protocol::Response response = takeCoverageDelta(result, &timestamp);
   SetCoverageEnabled(false);
   return response;
 }
@@ -2967,11 +2977,13 @@
   }
 }
 
-Response InspectorCSSAgent::takeCoverageDelta(
+protocol::Response InspectorCSSAgent::takeCoverageDelta(
     std::unique_ptr<protocol::Array<protocol::CSS::RuleUsage>>* result,
     double* out_timestamp) {
-  if (!tracker_)
-    return Response::ServerError("CSS rule usage tracking is not enabled");
+  if (!tracker_) {
+    return protocol::Response::ServerError(
+        "CSS rule usage tracking is not enabled");
+  }
 
   StyleRuleUsageTracker::RuleListByStyleSheet coverage_delta =
       tracker_->TakeDelta();
@@ -3015,10 +3027,10 @@
     }
   }
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorCSSAgent::trackComputedStyleUpdates(
+protocol::Response InspectorCSSAgent::trackComputedStyleUpdates(
     std::unique_ptr<protocol::Array<protocol::CSS::CSSComputedStyleProperty>>
         properties_to_track) {
   tracked_computed_styles_.clear();
@@ -3029,7 +3041,7 @@
       computed_style_updated_callback_ = nullptr;
     }
     computed_style_updated_node_ids_.clear();
-    return Response::Success();
+    return protocol::Response::Success();
   }
 
   for (const auto& property : *properties_to_track) {
@@ -3045,20 +3057,20 @@
     }
   }
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorCSSAgent::takeComputedStyleUpdates(
     std::unique_ptr<TakeComputedStyleUpdatesCallback> callback) {
   if (tracked_computed_styles_.empty()) {
-    callback->sendFailure(Response::ServerError(
+    callback->sendFailure(protocol::Response::ServerError(
         "No computed styles are being tracked right now."));
     return;
   }
 
   if (computed_style_updated_callback_) {
-    callback->sendFailure(
-        Response::ServerError("A previous request has not been resolved yet."));
+    callback->sendFailure(protocol::Response::ServerError(
+        "A previous request has not been resolved yet."));
     return;
   }
 
@@ -3163,11 +3175,11 @@
     *result = false;
 }
 
-Response InspectorCSSAgent::setLocalFontsEnabled(bool enabled) {
+protocol::Response InspectorCSSAgent::setLocalFontsEnabled(bool enabled) {
   local_fonts_enabled_.Set(enabled);
   // TODO(alexrudenko): how to rerender fonts so that
   // local_fonts_enabled_ applies without page reload?
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 }  // namespace blink

third_party/blink/renderer/core/inspector/inspector_dom_agent.cc

diff --git a/third_party/blink/renderer/core/inspector/inspector_dom_agent.cc b/third_party/blink/renderer/core/inspector/inspector_dom_agent.cc
index a2936a4..fbe48c2f 100644
--- a/third_party/blink/renderer/core/inspector/inspector_dom_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_dom_agent.cc
@@ -104,7 +104,6 @@
 namespace blink {
 
 using protocol::Maybe;
-using protocol::Response;
 
 namespace {
 
@@ -173,7 +172,8 @@
   visitor->Trace(timer_);
 }
 
-Response InspectorDOMAgent::ToResponse(ExceptionState& exception_state) {
+protocol::Response InspectorDOMAgent::ToResponse(
+    ExceptionState& exception_state) {
   if (exception_state.HadException()) {
     String name_prefix = IsDOMExceptionCode(exception_state.Code())
                              ? DOMException::GetErrorName(
@@ -181,9 +181,9 @@
                                    " "
                              : g_empty_string;
     String msg = name_prefix + exception_state.Message();
-    return Response::ServerError(msg.Utf8());
+    return protocol::Response::ServerError(msg.Utf8());
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 protocol::DOM::PseudoType InspectorDOMAgent::ProtocolPseudoElementType(
@@ -410,14 +410,14 @@
   cached_child_count_.erase(id);
 }
 
-Response InspectorDOMAgent::AssertNode(int node_id, Node*& node) {
+protocol::Response InspectorDOMAgent::AssertNode(int node_id, Node*& node) {
   node = NodeForId(node_id);
   if (!node)
-    return Response::ServerError("Could not find node with given id");
-  return Response::Success();
+    return protocol::Response::ServerError("Could not find node with given id");
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::AssertNode(
+protocol::Response InspectorDOMAgent::AssertNode(
     const protocol::Maybe<int>& node_id,
     const protocol::Maybe<int>& backend_node_id,
     const protocol::Maybe<String>& object_id,
@@ -427,27 +427,29 @@
 
   if (backend_node_id.isJust()) {
     node = DOMNodeIds::NodeForId(backend_node_id.fromJust());
-    return !node ? Response::ServerError("No node found for given backend id")
-                 : Response::Success();
+    return !node ? protocol::Response::ServerError(
+                       "No node found for given backend id")
+                 : protocol::Response::Success();
   }
 
   if (object_id.isJust())
     return NodeForRemoteObjectId(object_id.fromJust(), node);
 
-  return Response::ServerError(
+  return protocol::Response::ServerError(
       "Either nodeId, backendNodeId or objectId must be specified");
 }
 
-Response InspectorDOMAgent::AssertElement(int node_id, Element*& element) {
+protocol::Response InspectorDOMAgent::AssertElement(int node_id,
+                                                    Element*& element) {
   Node* node = nullptr;
-  Response response = AssertNode(node_id, node);
+  protocol::Response response = AssertNode(node_id, node);
   if (!response.IsSuccess())
     return response;
 
   element = DynamicTo<Element>(node);
   if (!element)
-    return Response::ServerError("Node is not an Element");
-  return Response::Success();
+    return protocol::Response::ServerError("Node is not an Element");
+  return protocol::Response::Success();
 }
 
 // static
@@ -464,51 +466,53 @@
   return shadow_root->IsUserAgent() ? shadow_root : nullptr;
 }
 
-Response InspectorDOMAgent::AssertEditableNode(int node_id, Node*& node) {
-  Response response = AssertNode(node_id, node);
+protocol::Response InspectorDOMAgent::AssertEditableNode(int node_id,
+                                                         Node*& node) {
+  protocol::Response response = AssertNode(node_id, node);
   if (!response.IsSuccess())
     return response;
 
   if (node->IsInShadowTree()) {
     if (IsA<ShadowRoot>(node))
-      return Response::ServerError("Cannot edit shadow roots");
+      return protocol::Response::ServerError("Cannot edit shadow roots");
     if (UserAgentShadowRoot(node)) {
-      return Response::ServerError(
+      return protocol::Response::ServerError(
           "Cannot edit nodes from user-agent shadow trees");
     }
   }
 
   if (node->IsPseudoElement())
-    return Response::ServerError("Cannot edit pseudo elements");
-  return Response::Success();
+    return protocol::Response::ServerError("Cannot edit pseudo elements");
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::AssertEditableChildNode(Element* parent_element,
-                                                    int node_id,
-                                                    Node*& node) {
-  Response response = AssertEditableNode(node_id, node);
+protocol::Response InspectorDOMAgent::AssertEditableChildNode(
+    Element* parent_element,
+    int node_id,
+    Node*& node) {
+  protocol::Response response = AssertEditableNode(node_id, node);
   if (!response.IsSuccess())
     return response;
   if (node->parentNode() != parent_element) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "Anchor node must be child of the target element");
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::AssertEditableElement(int node_id,
-                                                  Element*& element) {
-  Response response = AssertElement(node_id, element);
+protocol::Response InspectorDOMAgent::AssertEditableElement(int node_id,
+                                                            Element*& element) {
+  protocol::Response response = AssertElement(node_id, element);
   if (!response.IsSuccess())
     return response;
   if (element->IsInShadowTree() && UserAgentShadowRoot(element)) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "Cannot edit elements from user-agent shadow trees");
   }
   if (element->IsPseudoElement())
-    return Response::ServerError("Cannot edit pseudo elements");
+    return protocol::Response::ServerError("Cannot edit pseudo elements");
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorDOMAgent::EnableAndReset() {
@@ -519,7 +523,7 @@
   instrumenting_agents_->AddInspectorDOMAgent(this);
 }
 
-Response InspectorDOMAgent::enable(Maybe<String> includeWhitespace) {
+protocol::Response InspectorDOMAgent::enable(Maybe<String> includeWhitespace) {
   if (!enabled_.Get()) {
     EnableAndReset();
     include_whitespace_.Set(static_cast<int32_t>(
@@ -529,22 +533,22 @@
             ? InspectorDOMAgent::IncludeWhitespaceEnum::ALL
             : InspectorDOMAgent::IncludeWhitespaceEnum::NONE));
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::disable() {
+protocol::Response InspectorDOMAgent::disable() {
   if (!enabled_.Get())
-    return Response::ServerError("DOM agent hasn't been enabled");
+    return protocol::Response::ServerError("DOM agent hasn't been enabled");
   include_whitespace_.Clear();
   enabled_.Clear();
   instrumenting_agents_->RemoveInspectorDOMAgent(this);
   history_.Clear();
   dom_editor_.Clear();
   SetDocument(nullptr);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::getDocument(
+protocol::Response InspectorDOMAgent::getDocument(
     Maybe<int> depth,
     Maybe<bool> pierce,
     std::unique_ptr<protocol::DOM::Node>* root) {
@@ -553,7 +557,7 @@
     enable(Maybe<String>());
 
   if (!document_)
-    return Response::ServerError("Document is not available");
+    return protocol::Response::ServerError("Document is not available");
 
   DiscardFrontendBindings();
 
@@ -564,7 +568,7 @@
   *root = BuildObjectForNode(document_.Get(), sanitized_depth,
                              pierce.fromMaybe(false),
                              document_node_to_id_map_.Get());
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 namespace {
@@ -589,20 +593,20 @@
 
 }  // namespace
 
-Response InspectorDOMAgent::getNodesForSubtreeByStyle(
+protocol::Response InspectorDOMAgent::getNodesForSubtreeByStyle(
     int node_id,
     std::unique_ptr<protocol::Array<protocol::DOM::CSSComputedStyleProperty>>
         computed_styles,
     Maybe<bool> pierce,
     std::unique_ptr<protocol::Array<int>>* node_ids) {
   if (!enabled_.Get())
-    return Response::ServerError("DOM agent hasn't been enabled");
+    return protocol::Response::ServerError("DOM agent hasn't been enabled");
 
   if (!document_)
-    return Response::ServerError("Document is not available");
+    return protocol::Response::ServerError("Document is not available");
 
   Node* root_node = nullptr;
-  Response response = AssertNode(node_id, root_node);
+  protocol::Response response = AssertNode(node_id, root_node);
   if (!response.IsSuccess())
     return response;
 
@@ -611,7 +615,7 @@
     absl::optional<CSSPropertyName> property_name = CSSPropertyName::From(
         document_->GetExecutionContext(), style->getName());
     if (!property_name)
-      return Response::InvalidParams("Invalid CSS property name");
+      return protocol::Response::InvalidParams("Invalid CSS property name");
     auto property_id = property_name->Id();
     HashMap<CSSPropertyID, HashSet<String>>::iterator it =
         properties.find(property_id);
@@ -635,18 +639,18 @@
     (*node_ids)->push_back(id);
   }
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::getFlattenedDocument(
+protocol::Response InspectorDOMAgent::getFlattenedDocument(
     Maybe<int> depth,
     Maybe<bool> pierce,
     std::unique_ptr<protocol::Array<protocol::DOM::Node>>* nodes) {
   if (!enabled_.Get())
-    return Response::ServerError("DOM agent hasn't been enabled");
+    return protocol::Response::ServerError("DOM agent hasn't been enabled");
 
   if (!document_)
-    return Response::ServerError("Document is not available");
+    return protocol::Response::ServerError("Document is not available");
 
   DiscardFrontendBindings();
 
@@ -658,7 +662,7 @@
   (*nodes)->emplace_back(BuildObjectForNode(
       document_.Get(), sanitized_depth, pierce.fromMaybe(false),
       document_node_to_id_map_.Get(), nodes->get()));
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorDOMAgent::PushChildNodesToFrontend(int node_id,
@@ -718,18 +722,22 @@
   return nullptr;
 }
 
-Response InspectorDOMAgent::collectClassNamesFromSubtree(
+protocol::Response InspectorDOMAgent::collectClassNamesFromSubtree(
     int node_id,
     std::unique_ptr<protocol::Array<String>>* class_names) {
   HashSet<String> unique_names;
   *class_names = std::make_unique<protocol::Array<String>>();
   Node* parent_node = NodeForId(node_id);
-  if (!parent_node)
-    return Response::ServerError("No suitable node with given id found");
+  if (!parent_node) {
+    return protocol::Response::ServerError(
+        "No suitable node with given id found");
+  }
   auto* parent_element = DynamicTo<Element>(parent_node);
   if (!parent_element && !parent_node->IsDocumentNode() &&
-      !parent_node->IsDocumentFragment())
-    return Response::ServerError("No suitable node with given id found");
+      !parent_node->IsDocumentFragment()) {
+    return protocol::Response::ServerError(
+        "No suitable node with given id found");
+  }
 
   for (Node* node = parent_node; node;
        node = FlatTreeTraversal::Next(*node, parent_node)) {
@@ -743,16 +751,16 @@
   }
   for (const String& class_name : unique_names)
     (*class_names)->emplace_back(class_name);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::requestChildNodes(
+protocol::Response InspectorDOMAgent::requestChildNodes(
     int node_id,
     Maybe<int> depth,
     Maybe<bool> maybe_taverse_frames) {
   int sanitized_depth = depth.fromMaybe(1);
   if (sanitized_depth == 0 || sanitized_depth < -1) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "Please provide a positive integer as a depth or -1 for entire "
         "subtree");
   }
@@ -761,61 +769,61 @@
 
   PushChildNodesToFrontend(node_id, sanitized_depth,
                            maybe_taverse_frames.fromMaybe(false));
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::querySelector(int node_id,
-                                          const String& selectors,
-                                          int* element_id) {
+protocol::Response InspectorDOMAgent::querySelector(int node_id,
+                                                    const String& selectors,
+                                                    int* element_id) {
   *element_id = 0;
   Node* node = nullptr;
-  Response response = AssertNode(node_id, node);
+  protocol::Response response = AssertNode(node_id, node);
   if (!response.IsSuccess())
     return response;
   auto* container_node = DynamicTo<ContainerNode>(node);
   if (!container_node)
-    return Response::ServerError("Not a container node");
+    return protocol::Response::ServerError("Not a container node");
 
   DummyExceptionStateForTesting exception_state;
   Element* element =
       container_node->QuerySelector(AtomicString(selectors), exception_state);
   if (exception_state.HadException())
-    return Response::ServerError("DOM Error while querying");
+    return protocol::Response::ServerError("DOM Error while querying");
 
   if (element)
     *element_id = PushNodePathToFrontend(element);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::querySelectorAll(
+protocol::Response InspectorDOMAgent::querySelectorAll(
     int node_id,
     const String& selectors,
     std::unique_ptr<protocol::Array<int>>* result) {
   Node* node = nullptr;
-  Response response = AssertNode(node_id, node);
+  protocol::Response response = AssertNode(node_id, node);
   if (!response.IsSuccess())
     return response;
   auto* container_node = DynamicTo<ContainerNode>(node);
   if (!container_node)
-    return Response::ServerError("Not a container node");
+    return protocol::Response::ServerError("Not a container node");
 
   DummyExceptionStateForTesting exception_state;
   StaticElementList* elements = container_node->QuerySelectorAll(
       AtomicString(selectors), exception_state);
   if (exception_state.HadException())
-    return Response::ServerError("DOM Error while querying");
+    return protocol::Response::ServerError("DOM Error while querying");
 
   *result = std::make_unique<protocol::Array<int>>();
 
   for (unsigned i = 0; i < elements->length(); ++i)
     (*result)->emplace_back(PushNodePathToFrontend(elements->item(i)));
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::getTopLayerElements(
+protocol::Response InspectorDOMAgent::getTopLayerElements(
     std::unique_ptr<protocol::Array<int>>* result) {
   if (!document_)
-    return Response::ServerError("DOM agent hasn't been enabled");
+    return protocol::Response::ServerError("DOM agent hasn't been enabled");
 
   *result = std::make_unique<protocol::Array<int>>();
   for (auto document : Documents()) {
@@ -826,7 +834,7 @@
     }
   }
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 int InspectorDOMAgent::PushNodePathToFrontend(Node* node_to_push,
@@ -895,21 +903,21 @@
   return it != document_node_to_id_map_->end() ? it->value : 0;
 }
 
-Response InspectorDOMAgent::setAttributeValue(int element_id,
-                                              const String& name,
-                                              const String& value) {
+protocol::Response InspectorDOMAgent::setAttributeValue(int element_id,
+                                                        const String& name,
+                                                        const String& value) {
   Element* element = nullptr;
-  Response response = AssertEditableElement(element_id, element);
+  protocol::Response response = AssertEditableElement(element_id, element);
   if (!response.IsSuccess())
     return response;
   return dom_editor_->SetAttribute(element, name, value);
 }
 
-Response InspectorDOMAgent::setAttributesAsText(int element_id,
-                                                const String& text,
-                                                Maybe<String> name) {
+protocol::Response InspectorDOMAgent::setAttributesAsText(int element_id,
+                                                          const String& text,
+                                                          Maybe<String> name) {
   Element* element = nullptr;
-  Response response = AssertEditableElement(element_id, element);
+  protocol::Response response = AssertEditableElement(element_id, element);
   if (!response.IsSuccess())
     return response;
 
@@ -949,8 +957,10 @@
 
   Element* parsed_element =
       getParsedElement(element, contextElement, text, is_html_document);
-  if (!parsed_element)
-    return Response::ServerError("Could not parse value as attributes");
+  if (!parsed_element) {
+    return protocol::Response::ServerError(
+        "Could not parse value as attributes");
+  }
 
   bool should_ignore_case = is_html_document && element->IsHTMLElement();
   String case_adjusted_name = should_ignore_case
@@ -979,39 +989,39 @@
       name.fromJust().LengthWithStrippedWhiteSpace() > 0) {
     return dom_editor_->RemoveAttribute(element, case_adjusted_name);
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::removeAttribute(int element_id,
-                                            const String& name) {
+protocol::Response InspectorDOMAgent::removeAttribute(int element_id,
+                                                      const String& name) {
   Element* element = nullptr;
-  Response response = AssertEditableElement(element_id, element);
+  protocol::Response response = AssertEditableElement(element_id, element);
   if (!response.IsSuccess())
     return response;
 
   return dom_editor_->RemoveAttribute(element, name);
 }
 
-Response InspectorDOMAgent::removeNode(int node_id) {
+protocol::Response InspectorDOMAgent::removeNode(int node_id) {
   Node* node = nullptr;
-  Response response = AssertEditableNode(node_id, node);
+  protocol::Response response = AssertEditableNode(node_id, node);
   if (!response.IsSuccess())
     return response;
 
   ContainerNode* parent_node = node->parentNode();
   if (!parent_node)
-    return Response::ServerError("Cannot remove detached node");
+    return protocol::Response::ServerError("Cannot remove detached node");
 
   return dom_editor_->RemoveChild(parent_node, node);
 }
 
-Response InspectorDOMAgent::setNodeName(int node_id,
-                                        const String& tag_name,
-                                        int* new_id) {
+protocol::Response InspectorDOMAgent::setNodeName(int node_id,
+                                                  const String& tag_name,
+                                                  int* new_id) {
   *new_id = 0;
 
   Element* old_element = nullptr;
-  Response response = AssertElement(node_id, old_element);
+  protocol::Response response = AssertElement(node_id, old_element);
   if (!response.IsSuccess())
     return response;
 
@@ -1045,33 +1055,34 @@
   *new_id = PushNodePathToFrontend(new_elem);
   if (children_requested_.Contains(node_id))
     PushChildNodesToFrontend(*new_id);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::getOuterHTML(Maybe<int> node_id,
-                                         Maybe<int> backend_node_id,
-                                         Maybe<String> object_id,
-                                         WTF::String* outer_html) {
+protocol::Response InspectorDOMAgent::getOuterHTML(Maybe<int> node_id,
+                                                   Maybe<int> backend_node_id,
+                                                   Maybe<String> object_id,
+                                                   WTF::String* outer_html) {
   Node* node = nullptr;
-  Response response = AssertNode(node_id, backend_node_id, object_id, node);
+  protocol::Response response =
+      AssertNode(node_id, backend_node_id, object_id, node);
   if (!response.IsSuccess())
     return response;
 
   *outer_html = CreateMarkup(node);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::setOuterHTML(int node_id,
-                                         const String& outer_html) {
+protocol::Response InspectorDOMAgent::setOuterHTML(int node_id,
+                                                   const String& outer_html) {
   if (!node_id) {
     DCHECK(document_);
     DOMPatchSupport dom_patch_support(dom_editor_.Get(), *document_.Get());
     dom_patch_support.PatchDocument(outer_html);
-    return Response::Success();
+    return protocol::Response::Success();
   }
 
   Node* node = nullptr;
-  Response response = AssertEditableNode(node_id, node);
+  protocol::Response response = AssertEditableNode(node_id, node);
   if (!response.IsSuccess())
     return response;
 
@@ -1079,7 +1090,7 @@
       IsA<Document>(node) ? To<Document>(node) : node->ownerDocument();
   if (!document ||
       (!IsA<HTMLDocument>(document) && !IsA<XMLDocument>(document)))
-    return Response::ServerError("Not an HTML/XML document");
+    return protocol::Response::ServerError("Not an HTML/XML document");
 
   Node* new_node = nullptr;
   response = dom_editor_->SetOuterHTML(node, outer_html, &new_node);
@@ -1088,7 +1099,7 @@
 
   if (!new_node) {
     // The only child node has been deleted.
-    return Response::Success();
+    return protocol::Response::Success();
   }
 
   int new_id = PushNodePathToFrontend(new_node);
@@ -1096,17 +1107,18 @@
   bool children_requested = children_requested_.Contains(node_id);
   if (children_requested)
     PushChildNodesToFrontend(new_id);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::setNodeValue(int node_id, const String& value) {
+protocol::Response InspectorDOMAgent::setNodeValue(int node_id,
+                                                   const String& value) {
   Node* node = nullptr;
-  Response response = AssertEditableNode(node_id, node);
+  protocol::Response response = AssertEditableNode(node_id, node);
   if (!response.IsSuccess())
     return response;
 
   if (node->getNodeType() != Node::kTextNode)
-    return Response::ServerError("Can only set value of text nodes");
+    return protocol::Response::ServerError("Can only set value of text nodes");
 
   return dom_editor_->SetNodeValue(node, value);
 }
@@ -1142,13 +1154,13 @@
   return nullptr;
 }
 
-Response InspectorDOMAgent::performSearch(
+protocol::Response InspectorDOMAgent::performSearch(
     const String& whitespace_trimmed_query,
     Maybe<bool> optional_include_user_agent_shadow_dom,
     String* search_id,
     int* result_count) {
   if (!enabled_.Get())
-    return Response::ServerError("DOM agent is not enabled");
+    return protocol::Response::ServerError("DOM agent is not enabled");
 
   // FIXME: Few things are missing here:
   // 1) Search works with node granularity - number of matches within node is
@@ -1290,58 +1302,66 @@
     results_it->push_back(result);
 
   *result_count = results_it->size();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::getSearchResults(
+protocol::Response InspectorDOMAgent::getSearchResults(
     const String& search_id,
     int from_index,
     int to_index,
     std::unique_ptr<protocol::Array<int>>* node_ids) {
   SearchResults::iterator it = search_results_.find(search_id);
-  if (it == search_results_.end())
-    return Response::ServerError("No search session with given id found");
+  if (it == search_results_.end()) {
+    return protocol::Response::ServerError(
+        "No search session with given id found");
+  }
 
   int size = it->value->size();
   if (from_index < 0 || to_index > size || from_index >= to_index)
-    return Response::ServerError("Invalid search result range");
+    return protocol::Response::ServerError("Invalid search result range");
 
   *node_ids = std::make_unique<protocol::Array<int>>();
   for (int i = from_index; i < to_index; ++i)
     (*node_ids)->emplace_back(PushNodePathToFrontend((*it->value)[i].Get()));
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::discardSearchResults(const String& search_id) {
+protocol::Response InspectorDOMAgent::discardSearchResults(
+    const String& search_id) {
   search_results_.erase(search_id);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::NodeForRemoteObjectId(const String& object_id,
-                                                  Node*& node) {
+protocol::Response InspectorDOMAgent::NodeForRemoteObjectId(
+    const String& object_id,
+    Node*& node) {
   v8::HandleScope handles(isolate_);
   v8::Local<v8::Value> value;
   v8::Local<v8::Context> context;
   std::unique_ptr<v8_inspector::StringBuffer> error;
   if (!v8_session_->unwrapObject(&error, ToV8InspectorStringView(object_id),
-                                 &value, &context, nullptr))
-    return Response::ServerError(ToCoreString(std::move(error)).Utf8());
-  if (!V8Node::HasInstance(value, isolate_))
-    return Response::ServerError("Object id doesn't reference a Node");
+                                 &value, &context, nullptr)) {
+    return protocol::Response::ServerError(
+        ToCoreString(std::move(error)).Utf8());
+  }
+  if (!V8Node::HasInstance(value, isolate_)) {
+    return protocol::Response::ServerError(
+        "Object id doesn't reference a Node");
+  }
   node = V8Node::ToImpl(v8::Local<v8::Object>::Cast(value));
   if (!node) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "Couldn't convert object with given objectId to Node");
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::copyTo(int node_id,
-                                   int target_element_id,
-                                   Maybe<int> anchor_node_id,
-                                   int* new_node_id) {
+protocol::Response InspectorDOMAgent::copyTo(int node_id,
+                                             int target_element_id,
+                                             Maybe<int> anchor_node_id,
+                                             int* new_node_id) {
   Node* node = nullptr;
-  Response response = AssertEditableNode(node_id, node);
+  protocol::Response response = AssertEditableNode(node_id, node);
   if (!response.IsSuccess())
     return response;
 
@@ -1361,22 +1381,22 @@
   // The clone is deep by default.
   Node* cloned_node = node->cloneNode(true);
   if (!cloned_node)
-    return Response::ServerError("Failed to clone node");
+    return protocol::Response::ServerError("Failed to clone node");
   response =
       dom_editor_->InsertBefore(target_element, cloned_node, anchor_node);
   if (!response.IsSuccess())
     return response;
 
   *new_node_id = PushNodePathToFrontend(cloned_node);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::moveTo(int node_id,
-                                   int target_element_id,
-                                   Maybe<int> anchor_node_id,
-                                   int* new_node_id) {
+protocol::Response InspectorDOMAgent::moveTo(int node_id,
+                                             int target_element_id,
+                                             Maybe<int> anchor_node_id,
+                                             int* new_node_id) {
   Node* node = nullptr;
-  Response response = AssertEditableNode(node_id, node);
+  protocol::Response response = AssertEditableNode(node_id, node);
   if (!response.IsSuccess())
     return response;
 
@@ -1388,7 +1408,7 @@
   Node* current = target_element;
   while (current) {
     if (current == node) {
-      return Response::ServerError(
+      return protocol::Response::ServerError(
           "Unable to move node into self or descendant");
     }
     current = current->parentNode();
@@ -1407,82 +1427,84 @@
     return response;
 
   *new_node_id = PushNodePathToFrontend(node);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::undo() {
+protocol::Response InspectorDOMAgent::undo() {
   if (!enabled_.Get())
-    return Response::ServerError("DOM agent is not enabled");
+    return protocol::Response::ServerError("DOM agent is not enabled");
   DummyExceptionStateForTesting exception_state;
   history_->Undo(exception_state);
   return InspectorDOMAgent::ToResponse(exception_state);
 }
 
-Response InspectorDOMAgent::redo() {
+protocol::Response InspectorDOMAgent::redo() {
   if (!enabled_.Get())
-    return Response::ServerError("DOM agent is not enabled");
+    return protocol::Response::ServerError("DOM agent is not enabled");
   DummyExceptionStateForTesting exception_state;
   history_->Redo(exception_state);
   return InspectorDOMAgent::ToResponse(exception_state);
 }
 
-Response InspectorDOMAgent::markUndoableState() {
+protocol::Response InspectorDOMAgent::markUndoableState() {
   if (!enabled_.Get())
-    return Response::ServerError("DOM agent is not enabled");
+    return protocol::Response::ServerError("DOM agent is not enabled");
   history_->MarkUndoableState();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::focus(Maybe<int> node_id,
-                                  Maybe<int> backend_node_id,
-                                  Maybe<String> object_id) {
+protocol::Response InspectorDOMAgent::focus(Maybe<int> node_id,
+                                            Maybe<int> backend_node_id,
+                                            Maybe<String> object_id) {
   Node* node = nullptr;
-  Response response = AssertNode(node_id, backend_node_id, object_id, node);
+  protocol::Response response =
+      AssertNode(node_id, backend_node_id, object_id, node);
   if (!response.IsSuccess())
     return response;
   auto* element = DynamicTo<Element>(node);
   if (!element)
-    return Response::ServerError("Node is not an Element");
+    return protocol::Response::ServerError("Node is not an Element");
   element->GetDocument().UpdateStyleAndLayout(DocumentUpdateReason::kInspector);
   if (!element->IsFocusable())
-    return Response::ServerError("Element is not focusable");
+    return protocol::Response::ServerError("Element is not focusable");
   element->Focus();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::setFileInputFiles(
+protocol::Response InspectorDOMAgent::setFileInputFiles(
     std::unique_ptr<protocol::Array<String>> files,
     Maybe<int> node_id,
     Maybe<int> backend_node_id,
     Maybe<String> object_id) {
   Node* node = nullptr;
-  Response response = AssertNode(node_id, backend_node_id, object_id, node);
+  protocol::Response response =
+      AssertNode(node_id, backend_node_id, object_id, node);
   if (!response.IsSuccess())
     return response;
 
   auto* html_input_element = DynamicTo<HTMLInputElement>(node);
   if (!html_input_element ||
       html_input_element->type() != input_type_names::kFile)
-    return Response::ServerError("Node is not a file input element");
+    return protocol::Response::ServerError("Node is not a file input element");
 
   Vector<String> paths;
   for (const String& file : *files)
     paths.push_back(file);
   To<HTMLInputElement>(node)->SetFilesFromPaths(paths);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::setNodeStackTracesEnabled(bool enable) {
+protocol::Response InspectorDOMAgent::setNodeStackTracesEnabled(bool enable) {
   capture_node_stack_traces_.Set(enable);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::getNodeStackTraces(
+protocol::Response InspectorDOMAgent::getNodeStackTraces(
     int node_id,
     protocol::Maybe<v8_inspector::protocol::Runtime::API::StackTrace>*
         creation) {
   Node* node = nullptr;
-  Response response = AssertNode(node_id, node);
+  protocol::Response response = AssertNode(node_id, node);
   if (!response.IsSuccess())
     return response;
 
@@ -1491,41 +1513,43 @@
     SourceLocation& source_location = it->value->GetSourceLocation();
     *creation = source_location.BuildInspectorObject();
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::getBoxModel(
+protocol::Response InspectorDOMAgent::getBoxModel(
     Maybe<int> node_id,
     Maybe<int> backend_node_id,
     Maybe<String> object_id,
     std::unique_ptr<protocol::DOM::BoxModel>* model) {
   Node* node = nullptr;
-  Response response = AssertNode(node_id, backend_node_id, object_id, node);
+  protocol::Response response =
+      AssertNode(node_id, backend_node_id, object_id, node);
   if (!response.IsSuccess())
     return response;
 
   bool result = InspectorHighlight::GetBoxModel(node, model, true);
   if (!result)
-    return Response::ServerError("Could not compute box model.");
-  return Response::Success();
+    return protocol::Response::ServerError("Could not compute box model.");
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::getContentQuads(
+protocol::Response InspectorDOMAgent::getContentQuads(
     Maybe<int> node_id,
     Maybe<int> backend_node_id,
     Maybe<String> object_id,
     std::unique_ptr<protocol::Array<protocol::Array<double>>>* quads) {
   Node* node = nullptr;
-  Response response = AssertNode(node_id, backend_node_id, object_id, node);
+  protocol::Response response =
+      AssertNode(node_id, backend_node_id, object_id, node);
   if (!response.IsSuccess())
     return response;
   bool result = InspectorHighlight::GetContentQuads(node, quads);
   if (!result)
-    return Response::ServerError("Could not compute content quads.");
-  return Response::Success();
+    return protocol::Response::ServerError("Could not compute content quads.");
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::getNodeForLocation(
+protocol::Response InspectorDOMAgent::getNodeForLocation(
     int x,
     int y,
     Maybe<bool> optional_include_user_agent_shadow_dom,
@@ -1554,7 +1578,7 @@
   while (node && node->getNodeType() == Node::kTextNode)
     node = node->parentNode();
   if (!node)
-    return Response::ServerError("No node found at given location");
+    return protocol::Response::ServerError("No node found at given location");
   *backend_node_id = IdentifiersFactory::IntIdForNode(node);
   LocalFrame* frame = node->GetDocument().GetFrame();
   *frame_id = IdentifiersFactory::FrameId(frame);
@@ -1562,10 +1586,10 @@
       document_node_to_id_map_->Contains(document_)) {
     *node_id = PushNodePathToFrontend(node);
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::resolveNode(
+protocol::Response InspectorDOMAgent::resolveNode(
     protocol::Maybe<int> node_id,
     protocol::Maybe<int> backend_node_id,
     protocol::Maybe<String> object_group,
@@ -1576,7 +1600,7 @@
   Node* node = nullptr;
 
   if (node_id.isJust() == backend_node_id.isJust()) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "Either nodeId or backendNodeId must be specified.");
   }
 
@@ -1586,45 +1610,46 @@
     node = DOMNodeIds::NodeForId(backend_node_id.fromJust());
 
   if (!node)
-    return Response::ServerError("No node with given id found");
+    return protocol::Response::ServerError("No node with given id found");
   *result = ResolveNode(v8_session_, node, object_group_name,
                         std::move(execution_context_id));
   if (!*result) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "Node with given id does not belong to the document");
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::getAttributes(
+protocol::Response InspectorDOMAgent::getAttributes(
     int node_id,
     std::unique_ptr<protocol::Array<String>>* result) {
   Element* element = nullptr;
-  Response response = AssertElement(node_id, element);
+  protocol::Response response = AssertElement(node_id, element);
   if (!response.IsSuccess())
     return response;
 
   *result = BuildArrayForElementAttributes(element);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::requestNode(const String& object_id, int* node_id) {
+protocol::Response InspectorDOMAgent::requestNode(const String& object_id,
+                                                  int* node_id) {
   Node* node = nullptr;
-  Response response = NodeForRemoteObjectId(object_id, node);
+  protocol::Response response = NodeForRemoteObjectId(object_id, node);
   if (!response.IsSuccess())
     return response;
   *node_id = PushNodePathToFrontend(node);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::getContainerForNode(
+protocol::Response InspectorDOMAgent::getContainerForNode(
     int node_id,
     protocol::Maybe<String> container_name,
     protocol::Maybe<protocol::DOM::PhysicalAxes> physical_axes,
     protocol::Maybe<protocol::DOM::LogicalAxes> logical_axes,
     Maybe<int>* container_node_id) {
   Element* element = nullptr;
-  Response response = AssertElement(node_id, element);
+  protocol::Response response = AssertElement(node_id, element);
   if (!response.IsSuccess())
     return response;
 
@@ -1666,14 +1691,14 @@
                         physical, logical));
   if (container)
     *container_node_id = PushNodePathToFrontend(container);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::getQueryingDescendantsForContainer(
+protocol::Response InspectorDOMAgent::getQueryingDescendantsForContainer(
     int node_id,
     std::unique_ptr<protocol::Array<int>>* node_ids) {
   Element* container = nullptr;
-  Response response = AssertElement(node_id, container);
+  protocol::Response response = AssertElement(node_id, container);
   if (!response.IsSuccess())
     return response;
 
@@ -1684,7 +1709,7 @@
     (*node_ids)->push_back(id);
   }
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 // static
@@ -2479,22 +2504,25 @@
   return node;
 }
 
-Response InspectorDOMAgent::pushNodeByPathToFrontend(const String& path,
-                                                     int* node_id) {
+protocol::Response InspectorDOMAgent::pushNodeByPathToFrontend(
+    const String& path,
+    int* node_id) {
   if (!enabled_.Get())
-    return Response::ServerError("DOM agent is not enabled");
+    return protocol::Response::ServerError("DOM agent is not enabled");
   if (Node* node = NodeForPath(path))
     *node_id = PushNodePathToFrontend(node);
   else
-    return Response::ServerError("No node with given path found");
-  return Response::Success();
+    return protocol::Response::ServerError("No node with given path found");
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::pushNodesByBackendIdsToFrontend(
+protocol::Response InspectorDOMAgent::pushNodesByBackendIdsToFrontend(
     std::unique_ptr<protocol::Array<int>> backend_node_ids,
     std::unique_ptr<protocol::Array<int>>* result) {
-  if (!document_ || !BoundNodeId(document_))
-    return Response::ServerError("Document needs to be requested first");
+  if (!document_ || !BoundNodeId(document_)) {
+    return protocol::Response::ServerError(
+        "Document needs to be requested first");
+  }
 
   *result = std::make_unique<protocol::Array<int>>();
   for (int id : *backend_node_ids) {
@@ -2505,7 +2533,7 @@
     else
       (*result)->emplace_back(0);
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 class InspectableNode final
@@ -2522,25 +2550,25 @@
   DOMNodeId node_id_;
 };
 
-Response InspectorDOMAgent::setInspectedNode(int node_id) {
+protocol::Response InspectorDOMAgent::setInspectedNode(int node_id) {
   Node* node = nullptr;
-  Response response = AssertNode(node_id, node);
+  protocol::Response response = AssertNode(node_id, node);
   if (!response.IsSuccess())
     return response;
   v8_session_->addInspectedObject(std::make_unique<InspectableNode>(node));
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::getRelayoutBoundary(
+protocol::Response InspectorDOMAgent::getRelayoutBoundary(
     int node_id,
     int* relayout_boundary_node_id) {
   Node* node = nullptr;
-  Response response = AssertNode(node_id, node);
+  protocol::Response response = AssertNode(node_id, node);
   if (!response.IsSuccess())
     return response;
   LayoutObject* layout_object = node->GetLayoutObject();
   if (!layout_object) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "No layout object for node, perhaps orphan or hidden node");
   }
   while (layout_object && !layout_object->IsDocumentElement() &&
@@ -2549,7 +2577,7 @@
   Node* result_node =
       layout_object ? layout_object->GeneratingNode() : node->ownerDocument();
   *relayout_boundary_node_id = PushNodePathToFrontend(result_node);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 protocol::Response InspectorDOMAgent::describeNode(
@@ -2560,14 +2588,15 @@
     protocol::Maybe<bool> pierce,
     std::unique_ptr<protocol::DOM::Node>* result) {
   Node* node = nullptr;
-  Response response = AssertNode(node_id, backend_node_id, object_id, node);
+  protocol::Response response =
+      AssertNode(node_id, backend_node_id, object_id, node);
   if (!response.IsSuccess())
     return response;
   if (!node)
-    return Response::ServerError("Node not found");
+    return protocol::Response::ServerError("Node not found");
   *result = BuildObjectForNode(node, depth.fromMaybe(0),
                                pierce.fromMaybe(false), nullptr, nullptr);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 protocol::Response InspectorDOMAgent::scrollIntoViewIfNeeded(
@@ -2576,21 +2605,24 @@
     protocol::Maybe<String> object_id,
     protocol::Maybe<protocol::DOM::Rect> rect) {
   Node* node = nullptr;
-  Response response = AssertNode(node_id, backend_node_id, object_id, node);
+  protocol::Response response =
+      AssertNode(node_id, backend_node_id, object_id, node);
   if (!response.IsSuccess())
     return response;
   node->GetDocument().EnsurePaintLocationDataValidForNode(
       node, DocumentUpdateReason::kInspector);
   if (!node->isConnected())
-    return Response::ServerError("Node is detached from document");
+    return protocol::Response::ServerError("Node is detached from document");
   LayoutObject* layout_object = node->GetLayoutObject();
   if (!layout_object) {
     node = LayoutTreeBuilderTraversal::FirstLayoutChild(*node);
     if (node)
       layout_object = node->GetLayoutObject();
   }
-  if (!layout_object)
-    return Response::ServerError("Node does not have a layout object");
+  if (!layout_object) {
+    return protocol::Response::ServerError(
+        "Node does not have a layout object");
+  }
   PhysicalRect rect_to_scroll =
       PhysicalRect::EnclosingRect(layout_object->AbsoluteBoundingBoxRectF());
   if (rect.isJust()) {
@@ -2609,7 +2641,7 @@
           true /* make_visible_in_visual_viewport */,
           mojom::blink::ScrollBehavior::kInstant,
           true /* is_for_scroll_sequence */));
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 protocol::Response InspectorDOMAgent::getFrameOwner(
@@ -2650,11 +2682,13 @@
       }
     }
   }
-  if (!found_frame)
-    return Response::ServerError("Frame with the given id was not found.");
+  if (!found_frame) {
+    return protocol::Response::ServerError(
+        "Frame with the given id was not found.");
+  }
   auto* frame_owner = DynamicTo<HTMLFrameOwnerElement>(found_frame->Owner());
   if (!frame_owner) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "Frame with the given id does not belong to the target.");
   }
 
@@ -2663,28 +2697,33 @@
   if (enabled_.Get() && document_ && BoundNodeId(document_)) {
     *node_id = PushNodePathToFrontend(frame_owner);
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMAgent::getFileInfo(const String& object_id, String* path) {
+protocol::Response InspectorDOMAgent::getFileInfo(const String& object_id,
+                                                  String* path) {
   v8::HandleScope handles(isolate_);
   v8::Local<v8::Value> value;
   v8::Local<v8::Context> context;
   std::unique_ptr<v8_inspector::StringBuffer> error;
   if (!v8_session_->unwrapObject(&error, ToV8InspectorStringView(object_id),
-                                 &value, &context, nullptr))
-    return Response::ServerError(ToCoreString(std::move(error)).Utf8());
+                                 &value, &context, nullptr)) {
+    return protocol::Response::ServerError(
+        ToCoreString(std::move(error)).Utf8());
+  }
 
-  if (!V8File::HasInstance(value, isolate_))
-    return Response::ServerError("Object id doesn't reference a File");
+  if (!V8File::HasInstance(value, isolate_)) {
+    return protocol::Response::ServerError(
+        "Object id doesn't reference a File");
+  }
   File* file = V8File::ToImpl(v8::Local<v8::Object>::Cast(value));
   if (!file) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "Couldn't convert object with given objectId to File");
   }
 
   *path = file->GetPath();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorDOMAgent::Trace(Visitor* visitor) const {

third_party/blink/renderer/core/inspector/inspector_dom_debugger_agent.cc

diff --git a/third_party/blink/renderer/core/inspector/inspector_dom_debugger_agent.cc b/third_party/blink/renderer/core/inspector/inspector_dom_debugger_agent.cc
index 429572a..1091208b 100644
--- a/third_party/blink/renderer/core/inspector/inspector_dom_debugger_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_dom_debugger_agent.cc
@@ -78,7 +78,6 @@
 
 namespace blink {
 using protocol::Maybe;
-using protocol::Response;
 namespace {
 // Returns the key that we use to identify the brekpoint in
 // event_listener_breakpoints_. |target_name| may be "", in which case
@@ -225,11 +224,11 @@
   InspectorBaseAgent::Trace(visitor);
 }
 
-Response InspectorDOMDebuggerAgent::disable() {
+protocol::Response InspectorDOMDebuggerAgent::disable() {
   SetEnabled(false);
   dom_breakpoints_.clear();
   agent_state_.ClearAllFields();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorDOMDebuggerAgent::Restore() {
@@ -237,51 +236,52 @@
     instrumenting_agents_->AddInspectorDOMDebuggerAgent(this);
 }
 
-Response InspectorDOMDebuggerAgent::setEventListenerBreakpoint(
+protocol::Response InspectorDOMDebuggerAgent::setEventListenerBreakpoint(
     const String& event_name,
     Maybe<String> target_name) {
   return SetBreakpoint(String(listenerEventCategoryType) + event_name,
                        target_name.fromMaybe(String()));
 }
 
-Response InspectorDOMDebuggerAgent::setInstrumentationBreakpoint(
+protocol::Response InspectorDOMDebuggerAgent::setInstrumentationBreakpoint(
     const String& event_name) {
   return SetBreakpoint(String(instrumentationEventCategoryType) + event_name,
                        String());
 }
 
-Response InspectorDOMDebuggerAgent::SetBreakpoint(const String& event_name,
-                                                  const String& target_name) {
+protocol::Response InspectorDOMDebuggerAgent::SetBreakpoint(
+    const String& event_name,
+    const String& target_name) {
   if (event_name.empty())
-    return Response::ServerError("Event name is empty");
+    return protocol::Response::ServerError("Event name is empty");
   event_listener_breakpoints_.Set(
       EventListenerBreakpointKey(event_name, target_name), true);
   DidAddBreakpoint();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMDebuggerAgent::removeEventListenerBreakpoint(
+protocol::Response InspectorDOMDebuggerAgent::removeEventListenerBreakpoint(
     const String& event_name,
     Maybe<String> target_name) {
   return RemoveBreakpoint(String(listenerEventCategoryType) + event_name,
                           target_name.fromMaybe(String()));
 }
 
-Response InspectorDOMDebuggerAgent::removeInstrumentationBreakpoint(
+protocol::Response InspectorDOMDebuggerAgent::removeInstrumentationBreakpoint(
     const String& event_name) {
   return RemoveBreakpoint(String(instrumentationEventCategoryType) + event_name,
                           String());
 }
 
-Response InspectorDOMDebuggerAgent::RemoveBreakpoint(
+protocol::Response InspectorDOMDebuggerAgent::RemoveBreakpoint(
     const String& event_name,
     const String& target_name) {
   if (event_name.empty())
-    return Response::ServerError("Event name is empty");
+    return protocol::Response::ServerError("Event name is empty");
   event_listener_breakpoints_.Clear(
       EventListenerBreakpointKey(event_name, target_name));
   DidRemoveBreakpoint();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorDOMDebuggerAgent::DidInvalidateStyleAttr(Node* node) {
@@ -323,20 +323,20 @@
   }
 }
 
-static Response DomTypeForName(const String& type_string, int& type) {
+static protocol::Response DomTypeForName(const String& type_string, int& type) {
   if (type_string == "subtree-modified") {
     type = SubtreeModified;
-    return Response::Success();
+    return protocol::Response::Success();
   }
   if (type_string == "attribute-modified") {
     type = AttributeModified;
-    return Response::Success();
+    return protocol::Response::Success();
   }
   if (type_string == "node-removed") {
     type = NodeRemoved;
-    return Response::Success();
+    return protocol::Response::Success();
   }
-  return Response::ServerError(
+  return protocol::Response::ServerError(
       String("Unknown DOM breakpoint type: " + type_string).Utf8());
 }
 
@@ -366,12 +366,12 @@
   return false;
 }
 
-Response InspectorDOMDebuggerAgent::setBreakOnCSPViolation(
+protocol::Response InspectorDOMDebuggerAgent::setBreakOnCSPViolation(
     std::unique_ptr<protocol::Array<String>> violationTypes) {
   csp_violation_breakpoints_.Clear();
   if (violationTypes->empty()) {
     DidRemoveBreakpoint();
-    return Response::Success();
+    return protocol::Response::Success();
   }
   for (const auto& violationString : *violationTypes) {
     if (IsValidViolationType(violationString)) {
@@ -379,18 +379,18 @@
     } else {
       csp_violation_breakpoints_.Clear();
       DidRemoveBreakpoint();
-      return Response::InvalidParams("Invalid violation type");
+      return protocol::Response::InvalidParams("Invalid violation type");
     }
   }
   DidAddBreakpoint();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMDebuggerAgent::setDOMBreakpoint(
+protocol::Response InspectorDOMDebuggerAgent::setDOMBreakpoint(
     int node_id,
     const String& type_string) {
   Node* node = nullptr;
-  Response response = dom_agent_->AssertNode(node_id, node);
+  protocol::Response response = dom_agent_->AssertNode(node_id, node);
   if (!response.IsSuccess())
     return response;
 
@@ -411,14 +411,14 @@
       UpdateSubtreeBreakpoints(child, root_bit, true);
   }
   DidAddBreakpoint();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMDebuggerAgent::removeDOMBreakpoint(
+protocol::Response InspectorDOMDebuggerAgent::removeDOMBreakpoint(
     int node_id,
     const String& type_string) {
   Node* node = nullptr;
-  Response response = dom_agent_->AssertNode(node_id, node);
+  protocol::Response response = dom_agent_->AssertNode(node_id, node);
   if (!response.IsSuccess())
     return response;
 
@@ -445,10 +445,10 @@
       UpdateSubtreeBreakpoints(child, root_bit, false);
   }
   DidRemoveBreakpoint();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMDebuggerAgent::getEventListeners(
+protocol::Response InspectorDOMDebuggerAgent::getEventListeners(
     const String& object_id,
     Maybe<int> depth,
     Maybe<bool> pierce,
@@ -461,7 +461,8 @@
   std::unique_ptr<v8_inspector::StringBuffer> object_group;
   if (!v8_session_->unwrapObject(&error, ToV8InspectorStringView(object_id),
                                  &object, &context, &object_group)) {
-    return Response::ServerError(ToCoreString(std::move(error)).Utf8());
+    return protocol::Response::ServerError(
+        ToCoreString(std::move(error)).Utf8());
   }
   v8::Context::Scope scope(context);
   V8EventListenerInfoList event_information;
@@ -471,7 +472,7 @@
       &event_information);
   *listeners_array = BuildObjectsForEventListeners(event_information, context,
                                                    object_group->string());
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 std::unique_ptr<protocol::Array<protocol::DOMDebugger::EventListener>>
@@ -752,22 +753,24 @@
   AllowNativeBreakpoint(name, nullptr, true);
 }
 
-Response InspectorDOMDebuggerAgent::setXHRBreakpoint(const String& url) {
+protocol::Response InspectorDOMDebuggerAgent::setXHRBreakpoint(
+    const String& url) {
   if (url.empty())
     pause_on_all_xhrs_.Set(true);
   else
     xhr_breakpoints_.Set(url, true);
   DidAddBreakpoint();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMDebuggerAgent::removeXHRBreakpoint(const String& url) {
+protocol::Response InspectorDOMDebuggerAgent::removeXHRBreakpoint(
+    const String& url) {
   if (url.empty())
     pause_on_all_xhrs_.Set(false);
   else
     xhr_breakpoints_.Clear(url);
   DidRemoveBreakpoint();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 // Returns the breakpoint url if a match is found, or WTF::String().

third_party/blink/renderer/core/inspector/inspector_dom_snapshot_agent.cc

diff --git a/third_party/blink/renderer/core/inspector/inspector_dom_snapshot_agent.cc b/third_party/blink/renderer/core/inspector/inspector_dom_snapshot_agent.cc
index b526e436..992f2f0 100644
--- a/third_party/blink/renderer/core/inspector/inspector_dom_snapshot_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_dom_snapshot_agent.cc
@@ -47,7 +47,6 @@
 
 namespace blink {
 using protocol::Maybe;
-using protocol::Response;
 
 namespace {
 
@@ -234,22 +233,24 @@
     EnableAndReset();
 }
 
-Response InspectorDOMSnapshotAgent::enable() {
+protocol::Response InspectorDOMSnapshotAgent::enable() {
   if (!enabled_.Get())
     EnableAndReset();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMSnapshotAgent::disable() {
-  if (!enabled_.Get())
-    return Response::ServerError("DOM snapshot agent hasn't been enabled.");
+protocol::Response InspectorDOMSnapshotAgent::disable() {
+  if (!enabled_.Get()) {
+    return protocol::Response::ServerError(
+        "DOM snapshot agent hasn't been enabled.");
+  }
   enabled_.Clear();
   origin_url_map_.reset();
   instrumenting_agents_->RemoveInspectorDOMSnapshotAgent(this);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMSnapshotAgent::getSnapshot(
+protocol::Response InspectorDOMSnapshotAgent::getSnapshot(
     std::unique_ptr<protocol::Array<String>> style_filter,
     protocol::Maybe<bool> include_event_listeners,
     protocol::Maybe<bool> include_paint_order,
@@ -261,7 +262,7 @@
         computed_styles) {
   Document* document = inspected_frames_->Root()->GetDocument();
   if (!document)
-    return Response::ServerError("Document is not available");
+    return protocol::Response::ServerError("Document is not available");
   LegacyDOMSnapshotAgent legacySupport(dom_debugger_agent_,
                                        origin_url_map_.get());
   return legacySupport.GetSnapshot(
@@ -285,7 +286,7 @@
 
   auto* main_window = inspected_frames_->Root()->DomWindow();
   if (!main_window)
-    return Response::ServerError("Document is not available");
+    return protocol::Response::ServerError("Document is not available");
 
   // Update layout before traversal of document so that we inspect a
   // current and consistent state of all trees.
@@ -302,7 +303,7 @@
     const CSSPropertyID id =
         UnresolvedCSSPropertyID(main_window, property_name);
     if (id == CSSPropertyID::kInvalid || id == CSSPropertyID::kVariable)
-      return Response::InvalidParams("invalid CSS property");
+      return protocol::Response::InvalidParams("invalid CSS property");
     const auto& property = CSSProperty::Get(ResolveCSSPropertyID(id));
     css_property_filter_->push_back(&property);
   }
@@ -336,7 +337,7 @@
   documents_.reset();
   css_value_cache_.clear();
   style_cache_.clear();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 int InspectorDOMSnapshotAgent::AddString(const String& string) {

third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc

diff --git a/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc b/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc
index 11217f3..16cbaa0 100644
--- a/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc
@@ -33,7 +33,6 @@
 
 namespace blink {
 using protocol::Maybe;
-using protocol::Response;
 
 InspectorEmulationAgent::InspectorEmulationAgent(
     WebLocalFrameImpl* web_local_frame_impl,
@@ -159,7 +158,7 @@
                        &virtual_time_ticks_base_ms);
 }
 
-Response InspectorEmulationAgent::disable() {
+protocol::Response InspectorEmulationAgent::disable() {
   if (enabled_) {
     instrumenting_agents_->RemoveInspectorEmulationAgent(this);
     enabled_ = false;
@@ -172,7 +171,7 @@
   if (!locale_override_.Get().empty())
     setLocaleOverride(String());
   if (!web_local_frame_)
-    return Response::Success();
+    return protocol::Response::Success();
   setScriptExecutionDisabled(false);
   setScrollbarsHidden(false);
   setDocumentCookieDisabled(false);
@@ -195,27 +194,29 @@
   }
   setDefaultBackgroundColorOverride(Maybe<protocol::DOM::RGBA>());
   disabled_image_types_.Clear();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorEmulationAgent::resetPageScaleFactor() {
-  Response response = AssertPage();
+protocol::Response InspectorEmulationAgent::resetPageScaleFactor() {
+  protocol::Response response = AssertPage();
   if (!response.IsSuccess())
     return response;
   GetWebViewImpl()->ResetScaleStateImmediately();
   return response;
 }
 
-Response InspectorEmulationAgent::setPageScaleFactor(double page_scale_factor) {
-  Response response = AssertPage();
+protocol::Response InspectorEmulationAgent::setPageScaleFactor(
+    double page_scale_factor) {
+  protocol::Response response = AssertPage();
   if (!response.IsSuccess())
     return response;
   GetWebViewImpl()->SetPageScaleFactor(static_cast<float>(page_scale_factor));
   return response;
 }
 
-Response InspectorEmulationAgent::setScriptExecutionDisabled(bool value) {
-  Response response = AssertPage();
+protocol::Response InspectorEmulationAgent::setScriptExecutionDisabled(
+    bool value) {
+  protocol::Response response = AssertPage();
   if (!response.IsSuccess())
     return response;
   if (script_execution_disabled_.Get() == value)
@@ -225,8 +226,8 @@
   return response;
 }
 
-Response InspectorEmulationAgent::setScrollbarsHidden(bool hidden) {
-  Response response = AssertPage();
+protocol::Response InspectorEmulationAgent::setScrollbarsHidden(bool hidden) {
+  protocol::Response response = AssertPage();
   if (!response.IsSuccess())
     return response;
   if (scrollbars_hidden_.Get() == hidden)
@@ -236,8 +237,9 @@
   return response;
 }
 
-Response InspectorEmulationAgent::setDocumentCookieDisabled(bool disabled) {
-  Response response = AssertPage();
+protocol::Response InspectorEmulationAgent::setDocumentCookieDisabled(
+    bool disabled) {
+  protocol::Response response = AssertPage();
   if (!response.IsSuccess())
     return response;
   if (document_cookie_disabled_.Get() == disabled)
@@ -247,10 +249,10 @@
   return response;
 }
 
-Response InspectorEmulationAgent::setTouchEmulationEnabled(
+protocol::Response InspectorEmulationAgent::setTouchEmulationEnabled(
     bool enabled,
     protocol::Maybe<int> max_touch_points) {
-  Response response = AssertPage();
+  protocol::Response response = AssertPage();
   if (!response.IsSuccess())
     return response;
   int max_points = max_touch_points.fromMaybe(1);
@@ -258,7 +260,7 @@
     String msg =
         "Touch points must be between 1 and " +
         String::Number(static_cast<uint16_t>(WebTouchEvent::kTouchesLengthCap));
-    return Response::InvalidParams(msg.Utf8());
+    return protocol::Response::InvalidParams(msg.Utf8());
   }
   touch_event_emulation_enabled_.Set(enabled);
   max_touch_points_.Set(max_points);
@@ -267,10 +269,10 @@
   return response;
 }
 
-Response InspectorEmulationAgent::setEmulatedMedia(
+protocol::Response InspectorEmulationAgent::setEmulatedMedia(
     Maybe<String> media,
     Maybe<protocol::Array<protocol::Emulation::MediaFeature>> features) {
-  Response response = AssertPage();
+  protocol::Response response = AssertPage();
   if (!response.IsSuccess())
     return response;
   if (media.isJust()) {
@@ -355,9 +357,9 @@
   return response;
 }
 
-Response InspectorEmulationAgent::setEmulatedVisionDeficiency(
+protocol::Response InspectorEmulationAgent::setEmulatedVisionDeficiency(
     const String& type) {
-  Response response = AssertPage();
+  protocol::Response response = AssertPage();
   if (!response.IsSuccess())
     return response;
 
@@ -379,15 +381,15 @@
   else if (type == TypeEnum::Tritanopia)
     vision_deficiency = VisionDeficiency::kTritanopia;
   else
-    return Response::InvalidParams("Unknown vision deficiency type");
+    return protocol::Response::InvalidParams("Unknown vision deficiency type");
 
   emulated_vision_deficiency_.Set(type);
   GetWebViewImpl()->GetPage()->SetVisionDeficiency(vision_deficiency);
   return response;
 }
 
-Response InspectorEmulationAgent::setCPUThrottlingRate(double rate) {
-  Response response = AssertPage();
+protocol::Response InspectorEmulationAgent::setCPUThrottlingRate(double rate) {
+  protocol::Response response = AssertPage();
   if (!response.IsSuccess())
     return response;
   cpu_throttling_rate_.Set(rate);
@@ -395,8 +397,9 @@
   return response;
 }
 
-Response InspectorEmulationAgent::setFocusEmulationEnabled(bool enabled) {
-  Response response = AssertPage();
+protocol::Response InspectorEmulationAgent::setFocusEmulationEnabled(
+    bool enabled) {
+  protocol::Response response = AssertPage();
   if (!response.IsSuccess())
     return response;
   emulate_focus_.Set(enabled);
@@ -405,8 +408,9 @@
   return response;
 }
 
-Response InspectorEmulationAgent::setAutoDarkModeOverride(Maybe<bool> enabled) {
-  Response response = AssertPage();
+protocol::Response InspectorEmulationAgent::setAutoDarkModeOverride(
+    Maybe<bool> enabled) {
+  protocol::Response response = AssertPage();
   if (!response.IsSuccess())
     return response;
   if (enabled.isJust()) {
@@ -421,7 +425,7 @@
   return response;
 }
 
-Response InspectorEmulationAgent::setVirtualTimePolicy(
+protocol::Response InspectorEmulationAgent::setVirtualTimePolicy(
     const String& policy,
     Maybe<double> virtual_time_budget_ms,
     protocol::Maybe<int> max_virtual_time_task_starvation_count,
@@ -439,11 +443,11 @@
     DCHECK_EQ(scheduler_policy,
               VirtualTimeController::VirtualTimePolicy::kPause);
     if (virtual_time_budget_ms.isJust()) {
-      return Response::InvalidParams(
+      return protocol::Response::InvalidParams(
           "Can only specify budget for non-Pause policy");
     }
     if (max_virtual_time_task_starvation_count.isJust()) {
-      return Response::InvalidParams(
+      return protocol::Response::InvalidParams(
           "Can only specify starvation count for non-Pause policy");
     }
   }
@@ -489,7 +493,7 @@
           ? 0
           : (virtual_time_base_ticks_ - base::TimeTicks()).InMillisecondsF();
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 AtomicString InspectorEmulationAgent::OverrideAcceptImageHeader(
@@ -537,9 +541,9 @@
   request.SetCacheMode(mojom::blink::FetchCacheMode::kBypassCache);
 }
 
-Response InspectorEmulationAgent::setNavigatorOverrides(
+protocol::Response InspectorEmulationAgent::setNavigatorOverrides(
     const String& platform) {
-  Response response = AssertPage();
+  protocol::Response response = AssertPage();
   if (!response.IsSuccess())
     return response;
   navigator_platform_override_.Set(platform);
@@ -560,16 +564,16 @@
     frontend->virtualTimeBudgetExpired();
 }
 
-Response InspectorEmulationAgent::setDefaultBackgroundColorOverride(
+protocol::Response InspectorEmulationAgent::setDefaultBackgroundColorOverride(
     Maybe<protocol::DOM::RGBA> color) {
-  Response response = AssertPage();
+  protocol::Response response = AssertPage();
   if (!response.IsSuccess())
     return response;
   if (!color.isJust()) {
     // Clear the override and state.
     GetWebViewImpl()->SetBaseBackgroundColorOverrideForInspector(absl::nullopt);
     default_background_color_override_rgba_.Clear();
-    return Response::Success();
+    return protocol::Response::Success();
   }
 
   blink::protocol::DOM::RGBA* rgba = color.fromJust();
@@ -578,10 +582,10 @@
   int alpha = static_cast<int>(lroundf(255.0f * rgba->getA(1.0f)));
   GetWebViewImpl()->SetBaseBackgroundColorOverrideForInspector(
       Color(rgba->getR(), rgba->getG(), rgba->getB(), alpha).Rgb());
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorEmulationAgent::setDeviceMetricsOverride(
+protocol::Response InspectorEmulationAgent::setDeviceMetricsOverride(
     int width,
     int height,
     double device_scale_factor,
@@ -601,26 +605,26 @@
   return AssertPage();
 }
 
-Response InspectorEmulationAgent::clearDeviceMetricsOverride() {
+protocol::Response InspectorEmulationAgent::clearDeviceMetricsOverride() {
   // We don't have to do anything other than reply to the client, as the
   // emulation parameters should have already been cleared by the handling of
   // blink::mojom::FrameWidget::DisableDeviceEmulation.
   return AssertPage();
 }
 
-Response InspectorEmulationAgent::setHardwareConcurrencyOverride(
+protocol::Response InspectorEmulationAgent::setHardwareConcurrencyOverride(
     int hardware_concurrency) {
   if (hardware_concurrency <= 0) {
-    return Response::InvalidParams(
+    return protocol::Response::InvalidParams(
         "HardwareConcurrency must be a positive number");
   }
   InnerEnable();
   hardware_concurrency_override_.Set(hardware_concurrency);
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorEmulationAgent::setUserAgentOverride(
+protocol::Response InspectorEmulationAgent::setUserAgentOverride(
     const String& user_agent,
     protocol::Maybe<String> accept_language,
     protocol::Maybe<String> platform,
@@ -643,7 +647,7 @@
     if (user_agent.empty()) {
       ua_metadata_override_ = absl::nullopt;
       serialized_ua_metadata_override_.Set(std::vector<uint8_t>());
-      return Response::InvalidParams(
+      return protocol::Response::InvalidParams(
           "Can't specify UserAgentMetadata but no UA string");
     }
     std::unique_ptr<protocol::Emulation::UserAgentMetadata> ua_metadata =
@@ -712,26 +716,26 @@
                              marshalled.end());
   serialized_ua_metadata_override_.Set(std::move(marshalled_as_bytes));
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorEmulationAgent::setLocaleOverride(
+protocol::Response InspectorEmulationAgent::setLocaleOverride(
     protocol::Maybe<String> maybe_locale) {
   // Only allow resetting overrides set by the same agent.
   if (locale_override_.Get().empty() &&
       LocaleController::instance().has_locale_override()) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "Another locale override is already in effect");
   }
   String locale = maybe_locale.fromMaybe(String());
   String error = LocaleController::instance().SetLocaleOverride(locale);
   if (!error.empty())
-    return Response::ServerError(error.Utf8());
+    return protocol::Response::ServerError(error.Utf8());
   locale_override_.Set(locale);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorEmulationAgent::setTimezoneOverride(
+protocol::Response InspectorEmulationAgent::setTimezoneOverride(
     const String& timezone_id) {
   if (timezone_id == TimeZoneController::TimeZoneIdOverride()) {
     // Do nothing.
@@ -745,15 +749,15 @@
     }
     if (!timezone_override_) {
       return TimeZoneController::HasTimeZoneOverride()
-                 ? Response::ServerError(
+                 ? protocol::Response::ServerError(
                        "Timezone override is already in effect")
-                 : Response::InvalidParams("Invalid timezone id");
+                 : protocol::Response::InvalidParams("Invalid timezone id");
     }
   }
 
   timezone_id_override_.Set(timezone_id);
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorEmulationAgent::GetDisabledImageTypes(HashSet<String>* result) {
@@ -814,12 +818,12 @@
 
 void InspectorEmulationAgent::SetSystemThemeState() {}
 
-Response InspectorEmulationAgent::AssertPage() {
+protocol::Response InspectorEmulationAgent::AssertPage() {
   if (!web_local_frame_) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "Operation is only supported for pages, not workers");
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorEmulationAgent::Trace(Visitor* visitor) const {
@@ -843,9 +847,9 @@
       continue;
     }
     disabled_image_types_.Clear();
-    return Response::InvalidParams("Invalid image type");
+    return protocol::Response::InvalidParams("Invalid image type");
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 protocol::Response InspectorEmulationAgent::setAutomationOverride(
@@ -853,7 +857,7 @@
   if (enabled)
     InnerEnable();
   automation_override_.Set(enabled);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorEmulationAgent::ApplyAutomationOverride(bool& enabled) const {

third_party/blink/renderer/core/inspector/inspector_io_agent.cc

diff --git a/third_party/blink/renderer/core/inspector/inspector_io_agent.cc b/third_party/blink/renderer/core/inspector/inspector_io_agent.cc
index e166739..161edb25 100644
--- a/third_party/blink/renderer/core/inspector/inspector_io_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_io_agent.cc
@@ -10,34 +10,37 @@
 
 namespace blink {
 
-using protocol::Response;
-
 InspectorIOAgent::InspectorIOAgent(v8::Isolate* isolate,
                                    v8_inspector::V8InspectorSession* session)
     : isolate_(isolate), v8_session_(session) {}
 
 InspectorIOAgent::~InspectorIOAgent() = default;
 
-Response InspectorIOAgent::resolveBlob(const String& object_id, String* uuid) {
+protocol::Response InspectorIOAgent::resolveBlob(const String& object_id,
+                                                 String* uuid) {
   v8::HandleScope handles(isolate_);
   v8::Local<v8::Value> value;
   v8::Local<v8::Context> context;
   std::unique_ptr<v8_inspector::StringBuffer> error;
   if (!v8_session_->unwrapObject(&error, ToV8InspectorStringView(object_id),
-                                 &value, &context, nullptr))
-    return Response::ServerError(ToCoreString(std::move(error)).Utf8());
+                                 &value, &context, nullptr)) {
+    return protocol::Response::ServerError(
+        ToCoreString(std::move(error)).Utf8());
+  }
 
-  if (!V8Blob::HasInstance(value, isolate_))
-    return Response::ServerError("Object id doesn't reference a Blob");
+  if (!V8Blob::HasInstance(value, isolate_)) {
+    return protocol::Response::ServerError(
+        "Object id doesn't reference a Blob");
+  }
 
   Blob* blob = V8Blob::ToImpl(v8::Local<v8::Object>::Cast(value));
   if (!blob) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "Couldn't convert object with given objectId to Blob");
   }
 
   *uuid = blob->Uuid();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 }  // namespace blink

third_party/blink/renderer/core/inspector/inspector_layer_tree_agent.cc

diff --git a/third_party/blink/renderer/core/inspector/inspector_layer_tree_agent.cc b/third_party/blink/renderer/core/inspector/inspector_layer_tree_agent.cc
index 5279b84..74ced4e3 100644
--- a/third_party/blink/renderer/core/inspector/inspector_layer_tree_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_layer_tree_agent.cc
@@ -64,7 +64,6 @@
 
 using protocol::Array;
 using protocol::Maybe;
-using protocol::Response;
 unsigned InspectorLayerTreeAgent::last_snapshot_id_;
 
 inline String IdForLayer(const cc::Layer* layer) {
@@ -260,19 +259,19 @@
   // front-end request document and re-enable the agent manually after this.
 }
 
-Response InspectorLayerTreeAgent::enable() {
+protocol::Response InspectorLayerTreeAgent::enable() {
   instrumenting_agents_->AddInspectorLayerTreeAgent(this);
   if (auto* view = inspected_frames_->Root()->View()) {
     view->ScheduleAnimation();
-    return Response::Success();
+    return protocol::Response::Success();
   }
-  return Response::ServerError("The root frame doesn't have a view");
+  return protocol::Response::ServerError("The root frame doesn't have a view");
 }
 
-Response InspectorLayerTreeAgent::disable() {
+protocol::Response InspectorLayerTreeAgent::disable() {
   instrumenting_agents_->RemoveInspectorLayerTreeAgent(this);
   snapshot_by_id_.clear();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorLayerTreeAgent::LayerTreeDidChange() {
@@ -327,25 +326,26 @@
   return nullptr;
 }
 
-Response InspectorLayerTreeAgent::LayerById(const String& layer_id,
-                                            const cc::Layer*& result) {
+protocol::Response InspectorLayerTreeAgent::LayerById(
+    const String& layer_id,
+    const cc::Layer*& result) {
   bool ok;
   int id = layer_id.ToInt(&ok);
   if (!ok)
-    return Response::ServerError("Invalid layer id");
+    return protocol::Response::ServerError("Invalid layer id");
 
   result = FindLayerById(RootLayer(), id);
   if (!result)
-    return Response::ServerError("No layer matching given id found");
-  return Response::Success();
+    return protocol::Response::ServerError("No layer matching given id found");
+  return protocol::Response::Success();
 }
 
-Response InspectorLayerTreeAgent::compositingReasons(
+protocol::Response InspectorLayerTreeAgent::compositingReasons(
     const String& layer_id,
     std::unique_ptr<Array<String>>* compositing_reasons,
     std::unique_ptr<Array<String>>* compositing_reason_ids) {
   const cc::Layer* layer = nullptr;
-  Response response = LayerById(layer_id, layer);
+  protocol::Response response = LayerById(layer_id, layer);
   if (!response.IsSuccess())
     return response;
   *compositing_reasons = std::make_unique<protocol::Array<String>>();
@@ -361,11 +361,11 @@
     }
   }
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorLayerTreeAgent::makeSnapshot(const String& layer_id,
-                                               String* snapshot_id) {
+protocol::Response InspectorLayerTreeAgent::makeSnapshot(const String& layer_id,
+                                                         String* snapshot_id) {
   suppress_layer_paint_events_ = true;
 
   // If we hit a devtool break point in the middle of document lifecycle, for
@@ -375,7 +375,7 @@
                                                       ->GetDocument()
                                                       ->Lifecycle()
                                                       .LifecyclePostponed())
-    return Response::ServerError("Layer does not draw content");
+    return protocol::Response::ServerError("Layer does not draw content");
 
   inspected_frames_->Root()->View()->UpdateAllLifecyclePhases(
       DocumentUpdateReason::kInspector);
@@ -383,30 +383,34 @@
   suppress_layer_paint_events_ = false;
 
   const cc::Layer* layer = nullptr;
-  Response response = LayerById(layer_id, layer);
+  protocol::Response response = LayerById(layer_id, layer);
   if (!response.IsSuccess())
     return response;
   if (!layer->draws_content())
-    return Response::ServerError("Layer does not draw content");
+    return protocol::Response::ServerError("Layer does not draw content");
 
   auto picture = layer->GetPicture();
   if (!picture)
-    return Response::ServerError("Layer does not produce picture");
+    return protocol::Response::ServerError("Layer does not produce picture");
 
   auto snapshot = base::MakeRefCounted<PictureSnapshot>(std::move(picture));
   *snapshot_id = String::Number(++last_snapshot_id_);
   bool new_entry = snapshot_by_id_.insert(*snapshot_id, snapshot).is_new_entry;
   DCHECK(new_entry);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorLayerTreeAgent::loadSnapshot(
+protocol::Response InspectorLayerTreeAgent::loadSnapshot(
     std::unique_ptr<Array<protocol::LayerTree::PictureTile>> tiles,
     String* snapshot_id) {
-  if (tiles->empty())
-    return Response::ServerError("Invalid argument, no tiles provided");
-  if (tiles->size() > UINT_MAX)
-    return Response::ServerError("Invalid argument, too many tiles provided");
+  if (tiles->empty()) {
+    return protocol::Response::ServerError(
+        "Invalid argument, no tiles provided");
+  }
+  if (tiles->size() > UINT_MAX) {
+    return protocol::Response::ServerError(
+        "Invalid argument, too many tiles provided");
+  }
   wtf_size_t tiles_length = static_cast<wtf_size_t>(tiles->size());
   Vector<scoped_refptr<PictureSnapshot::TilePictureStream>> decoded_tiles;
   decoded_tiles.Grow(tiles_length);
@@ -421,49 +425,51 @@
   scoped_refptr<PictureSnapshot> snapshot =
       PictureSnapshot::Load(decoded_tiles);
   if (!snapshot)
-    return Response::ServerError("Invalid snapshot format");
+    return protocol::Response::ServerError("Invalid snapshot format");
   if (snapshot->IsEmpty())
-    return Response::ServerError("Empty snapshot");
+    return protocol::Response::ServerError("Empty snapshot");
 
   *snapshot_id = String::Number(++last_snapshot_id_);
   bool new_entry = snapshot_by_id_.insert(*snapshot_id, snapshot).is_new_entry;
   DCHECK(new_entry);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorLayerTreeAgent::releaseSnapshot(const String& snapshot_id) {
+protocol::Response InspectorLayerTreeAgent::releaseSnapshot(
+    const String& snapshot_id) {
   SnapshotById::iterator it = snapshot_by_id_.find(snapshot_id);
   if (it == snapshot_by_id_.end())
-    return Response::ServerError("Snapshot not found");
+    return protocol::Response::ServerError("Snapshot not found");
   snapshot_by_id_.erase(it);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorLayerTreeAgent::GetSnapshotById(
+protocol::Response InspectorLayerTreeAgent::GetSnapshotById(
     const String& snapshot_id,
     const PictureSnapshot*& result) {
   SnapshotById::iterator it = snapshot_by_id_.find(snapshot_id);
   if (it == snapshot_by_id_.end())
-    return Response::ServerError("Snapshot not found");
+    return protocol::Response::ServerError("Snapshot not found");
   result = it->value.get();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorLayerTreeAgent::replaySnapshot(const String& snapshot_id,
-                                                 Maybe<int> from_step,
-                                                 Maybe<int> to_step,
-                                                 Maybe<double> scale,
-                                                 String* data_url) {
+protocol::Response InspectorLayerTreeAgent::replaySnapshot(
+    const String& snapshot_id,
+    Maybe<int> from_step,
+    Maybe<int> to_step,
+    Maybe<double> scale,
+    String* data_url) {
   const PictureSnapshot* snapshot = nullptr;
-  Response response = GetSnapshotById(snapshot_id, snapshot);
+  protocol::Response response = GetSnapshotById(snapshot_id, snapshot);
   if (!response.IsSuccess())
     return response;
   auto png_data = snapshot->Replay(from_step.fromMaybe(0), to_step.fromMaybe(0),
                                    scale.fromMaybe(1.0));
   if (png_data.empty())
-    return Response::ServerError("Image encoding failed");
+    return protocol::Response::ServerError("Image encoding failed");
   *data_url = "data:image/png;base64," + Base64Encode(png_data);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 static void ParseRect(protocol::DOM::Rect* object, gfx::RectF* rect) {
@@ -471,14 +477,14 @@
                      object->getHeight());
 }
 
-Response InspectorLayerTreeAgent::profileSnapshot(
+protocol::Response InspectorLayerTreeAgent::profileSnapshot(
     const String& snapshot_id,
     Maybe<int> min_repeat_count,
     Maybe<double> min_duration,
     Maybe<protocol::DOM::Rect> clip_rect,
     std::unique_ptr<protocol::Array<protocol::Array<double>>>* out_timings) {
   const PictureSnapshot* snapshot = nullptr;
-  Response response = GetSnapshotById(snapshot_id, snapshot);
+  protocol::Response response = GetSnapshotById(snapshot_id, snapshot);
   if (!response.IsSuccess())
     return response;
   gfx::RectF rect;
@@ -494,14 +500,14 @@
       out_row->emplace_back(delta.InSecondsF());
     (*out_timings)->emplace_back(std::move(out_row));
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorLayerTreeAgent::snapshotCommandLog(
+protocol::Response InspectorLayerTreeAgent::snapshotCommandLog(
     const String& snapshot_id,
     std::unique_ptr<Array<protocol::DictionaryValue>>* command_log) {
   const PictureSnapshot* snapshot = nullptr;
-  Response response = GetSnapshotById(snapshot_id, snapshot);
+  protocol::Response response = GetSnapshotById(snapshot_id, snapshot);
   if (!response.IsSuccess())
     return response;
   protocol::ErrorSupport errors;
@@ -523,8 +529,8 @@
                                                              &errors);
   auto err = errors.Errors();
   if (err.empty())
-    return Response::Success();
-  return Response::ServerError(std::string(err.begin(), err.end()));
+    return protocol::Response::Success();
+  return protocol::Response::ServerError(std::string(err.begin(), err.end()));
 }
 
 }  // namespace blink

third_party/blink/renderer/core/inspector/inspector_log_agent.cc

diff --git a/third_party/blink/renderer/core/inspector/inspector_log_agent.cc b/third_party/blink/renderer/core/inspector/inspector_log_agent.cc
index 44d3238..ad5d09e 100644
--- a/third_party/blink/renderer/core/inspector/inspector_log_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_log_agent.cc
@@ -16,7 +16,6 @@
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 
 namespace blink {
-using protocol::Response;
 
 namespace {
 
@@ -192,26 +191,26 @@
     ConsoleMessageAdded(storage_->at(i));
 }
 
-Response InspectorLogAgent::enable() {
+protocol::Response InspectorLogAgent::enable() {
   if (enabled_.Get())
-    return Response::Success();
+    return protocol::Response::Success();
   enabled_.Set(true);
   InnerEnable();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorLogAgent::disable() {
+protocol::Response InspectorLogAgent::disable() {
   if (!enabled_.Get())
-    return Response::Success();
+    return protocol::Response::Success();
   enabled_.Clear();
   stopViolationsReport();
   instrumenting_agents_->RemoveInspectorLogAgent(this);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorLogAgent::clear() {
+protocol::Response InspectorLogAgent::clear() {
   storage_->Clear();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 static PerformanceMonitor::Violation ParseViolation(const String& name) {
@@ -232,12 +231,12 @@
   return PerformanceMonitor::kAfterLast;
 }
 
-Response InspectorLogAgent::startViolationsReport(
+protocol::Response InspectorLogAgent::startViolationsReport(
     std::unique_ptr<protocol::Array<ViolationSetting>> settings) {
   if (!enabled_.Get())
-    return Response::ServerError("Log is not enabled");
+    return protocol::Response::ServerError("Log is not enabled");
   if (!performance_monitor_) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "Violations are not supported for this target");
   }
   performance_monitor_->UnsubscribeAll(this);
@@ -252,17 +251,17 @@
                                     this);
     violation_thresholds_.Set(name, threshold);
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorLogAgent::stopViolationsReport() {
+protocol::Response InspectorLogAgent::stopViolationsReport() {
   violation_thresholds_.Clear();
   if (!performance_monitor_) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "Violations are not supported for this target");
   }
   performance_monitor_->UnsubscribeAll(this);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorLogAgent::ReportLongLayout(base::TimeDelta duration) {

third_party/blink/renderer/core/inspector/inspector_memory_agent.cc

diff --git a/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc b/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc
index 79bce018..f73fc79 100644
--- a/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc
@@ -49,26 +49,25 @@
 
 constexpr int kDefaultNativeMemorySamplingInterval = 128 * 1024;
 
-using protocol::Response;
-
 InspectorMemoryAgent::InspectorMemoryAgent(InspectedFrames* inspected_frames)
     : frames_(inspected_frames),
       sampling_profile_interval_(&agent_state_, /*default_value=*/0) {}
 
 InspectorMemoryAgent::~InspectorMemoryAgent() = default;
 
-Response InspectorMemoryAgent::getDOMCounters(int* documents,
-                                              int* nodes,
-                                              int* js_event_listeners) {
+protocol::Response InspectorMemoryAgent::getDOMCounters(
+    int* documents,
+    int* nodes,
+    int* js_event_listeners) {
   *documents =
       InstanceCounters::CounterValue(InstanceCounters::kDocumentCounter);
   *nodes = InstanceCounters::CounterValue(InstanceCounters::kNodeCounter);
   *js_event_listeners =
       InstanceCounters::CounterValue(InstanceCounters::kJSEventListenerCounter);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorMemoryAgent::forciblyPurgeJavaScriptMemory() {
+protocol::Response InspectorMemoryAgent::forciblyPurgeJavaScriptMemory() {
   for (const auto& page : Page::OrdinaryPages()) {
     for (Frame* frame = page->MainFrame(); frame;
          frame = frame->Tree().TraverseNext()) {
@@ -80,7 +79,7 @@
   }
   V8PerIsolateData::MainThreadIsolate()->MemoryPressureNotification(
       v8::MemoryPressureLevel::kCritical);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorMemoryAgent::Trace(Visitor* visitor) const {
@@ -94,13 +93,13 @@
                 protocol::Maybe<bool>());
 }
 
-Response InspectorMemoryAgent::startSampling(
+protocol::Response InspectorMemoryAgent::startSampling(
     protocol::Maybe<int> in_sampling_interval,
     protocol::Maybe<bool> in_suppressRandomness) {
   int interval =
       in_sampling_interval.fromMaybe(kDefaultNativeMemorySamplingInterval);
   if (interval <= 0)
-    return Response::ServerError("Invalid sampling rate.");
+    return protocol::Response::ServerError("Invalid sampling rate.");
   base::SamplingHeapProfiler::Get()->SetSamplingInterval(interval);
   sampling_profile_interval_.Set(interval);
   if (in_suppressRandomness.fromMaybe(false)) {
@@ -108,28 +107,28 @@
         base::PoissonAllocationSampler::ScopedSuppressRandomnessForTesting>();
   }
   profile_id_ = base::SamplingHeapProfiler::Get()->Start();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorMemoryAgent::stopSampling() {
+protocol::Response InspectorMemoryAgent::stopSampling() {
   if (sampling_profile_interval_.Get() == 0)
-    return Response::ServerError("Sampling profiler is not started.");
+    return protocol::Response::ServerError("Sampling profiler is not started.");
   base::SamplingHeapProfiler::Get()->Stop();
   sampling_profile_interval_.Clear();
   randomness_suppressor_.reset();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorMemoryAgent::getAllTimeSamplingProfile(
+protocol::Response InspectorMemoryAgent::getAllTimeSamplingProfile(
     std::unique_ptr<protocol::Memory::SamplingProfile>* out_profile) {
   *out_profile = GetSamplingProfileById(0);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorMemoryAgent::getSamplingProfile(
+protocol::Response InspectorMemoryAgent::getSamplingProfile(
     std::unique_ptr<protocol::Memory::SamplingProfile>* out_profile) {
   *out_profile = GetSamplingProfileById(profile_id_);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 std::unique_ptr<protocol::Memory::SamplingProfile>

third_party/blink/renderer/core/inspector/inspector_network_agent.cc

diff --git a/third_party/blink/renderer/core/inspector/inspector_network_agent.cc b/third_party/blink/renderer/core/inspector/inspector_network_agent.cc
index 7f3a18dd..3715244 100644
--- a/third_party/blink/renderer/core/inspector/inspector_network_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_network_agent.cc
@@ -114,7 +114,6 @@
     protocol::Network::Backend::GetRequestPostDataCallback;
 using GetResponseBodyCallback =
     protocol::Network::Backend::GetResponseBodyCallback;
-using protocol::Response;
 
 namespace {
 
@@ -259,7 +258,8 @@
     std::unique_ptr<GetResponseBodyCallback> callback,
     scoped_refptr<SharedBuffer> raw_data) {
   if (!raw_data) {
-    callback->sendFailure(Response::ServerError("Couldn't read BLOB"));
+    callback->sendFailure(
+        protocol::Response::ServerError("Couldn't read BLOB"));
     return;
   }
   String result;
@@ -268,7 +268,8 @@
           raw_data, mime_type, text_encoding_name, &result, &base64_encoded)) {
     callback->sendSuccess(result, base64_encoded);
   } else {
-    callback->sendFailure(Response::ServerError("Couldn't encode data"));
+    callback->sendFailure(
+        protocol::Response::ServerError("Couldn't encode data"));
   }
 }
 
@@ -1914,15 +1915,16 @@
       base::TimeTicks::Now().since_origin().InSecondsF());
 }
 
-Response InspectorNetworkAgent::enable(Maybe<int> total_buffer_size,
-                                       Maybe<int> resource_buffer_size,
-                                       Maybe<int> max_post_data_size) {
+protocol::Response InspectorNetworkAgent::enable(
+    Maybe<int> total_buffer_size,
+    Maybe<int> resource_buffer_size,
+    Maybe<int> max_post_data_size) {
   total_buffer_size_.Set(total_buffer_size.fromMaybe(kDefaultTotalBufferSize));
   resource_buffer_size_.Set(
       resource_buffer_size.fromMaybe(kDefaultResourceBufferSize));
   max_post_data_size_.Set(max_post_data_size.fromMaybe(0));
   Enable();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorNetworkAgent::Enable() {
@@ -1934,7 +1936,7 @@
   instrumenting_agents_->AddInspectorNetworkAgent(this);
 }
 
-Response InspectorNetworkAgent::disable() {
+protocol::Response InspectorNetworkAgent::disable() {
   DCHECK(!pending_request_type_);
   if (IsMainThread())
     GetNetworkStateNotifier().ClearOverride();
@@ -1942,10 +1944,10 @@
   agent_state_.ClearAllFields();
   resources_data_->Clear();
   clearAcceptedEncodingsOverride();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorNetworkAgent::setExtraHTTPHeaders(
+protocol::Response InspectorNetworkAgent::setExtraHTTPHeaders(
     std::unique_ptr<protocol::Network::Headers> headers) {
   extra_request_headers_.Clear();
   std::unique_ptr<protocol::DictionaryValue> in = headers->toValue();
@@ -1955,14 +1957,14 @@
     if (entry.second && entry.second->asString(&value))
       extra_request_headers_.Set(entry.first, value);
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorNetworkAgent::setAttachDebugStack(bool enabled) {
+protocol::Response InspectorNetworkAgent::setAttachDebugStack(bool enabled) {
   if (enabled && !enabled_.Get())
-    return Response::InvalidParams("Domain must be enabled");
+    return protocol::Response::InvalidParams("Domain must be enabled");
   attach_debug_stack_enabled_.Set(enabled);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 bool InspectorNetworkAgent::CanGetResponseBodyBlob(const String& request_id) {
@@ -1987,7 +1989,7 @@
   BlobDataHandle* blob = resource_data->DownloadedFileBlob();
   ExecutionContext* context = GetTargetExecutionContext();
   if (!context) {
-    callback->sendFailure(Response::InternalError());
+    callback->sendFailure(protocol::Response::InternalError());
     return;
   }
   InspectorFileReaderLoaderClient* client =
@@ -2009,7 +2011,8 @@
 
   String content;
   bool base64_encoded;
-  Response response = GetResponseBody(request_id, &content, &base64_encoded);
+  protocol::Response response =
+      GetResponseBody(request_id, &content, &base64_encoded);
   if (response.IsSuccess()) {
     callback->sendSuccess(content, base64_encoded);
   } else {
@@ -2017,26 +2020,28 @@
   }
 }
 
-Response InspectorNetworkAgent::setBlockedURLs(
+protocol::Response InspectorNetworkAgent::setBlockedURLs(
     std::unique_ptr<protocol::Array<String>> urls) {
   blocked_urls_.Clear();
   for (const String& url : *urls)
     blocked_urls_.Set(url, true);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorNetworkAgent::replayXHR(const String& request_id) {
+protocol::Response InspectorNetworkAgent::replayXHR(const String& request_id) {
   String actual_request_id = request_id;
 
   XHRReplayData* xhr_replay_data = resources_data_->XhrReplayData(request_id);
   auto* data = resources_data_->Data(request_id);
-  if (!xhr_replay_data || !data)
-    return Response::ServerError("Given id does not correspond to XHR");
+  if (!xhr_replay_data || !data) {
+    return protocol::Response::ServerError(
+        "Given id does not correspond to XHR");
+  }
 
   ExecutionContext* execution_context = xhr_replay_data->GetExecutionContext();
   if (!execution_context || execution_context->IsContextDestroyed()) {
     resources_data_->SetXHRReplayData(request_id, nullptr);
-    return Response::ServerError("Document is already detached");
+    return protocol::Response::ServerError("Document is already detached");
   }
 
   XMLHttpRequest* xhr = XMLHttpRequest::Create(execution_context);
@@ -2055,28 +2060,28 @@
                                  IGNORE_EXCEPTION_FOR_TESTING);
 
   replay_xhrs_.insert(xhr);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorNetworkAgent::canClearBrowserCache(bool* result) {
+protocol::Response InspectorNetworkAgent::canClearBrowserCache(bool* result) {
   *result = true;
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorNetworkAgent::canClearBrowserCookies(bool* result) {
+protocol::Response InspectorNetworkAgent::canClearBrowserCookies(bool* result) {
   *result = true;
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorNetworkAgent::setAcceptedEncodings(
+protocol::Response InspectorNetworkAgent::setAcceptedEncodings(
     std::unique_ptr<protocol::Array<protocol::Network::ContentEncoding>>
         encodings) {
   HashSet<String> accepted_encodings;
   for (const protocol::Network::ContentEncoding& encoding : *encodings) {
     absl::optional<String> value = AcceptedEncodingFromProtocol(encoding);
     if (!value) {
-      return Response::InvalidParams("Unknown encoding type: " +
-                                     encoding.Utf8());
+      return protocol::Response::InvalidParams("Unknown encoding type: " +
+                                               encoding.Utf8());
     }
     accepted_encodings.insert(value.value());
   }
@@ -2090,15 +2095,15 @@
   for (auto encoding : accepted_encodings)
     accepted_encodings_.Set(encoding, true);
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorNetworkAgent::clearAcceptedEncodingsOverride() {
+protocol::Response InspectorNetworkAgent::clearAcceptedEncodingsOverride() {
   accepted_encodings_.Clear();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorNetworkAgent::emulateNetworkConditions(
+protocol::Response InspectorNetworkAgent::emulateNetworkConditions(
     bool offline,
     double latency,
     double download_throughput,
@@ -2108,7 +2113,7 @@
   if (connection_type.isJust()) {
     type = ToWebConnectionType(connection_type.fromJust());
     if (type == kWebConnectionTypeUnknown)
-      return Response::ServerError("Unknown connection type");
+      return protocol::Response::ServerError("Unknown connection type");
   }
 
   if (worker_global_scope_) {
@@ -2123,33 +2128,34 @@
           FROM_HERE,
           CrossThreadBindOnce(SetNetworkStateOverride, offline, latency,
                               download_throughput, upload_throughput, type));
-      return Response::Success();
+      return protocol::Response::Success();
     }
-    return Response::ServerError("Not supported");
+    return protocol::Response::ServerError("Not supported");
   }
 
   SetNetworkStateOverride(offline, latency, download_throughput,
                           upload_throughput, type);
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorNetworkAgent::setCacheDisabled(bool cache_disabled) {
+protocol::Response InspectorNetworkAgent::setCacheDisabled(
+    bool cache_disabled) {
   // TODO(ananta)
   // We should extract network cache state into a global entity which can be
   // queried from FrameLoader and other places.
   cache_disabled_.Set(cache_disabled);
   if (cache_disabled && IsMainThread())
     MemoryCache::Get()->EvictResources();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorNetworkAgent::setBypassServiceWorker(bool bypass) {
+protocol::Response InspectorNetworkAgent::setBypassServiceWorker(bool bypass) {
   bypass_service_worker_.Set(bypass);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorNetworkAgent::getCertificate(
+protocol::Response InspectorNetworkAgent::getCertificate(
     const String& origin,
     std::unique_ptr<protocol::Array<String>>* certificate) {
   *certificate = std::make_unique<protocol::Array<String>>();
@@ -2168,10 +2174,10 @@
             ->push_back(
                 Base64Encode(net::x509_util::CryptoBufferAsSpan(buf.get())));
       }
-      return Response::Success();
+      return protocol::Response::Success();
     }
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorNetworkAgent::DidCommitLoad(LocalFrame* frame,
@@ -2203,23 +2209,25 @@
   frame_navigation_initiator_map_.erase(IdentifiersFactory::FrameId(frame));
 }
 
-Response InspectorNetworkAgent::GetResponseBody(const String& request_id,
-                                                String* content,
-                                                bool* base64_encoded) {
+protocol::Response InspectorNetworkAgent::GetResponseBody(
+    const String& request_id,
+    String* content,
+    bool* base64_encoded) {
   NetworkResourcesData::ResourceData const* resource_data =
       resources_data_->Data(request_id);
   if (!resource_data) {
-    return Response::ServerError("No resource with given identifier found");
+    return protocol::Response::ServerError(
+        "No resource with given identifier found");
   }
 
   if (resource_data->HasContent()) {
     *content = resource_data->Content();
     *base64_encoded = resource_data->Base64Encoded();
-    return Response::Success();
+    return protocol::Response::Success();
   }
 
   if (resource_data->IsContentEvicted()) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "Request content was evicted from inspector cache");
   }
 
@@ -2228,20 +2236,20 @@
         resource_data->Buffer(), resource_data->MimeType(),
         resource_data->TextEncodingName(), content, base64_encoded);
     DCHECK(success);
-    return Response::Success();
+    return protocol::Response::Success();
   }
 
   if (resource_data->CachedResource() &&
       InspectorPageAgent::CachedResourceContent(resource_data->CachedResource(),
                                                 content, base64_encoded)) {
-    return Response::Success();
+    return protocol::Response::Success();
   }
 
-  return Response::ServerError(
+  return protocol::Response::ServerError(
       "No data found for resource with given identifier");
 }
 
-Response InspectorNetworkAgent::searchInResponseBody(
+protocol::Response InspectorNetworkAgent::searchInResponseBody(
     const String& request_id,
     const String& query,
     Maybe<bool> case_sensitive,
@@ -2251,7 +2259,8 @@
         matches) {
   String content;
   bool base64_encoded;
-  Response response = GetResponseBody(request_id, &content, &base64_encoded);
+  protocol::Response response =
+      GetResponseBody(request_id, &content, &base64_encoded);
   if (!response.IsSuccess())
     return response;
 
@@ -2261,7 +2270,7 @@
   *matches = std::make_unique<
       protocol::Array<v8_inspector::protocol::Debugger::API::SearchMatch>>(
       std::move(results));
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 bool InspectorNetworkAgent::FetchResourceContent(Document* document,
@@ -2354,18 +2363,18 @@
       resources_data_->Data(request_id);
   if (!resource_data) {
     callback->sendFailure(
-        Response::ServerError("No resource with given id was found"));
+        protocol::Response::ServerError("No resource with given id was found"));
     return;
   }
   scoped_refptr<EncodedFormData> post_data = resource_data->PostData();
   if (!post_data || post_data->IsEmpty()) {
-    callback->sendFailure(
-        Response::ServerError("No post data available for the request"));
+    callback->sendFailure(protocol::Response::ServerError(
+        "No post data available for the request"));
     return;
   }
   ExecutionContext* context = GetTargetExecutionContext();
   if (!context) {
-    callback->sendFailure(Response::InternalError());
+    callback->sendFailure(protocol::Response::InternalError());
     return;
   }
   scoped_refptr<InspectorPostBodyParser> parser =

third_party/blink/renderer/core/inspector/inspector_overlay_agent.cc

diff --git a/third_party/blink/renderer/core/inspector/inspector_overlay_agent.cc b/third_party/blink/renderer/core/inspector/inspector_overlay_agent.cc
index be4713c7..6f1f76c 100644
--- a/third_party/blink/renderer/core/inspector/inspector_overlay_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_overlay_agent.cc
@@ -97,7 +97,6 @@
 namespace blink {
 
 using protocol::Maybe;
-using protocol::Response;
 
 namespace {
 
@@ -436,9 +435,9 @@
   disposed_ = true;
 }
 
-Response InspectorOverlayAgent::enable() {
+protocol::Response InspectorOverlayAgent::enable() {
   if (!dom_agent_->Enabled())
-    return Response::ServerError("DOM should be enabled first");
+    return protocol::Response::ServerError("DOM should be enabled first");
   enabled_.Set(true);
   if (backend_node_id_to_inspect_) {
     GetFrontend()->inspectNodeRequested(
@@ -446,7 +445,7 @@
   }
   backend_node_id_to_inspect_ = 0;
   SetNeedsUnbufferedInput(true);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorOverlayAgent::EnsureAXContext(Node* node) {
@@ -457,7 +456,7 @@
   }
 }
 
-Response InspectorOverlayAgent::disable() {
+protocol::Response InspectorOverlayAgent::disable() {
   enabled_.Clear();
   setShowAdHighlights(false);
   setShowViewportSizeOnResize(false);
@@ -485,19 +484,19 @@
   PickTheRightTool();
   SetNeedsUnbufferedInput(false);
   document_to_ax_context_.clear();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::setShowAdHighlights(bool show) {
+protocol::Response InspectorOverlayAgent::setShowAdHighlights(bool show) {
   show_ad_highlights_.Set(show);
   frame_impl_->ViewImpl()->GetPage()->GetSettings().SetHighlightAds(show);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::setShowDebugBorders(bool show) {
+protocol::Response InspectorOverlayAgent::setShowDebugBorders(bool show) {
   show_debug_borders_.Set(show);
   if (show) {
-    Response response = CompositingEnabled();
+    protocol::Response response = CompositingEnabled();
     if (!response.IsSuccess())
       return response;
   }
@@ -508,13 +507,13 @@
   else
     debug_state.show_debug_borders.reset();
   widget->SetLayerTreeDebugState(debug_state);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::setShowFPSCounter(bool show) {
+protocol::Response InspectorOverlayAgent::setShowFPSCounter(bool show) {
   show_fps_counter_.Set(show);
   if (show) {
-    Response response = CompositingEnabled();
+    protocol::Response response = CompositingEnabled();
     if (!response.IsSuccess())
       return response;
   }
@@ -522,13 +521,13 @@
   cc::LayerTreeDebugState debug_state = widget->GetLayerTreeDebugState();
   debug_state.show_fps_counter = show;
   widget->SetLayerTreeDebugState(debug_state);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::setShowPaintRects(bool show) {
+protocol::Response InspectorOverlayAgent::setShowPaintRects(bool show) {
   show_paint_rects_.Set(show);
   if (show) {
-    Response response = CompositingEnabled();
+    protocol::Response response = CompositingEnabled();
     if (!response.IsSuccess())
       return response;
   }
@@ -536,13 +535,13 @@
   cc::LayerTreeDebugState debug_state = widget->GetLayerTreeDebugState();
   debug_state.show_paint_rects = show;
   widget->SetLayerTreeDebugState(debug_state);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::setShowLayoutShiftRegions(bool show) {
+protocol::Response InspectorOverlayAgent::setShowLayoutShiftRegions(bool show) {
   show_layout_shift_regions_.Set(show);
   if (show) {
-    Response response = CompositingEnabled();
+    protocol::Response response = CompositingEnabled();
     if (!response.IsSuccess())
       return response;
   }
@@ -550,13 +549,14 @@
   cc::LayerTreeDebugState debug_state = widget->GetLayerTreeDebugState();
   debug_state.show_layout_shift_regions = show;
   widget->SetLayerTreeDebugState(debug_state);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::setShowScrollBottleneckRects(bool show) {
+protocol::Response InspectorOverlayAgent::setShowScrollBottleneckRects(
+    bool show) {
   show_scroll_bottleneck_rects_.Set(show);
   if (show) {
-    Response response = CompositingEnabled();
+    protocol::Response response = CompositingEnabled();
     if (!response.IsSuccess())
       return response;
   }
@@ -567,23 +567,24 @@
   debug_state.show_non_fast_scrollable_rects = show;
   debug_state.show_main_thread_scrolling_reason_rects = show;
   widget->SetLayerTreeDebugState(debug_state);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::setShowHitTestBorders(bool show) {
+protocol::Response InspectorOverlayAgent::setShowHitTestBorders(bool show) {
   // This CDP command has been deprecated. Don't do anything and return success.
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::setShowViewportSizeOnResize(bool show) {
+protocol::Response InspectorOverlayAgent::setShowViewportSizeOnResize(
+    bool show) {
   show_size_on_resize_.Set(show);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::setShowWebVitals(bool show) {
+protocol::Response InspectorOverlayAgent::setShowWebVitals(bool show) {
   show_web_vitals_.Set(show);
   if (show) {
-    Response response = CompositingEnabled();
+    protocol::Response response = CompositingEnabled();
     if (!response.IsSuccess())
       return response;
   }
@@ -591,17 +592,17 @@
   cc::LayerTreeDebugState debug_state = widget->GetLayerTreeDebugState();
   debug_state.show_web_vital_metrics = show;
   widget->SetLayerTreeDebugState(debug_state);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::setPausedInDebuggerMessage(
+protocol::Response InspectorOverlayAgent::setPausedInDebuggerMessage(
     Maybe<String> message) {
   paused_in_debugger_message_.Set(message.fromMaybe(String()));
   PickTheRightTool();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::highlightRect(
+protocol::Response InspectorOverlayAgent::highlightRect(
     int x,
     int y,
     int width,
@@ -616,20 +617,20 @@
       InspectorDOMAgent::ParseColor(outline_color.fromMaybe(nullptr))));
 }
 
-Response InspectorOverlayAgent::highlightQuad(
+protocol::Response InspectorOverlayAgent::highlightQuad(
     std::unique_ptr<protocol::Array<double>> quad_array,
     Maybe<protocol::DOM::RGBA> color,
     Maybe<protocol::DOM::RGBA> outline_color) {
   std::unique_ptr<gfx::QuadF> quad = std::make_unique<gfx::QuadF>();
   if (!ParseQuad(std::move(quad_array), quad.get()))
-    return Response::ServerError("Invalid Quad format");
+    return protocol::Response::ServerError("Invalid Quad format");
   return SetInspectTool(MakeGarbageCollected<QuadHighlightTool>(
       this, GetFrontend(), std::move(quad),
       InspectorDOMAgent::ParseColor(color.fromMaybe(nullptr)),
       InspectorDOMAgent::ParseColor(outline_color.fromMaybe(nullptr))));
 }
 
-Response InspectorOverlayAgent::setShowHinge(
+protocol::Response InspectorOverlayAgent::setShowHinge(
     protocol::Maybe<protocol::Overlay::HingeConfig> tool_config) {
   // Hide the hinge when called without a configuration.
   if (!tool_config.isJust()) {
@@ -637,7 +638,7 @@
     if (!inspect_tool_)
       DisableFrameOverlay();
     ScheduleUpdate();
-    return Response::Success();
+    return protocol::Response::Success();
   }
 
   // Create a hinge
@@ -648,7 +649,7 @@
   int width = rect->getWidth();
   int height = rect->getHeight();
   if (x < 0 || y < 0 || width < 0 || height < 0)
-    return Response::InvalidParams("Invalid hinge rectangle.");
+    return protocol::Response::InvalidParams("Invalid hinge rectangle.");
 
   // Use default color if a content color is not provided.
   Color content_color =
@@ -671,10 +672,10 @@
 
   ScheduleUpdate();
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::highlightNode(
+protocol::Response InspectorOverlayAgent::highlightNode(
     std::unique_ptr<protocol::Overlay::HighlightConfig>
         highlight_inspector_object,
     Maybe<int> node_id,
@@ -682,14 +683,15 @@
     Maybe<String> object_id,
     Maybe<String> selector_list) {
   Node* node = nullptr;
-  Response response =
+  protocol::Response response =
       dom_agent_->AssertNode(node_id, backend_node_id, object_id, node);
   if (!response.IsSuccess())
     return response;
 
   if (node->GetDocument().Lifecycle().GetState() <=
       DocumentLifecycle::LifecycleState::kInactive) {
-    return Response::InvalidRequest("The node's document is not active");
+    return protocol::Response::InvalidRequest(
+        "The node's document is not active");
   }
 
   std::unique_ptr<InspectorHighlightConfig> highlight_config;
@@ -703,7 +705,7 @@
       std::move(highlight_config)));
 }
 
-Response InspectorOverlayAgent::setShowGridOverlays(
+protocol::Response InspectorOverlayAgent::setShowGridOverlays(
     std::unique_ptr<protocol::Array<protocol::Overlay::GridNodeHighlightConfig>>
         grid_node_highlight_configs) {
   if (!persistent_tool_) {
@@ -716,7 +718,8 @@
   for (std::unique_ptr<protocol::Overlay::GridNodeHighlightConfig>& config :
        *grid_node_highlight_configs) {
     Node* node = nullptr;
-    Response response = dom_agent_->AssertNode(config->getNodeId(), node);
+    protocol::Response response =
+        dom_agent_->AssertNode(config->getNodeId(), node);
     if (!response.IsSuccess())
       return response;
     configs.insert(node, InspectorOverlayAgent::ToGridHighlightConfig(
@@ -727,10 +730,10 @@
 
   PickTheRightTool();
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::setShowFlexOverlays(
+protocol::Response InspectorOverlayAgent::setShowFlexOverlays(
     std::unique_ptr<protocol::Array<protocol::Overlay::FlexNodeHighlightConfig>>
         flex_node_highlight_configs) {
   if (!persistent_tool_) {
@@ -745,7 +748,8 @@
   for (std::unique_ptr<protocol::Overlay::FlexNodeHighlightConfig>& config :
        *flex_node_highlight_configs) {
     Node* node = nullptr;
-    Response response = dom_agent_->AssertNode(config->getNodeId(), node);
+    protocol::Response response =
+        dom_agent_->AssertNode(config->getNodeId(), node);
     if (!response.IsSuccess())
       return response;
     configs.insert(node, InspectorOverlayAgent::ToFlexContainerHighlightConfig(
@@ -756,10 +760,10 @@
 
   PickTheRightTool();
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::setShowScrollSnapOverlays(
+protocol::Response InspectorOverlayAgent::setShowScrollSnapOverlays(
     std::unique_ptr<
         protocol::Array<protocol::Overlay::ScrollSnapHighlightConfig>>
         scroll_snap_highlight_configs) {
@@ -775,7 +779,8 @@
   for (std::unique_ptr<protocol::Overlay::ScrollSnapHighlightConfig>& config :
        *scroll_snap_highlight_configs) {
     Node* node = nullptr;
-    Response response = dom_agent_->AssertNode(config->getNodeId(), node);
+    protocol::Response response =
+        dom_agent_->AssertNode(config->getNodeId(), node);
     if (!response.IsSuccess())
       return response;
     configs.insert(node,
@@ -787,10 +792,10 @@
 
   PickTheRightTool();
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::setShowContainerQueryOverlays(
+protocol::Response InspectorOverlayAgent::setShowContainerQueryOverlays(
     std::unique_ptr<
         protocol::Array<protocol::Overlay::ContainerQueryHighlightConfig>>
         container_query_highlight_configs) {
@@ -806,7 +811,8 @@
   for (std::unique_ptr<protocol::Overlay::ContainerQueryHighlightConfig>&
            config : *container_query_highlight_configs) {
     Node* node = nullptr;
-    Response response = dom_agent_->AssertNode(config->getNodeId(), node);
+    protocol::Response response =
+        dom_agent_->AssertNode(config->getNodeId(), node);
     if (!response.IsSuccess())
       return response;
     configs.insert(
@@ -818,10 +824,10 @@
 
   PickTheRightTool();
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::setShowIsolatedElements(
+protocol::Response InspectorOverlayAgent::setShowIsolatedElements(
     std::unique_ptr<
         protocol::Array<protocol::Overlay::IsolatedElementHighlightConfig>>
         isolated_element_highlight_configs) {
@@ -839,7 +845,8 @@
            config : *isolated_element_highlight_configs) {
     Element* element = nullptr;
     // Isolation mode can only be triggered on elements
-    Response response = dom_agent_->AssertElement(config->getNodeId(), element);
+    protocol::Response response =
+        dom_agent_->AssertElement(config->getNodeId(), element);
     if (!response.IsSuccess())
       return response;
     configs.insert(element,
@@ -852,17 +859,17 @@
 
   PickTheRightTool();
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::highlightSourceOrder(
+protocol::Response InspectorOverlayAgent::highlightSourceOrder(
     std::unique_ptr<protocol::Overlay::SourceOrderConfig>
         source_order_inspector_object,
     Maybe<int> node_id,
     Maybe<int> backend_node_id,
     Maybe<String> object_id) {
   Node* node = nullptr;
-  Response response =
+  protocol::Response response =
       dom_agent_->AssertNode(node_id, backend_node_id, object_id, node);
   if (!response.IsSuccess())
     return response;
@@ -876,7 +883,7 @@
       this, GetFrontend(), node, std::move(source_order_config)));
 }
 
-Response InspectorOverlayAgent::highlightFrame(
+protocol::Response InspectorOverlayAgent::highlightFrame(
     const String& frame_id,
     Maybe<protocol::DOM::RGBA> color,
     Maybe<protocol::DOM::RGBA> outline_color) {
@@ -884,10 +891,10 @@
       IdentifiersFactory::FrameById(inspected_frames_, frame_id);
   // FIXME: Inspector doesn't currently work cross process.
   if (!frame)
-    return Response::ServerError("Invalid frame id");
+    return protocol::Response::ServerError("Invalid frame id");
   if (!frame->DeprecatedLocalOwner()) {
     PickTheRightTool();
-    return Response::Success();
+    return protocol::Response::Success();
   }
 
   std::unique_ptr<InspectorHighlightConfig> highlight_config =
@@ -903,14 +910,14 @@
       std::move(highlight_config)));
 }
 
-Response InspectorOverlayAgent::hideHighlight() {
+protocol::Response InspectorOverlayAgent::hideHighlight() {
   if (inspect_tool_ && inspect_tool_->HideOnHideHighlight())
     PickTheRightTool();
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::getHighlightObjectForTest(
+protocol::Response InspectorOverlayAgent::getHighlightObjectForTest(
     int node_id,
     Maybe<bool> include_distance,
     Maybe<bool> include_style,
@@ -918,7 +925,7 @@
     Maybe<bool> show_accessibility_info,
     std::unique_ptr<protocol::DictionaryValue>* result) {
   Node* node = nullptr;
-  Response response = dom_agent_->AssertNode(node_id, node);
+  protocol::Response response = dom_agent_->AssertNode(node_id, node);
   if (!response.IsSuccess())
     return response;
 
@@ -943,10 +950,10 @@
       node, DocumentUpdateReason::kInspector);
   *result = tool.GetNodeInspectorHighlightAsJson(
       true /* append_element_info */, include_distance.fromMaybe(false));
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::getGridHighlightObjectsForTest(
+protocol::Response InspectorOverlayAgent::getGridHighlightObjectsForTest(
     std::unique_ptr<protocol::Array<int>> node_ids,
     std::unique_ptr<protocol::DictionaryValue>* highlights) {
   PersistentTool persistent_tool(this, GetFrontend());
@@ -955,7 +962,7 @@
       configs;
   for (const int node_id : *node_ids) {
     Node* node = nullptr;
-    Response response = dom_agent_->AssertNode(node_id, node);
+    protocol::Response response = dom_agent_->AssertNode(node_id, node);
     if (!response.IsSuccess())
       return response;
     configs.insert(node, std::make_unique<InspectorGridHighlightConfig>(
@@ -963,14 +970,14 @@
   }
   persistent_tool.SetGridConfigs(std::move(configs));
   *highlights = persistent_tool.GetGridInspectorHighlightsAsJson();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorOverlayAgent::getSourceOrderHighlightObjectForTest(
+protocol::Response InspectorOverlayAgent::getSourceOrderHighlightObjectForTest(
     int node_id,
     std::unique_ptr<protocol::DictionaryValue>* result) {
   Node* node = nullptr;
-  Response response = dom_agent_->AssertNode(node_id, node);
+  protocol::Response response = dom_agent_->AssertNode(node_id, node);
   if (!response.IsSuccess())
     return response;
 
@@ -979,7 +986,7 @@
 
   SourceOrderTool tool(this, GetFrontend(), node, std::move(config));
   *result = tool.GetNodeInspectorSourceOrderHighlightAsJson();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorOverlayAgent::UpdatePrePaint() {
@@ -1421,14 +1428,14 @@
   ScheduleUpdate();
 }
 
-Response InspectorOverlayAgent::CompositingEnabled() {
+protocol::Response InspectorOverlayAgent::CompositingEnabled() {
   bool main_frame = frame_impl_->ViewImpl() && !frame_impl_->Parent();
   if (!main_frame || !frame_impl_->ViewImpl()
                           ->GetPage()
                           ->GetSettings()
                           .GetAcceleratedCompositingEnabled())
-    return Response::ServerError("Compositing mode is not supported");
-  return Response::Success();
+    return protocol::Response::ServerError("Compositing mode is not supported");
+  return protocol::Response::Success();
 }
 
 bool InspectorOverlayAgent::InSomeInspectMode() {
@@ -1455,7 +1462,7 @@
   GetFrontend()->inspectNodeRequested(IdentifiersFactory::IntIdForNode(node));
 }
 
-Response InspectorOverlayAgent::setInspectMode(
+protocol::Response InspectorOverlayAgent::setInspectMode(
     const String& mode,
     Maybe<protocol::Overlay::HighlightConfig> highlight_inspector_object) {
   if (mode != protocol::Overlay::InspectModeEnum::None &&
@@ -1463,7 +1470,7 @@
       mode != protocol::Overlay::InspectModeEnum::SearchForUAShadowDOM &&
       mode != protocol::Overlay::InspectModeEnum::CaptureAreaScreenshot &&
       mode != protocol::Overlay::InspectModeEnum::ShowDistances) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         String("Unknown mode \"" + mode + "\" was provided.").Utf8());
   }
 
@@ -1472,14 +1479,14 @@
     highlight_inspector_object.fromJust()->AppendSerialized(&serialized_config);
   }
   std::unique_ptr<InspectorHighlightConfig> config;
-  Response response = HighlightConfigFromInspectorObject(
+  protocol::Response response = HighlightConfigFromInspectorObject(
       std::move(highlight_inspector_object), &config);
   if (!response.IsSuccess())
     return response;
   inspect_mode_.Set(mode);
   inspect_mode_protocol_config_.Set(serialized_config);
   PickTheRightTool();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorOverlayAgent::PickTheRightTool() {
@@ -1544,21 +1551,22 @@
     DisableFrameOverlay();
 }
 
-Response InspectorOverlayAgent::SetInspectTool(InspectTool* inspect_tool) {
+protocol::Response InspectorOverlayAgent::SetInspectTool(
+    InspectTool* inspect_tool) {
   ClearInspectTool();
 
   if (!inspect_tool)
-    return Response::Success();
+    return protocol::Response::Success();
 
   if (!enabled_.Get()) {
-    return Response::InvalidRequest(
+    return protocol::Response::InvalidRequest(
         "Overlay must be enabled before a tool can be shown");
   }
 
   LocalFrameView* view = frame_impl_->GetFrameView();
   LocalFrame* frame = GetFrame();
   if (!view || !frame)
-    return Response::InternalError();
+    return protocol::Response::InternalError();
 
   inspect_tool_ = inspect_tool;
   // If the tool supports persistent overlays, the resources of the persistent
@@ -1567,7 +1575,7 @@
   EvaluateInOverlay("setOverlay", inspect_tool->GetOverlayName());
   EnsureEnableFrameOverlay();
   ScheduleUpdate();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 InspectorSourceOrderConfig
@@ -1583,11 +1591,11 @@
   return source_order_config;
 }
 
-Response InspectorOverlayAgent::HighlightConfigFromInspectorObject(
+protocol::Response InspectorOverlayAgent::HighlightConfigFromInspectorObject(
     Maybe<protocol::Overlay::HighlightConfig> highlight_inspector_object,
     std::unique_ptr<InspectorHighlightConfig>* out_config) {
   if (!highlight_inspector_object.isJust()) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "Internal error: highlight configuration parameter is missing");
   }
   protocol::Overlay::HighlightConfig* config =
@@ -1599,11 +1607,11 @@
 
   if (format != ColorFormatEnum::Rgb && format != ColorFormatEnum::Hex &&
       format != ColorFormatEnum::Hsl && format != ColorFormatEnum::Hwb) {
-    return Response::InvalidParams("Unknown color format");
+    return protocol::Response::InvalidParams("Unknown color format");
   }
 
   *out_config = InspectorOverlayAgent::ToHighlightConfig(config);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 // static

third_party/blink/renderer/core/inspector/inspector_page_agent.cc

diff --git a/third_party/blink/renderer/core/inspector/inspector_page_agent.cc b/third_party/blink/renderer/core/inspector/inspector_page_agent.cc
index 8419f1c..8f4b06c5 100644
--- a/third_party/blink/renderer/core/inspector/inspector_page_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_page_agent.cc
@@ -100,8 +100,6 @@
 
 namespace blink {
 
-using protocol::Response;
-
 namespace {
 
 String ClientNavigationReasonToProtocol(ClientNavigationReason reason) {
@@ -537,13 +535,13 @@
   }
 }
 
-Response InspectorPageAgent::enable() {
+protocol::Response InspectorPageAgent::enable() {
   enabled_.Set(true);
   instrumenting_agents_->AddInspectorPageAgent(this);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorPageAgent::disable() {
+protocol::Response InspectorPageAgent::disable() {
   agent_state_.ClearAllFields();
   pending_isolated_worlds_.clear();
   script_to_evaluate_on_load_once_ = String();
@@ -556,10 +554,10 @@
   ad_script_identifiers_.clear();
   stopScreencast();
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorPageAgent::addScriptToEvaluateOnNewDocument(
+protocol::Response InspectorPageAgent::addScriptToEvaluateOnNewDocument(
     const String& source,
     Maybe<String> world_name,
     Maybe<bool> include_command_line_api,
@@ -589,34 +587,35 @@
     }
   }
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorPageAgent::removeScriptToEvaluateOnNewDocument(
+protocol::Response InspectorPageAgent::removeScriptToEvaluateOnNewDocument(
     const String& identifier) {
   if (scripts_to_evaluate_on_load_.Get(identifier).IsNull())
-    return Response::ServerError("Script not found");
+    return protocol::Response::ServerError("Script not found");
   scripts_to_evaluate_on_load_.Clear(identifier);
   worlds_to_evaluate_on_load_.Clear(identifier);
   include_command_line_api_for_scripts_to_evaluate_on_load_.Clear(identifier);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorPageAgent::addScriptToEvaluateOnLoad(const String& source,
-                                                       String* identifier) {
+protocol::Response InspectorPageAgent::addScriptToEvaluateOnLoad(
+    const String& source,
+    String* identifier) {
   return addScriptToEvaluateOnNewDocument(source, Maybe<String>(""),
                                           Maybe<bool>(false), identifier);
 }
 
-Response InspectorPageAgent::removeScriptToEvaluateOnLoad(
+protocol::Response InspectorPageAgent::removeScriptToEvaluateOnLoad(
     const String& identifier) {
   return removeScriptToEvaluateOnNewDocument(identifier);
 }
 
-Response InspectorPageAgent::setLifecycleEventsEnabled(bool enabled) {
+protocol::Response InspectorPageAgent::setLifecycleEventsEnabled(bool enabled) {
   lifecycle_events_enabled_.Set(enabled);
   if (!enabled)
-    return Response::Success();
+    return protocol::Response::Success();
 
   for (LocalFrame* frame : *inspected_frames_) {
     Document* document = frame->GetDocument();
@@ -659,24 +658,24 @@
     }
   }
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorPageAgent::setAdBlockingEnabled(bool enable) {
-  return Response::Success();
+protocol::Response InspectorPageAgent::setAdBlockingEnabled(bool enable) {
+  return protocol::Response::Success();
 }
 
-Response InspectorPageAgent::reload(
+protocol::Response InspectorPageAgent::reload(
     Maybe<bool> optional_bypass_cache,
     Maybe<String> optional_script_to_evaluate_on_load) {
   pending_script_to_evaluate_on_load_once_ =
       optional_script_to_evaluate_on_load.fromMaybe("");
   v8_session_->setSkipAllPauses(true);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorPageAgent::stopLoading() {
-  return Response::Success();
+protocol::Response InspectorPageAgent::stopLoading() {
+  return protocol::Response::Success();
 }
 
 static void CachedResourcesForDocument(Document* document,
@@ -707,16 +706,16 @@
   return result;
 }
 
-Response InspectorPageAgent::getResourceTree(
+protocol::Response InspectorPageAgent::getResourceTree(
     std::unique_ptr<protocol::Page::FrameResourceTree>* object) {
   *object = BuildObjectForResourceTree(inspected_frames_->Root());
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorPageAgent::getFrameTree(
+protocol::Response InspectorPageAgent::getFrameTree(
     std::unique_ptr<protocol::Page::FrameTree>* object) {
   *object = BuildObjectForFrameTree(inspected_frames_->Root());
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorPageAgent::GetResourceContentAfterResourcesContentLoaded(
@@ -726,7 +725,8 @@
   LocalFrame* frame =
       IdentifiersFactory::FrameById(inspected_frames_, frame_id);
   if (!frame) {
-    callback->sendFailure(Response::ServerError("No frame for given id found"));
+    callback->sendFailure(
+        protocol::Response::ServerError("No frame for given id found"));
     return;
   }
   String content;
@@ -737,7 +737,7 @@
     callback->sendSuccess(content, base64_encoded);
   } else {
     callback->sendFailure(
-        Response::ServerError("No resource with given URL found"));
+        protocol::Response::ServerError("No resource with given URL found"));
   }
 }
 
@@ -746,7 +746,8 @@
     const String& url,
     std::unique_ptr<GetResourceContentCallback> callback) {
   if (!enabled_.Get()) {
-    callback->sendFailure(Response::ServerError("Agent is not enabled."));
+    callback->sendFailure(
+        protocol::Response::ServerError("Agent is not enabled."));
     return;
   }
   inspector_resource_content_loader_->EnsureResourcesContentLoaded(
@@ -770,7 +771,7 @@
             .build();
   }
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorPageAgent::SearchContentAfterResourcesContentLoaded(
@@ -783,7 +784,8 @@
   LocalFrame* frame =
       IdentifiersFactory::FrameById(inspected_frames_, frame_id);
   if (!frame) {
-    callback->sendFailure(Response::ServerError("No frame for given id found"));
+    callback->sendFailure(
+        protocol::Response::ServerError("No frame for given id found"));
     return;
   }
   String content;
@@ -792,7 +794,7 @@
           CachedResource(frame, KURL(url), inspector_resource_content_loader_),
           &content, &base64_encoded)) {
     callback->sendFailure(
-        Response::ServerError("No resource with given URL found"));
+        protocol::Response::ServerError("No resource with given URL found"));
     return;
   }
 
@@ -813,7 +815,8 @@
     Maybe<bool> optional_is_regex,
     std::unique_ptr<SearchInResourceCallback> callback) {
   if (!enabled_.Get()) {
-    callback->sendFailure(Response::ServerError("Agent is not enabled."));
+    callback->sendFailure(
+        protocol::Response::ServerError("Agent is not enabled."));
     return;
   }
   inspector_resource_content_loader_->EnsureResourcesContentLoaded(
@@ -825,11 +828,11 @@
           optional_is_regex.fromMaybe(false), std::move(callback)));
 }
 
-Response InspectorPageAgent::setBypassCSP(bool enabled) {
+protocol::Response InspectorPageAgent::setBypassCSP(bool enabled) {
   LocalFrame* frame = inspected_frames_->Root();
   frame->GetSettings()->SetBypassCSP(enabled);
   bypass_csp_enabled_.Set(enabled);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 namespace {
@@ -862,7 +865,7 @@
 }
 }  // namespace
 
-Response InspectorPageAgent::getPermissionsPolicyState(
+protocol::Response InspectorPageAgent::getPermissionsPolicyState(
     const String& frame_id,
     std::unique_ptr<
         protocol::Array<protocol::Page::PermissionsPolicyFeatureState>>*
@@ -870,14 +873,16 @@
   LocalFrame* frame =
       IdentifiersFactory::FrameById(inspected_frames_, frame_id);
 
-  if (!frame)
-    return Response::ServerError("No frame for given id found in this target");
+  if (!frame) {
+    return protocol::Response::ServerError(
+        "No frame for given id found in this target");
+  }
 
   const blink::PermissionsPolicy* permissions_policy =
       frame->GetSecurityContext()->GetPermissionsPolicy();
 
   if (!permissions_policy)
-    return Response::ServerError("Frame not ready");
+    return protocol::Response::ServerError("Frame not ready");
 
   auto feature_states = std::make_unique<
       protocol::Array<protocol::Page::PermissionsPolicyFeatureState>>();
@@ -906,21 +911,24 @@
   }
 
   *states = std::move(feature_states);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorPageAgent::setDocumentContent(const String& frame_id,
-                                                const String& html) {
+protocol::Response InspectorPageAgent::setDocumentContent(
+    const String& frame_id,
+    const String& html) {
   LocalFrame* frame =
       IdentifiersFactory::FrameById(inspected_frames_, frame_id);
   if (!frame)
-    return Response::ServerError("No frame for given id found");
+    return protocol::Response::ServerError("No frame for given id found");
 
   Document* document = frame->GetDocument();
-  if (!document)
-    return Response::ServerError("No Document instance to set HTML for");
+  if (!document) {
+    return protocol::Response::ServerError(
+        "No Document instance to set HTML for");
+  }
   document->SetContent(html);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorPageAgent::DidNavigateWithinDocument(LocalFrame* frame) {
@@ -1525,21 +1533,22 @@
   return result;
 }
 
-Response InspectorPageAgent::startScreencast(Maybe<String> format,
-                                             Maybe<int> quality,
-                                             Maybe<int> max_width,
-                                             Maybe<int> max_height,
-                                             Maybe<int> every_nth_frame) {
+protocol::Response InspectorPageAgent::startScreencast(
+    Maybe<String> format,
+    Maybe<int> quality,
+    Maybe<int> max_width,
+    Maybe<int> max_height,
+    Maybe<int> every_nth_frame) {
   screencast_enabled_.Set(true);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorPageAgent::stopScreencast() {
+protocol::Response InspectorPageAgent::stopScreencast() {
   screencast_enabled_.Set(false);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorPageAgent::getLayoutMetrics(
+protocol::Response InspectorPageAgent::getLayoutMetrics(
     std::unique_ptr<protocol::Page::LayoutViewport>* out_layout_viewport,
     std::unique_ptr<protocol::Page::VisualViewport>* out_visual_viewport,
     std::unique_ptr<protocol::DOM::Rect>* out_content_size,
@@ -1634,7 +1643,7 @@
           .setScale(scale)
           .setZoom(page_zoom_factor)
           .build();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorPageAgent::createIsolatedWorld(
@@ -1646,7 +1655,7 @@
       IdentifiersFactory::FrameById(inspected_frames_, frame_id);
   if (!frame) {
     callback->sendFailure(
-        Response::InvalidParams("No frame for given id found"));
+        protocol::Response::InvalidParams("No frame for given id found"));
     return;
   }
   if (frame->IsProvisional()) {
@@ -1654,7 +1663,7 @@
     // won't work!
     if (!enabled_.Get()) {
       callback->sendFailure(
-          Response::ServerError("Agent needs to be enabled first"));
+          protocol::Response::ServerError("Agent needs to be enabled first"));
       return;
     }
     pending_isolated_worlds_.insert(frame, Vector<IsolatedWorldRequest>())
@@ -1678,7 +1687,7 @@
       EnsureDOMWrapperWorld(&frame, world_name, grant_universal_access);
   if (!world) {
     callback->sendFailure(
-        Response::ServerError("Could not create isolated world"));
+        protocol::Response::ServerError("Could not create isolated world"));
     return;
   }
 
@@ -1690,15 +1699,15 @@
       isolated_world_window_proxy->ContextIfInitialized()));
 }
 
-Response InspectorPageAgent::setFontFamilies(
+protocol::Response InspectorPageAgent::setFontFamilies(
     GenericFontFamilySettings& family_settings,
     const protocol::Array<protocol::Page::ScriptFontFamilies>&
         script_font_families) {
   for (const auto& entry : script_font_families) {
     UScriptCode script = ScriptNameToCode(entry->getScript());
     if (script == USCRIPT_INVALID_CODE) {
-      return Response::InvalidParams("Invalid script name: " +
-                                     entry->getScript().Utf8());
+      return protocol::Response::InvalidParams("Invalid script name: " +
+                                               entry->getScript().Utf8());
     }
     auto* font_families = entry->getFontFamilies();
     if (font_families->hasStandard()) {
@@ -1730,19 +1739,22 @@
                                  script);
     }
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorPageAgent::setFontFamilies(
+protocol::Response InspectorPageAgent::setFontFamilies(
     std::unique_ptr<protocol::Page::FontFamilies> font_families,
     Maybe<protocol::Array<protocol::Page::ScriptFontFamilies>> for_scripts) {
   LocalFrame* frame = inspected_frames_->Root();
   auto* settings = frame->GetSettings();
-  if (!settings)
-    return Response::ServerError("No settings");
+  if (!settings) {
+    return protocol::Response::ServerError("No settings");
+  }
 
-  if (!script_font_families_cbor_.Get().empty())
-    return Response::ServerError("Font families can only be set once");
+  if (!script_font_families_cbor_.Get().empty()) {
+    return protocol::Response::ServerError(
+        "Font families can only be set once");
+  }
 
   if (!for_scripts.isJust()) {
     for_scripts =
@@ -1764,10 +1776,10 @@
                                                       &serialized);
   script_font_families_cbor_.Set(serialized);
   settings->NotifyGenericFontFamilyChange();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorPageAgent::setFontSizes(
+protocol::Response InspectorPageAgent::setFontSizes(
     std::unique_ptr<protocol::Page::FontSizes> font_sizes) {
   LocalFrame* frame = inspected_frames_->Root();
   auto* settings = frame->GetSettings();
@@ -1782,7 +1794,7 @@
     }
   }
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorPageAgent::ApplyCompilationModeOverride(
@@ -1855,45 +1867,47 @@
       element ? Maybe<int>(DOMNodeIds::IdForNode(element)) : Maybe<int>());
 }
 
-Response InspectorPageAgent::produceCompilationCache(
+protocol::Response InspectorPageAgent::produceCompilationCache(
     std::unique_ptr<protocol::Array<protocol::Page::CompilationCacheParams>>
         scripts) {
   if (!enabled_.Get())
-    return Response::ServerError("Agent needs to be enabled first");
+    return protocol::Response::ServerError("Agent needs to be enabled first");
   for (const auto& script : *scripts) {
     requested_compilation_cache_.Set(script->getUrl(), script->getEager(false));
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorPageAgent::addCompilationCache(const String& url,
-                                                 const protocol::Binary& data) {
+protocol::Response InspectorPageAgent::addCompilationCache(
+    const String& url,
+    const protocol::Binary& data) {
   // TODO(caseq): this is temporary undocumented behavior, remove after m91.
   if (!data.size()) {
     requested_compilation_cache_.Set(url, true);
   } else {
     compilation_cache_.Set(url, data);
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorPageAgent::clearCompilationCache() {
+protocol::Response InspectorPageAgent::clearCompilationCache() {
   compilation_cache_.clear();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorPageAgent::waitForDebugger() {
+protocol::Response InspectorPageAgent::waitForDebugger() {
   client_->WaitForDebugger();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorPageAgent::setInterceptFileChooserDialog(bool enabled) {
+protocol::Response InspectorPageAgent::setInterceptFileChooserDialog(
+    bool enabled) {
   intercept_file_chooser_.Set(enabled);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorPageAgent::generateTestReport(const String& message,
-                                                Maybe<String> group) {
+protocol::Response InspectorPageAgent::generateTestReport(const String& message,
+                                                          Maybe<String> group) {
   LocalDOMWindow* window = inspected_frames_->Root()->DomWindow();
 
   // Construct the test report.
@@ -1904,7 +1918,7 @@
   // Send the test report to any ReportingObservers.
   ReportingContext::From(window)->QueueReport(report);
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorPageAgent::Trace(Visitor* visitor) const {
@@ -1915,7 +1929,7 @@
   InspectorBaseAgent::Trace(visitor);
 }
 
-Response InspectorPageAgent::getOriginTrials(
+protocol::Response InspectorPageAgent::getOriginTrials(
     const String& frame_id,
     std::unique_ptr<protocol::Array<protocol::Page::OriginTrial>>*
         originTrials) {
@@ -1923,11 +1937,11 @@
       IdentifiersFactory::FrameById(inspected_frames_, frame_id);
 
   if (!frame)
-    return Response::InvalidParams("Invalid frame id");
+    return protocol::Response::InvalidParams("Invalid frame id");
 
   *originTrials = CreateOriginTrials(frame->DomWindow());
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 }  // namespace blink

third_party/blink/renderer/core/inspector/inspector_performance_agent.cc

diff --git a/third_party/blink/renderer/core/inspector/inspector_performance_agent.cc b/third_party/blink/renderer/core/inspector/inspector_performance_agent.cc
index 968251a..1beafa3 100644
--- a/third_party/blink/renderer/core/inspector/inspector_performance_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_performance_agent.cc
@@ -24,8 +24,6 @@
 
 namespace TimeDomain = protocol::Performance::SetTimeDomain::TimeDomainEnum;
 
-using protocol::Response;
-
 namespace {
 constexpr bool isPlural(const char* str, int len) {
   return len > 1 && str[len - 2] == 's';
@@ -87,29 +85,29 @@
   String time_domain = optional_time_domain.fromMaybe(TimeDomain::TimeTicks);
   if (enabled_.Get()) {
     if (!HasTimeDomain(time_domain)) {
-      return Response::ServerError(
+      return protocol::Response::ServerError(
           "Cannot change time domain while performance metrics collection is "
           "enabled.");
     }
-    return Response::Success();
+    return protocol::Response::Success();
   }
 
-  Response response = InnerSetTimeDomain(time_domain);
+  protocol::Response response = InnerSetTimeDomain(time_domain);
   if (!response.IsSuccess())
     return response;
 
   enabled_.Set(true);
   InnerEnable();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 protocol::Response InspectorPerformanceAgent::disable() {
   if (!enabled_.Get())
-    return Response::Success();
+    return protocol::Response::Success();
   enabled_.Clear();
   instrumenting_agents_->RemoveInspectorPerformanceAgent(this);
   Thread::Current()->RemoveTaskTimeObserver(this);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 namespace {
@@ -124,9 +122,10 @@
 }  // namespace
 
 // TODO(crbug.com/1056306): remove this redundant API.
-Response InspectorPerformanceAgent::setTimeDomain(const String& time_domain) {
+protocol::Response InspectorPerformanceAgent::setTimeDomain(
+    const String& time_domain) {
   if (enabled_.Get()) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "Cannot set time domain while performance metrics collection"
         " is enabled.");
   }
@@ -154,35 +153,35 @@
                                  : time_domain == TimeDomain::TimeTicks;
 }
 
-Response InspectorPerformanceAgent::InnerSetTimeDomain(
+protocol::Response InspectorPerformanceAgent::InnerSetTimeDomain(
     const String& time_domain) {
   DCHECK(!enabled_.Get());
 
   if (time_domain == TimeDomain::TimeTicks) {
     use_thread_ticks_.Clear();
-    return Response::Success();
+    return protocol::Response::Success();
   }
 
   if (time_domain == TimeDomain::ThreadTicks) {
     if (!base::ThreadTicks::IsSupported()) {
-      return Response::ServerError(
+      return protocol::Response::ServerError(
           "Thread time is not supported on this platform.");
     }
     base::ThreadTicks::WaitUntilInitialized();
     use_thread_ticks_.Set(true);
-    return Response::Success();
+    return protocol::Response::Success();
   }
 
-  return Response::ServerError("Invalid time domain specification.");
+  return protocol::Response::ServerError("Invalid time domain specification.");
 }
 
-Response InspectorPerformanceAgent::getMetrics(
+protocol::Response InspectorPerformanceAgent::getMetrics(
     std::unique_ptr<protocol::Array<protocol::Performance::Metric>>*
         out_result) {
   if (!enabled_.Get()) {
     *out_result =
         std::make_unique<protocol::Array<protocol::Performance::Metric>>();
-    return Response::Success();
+    return protocol::Response::Success();
   }
 
   auto result =
@@ -272,7 +271,7 @@
   }
 
   *out_result = std::move(result);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorPerformanceAgent::ConsoleTimeStamp(const String& title) {

third_party/blink/renderer/core/inspector/inspector_performance_timeline_agent.cc

diff --git a/third_party/blink/renderer/core/inspector/inspector_performance_timeline_agent.cc b/third_party/blink/renderer/core/inspector/inspector_performance_timeline_agent.cc
index dc08f3e..d9f6f38 100644
--- a/third_party/blink/renderer/core/inspector/inspector_performance_timeline_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_performance_timeline_agent.cc
@@ -113,8 +113,6 @@
 
 }  // namespace
 
-using protocol::Response;
-
 InspectorPerformanceTimelineAgent::InspectorPerformanceTimelineAgent(
     InspectedFrames* inspected_frames)
     : inspected_frames_(inspected_frames),
@@ -169,7 +167,8 @@
         PerformanceEntry::ToEntryTypeEnum(type_atomic);
     if (type_enum == PerformanceEntry::EntryType::kInvalid ||
         (type_enum & kSupportedTypes) != type_enum) {
-      return Response::InvalidParams("Unknown or unsupported entry type");
+      return protocol::Response::InvalidParams(
+          "Unknown or unsupported entry type");
     }
 
     // Gather buffered entries for types that haven't been enabled previously
@@ -187,13 +186,13 @@
   for (auto& event : buffered_events)
     GetFrontend()->timelineEventAdded(std::move(event));
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 protocol::Response InspectorPerformanceTimelineAgent::disable() {
   enabled_types_.Clear();
   instrumenting_agents_->RemoveInspectorPerformanceTimelineAgent(this);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 bool InspectorPerformanceTimelineAgent::IsEnabled() const {

third_party/blink/renderer/core/inspector/inspector_preload_agent.cc

diff --git a/third_party/blink/renderer/core/inspector/inspector_preload_agent.cc b/third_party/blink/renderer/core/inspector/inspector_preload_agent.cc
index feb92d94..ca499264 100644
--- a/third_party/blink/renderer/core/inspector/inspector_preload_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_preload_agent.cc
@@ -13,8 +13,6 @@
 
 namespace blink {
 
-using protocol::Response;
-
 namespace {
 
 absl::optional<protocol::Preload::RuleSetErrorType> GetProtocolRuleSetErrorType(
@@ -246,13 +244,13 @@
 
 protocol::Response InspectorPreloadAgent::enable() {
   EnableInternal();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 protocol::Response InspectorPreloadAgent::disable() {
   enabled_.Clear();
   instrumenting_agents_->RemoveInspectorPreloadAgent(this);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorPreloadAgent::EnableInternal() {

third_party/blink/renderer/core/inspector/legacy_dom_snapshot_agent.cc

diff --git a/third_party/blink/renderer/core/inspector/legacy_dom_snapshot_agent.cc b/third_party/blink/renderer/core/inspector/legacy_dom_snapshot_agent.cc
index 1658414..ec3b9cf 100644
--- a/third_party/blink/renderer/core/inspector/legacy_dom_snapshot_agent.cc
+++ b/third_party/blink/renderer/core/inspector/legacy_dom_snapshot_agent.cc
@@ -42,7 +42,6 @@
 
 namespace blink {
 using protocol::Maybe;
-using protocol::Response;
 
 namespace {
 
@@ -101,7 +100,7 @@
 
 LegacyDOMSnapshotAgent::~LegacyDOMSnapshotAgent() = default;
 
-Response LegacyDOMSnapshotAgent::GetSnapshot(
+protocol::Response LegacyDOMSnapshotAgent::GetSnapshot(
     Document* document,
     std::unique_ptr<protocol::Array<String>> style_filter,
     protocol::Maybe<bool> include_event_listeners,
@@ -147,7 +146,7 @@
   computed_styles_map_.reset();
   css_property_filter_.reset();
   paint_order_map_ = nullptr;
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 int LegacyDOMSnapshotAgent::VisitNode(Node* node,

third_party/blink/renderer/core/intersection_observer/intersection_observer.cc

diff --git a/third_party/blink/renderer/core/intersection_observer/intersection_observer.cc b/third_party/blink/renderer/core/intersection_observer/intersection_observer.cc
index a022377..9abc009 100644
--- a/third_party/blink/renderer/core/intersection_observer/intersection_observer.cc
+++ b/third_party/blink/renderer/core/intersection_observer/intersection_observer.cc
@@ -273,7 +273,8 @@
     bool always_report_root_bounds,
     MarginTarget margin_target,
     bool use_overflow_clip_edge)
-    : ExecutionContextClient(delegate.GetExecutionContext()),
+    : ActiveScriptWrappable<IntersectionObserver>({}),
+      ExecutionContextClient(delegate.GetExecutionContext()),
       delegate_(&delegate),
       root_(root),
       thresholds_(thresholds),

third_party/blink/renderer/core/layout/scrollbars_test.cc

diff --git a/third_party/blink/renderer/core/layout/scrollbars_test.cc b/third_party/blink/renderer/core/layout/scrollbars_test.cc
index f6687fc..86ab6b66 100644
--- a/third_party/blink/renderer/core/layout/scrollbars_test.cc
+++ b/third_party/blink/renderer/core/layout/scrollbars_test.cc
@@ -2272,7 +2272,9 @@
 
   PaintLayer* paint_layer = scrollable_div->Layer();
   ASSERT_TRUE(paint_layer);
-  EXPECT_TRUE(scrollable_div->UsesCompositedScrolling());
+  if (!RuntimeEnabledFeatures::CompositeScrollAfterPaintEnabled()) {
+    EXPECT_TRUE(scrollable_div->UsesCompositedScrolling());
+  }
 
   div->setAttribute(html_names::kClassAttr, "hide");
   document.UpdateStyleAndLayout(DocumentUpdateReason::kTest);

third_party/blink/renderer/core/messaging/message_port.cc

diff --git a/third_party/blink/renderer/core/messaging/message_port.cc b/third_party/blink/renderer/core/messaging/message_port.cc
index b38bbd1d..515143a8 100644
--- a/third_party/blink/renderer/core/messaging/message_port.cc
+++ b/third_party/blink/renderer/core/messaging/message_port.cc
@@ -60,7 +60,8 @@
 namespace blink {
 
 MessagePort::MessagePort(ExecutionContext& execution_context)
-    : ExecutionContextLifecycleObserver(execution_context.IsContextDestroyed()
+    : ActiveScriptWrappable<MessagePort>({}),
+      ExecutionContextLifecycleObserver(execution_context.IsContextDestroyed()
                                             ? nullptr
                                             : &execution_context),
       // Ports in a destroyed context start out in a closed state.

third_party/blink/renderer/core/mojo/mojo_watcher.cc

diff --git a/third_party/blink/renderer/core/mojo/mojo_watcher.cc b/third_party/blink/renderer/core/mojo/mojo_watcher.cc
index 33ba0ae..e7913aa 100644
--- a/third_party/blink/renderer/core/mojo/mojo_watcher.cc
+++ b/third_party/blink/renderer/core/mojo/mojo_watcher.cc
@@ -66,7 +66,8 @@
 
 MojoWatcher::MojoWatcher(ExecutionContext* context,
                          V8MojoWatchCallback* callback)
-    : ExecutionContextLifecycleObserver(context),
+    : ActiveScriptWrappable<MojoWatcher>({}),
+      ExecutionContextLifecycleObserver(context),
       task_runner_(context->GetTaskRunner(TaskType::kInternalDefault)),
       callback_(callback) {}
 

third_party/blink/renderer/core/mojo/test/mojo_interface_interceptor.cc

diff --git a/third_party/blink/renderer/core/mojo/test/mojo_interface_interceptor.cc b/third_party/blink/renderer/core/mojo/test/mojo_interface_interceptor.cc
index ee43ee58..831898a 100644
--- a/third_party/blink/renderer/core/mojo/test/mojo_interface_interceptor.cc
+++ b/third_party/blink/renderer/core/mojo/test/mojo_interface_interceptor.cc
@@ -155,7 +155,8 @@
 MojoInterfaceInterceptor::MojoInterfaceInterceptor(ExecutionContext* context,
                                                    const String& interface_name,
                                                    Scope::Enum scope)
-    : ExecutionContextLifecycleObserver(context),
+    : ActiveScriptWrappable<MojoInterfaceInterceptor>({}),
+      ExecutionContextLifecycleObserver(context),
       interface_name_(interface_name),
       scope_(scope) {}
 

third_party/blink/renderer/core/page/scrolling/main_thread_scrolling_reasons_test.cc

diff --git a/third_party/blink/renderer/core/page/scrolling/main_thread_scrolling_reasons_test.cc b/third_party/blink/renderer/core/page/scrolling/main_thread_scrolling_reasons_test.cc
index aec01e37..cb215f75 100644
--- a/third_party/blink/renderer/core/page/scrolling/main_thread_scrolling_reasons_test.cc
+++ b/third_party/blink/renderer/core/page/scrolling/main_thread_scrolling_reasons_test.cc
@@ -79,6 +79,17 @@
         .FindNodeFromElementId(layer->element_id());
   }
 
+  const cc::ScrollNode* GetScrollNode(
+      const PaintLayerScrollableArea& scrollable_area) const {
+    return GetFrame()
+        ->View()
+        ->RootCcLayer()
+        ->layer_tree_host()
+        ->property_trees()
+        ->scroll_tree()
+        .FindNodeFromElementId(scrollable_area.GetScrollElementId());
+  }
+
   bool IsScrollable(const cc::Layer* layer) const {
     return GetScrollNode(layer)->scrollable;
   }
@@ -383,14 +394,16 @@
     NavigateTo(base_url_ + "two_scrollable_area.html");
   }
 
+  uint32_t GetMainThreadScrollingReasons(
+      const PaintLayerScrollableArea& scrollable_area) const {
+    if (RuntimeEnabledFeatures::CompositeScrollAfterPaintEnabled()) {
+      return GetScrollNode(scrollable_area)->main_thread_scrolling_reasons;
+    }
+    return scrollable_area.GetNonCompositedMainThreadScrollingReasons();
+  }
+
   void TestNonCompositedReasons(const AtomicString& style_class,
                                 const uint32_t reason) {
-    if (RuntimeEnabledFeatures::CompositeScrollAfterPaintEnabled() && reason) {
-      // TODO(crbug.com/1414885): We need a new way to test non-composited
-      // main thread scrolling reasons.
-      return;
-    }
-
     GetFrame()->GetSettings()->SetPreferCompositingToLCDTextForTesting(false);
     Document* document = GetFrame()->GetDocument();
     Element* container = document->getElementById("scroller1");
@@ -399,31 +412,30 @@
     PaintLayerScrollableArea* scrollable_area = GetScrollableArea(*container);
     ASSERT_TRUE(scrollable_area);
     EXPECT_NO_MAIN_THREAD_SCROLLING_REASON(
-        scrollable_area->GetNonCompositedMainThreadScrollingReasons());
+        GetMainThreadScrollingReasons(*scrollable_area));
 
     container->classList().Add(style_class);
     ForceFullCompositingUpdate();
 
     ASSERT_TRUE(scrollable_area);
     EXPECT_MAIN_THREAD_SCROLLING_REASON(
-        reason, scrollable_area->GetNonCompositedMainThreadScrollingReasons());
+        reason, GetMainThreadScrollingReasons(*scrollable_area));
 
     Element* container2 = document->getElementById("scroller2");
     PaintLayerScrollableArea* scrollable_area2 = GetScrollableArea(*container2);
     ASSERT_TRUE(scrollable_area2);
     // Different scrollable area should remain unaffected.
     EXPECT_NO_MAIN_THREAD_SCROLLING_REASON(
-        scrollable_area2->GetNonCompositedMainThreadScrollingReasons());
+        GetMainThreadScrollingReasons(*scrollable_area2));
 
     EXPECT_NO_MAIN_THREAD_SCROLLING_REASON(GetViewMainThreadScrollingReasons());
 
     // Remove class from the scroller 1 would lead to scroll on impl.
-
     container->classList().Remove(style_class);
     ForceFullCompositingUpdate();
 
     EXPECT_NO_MAIN_THREAD_SCROLLING_REASON(
-        scrollable_area->GetNonCompositedMainThreadScrollingReasons());
+        GetMainThreadScrollingReasons(*scrollable_area));
     EXPECT_NO_MAIN_THREAD_SCROLLING_REASON(GetViewMainThreadScrollingReasons());
 
     // Add target attribute would again lead to scroll on main thread
@@ -431,7 +443,7 @@
     ForceFullCompositingUpdate();
 
     EXPECT_MAIN_THREAD_SCROLLING_REASON(
-        reason, scrollable_area->GetNonCompositedMainThreadScrollingReasons());
+        reason, GetMainThreadScrollingReasons(*scrollable_area));
     EXPECT_NO_MAIN_THREAD_SCROLLING_REASON(GetViewMainThreadScrollingReasons());
 
     if ((reason & kLCDTextRelatedReasons) &&
@@ -439,7 +451,7 @@
       GetFrame()->GetSettings()->SetPreferCompositingToLCDTextForTesting(true);
       ForceFullCompositingUpdate();
       EXPECT_NO_MAIN_THREAD_SCROLLING_REASON(
-          scrollable_area->GetNonCompositedMainThreadScrollingReasons());
+          GetMainThreadScrollingReasons(*scrollable_area));
       EXPECT_NO_MAIN_THREAD_SCROLLING_REASON(
           GetViewMainThreadScrollingReasons());
     }
@@ -468,7 +480,10 @@
        CantPaintScrollingBackgroundTest) {
   TestNonCompositedReasons(
       "cant-paint-scrolling-background",
-      cc::MainThreadScrollingReason::kCantPaintScrollingBackgroundAndLCDText);
+      RuntimeEnabledFeatures::CompositeScrollAfterPaintEnabled()
+          ? cc::MainThreadScrollingReason::kNotOpaqueForTextAndLCDText
+          : cc::MainThreadScrollingReason::
+                kCantPaintScrollingBackgroundAndLCDText);
 }
 
 TEST_P(NonCompositedMainThreadScrollingReasonsTest, ClipTest) {
@@ -489,7 +504,10 @@
 TEST_P(NonCompositedMainThreadScrollingReasonsTest, InsetBoxShadowTest) {
   TestNonCompositedReasons(
       "inset-box-shadow",
-      cc::MainThreadScrollingReason::kCantPaintScrollingBackgroundAndLCDText);
+      RuntimeEnabledFeatures::CompositeScrollAfterPaintEnabled()
+          ? cc::MainThreadScrollingReason::kNotOpaqueForTextAndLCDText
+          : cc::MainThreadScrollingReason::
+                kCantPaintScrollingBackgroundAndLCDText);
 }
 
 TEST_P(NonCompositedMainThreadScrollingReasonsTest, StackingContextTest) {
@@ -511,23 +529,27 @@
   Document* document = GetFrame()->GetDocument();
   Element* container = document->getElementById("scroller1");
   ASSERT_TRUE(container);
-  container->setAttribute("class", "composited transparent",
+  container->setAttribute("class", "scroller composited transparent",
                           ASSERT_NO_EXCEPTION);
   ForceFullCompositingUpdate();
 
   PaintLayerScrollableArea* scrollable_area = GetScrollableArea(*container);
   ASSERT_TRUE(scrollable_area);
   EXPECT_NO_MAIN_THREAD_SCROLLING_REASON(
-      scrollable_area->GetNonCompositedMainThreadScrollingReasons());
+      GetMainThreadScrollingReasons(*scrollable_area));
 
   Element* container2 = document->getElementById("scroller2");
   ASSERT_TRUE(container2);
-  container2->setAttribute("class", "composited border-radius",
+  container2->setAttribute("class", "scroller composited border-radius",
                            ASSERT_NO_EXCEPTION);
   ForceFullCompositingUpdate();
   PaintLayerScrollableArea* scrollable_area2 = GetScrollableArea(*container2);
   ASSERT_TRUE(scrollable_area2);
-  ASSERT_TRUE(scrollable_area2->UsesCompositedScrolling());
+  if (RuntimeEnabledFeatures::CompositeScrollAfterPaintEnabled()) {
+    EXPECT_TRUE(GetScrollNode(*scrollable_area2)->is_composited);
+  } else {
+    ASSERT_TRUE(scrollable_area2->UsesCompositedScrolling());
+  }
 }
 
 }  // namespace blink

third_party/blink/renderer/core/page/scrolling/scroll_metrics_test.cc

diff --git a/third_party/blink/renderer/core/page/scrolling/scroll_metrics_test.cc b/third_party/blink/renderer/core/page/scrolling/scroll_metrics_test.cc
index 38459f34..3daa237 100644
--- a/third_party/blink/renderer/core/page/scrolling/scroll_metrics_test.cc
+++ b/third_party/blink/renderer/core/page/scrolling/scroll_metrics_test.cc
@@ -17,21 +17,33 @@
 #include "third_party/blink/renderer/platform/testing/testing_platform_support.h"
 #include "third_party/blink/renderer/platform/testing/unit_test_helpers.h"
 
-#define EXPECT_WHEEL_BUCKET(index, count) \
-  histogram_tester->ExpectBucketCount(    \
-      "Renderer4.MainThreadWheelScrollReason2", index, count);
+#define EXPECT_WHEEL_BUCKET(index, count)                        \
+  do {                                                           \
+    SCOPED_TRACE("EXPECT_WHEEL_BUCKET");                         \
+    histogram_tester->ExpectBucketCount(                         \
+        "Renderer4.MainThreadWheelScrollReason2", index, count); \
+  } while (false)
 
-#define EXPECT_TOUCH_BUCKET(index, count) \
-  histogram_tester->ExpectBucketCount(    \
-      "Renderer4.MainThreadGestureScrollReason2", index, count);
+#define EXPECT_TOUCH_BUCKET(index, count)                          \
+  do {                                                             \
+    SCOPED_TRACE("EXPECT_TOUCH_BUCKET");                           \
+    histogram_tester->ExpectBucketCount(                           \
+        "Renderer4.MainThreadGestureScrollReason2", index, count); \
+  } while (false)
 
-#define EXPECT_WHEEL_TOTAL(count)                                              \
-  histogram_tester->ExpectTotalCount("Renderer4.MainThreadWheelScrollReason2", \
-                                     count);
+#define EXPECT_WHEEL_TOTAL(count)                         \
+  do {                                                    \
+    SCOPED_TRACE("EXPECT_WHEEL_TOTAL");                   \
+    histogram_tester->ExpectTotalCount(                   \
+        "Renderer4.MainThreadWheelScrollReason2", count); \
+  } while (false)
 
-#define EXPECT_TOUCH_TOTAL(count)     \
-  histogram_tester->ExpectTotalCount( \
-      "Renderer4.MainThreadGestureScrollReason2", count);
+#define EXPECT_TOUCH_TOTAL(count)                           \
+  do {                                                      \
+    SCOPED_TRACE("EXPECT_TOUCH_TOTAL");                     \
+    histogram_tester->ExpectTotalCount(                     \
+        "Renderer4.MainThreadGestureScrollReason2", count); \
+  } while (false)
 
 namespace blink {
 

third_party/blink/renderer/core/paint/compositing/compositing_reason_finder_test.cc

diff --git a/third_party/blink/renderer/core/paint/compositing/compositing_reason_finder_test.cc b/third_party/blink/renderer/core/paint/compositing/compositing_reason_finder_test.cc
index 5965b4e..ca3b538 100644
--- a/third_party/blink/renderer/core/paint/compositing/compositing_reason_finder_test.cc
+++ b/third_party/blink/renderer/core/paint/compositing/compositing_reason_finder_test.cc
@@ -340,10 +340,17 @@
   iframe->contentDocument()->body()->setAttribute(html_names::kStyleAttr,
                                                   "height: 2000px");
   UpdateAllLifecyclePhasesForTest();
-  EXPECT_TRUE(iframe_layer->GetScrollableArea()->NeedsCompositedScrolling());
-  EXPECT_REASONS(
-      CompositingReason::kIFrame | CompositingReason::kOverflowScrolling,
-      DirectReasonsForPaintProperties(*iframe_layout_view));
+  if (RuntimeEnabledFeatures::CompositeScrollAfterPaintEnabled()) {
+    EXPECT_REASONS(CompositingReason::kIFrame,
+                   DirectReasonsForPaintProperties(*iframe_layout_view));
+    EXPECT_TRUE(CompositingReasonFinder::ShouldForcePreferCompositingToLCDText(
+        *iframe_layout_view, CompositingReason::kIFrame));
+  } else {
+    EXPECT_TRUE(iframe_layer->GetScrollableArea()->NeedsCompositedScrolling());
+    EXPECT_REASONS(
+        CompositingReason::kIFrame | CompositingReason::kOverflowScrolling,
+        DirectReasonsForPaintProperties(*iframe_layout_view));
+  }
 }
 
 TEST_P(CompositingReasonFinderTest,
@@ -542,7 +549,9 @@
   auto* target = GetLayoutObjectByElementId("target");
   EXPECT_TRUE(CompositingReasonFinder::ShouldForcePreferCompositingToLCDText(
       *target, CompositingReason::kNone));
-  EXPECT_REASONS(CompositingReason::kOverflowScrolling,
+  EXPECT_REASONS(RuntimeEnabledFeatures::CompositeScrollAfterPaintEnabled()
+                     ? CompositingReason::kNone
+                     : CompositingReason::kOverflowScrolling,
                  DirectReasonsForPaintProperties(*target));
 
   GetDocument().getElementById("target")->RemoveInlineStyleProperty(

third_party/blink/renderer/core/paint/paint_layer_scrollable_area.cc

diff --git a/third_party/blink/renderer/core/paint/paint_layer_scrollable_area.cc b/third_party/blink/renderer/core/paint/paint_layer_scrollable_area.cc
index 3e0e7d6..fb3433bc 100644
--- a/third_party/blink/renderer/core/paint/paint_layer_scrollable_area.cc
+++ b/third_party/blink/renderer/core/paint/paint_layer_scrollable_area.cc
@@ -2462,11 +2462,13 @@
   const auto* box = GetLayoutBox();
   auto new_background_paint_location =
       box->ComputeBackgroundPaintLocationIfComposited();
-  bool needs_composited_scrolling = ComputeNeedsCompositedScrollingInternal(
-      new_background_paint_location, force_prefer_compositing_to_lcd_text);
-  if (!RuntimeEnabledFeatures::CompositeScrollAfterPaintEnabled() &&
-      !needs_composited_scrolling) {
-    new_background_paint_location = kBackgroundPaintInBorderBoxSpace;
+  bool needs_composited_scrolling = false;
+  if (!RuntimeEnabledFeatures::CompositeScrollAfterPaintEnabled()) {
+    needs_composited_scrolling = ComputeNeedsCompositedScrollingInternal(
+        new_background_paint_location, force_prefer_compositing_to_lcd_text);
+    if (!needs_composited_scrolling) {
+      new_background_paint_location = kBackgroundPaintInBorderBoxSpace;
+    }
   }
   box->GetMutableForPainting().SetBackgroundPaintLocation(
       new_background_paint_location);
@@ -2477,6 +2479,7 @@
 bool PaintLayerScrollableArea::ComputeNeedsCompositedScrollingInternal(
     BackgroundPaintLocation background_paint_location_if_composited,
     bool force_prefer_compositing_to_lcd_text) {
+  DCHECK(!RuntimeEnabledFeatures::CompositeScrollAfterPaintEnabled());
   DCHECK_EQ(background_paint_location_if_composited,
             GetLayoutBox()->ComputeBackgroundPaintLocationIfComposited());
 
@@ -2491,10 +2494,6 @@
   if (force_prefer_compositing_to_lcd_text) {
     return true;
   }
-  if (RuntimeEnabledFeatures::CompositeScrollAfterPaintEnabled()) {
-    // We'll decide composited scrolling in PaintArtifactCompositor later.
-    return false;
-  }
   if (RuntimeEnabledFeatures::PreferNonCompositedScrollingEnabled()) {
     return false;
   }

third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h

diff --git a/third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h b/third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h
index 7f02706b..037a6cc 100644
--- a/third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h
+++ b/third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h
@@ -507,7 +507,7 @@
   void InvalidateAllStickyConstraints();
   void InvalidatePaintForStickyDescendants();
 
-  uint32_t GetNonCompositedMainThreadScrollingReasons() {
+  uint32_t GetNonCompositedMainThreadScrollingReasons() const {
     return non_composited_main_thread_scrolling_reasons_;
   }
 

third_party/blink/renderer/core/paint/paint_property_tree_builder.cc

diff --git a/third_party/blink/renderer/core/paint/paint_property_tree_builder.cc b/third_party/blink/renderer/core/paint/paint_property_tree_builder.cc
index db76b7d..b368262 100644
--- a/third_party/blink/renderer/core/paint/paint_property_tree_builder.cc
+++ b/third_party/blink/renderer/core/paint/paint_property_tree_builder.cc
@@ -2330,6 +2330,8 @@
         object_.GetFrameView()->RemoveUserScrollableArea(scrollable_area);
       }
 
+      state.prefers_composited_scrolling =
+          full_context_.prefers_composited_scrolling;
       state.main_thread_scrolling_reasons = GetMainThreadScrollingReasons();
 
       state.compositor_element_id = scrollable_area->GetScrollElementId();
@@ -2488,7 +2490,8 @@
       // was also updated in LayerTreeHost::ApplyCompositorChanges.
       if (effective_change_type <=
               PaintPropertyChangeType::kChangedOnlySimpleValues &&
-          properties_->ScrollTranslation()->HasDirectCompositingReasons() &&
+          (RuntimeEnabledFeatures::CompositeScrollAfterPaintEnabled() ||
+           properties_->ScrollTranslation()->HasDirectCompositingReasons()) &&
           // In platform code, only scroll translations with scroll nodes are
           // treated as scroll translations with overlap testing treatment.
           // A scroll translation for overflow:hidden doesn't have a scroll node
@@ -3146,9 +3149,11 @@
   context_.was_main_thread_scrolling = false;
   if (const auto* box = DynamicTo<LayoutBox>(object_)) {
     if (auto* scrollable_area = box->GetScrollableArea()) {
-      scrollable_area->UpdateNeedsCompositedScrolling(
+      context_.prefers_composited_scrolling =
           CompositingReasonFinder::ShouldForcePreferCompositingToLCDText(
-              object_, context_.direct_compositing_reasons));
+              object_, context_.direct_compositing_reasons);
+      scrollable_area->UpdateNeedsCompositedScrolling(
+          context_.prefers_composited_scrolling);
       context_.was_main_thread_scrolling =
           scrollable_area->ShouldScrollOnMainThread();
       context_.direct_compositing_reasons =

third_party/blink/renderer/core/paint/paint_property_tree_builder.h

diff --git a/third_party/blink/renderer/core/paint/paint_property_tree_builder.h b/third_party/blink/renderer/core/paint/paint_property_tree_builder.h
index 1b99fdd..1f3bf8b 100644
--- a/third_party/blink/renderer/core/paint/paint_property_tree_builder.h
+++ b/third_party/blink/renderer/core/paint/paint_property_tree_builder.h
@@ -225,6 +225,7 @@
 
   unsigned was_main_thread_scrolling : 1 = false;
   unsigned scroll_unification_enabled : 1 = false;
+  unsigned prefers_composited_scrolling : 1 = false;
 
   // Main thread scrolling reasons that apply to all scrollers in the current
   // LocalFrameView subtree.

third_party/blink/renderer/core/resize_observer/resize_observer.cc

diff --git a/third_party/blink/renderer/core/resize_observer/resize_observer.cc b/third_party/blink/renderer/core/resize_observer/resize_observer.cc
index 19e52ef..6f7f976 100644
--- a/third_party/blink/renderer/core/resize_observer/resize_observer.cc
+++ b/third_party/blink/renderer/core/resize_observer/resize_observer.cc
@@ -36,7 +36,8 @@
 
 ResizeObserver::ResizeObserver(V8ResizeObserverCallback* callback,
                                LocalDOMWindow* window)
-    : ExecutionContextClient(window),
+    : ActiveScriptWrappable<ResizeObserver>({}),
+      ExecutionContextClient(window),
       callback_(callback),
       skipped_observations_(false) {
   DCHECK(callback_);
@@ -47,7 +48,8 @@
 }
 
 ResizeObserver::ResizeObserver(Delegate* delegate, LocalDOMWindow* window)
-    : ExecutionContextClient(window),
+    : ActiveScriptWrappable<ResizeObserver>({}),
+      ExecutionContextClient(window),
       delegate_(delegate),
       skipped_observations_(false) {
   DCHECK(delegate_);

third_party/blink/renderer/core/streams/readable_stream_default_reader.cc

diff --git a/third_party/blink/renderer/core/streams/readable_stream_default_reader.cc b/third_party/blink/renderer/core/streams/readable_stream_default_reader.cc
index c6ea035..b6678377 100644
--- a/third_party/blink/renderer/core/streams/readable_stream_default_reader.cc
+++ b/third_party/blink/renderer/core/streams/readable_stream_default_reader.cc
@@ -76,7 +76,8 @@
     ScriptState* script_state,
     ReadableStream* stream,
     ExceptionState& exception_state)
-    : ExecutionContextClient(ExecutionContext::From(script_state)) {
+    : ActiveScriptWrappable<ReadableStreamDefaultReader>({}),
+      ExecutionContextClient(ExecutionContext::From(script_state)) {
   // https://streams.spec.whatwg.org/#default-reader-constructor
   // 1. Perform ? SetUpReadableStreamDefaultReader(this, stream).
   SetUpDefaultReader(script_state, this, stream, exception_state);

third_party/blink/renderer/core/svg/svg_image_element.cc

diff --git a/third_party/blink/renderer/core/svg/svg_image_element.cc b/third_party/blink/renderer/core/svg/svg_image_element.cc
index f541d56..5ac13b33 100644
--- a/third_party/blink/renderer/core/svg/svg_image_element.cc
+++ b/third_party/blink/renderer/core/svg/svg_image_element.cc
@@ -39,6 +39,7 @@
 SVGImageElement::SVGImageElement(Document& document)
     : SVGGraphicsElement(svg_names::kImageTag, document),
       SVGURIReference(this),
+      ActiveScriptWrappable<SVGImageElement>({}),
       is_default_overridden_intrinsic_size_(
           GetExecutionContext() &&
           !GetExecutionContext()->IsFeatureEnabled(

third_party/blink/renderer/core/testing/data/two_scrollable_area.html

diff --git a/third_party/blink/renderer/core/testing/data/two_scrollable_area.html b/third_party/blink/renderer/core/testing/data/two_scrollable_area.html
index 26ceb4f..f874476 100644
--- a/third_party/blink/renderer/core/testing/data/two_scrollable_area.html
+++ b/third_party/blink/renderer/core/testing/data/two_scrollable_area.html
@@ -6,7 +6,10 @@
   background: blue;
   /* Stacking context by default. */
   position: relative;
+  overflow: scroll;
   z-index: 1;
+  width: 200px;
+  height: 300px;
 }
 
 .transparent {
@@ -59,21 +62,14 @@
   z-index: auto;
 }
 
-div {
-  overflow: scroll;
-  width: 200px;
-  height: 300px;
-  background: green;
-}
-
 body {
     height: 2000px;
 }
 </style>
 
 <div class="scroller" id="scroller1">
-  <div class="content" id="content1"></div>
+  <div class="content" id="content1">Content1</div>
 </div>
 <div class="scroller" id="scroller2">
-  <div class="content"></div>
+  <div class="content" id="content2">Content2</div>
 </div>

third_party/blink/renderer/core/timing/performance_observer.cc

diff --git a/third_party/blink/renderer/core/timing/performance_observer.cc b/third_party/blink/renderer/core/timing/performance_observer.cc
index af7967d..f426e1ed 100644
--- a/third_party/blink/renderer/core/timing/performance_observer.cc
+++ b/third_party/blink/renderer/core/timing/performance_observer.cc
@@ -102,7 +102,8 @@
     ExecutionContext* execution_context,
     Performance* performance,
     V8PerformanceObserverCallback* callback)
-    : ExecutionContextLifecycleStateObserver(execution_context),
+    : ActiveScriptWrappable<PerformanceObserver>({}),
+      ExecutionContextLifecycleStateObserver(execution_context),
       callback_(callback),
       performance_(performance),
       filter_options_(PerformanceEntry::kInvalid),

third_party/blink/renderer/core/view_transition/view_transition.cc

diff --git a/third_party/blink/renderer/core/view_transition/view_transition.cc b/third_party/blink/renderer/core/view_transition/view_transition.cc
index 30950b13..87b2510 100644
--- a/third_party/blink/renderer/core/view_transition/view_transition.cc
+++ b/third_party/blink/renderer/core/view_transition/view_transition.cc
@@ -210,7 +210,8 @@
                                ScriptState* script_state,
                                V8ViewTransitionCallback* update_dom_callback,
                                Delegate* delegate)
-    : ExecutionContextLifecycleObserver(document->GetExecutionContext()),
+    : ActiveScriptWrappable<ViewTransition>({}),
+      ExecutionContextLifecycleObserver(document->GetExecutionContext()),
       creation_type_(CreationType::kScript),
       document_(document),
       delegate_(delegate),
@@ -236,7 +237,8 @@
 ViewTransition::ViewTransition(Document* document,
                                ViewTransitionStateCallback callback,
                                Delegate* delegate)
-    : ExecutionContextLifecycleObserver(document->GetExecutionContext()),
+    : ActiveScriptWrappable<ViewTransition>({}),
+      ExecutionContextLifecycleObserver(document->GetExecutionContext()),
       creation_type_(CreationType::kForSnapshot),
       document_(document),
       delegate_(delegate),
@@ -262,7 +264,8 @@
 ViewTransition::ViewTransition(Document* document,
                                ViewTransitionState transition_state,
                                Delegate* delegate)
-    : ExecutionContextLifecycleObserver(document->GetExecutionContext()),
+    : ActiveScriptWrappable<ViewTransition>({}),
+      ExecutionContextLifecycleObserver(document->GetExecutionContext()),
       creation_type_(CreationType::kFromSnapshot),
       document_(document),
       delegate_(delegate),

third_party/blink/renderer/core/workers/dedicated_worker.cc

diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third_party/blink/renderer/core/workers/dedicated_worker.cc
index 922f037..c7a4b9f 100644
--- a/third_party/blink/renderer/core/workers/dedicated_worker.cc
+++ b/third_party/blink/renderer/core/workers/dedicated_worker.cc
@@ -110,6 +110,7 @@
     base::FunctionRef<DedicatedWorkerMessagingProxy*(DedicatedWorker*)>
         context_proxy_factory)
     : AbstractWorker(context),
+      ActiveScriptWrappable<DedicatedWorker>({}),
       script_request_url_(script_request_url),
       options_(options),
       context_proxy_(context_proxy_factory(this)),

third_party/blink/renderer/core/workers/shared_worker.cc

diff --git a/third_party/blink/renderer/core/workers/shared_worker.cc b/third_party/blink/renderer/core/workers/shared_worker.cc
index 1e19049..1e35209 100644
--- a/third_party/blink/renderer/core/workers/shared_worker.cc
+++ b/third_party/blink/renderer/core/workers/shared_worker.cc
@@ -68,6 +68,7 @@
 
 SharedWorker::SharedWorker(ExecutionContext* context)
     : AbstractWorker(context),
+      ActiveScriptWrappable<SharedWorker>({}),
       is_being_connected_(false),
       feature_handle_for_scheduler_(context->GetScheduler()->RegisterFeature(
           SchedulingPolicy::Feature::kSharedWorker,

third_party/blink/renderer/core/workers/worker_global_scope.cc

diff --git a/third_party/blink/renderer/core/workers/worker_global_scope.cc b/third_party/blink/renderer/core/workers/worker_global_scope.cc
index 4e827ae..df5729b2 100644
--- a/third_party/blink/renderer/core/workers/worker_global_scope.cc
+++ b/third_party/blink/renderer/core/workers/worker_global_scope.cc
@@ -612,6 +612,7 @@
           std::move(creation_params->web_worker_fetch_context),
           thread->GetWorkerReportingProxy(),
           creation_params->script_url.ProtocolIsData()),
+      ActiveScriptWrappable<WorkerGlobalScope>({}),
       script_type_(creation_params->script_type),
       user_agent_(creation_params->user_agent),
       ua_metadata_(creation_params->ua_metadata),

third_party/blink/renderer/core/workers/worklet_global_scope.cc

diff --git a/third_party/blink/renderer/core/workers/worklet_global_scope.cc b/third_party/blink/renderer/core/workers/worklet_global_scope.cc
index f11fb70..9dfd614 100644
--- a/third_party/blink/renderer/core/workers/worklet_global_scope.cc
+++ b/third_party/blink/renderer/core/workers/worklet_global_scope.cc
@@ -94,6 +94,7 @@
           std::move(creation_params->web_worker_fetch_context),
           reporting_proxy,
           /*is_worker_loaded_from_data_url=*/false),
+      ActiveScriptWrappable<WorkletGlobalScope>({}),
       url_(creation_params->script_url),
       user_agent_(creation_params->user_agent),
       document_security_origin_(creation_params->starter_origin),

third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc

diff --git a/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc b/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc
index c648e963..16f7796 100644
--- a/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc
+++ b/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc
@@ -295,7 +295,8 @@
 XMLHttpRequest::XMLHttpRequest(ExecutionContext* context,
                                v8::Isolate* isolate,
                                scoped_refptr<const DOMWrapperWorld> world)
-    : ExecutionContextLifecycleObserver(context),
+    : ActiveScriptWrappable<XMLHttpRequest>({}),
+      ExecutionContextLifecycleObserver(context),
       progress_event_throttle_(
           MakeGarbageCollected<XMLHttpRequestProgressEventThrottle>(this)),
       isolate_(isolate),

third_party/blink/renderer/modules/accessibility/ax_object.cc

diff --git a/third_party/blink/renderer/modules/accessibility/ax_object.cc b/third_party/blink/renderer/modules/accessibility/ax_object.cc
index 5c974682..6a740228 100644
--- a/third_party/blink/renderer/modules/accessibility/ax_object.cc
+++ b/third_party/blink/renderer/modules/accessibility/ax_object.cc
@@ -6397,7 +6397,6 @@
 }
 
 bool AXObject::RequestExpandAction() {
-  // TODO(accessibility): Handle AOM event dispatching if needed.
   if (ui::SupportsArrowKeysForExpandCollapse(RoleValue())) {
     return OnNativeKeyboardAction(ax::mojom::blink::Action::kExpand);
   }
@@ -6405,7 +6404,6 @@
 }
 
 bool AXObject::RequestCollapseAction() {
-  // TODO(accessibility): Handle AOM event dispatching if needed.
   if (ui::SupportsArrowKeysForExpandCollapse(RoleValue())) {
     return OnNativeKeyboardAction(ax::mojom::blink::Action::kCollapse);
   }

third_party/blink/renderer/modules/accessibility/inspector_accessibility_agent.cc

diff --git a/third_party/blink/renderer/modules/accessibility/inspector_accessibility_agent.cc b/third_party/blink/renderer/modules/accessibility/inspector_accessibility_agent.cc
index c7fd319..2b11c71a 100644
--- a/third_party/blink/renderer/modules/accessibility/inspector_accessibility_agent.cc
+++ b/third_party/blink/renderer/modules/accessibility/inspector_accessibility_agent.cc
@@ -30,7 +30,6 @@
 namespace blink {
 
 using protocol::Maybe;
-using protocol::Response;
 using protocol::Accessibility::AXNode;
 using protocol::Accessibility::AXNodeId;
 using protocol::Accessibility::AXProperty;
@@ -524,14 +523,14 @@
       dom_agent_(dom_agent),
       enabled_(&agent_state_, /*default_value=*/false) {}
 
-Response InspectorAccessibilityAgent::getPartialAXTree(
+protocol::Response InspectorAccessibilityAgent::getPartialAXTree(
     Maybe<int> dom_node_id,
     Maybe<int> backend_node_id,
     Maybe<String> object_id,
     Maybe<bool> fetch_relatives,
     std::unique_ptr<protocol::Array<AXNode>>* nodes) {
   Node* dom_node = nullptr;
-  Response response =
+  protocol::Response response =
       dom_agent_->AssertNode(dom_node_id, backend_node_id, object_id, dom_node);
   if (!response.IsSuccess())
     return response;
@@ -542,7 +541,7 @@
       document.Lifecycle());
   LocalFrame* local_frame = document.GetFrame();
   if (!local_frame)
-    return Response::ServerError("Frame is detached.");
+    return protocol::Response::ServerError("Frame is detached.");
 
   auto& cache = AttachToAXObjectCache(&document);
 
@@ -557,7 +556,7 @@
   }
 
   if (!fetch_relatives.fromMaybe(true))
-    return Response::Success();
+    return protocol::Response::Success();
 
   if (inspected_ax_object && !inspected_ax_object->AccessibilityIsIgnored())
     AddChildren(*inspected_ax_object, true, *nodes, cache);
@@ -579,10 +578,10 @@
     }
   }
   if (!parent_ax_object)
-    return Response::Success();
+    return protocol::Response::Success();
   AddAncestors(*parent_ax_object, inspected_ax_object, *nodes, cache);
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorAccessibilityAgent::AddAncestors(
@@ -769,25 +768,25 @@
   return inspected_frames_->Root();
 }
 
-Response InspectorAccessibilityAgent::getFullAXTree(
+protocol::Response InspectorAccessibilityAgent::getFullAXTree(
     protocol::Maybe<int> depth,
     Maybe<String> frame_id,
     std::unique_ptr<protocol::Array<AXNode>>* nodes) {
   LocalFrame* frame = FrameFromIdOrRoot(frame_id);
   if (!frame) {
-    return Response::InvalidParams(
+    return protocol::Response::InvalidParams(
         "Frame with the given frameId is not found.");
   }
 
   Document* document = frame->GetDocument();
   if (!document)
-    return Response::InternalError();
+    return protocol::Response::InternalError();
   if (document->View()->NeedsLayout() || document->NeedsLayoutTreeUpdate())
     document->UpdateStyleAndLayout(DocumentUpdateReason::kInspector);
 
   *nodes = WalkAXNodesToDepth(document, depth.fromMaybe(-1));
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 std::unique_ptr<protocol::Array<AXNode>>
@@ -822,20 +821,22 @@
   return nodes;
 }
 
-Response InspectorAccessibilityAgent::getRootAXNode(
+protocol::Response InspectorAccessibilityAgent::getRootAXNode(
     Maybe<String> frame_id,
     std::unique_ptr<AXNode>* node) {
   LocalFrame* frame = FrameFromIdOrRoot(frame_id);
   if (!frame) {
-    return Response::InvalidParams(
+    return protocol::Response::InvalidParams(
         "Frame with the given frameId is not found.");
   }
-  if (!enabled_.Get())
-    return Response::ServerError("Accessibility has not been enabled.");
+  if (!enabled_.Get()) {
+    return protocol::Response::ServerError(
+        "Accessibility has not been enabled.");
+  }
 
   Document* document = frame->GetDocument();
   if (!document)
-    return Response::InternalError();
+    return protocol::Response::InternalError();
   if (document->View()->NeedsLayout() || document->NeedsLayoutTreeUpdate())
     document->UpdateStyleAndLayout(DocumentUpdateReason::kInspector);
 
@@ -845,7 +846,7 @@
   *node = BuildProtocolAXNodeForAXObject(root);
   nodes_requested_.insert(root.AXObjectID());
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 protocol::Response InspectorAccessibilityAgent::getAXNodeAndAncestors(
@@ -854,11 +855,13 @@
     Maybe<String> object_id,
     std::unique_ptr<protocol::Array<protocol::Accessibility::AXNode>>*
         out_nodes) {
-  if (!enabled_.Get())
-    return Response::ServerError("Accessibility has not been enabled.");
+  if (!enabled_.Get()) {
+    return protocol::Response::ServerError(
+        "Accessibility has not been enabled.");
+  }
 
   Node* dom_node = nullptr;
-  Response response =
+  protocol::Response response =
       dom_agent_->AssertNode(dom_node_id, backend_node_id, object_id, dom_node);
   if (!response.IsSuccess())
     return response;
@@ -869,7 +872,7 @@
       document.Lifecycle());
   LocalFrame* local_frame = document.GetFrame();
   if (!local_frame)
-    return Response::ServerError("Frame is detached.");
+    return protocol::Response::ServerError("Frame is detached.");
 
   auto& cache = AttachToAXObjectCache(&document);
 
@@ -882,7 +885,7 @@
     (*out_nodes)
         ->emplace_back(BuildProtocolAXNodeForDOMNodeWithNoAXNode(
             IdentifiersFactory::IntIdForNode(dom_node)));
-    return Response::Success();
+    return protocol::Response::Success();
   }
 
   do {
@@ -893,7 +896,7 @@
     ax_object = ax_object->ParentObjectIncludedInTree();
   } while (ax_object);
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 protocol::Response InspectorAccessibilityAgent::getChildAXNodes(
@@ -901,18 +904,20 @@
     Maybe<String> frame_id,
     std::unique_ptr<protocol::Array<protocol::Accessibility::AXNode>>*
         out_nodes) {
-  if (!enabled_.Get())
-    return Response::ServerError("Accessibility has not been enabled.");
+  if (!enabled_.Get()) {
+    return protocol::Response::ServerError(
+        "Accessibility has not been enabled.");
+  }
 
   LocalFrame* frame = FrameFromIdOrRoot(frame_id);
   if (!frame) {
-    return Response::InvalidParams(
+    return protocol::Response::InvalidParams(
         "Frame with the given frameId is not found.");
   }
 
   Document* document = frame->GetDocument();
   if (!document)
-    return Response::InternalError();
+    return protocol::Response::InternalError();
 
   if (document->View()->NeedsLayout() || document->NeedsLayoutTreeUpdate())
     document->UpdateStyleAndLayout(DocumentUpdateReason::kInspector);
@@ -923,7 +928,7 @@
   AXObject* ax_object = cache.ObjectFromAXID(ax_id);
 
   if (!ax_object || ax_object->IsDetached())
-    return Response::InvalidParams("Invalid ID");
+    return protocol::Response::InvalidParams("Invalid ID");
 
   *out_nodes =
       std::make_unique<protocol::Array<protocol::Accessibility::AXNode>>();
@@ -933,7 +938,7 @@
   for (const auto& child : **out_nodes)
     nodes_requested_.insert(child->getNodeId().ToInt());
 
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorAccessibilityAgent::FillCoreProperties(
@@ -999,8 +1004,8 @@
     Maybe<String> role,
     std::unique_ptr<QueryAXTreeCallback> callback) {
   Node* root_dom_node = nullptr;
-  Response response = dom_agent_->AssertNode(dom_node_id, backend_node_id,
-                                             object_id, root_dom_node);
+  protocol::Response response = dom_agent_->AssertNode(
+      dom_node_id, backend_node_id, object_id, root_dom_node);
   if (!response.IsSuccess()) {
     callback->sendFailure(response);
     return;
@@ -1014,7 +1019,7 @@
   }
   if (!root_dom_node) {
     callback->sendFailure(
-        Response::InvalidParams("Root DOM node could not be found"));
+        protocol::Response::InvalidParams("Root DOM node could not be found"));
     return;
   }
 
@@ -1041,7 +1046,7 @@
 void InspectorAccessibilityAgent::CompleteQuery(AXQuery& query) {
   Node* root_dom_node = nullptr;
 
-  Response response = dom_agent_->AssertNode(
+  protocol::Response response = dom_agent_->AssertNode(
       query.dom_node_id, query.backend_node_id, query.object_id, root_dom_node);
   if (!response.IsSuccess()) {
     query.callback->sendFailure(response);
@@ -1055,7 +1060,7 @@
     root_dom_node = root_dom_node->OwnerShadowHost();
   if (!root_dom_node) {
     query.callback->sendFailure(
-        Response::InvalidParams("Root DOM node could not be found"));
+        protocol::Response::InvalidParams("Root DOM node could not be found"));
     return;
   }
   Document& document = root_dom_node->GetDocument();
@@ -1261,12 +1266,12 @@
 protocol::Response InspectorAccessibilityAgent::enable() {
   if (!enabled_.Get())
     EnableAndReset();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 protocol::Response InspectorAccessibilityAgent::disable() {
   if (!enabled_.Get())
-    return Response::Success();
+    return protocol::Response::Success();
   enabled_.Set(false);
   document_to_context_map_.clear();
   nodes_requested_.clear();
@@ -1281,7 +1286,7 @@
     auto& cache = To<AXObjectCacheImpl>(context->GetAXObjectCache());
     cache.RemoveInspectorAgent(this);
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorAccessibilityAgent::Restore() {

third_party/blink/renderer/modules/app_banner/before_install_prompt_event.cc

diff --git a/third_party/blink/renderer/modules/app_banner/before_install_prompt_event.cc b/third_party/blink/renderer/modules/app_banner/before_install_prompt_event.cc
index ffdc827..a8a6081a 100644
--- a/third_party/blink/renderer/modules/app_banner/before_install_prompt_event.cc
+++ b/third_party/blink/renderer/modules/app_banner/before_install_prompt_event.cc
@@ -24,6 +24,7 @@
     mojo::PendingReceiver<mojom::blink::AppBannerEvent> event_receiver,
     const Vector<String>& platforms)
     : Event(name, Bubbles::kNo, Cancelable::kYes),
+      ActiveScriptWrappable<BeforeInstallPromptEvent>({}),
       ExecutionContextClient(&context),
       banner_service_remote_(&context),
       receiver_(this, &context),
@@ -44,6 +45,7 @@
     const AtomicString& name,
     const BeforeInstallPromptEventInit* init)
     : Event(name, init),
+      ActiveScriptWrappable<BeforeInstallPromptEvent>({}),
       ExecutionContextClient(execution_context),
       banner_service_remote_(execution_context),
       receiver_(this, execution_context) {

third_party/blink/renderer/modules/background_fetch/background_fetch_registration.cc

diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetch_registration.cc b/third_party/blink/renderer/modules/background_fetch/background_fetch_registration.cc
index e3642ee..a77cf85 100644
--- a/third_party/blink/renderer/modules/background_fetch/background_fetch_registration.cc
+++ b/third_party/blink/renderer/modules/background_fetch/background_fetch_registration.cc
@@ -35,7 +35,8 @@
 BackgroundFetchRegistration::BackgroundFetchRegistration(
     ServiceWorkerRegistration* service_worker_registration,
     mojom::blink::BackgroundFetchRegistrationPtr registration)
-    : developer_id_(registration->registration_data->developer_id),
+    : ActiveScriptWrappable<BackgroundFetchRegistration>({}),
+      developer_id_(registration->registration_data->developer_id),
       upload_total_(registration->registration_data->upload_total),
       uploaded_(registration->registration_data->uploaded),
       download_total_(registration->registration_data->download_total),

third_party/blink/renderer/modules/battery/battery_manager.cc

diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
index 848f452..e8512cf 100644
--- a/third_party/blink/renderer/modules/battery/battery_manager.cc
+++ b/third_party/blink/renderer/modules/battery/battery_manager.cc
@@ -51,7 +51,8 @@
 BatteryManager::~BatteryManager() = default;
 
 BatteryManager::BatteryManager(Navigator& navigator)
-    : Supplement<Navigator>(navigator),
+    : ActiveScriptWrappable<BatteryManager>({}),
+      Supplement<Navigator>(navigator),
       ExecutionContextLifecycleStateObserver(navigator.DomWindow()),
       PlatformEventController(*navigator.DomWindow()),
       battery_dispatcher_(

third_party/blink/renderer/modules/bluetooth/bluetooth_device.cc

diff --git a/third_party/blink/renderer/modules/bluetooth/bluetooth_device.cc b/third_party/blink/renderer/modules/bluetooth/bluetooth_device.cc
index 87d4a01..c706778 100644
--- a/third_party/blink/renderer/modules/bluetooth/bluetooth_device.cc
+++ b/third_party/blink/renderer/modules/bluetooth/bluetooth_device.cc
@@ -35,6 +35,7 @@
                                  mojom::blink::WebBluetoothDevicePtr device,
                                  Bluetooth* bluetooth)
     : ExecutionContextClient(context),
+      ActiveScriptWrappable<BluetoothDevice>({}),
       attribute_instance_map_(
           MakeGarbageCollected<BluetoothAttributeInstanceMap>(this)),
       device_(std::move(device)),

third_party/blink/renderer/modules/bluetooth/bluetooth_remote_gatt_characteristic.cc

diff --git a/third_party/blink/renderer/modules/bluetooth/bluetooth_remote_gatt_characteristic.cc b/third_party/blink/renderer/modules/bluetooth/bluetooth_remote_gatt_characteristic.cc
index 209edb3..a9f8642 100644
--- a/third_party/blink/renderer/modules/bluetooth/bluetooth_remote_gatt_characteristic.cc
+++ b/third_party/blink/renderer/modules/bluetooth/bluetooth_remote_gatt_characteristic.cc
@@ -35,7 +35,8 @@
     mojom::blink::WebBluetoothRemoteGATTCharacteristicPtr characteristic,
     BluetoothRemoteGATTService* service,
     BluetoothDevice* device)
-    : ExecutionContextLifecycleObserver(context),
+    : ActiveScriptWrappable<BluetoothRemoteGATTCharacteristic>({}),
+      ExecutionContextLifecycleObserver(context),
       characteristic_(std::move(characteristic)),
       service_(service),
       device_(device),

third_party/blink/renderer/modules/breakout_box/frame_queue_underlying_source.cc

diff --git a/third_party/blink/renderer/modules/breakout_box/frame_queue_underlying_source.cc b/third_party/blink/renderer/modules/breakout_box/frame_queue_underlying_source.cc
index 9611a04..f5f25e3 100644
--- a/third_party/blink/renderer/modules/breakout_box/frame_queue_underlying_source.cc
+++ b/third_party/blink/renderer/modules/breakout_box/frame_queue_underlying_source.cc
@@ -41,6 +41,7 @@
     std::string device_id,
     wtf_size_t frame_pool_size)
     : UnderlyingSourceBase(script_state),
+      ActiveScriptWrappable<FrameQueueUnderlyingSource<NativeFrameType>>({}),
       realm_task_runner_(ExecutionContext::From(script_state)
                              ->GetTaskRunner(TaskType::kInternalMediaRealTime)),
       frame_queue_handle_(
@@ -64,6 +65,7 @@
     ScriptState* script_state,
     FrameQueueUnderlyingSource<NativeFrameType>* other_source)
     : UnderlyingSourceBase(script_state),
+      ActiveScriptWrappable<FrameQueueUnderlyingSource<NativeFrameType>>({}),
       realm_task_runner_(ExecutionContext::From(script_state)
                              ->GetTaskRunner(TaskType::kInternalMediaRealTime)),
       frame_queue_handle_(other_source->frame_queue_handle_.Queue()),

third_party/blink/renderer/modules/broadcastchannel/broadcast_channel.cc

diff --git a/third_party/blink/renderer/modules/broadcastchannel/broadcast_channel.cc b/third_party/blink/renderer/modules/broadcastchannel/broadcast_channel.cc
index 1b56281..09ccb79 100644
--- a/third_party/blink/renderer/modules/broadcastchannel/broadcast_channel.cc
+++ b/third_party/blink/renderer/modules/broadcastchannel/broadcast_channel.cc
@@ -212,7 +212,8 @@
     mojo::PendingAssociatedReceiver<mojom::blink::BroadcastChannelClient>
         receiver,
     mojo::PendingAssociatedRemote<mojom::blink::BroadcastChannelClient> remote)
-    : ExecutionContextLifecycleObserver(execution_context),
+    : ActiveScriptWrappable<BroadcastChannel>({}),
+      ExecutionContextLifecycleObserver(execution_context),
       name_(name),
       feature_handle_for_scheduler_(
           execution_context->GetScheduler()->RegisterFeature(

third_party/blink/renderer/modules/buckets/storage_bucket.cc

diff --git a/third_party/blink/renderer/modules/buckets/storage_bucket.cc b/third_party/blink/renderer/modules/buckets/storage_bucket.cc
index d712f8e..684c47ef 100644
--- a/third_party/blink/renderer/modules/buckets/storage_bucket.cc
+++ b/third_party/blink/renderer/modules/buckets/storage_bucket.cc
@@ -6,6 +6,7 @@
 
 #include "base/time/time.h"
 #include "third_party/blink/public/platform/task_type.h"
+#include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable_creation_key.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_storage_estimate.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_storage_usage_details.h"

third_party/blink/renderer/modules/cache_storage/cache_storage.cc

diff --git a/third_party/blink/renderer/modules/cache_storage/cache_storage.cc b/third_party/blink/renderer/modules/cache_storage/cache_storage.cc
index c3a1852..7f88eb3 100644
--- a/third_party/blink/renderer/modules/cache_storage/cache_storage.cc
+++ b/third_party/blink/renderer/modules/cache_storage/cache_storage.cc
@@ -535,7 +535,8 @@
     ExecutionContext* context,
     GlobalFetch::ScopedFetcher* fetcher,
     mojo::PendingRemote<mojom::blink::CacheStorage> pending_remote)
-    : ExecutionContextClient(context),
+    : ActiveScriptWrappable<CacheStorage>({}),
+      ExecutionContextClient(context),
       scoped_fetcher_(fetcher),
       blob_client_list_(MakeGarbageCollected<CacheStorageBlobClientList>()),
       cache_storage_remote_(context) {

third_party/blink/renderer/modules/clipboard/clipboard_promise.cc

diff --git a/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc b/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc
index 92b72c5..0a89ccac 100644
--- a/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc
+++ b/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc
@@ -44,7 +44,6 @@
 
 namespace blink {
 
-using mojom::blink::PermissionStatus;
 using mojom::blink::PermissionService;
 
 // This class deals with all the Blob promises and executes the write
@@ -338,11 +337,12 @@
                     WrapPersistent(this)));
 }
 
-void ClipboardPromise::HandleReadWithPermission(PermissionStatus status) {
+void ClipboardPromise::HandleReadWithPermission(
+    mojom::blink::PermissionStatus status) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (!GetExecutionContext())
     return;
-  if (status != PermissionStatus::GRANTED) {
+  if (status != mojom::blink::PermissionStatus::GRANTED) {
     script_promise_resolver_->Reject(MakeGarbageCollected<DOMException>(
         DOMExceptionCode::kNotAllowedError, "Read permission denied."));
     return;
@@ -425,11 +425,12 @@
   ReadNextRepresentation();
 }
 
-void ClipboardPromise::HandleReadTextWithPermission(PermissionStatus status) {
+void ClipboardPromise::HandleReadTextWithPermission(
+    mojom::blink::PermissionStatus status) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (!GetExecutionContext())
     return;
-  if (status != PermissionStatus::GRANTED) {
+  if (status != mojom::blink::PermissionStatus::GRANTED) {
     script_promise_resolver_->Reject(MakeGarbageCollected<DOMException>(
         DOMExceptionCode::kNotAllowedError, "Read permission denied."));
     return;
@@ -473,11 +474,12 @@
   WriteNextRepresentation();
 }
 
-void ClipboardPromise::HandleWriteWithPermission(PermissionStatus status) {
+void ClipboardPromise::HandleWriteWithPermission(
+    mojom::blink::PermissionStatus status) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (!GetExecutionContext())
     return;
-  if (status != PermissionStatus::GRANTED) {
+  if (status != mojom::blink::PermissionStatus::GRANTED) {
     script_promise_resolver_->Reject(MakeGarbageCollected<DOMException>(
         DOMExceptionCode::kNotAllowedError, "Write permission denied."));
     return;
@@ -506,11 +508,12 @@
       script_state_, ScriptPromise::All(script_state_, promise_list), this);
 }
 
-void ClipboardPromise::HandleWriteTextWithPermission(PermissionStatus status) {
+void ClipboardPromise::HandleWriteTextWithPermission(
+    mojom::blink::PermissionStatus status) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (!GetExecutionContext())
     return;
-  if (status != PermissionStatus::GRANTED) {
+  if (status != mojom::blink::PermissionStatus::GRANTED) {
     script_promise_resolver_->Reject(MakeGarbageCollected<DOMException>(
         DOMExceptionCode::kNotAllowedError, "Write permission denied."));
     return;

third_party/blink/renderer/modules/device_orientation/device_orientation_inspector_agent.cc

diff --git a/third_party/blink/renderer/modules/device_orientation/device_orientation_inspector_agent.cc b/third_party/blink/renderer/modules/device_orientation/device_orientation_inspector_agent.cc
index 494552d0..0de0a77 100644
--- a/third_party/blink/renderer/modules/device_orientation/device_orientation_inspector_agent.cc
+++ b/third_party/blink/renderer/modules/device_orientation/device_orientation_inspector_agent.cc
@@ -12,8 +12,6 @@
 
 namespace blink {
 
-using protocol::Response;
-
 DeviceOrientationInspectorAgent::~DeviceOrientationInspectorAgent() = default;
 
 DeviceOrientationInspectorAgent::DeviceOrientationInspectorAgent(
@@ -37,10 +35,10 @@
       *inspected_frames_->Root()->DomWindow());
 }
 
-Response DeviceOrientationInspectorAgent::setDeviceOrientationOverride(
-    double alpha,
-    double beta,
-    double gamma) {
+protocol::Response
+DeviceOrientationInspectorAgent::setDeviceOrientationOverride(double alpha,
+                                                              double beta,
+                                                              double gamma) {
   enabled_.Set(true);
   alpha_.Set(alpha);
   beta_.Set(beta);
@@ -48,19 +46,20 @@
   Controller().SetOverride(
       DeviceOrientationData::Create(alpha, beta, gamma, false));
   sensor_agent_->SetOrientationSensorOverride(alpha, beta, gamma);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response DeviceOrientationInspectorAgent::clearDeviceOrientationOverride() {
+protocol::Response
+DeviceOrientationInspectorAgent::clearDeviceOrientationOverride() {
   return disable();
 }
 
-Response DeviceOrientationInspectorAgent::disable() {
+protocol::Response DeviceOrientationInspectorAgent::disable() {
   agent_state_.ClearAllFields();
   if (!inspected_frames_->Root()->DomWindow()->IsContextDestroyed())
     Controller().ClearOverride();
   sensor_agent_->Disable();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void DeviceOrientationInspectorAgent::Restore() {

third_party/blink/renderer/modules/direct_sockets/tcp_socket.cc

diff --git a/third_party/blink/renderer/modules/direct_sockets/tcp_socket.cc b/third_party/blink/renderer/modules/direct_sockets/tcp_socket.cc
index 45a2db10..6ce5de6 100644
--- a/third_party/blink/renderer/modules/direct_sockets/tcp_socket.cc
+++ b/third_party/blink/renderer/modules/direct_sockets/tcp_socket.cc
@@ -134,6 +134,7 @@
 
 TCPSocket::TCPSocket(ScriptState* script_state)
     : Socket(script_state),
+      ActiveScriptWrappable<TCPSocket>({}),
       tcp_socket_{GetExecutionContext()},
       socket_observer_{this, GetExecutionContext()} {}
 

third_party/blink/renderer/modules/direct_sockets/udp_socket.cc

diff --git a/third_party/blink/renderer/modules/direct_sockets/udp_socket.cc b/third_party/blink/renderer/modules/direct_sockets/udp_socket.cc
index 95387a86..cf785f4a 100644
--- a/third_party/blink/renderer/modules/direct_sockets/udp_socket.cc
+++ b/third_party/blink/renderer/modules/direct_sockets/udp_socket.cc
@@ -194,6 +194,7 @@
 
 UDPSocket::UDPSocket(ScriptState* script_state)
     : Socket(script_state),
+      ActiveScriptWrappable<UDPSocket>({}),
       udp_socket_(
           MakeGarbageCollected<UDPSocketMojoRemote>(GetExecutionContext())) {}
 

third_party/blink/renderer/modules/encryptedmedia/media_key_session.cc

diff --git a/third_party/blink/renderer/modules/encryptedmedia/media_key_session.cc b/third_party/blink/renderer/modules/encryptedmedia/media_key_session.cc
index f549fbb..b349dc2 100644
--- a/third_party/blink/renderer/modules/encryptedmedia/media_key_session.cc
+++ b/third_party/blink/renderer/modules/encryptedmedia/media_key_session.cc
@@ -38,6 +38,7 @@
 #include "third_party/blink/public/platform/web_encrypted_media_key_information.h"
 #include "third_party/blink/public/platform/web_string.h"
 #include "third_party/blink/public/platform/web_url.h"
+#include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable_creation_key.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
 #include "third_party/blink/renderer/core/dom/dom_exception.h"
@@ -403,7 +404,8 @@
                                  MediaKeys* media_keys,
                                  WebEncryptedMediaSessionType session_type,
                                  const MediaKeysConfig& config)
-    : ExecutionContextLifecycleObserver(ExecutionContext::From(script_state)),
+    : ActiveScriptWrappable<MediaKeySession>({}),
+      ExecutionContextLifecycleObserver(ExecutionContext::From(script_state)),
       async_event_queue_(
           MakeGarbageCollected<EventQueue>(GetExecutionContext(),
                                            TaskType::kMediaElementEvent)),

third_party/blink/renderer/modules/encryptedmedia/media_keys.cc

diff --git a/third_party/blink/renderer/modules/encryptedmedia/media_keys.cc b/third_party/blink/renderer/modules/encryptedmedia/media_keys.cc
index fb826b4..cfb4a50 100644
--- a/third_party/blink/renderer/modules/encryptedmedia/media_keys.cc
+++ b/third_party/blink/renderer/modules/encryptedmedia/media_keys.cc
@@ -274,7 +274,8 @@
     const WebVector<WebEncryptedMediaSessionType>& supported_session_types,
     std::unique_ptr<WebContentDecryptionModule> cdm,
     const MediaKeysConfig& config)
-    : ExecutionContextLifecycleObserver(context),
+    : ActiveScriptWrappable<MediaKeys>({}),
+      ExecutionContextLifecycleObserver(context),
       supported_session_types_(supported_session_types),
       cdm_(std::move(cdm)),
       config_(config),

third_party/blink/renderer/modules/eventsource/event_source.cc

diff --git a/third_party/blink/renderer/modules/eventsource/event_source.cc b/third_party/blink/renderer/modules/eventsource/event_source.cc
index 02f42fe..546aeed 100644
--- a/third_party/blink/renderer/modules/eventsource/event_source.cc
+++ b/third_party/blink/renderer/modules/eventsource/event_source.cc
@@ -92,7 +92,8 @@
 inline EventSource::EventSource(ExecutionContext* context,
                                 const KURL& url,
                                 const EventSourceInit* event_source_init)
-    : ExecutionContextLifecycleObserver(context),
+    : ActiveScriptWrappable<EventSource>({}),
+      ExecutionContextLifecycleObserver(context),
       url_(url),
       current_url_(url),
       with_credentials_(event_source_init->withCredentials()),

third_party/blink/renderer/modules/file_system_access/file_system_directory_iterator.cc

diff --git a/third_party/blink/renderer/modules/file_system_access/file_system_directory_iterator.cc b/third_party/blink/renderer/modules/file_system_access/file_system_directory_iterator.cc
index 0a694d8..c2e9ea3 100644
--- a/third_party/blink/renderer/modules/file_system_access/file_system_directory_iterator.cc
+++ b/third_party/blink/renderer/modules/file_system_access/file_system_directory_iterator.cc
@@ -17,7 +17,8 @@
     FileSystemDirectoryHandle* directory,
     Mode mode,
     ExecutionContext* execution_context)
-    : ExecutionContextClient(execution_context),
+    : ActiveScriptWrappable<FileSystemDirectoryIterator>({}),
+      ExecutionContextClient(execution_context),
       mode_(mode),
       directory_(directory),
       receiver_(this, execution_context) {

third_party/blink/renderer/modules/filesystem/dom_file_system.cc

diff --git a/third_party/blink/renderer/modules/filesystem/dom_file_system.cc b/third_party/blink/renderer/modules/filesystem/dom_file_system.cc
index bfa366a..5f30113 100644
--- a/third_party/blink/renderer/modules/filesystem/dom_file_system.cc
+++ b/third_party/blink/renderer/modules/filesystem/dom_file_system.cc
@@ -96,6 +96,7 @@
                              mojom::blink::FileSystemType type,
                              const KURL& root_url)
     : DOMFileSystemBase(context, name, type, root_url),
+      ActiveScriptWrappable<DOMFileSystem>({}),
       ExecutionContextClient(context),
       number_of_pending_callbacks_(0),
       root_entry_(

third_party/blink/renderer/modules/filesystem/file_writer.cc

diff --git a/third_party/blink/renderer/modules/filesystem/file_writer.cc b/third_party/blink/renderer/modules/filesystem/file_writer.cc
index 88936d5..4eb3b7ef 100644
--- a/third_party/blink/renderer/modules/filesystem/file_writer.cc
+++ b/third_party/blink/renderer/modules/filesystem/file_writer.cc
@@ -48,7 +48,8 @@
     std::numeric_limits<uint64_t>::max();
 
 FileWriter::FileWriter(ExecutionContext* context)
-    : ExecutionContextLifecycleObserver(context),
+    : ActiveScriptWrappable<FileWriter>({}),
+      ExecutionContextLifecycleObserver(context),
       ready_state_(kInit),
       operation_in_progress_(kOperationNone),
       queued_operation_(kOperationNone),

third_party/blink/renderer/modules/geolocation/geolocation.cc

diff --git a/third_party/blink/renderer/modules/geolocation/geolocation.cc b/third_party/blink/renderer/modules/geolocation/geolocation.cc
index 962df1c..c9d7e9ae 100644
--- a/third_party/blink/renderer/modules/geolocation/geolocation.cc
+++ b/third_party/blink/renderer/modules/geolocation/geolocation.cc
@@ -124,7 +124,8 @@
 }
 
 Geolocation::Geolocation(Navigator& navigator)
-    : Supplement<Navigator>(navigator),
+    : ActiveScriptWrappable<Geolocation>({}),
+      Supplement<Navigator>(navigator),
       ExecutionContextLifecycleObserver(navigator.DomWindow()),
       PageVisibilityObserver(navigator.DomWindow()->GetFrame()->GetPage()),
       one_shots_(MakeGarbageCollected<GeoNotifierSet>()),

third_party/blink/renderer/modules/hid/hid_device.cc

diff --git a/third_party/blink/renderer/modules/hid/hid_device.cc b/third_party/blink/renderer/modules/hid/hid_device.cc
index 544b39d..dc698f6 100644
--- a/third_party/blink/renderer/modules/hid/hid_device.cc
+++ b/third_party/blink/renderer/modules/hid/hid_device.cc
@@ -200,6 +200,7 @@
                      device::mojom::blink::HidDeviceInfoPtr info,
                      ExecutionContext* context)
     : ExecutionContextLifecycleObserver(context),
+      ActiveScriptWrappable<HIDDevice>({}),
       parent_(parent),
       connection_(context),
       receiver_(this, context) {

third_party/blink/renderer/modules/idle/idle_detector.cc

diff --git a/third_party/blink/renderer/modules/idle/idle_detector.cc b/third_party/blink/renderer/modules/idle/idle_detector.cc
index dac3ecb..0cfe740 100644
--- a/third_party/blink/renderer/modules/idle/idle_detector.cc
+++ b/third_party/blink/renderer/modules/idle/idle_detector.cc
@@ -72,7 +72,8 @@
 }
 
 IdleDetector::IdleDetector(ExecutionContext* context)
-    : ExecutionContextClient(context),
+    : ActiveScriptWrappable<IdleDetector>({}),
+      ExecutionContextClient(context),
       task_runner_(context->GetTaskRunner(TaskType::kMiscPlatformAPI)),
       timer_(task_runner_, this, &IdleDetector::DispatchUserIdleEvent),
       receiver_(this, context) {}

third_party/blink/renderer/modules/indexeddb/idb_database.cc

diff --git a/third_party/blink/renderer/modules/indexeddb/idb_database.cc b/third_party/blink/renderer/modules/indexeddb/idb_database.cc
index 1a34c86..18b79fbc 100644
--- a/third_party/blink/renderer/modules/indexeddb/idb_database.cc
+++ b/third_party/blink/renderer/modules/indexeddb/idb_database.cc
@@ -101,7 +101,8 @@
     mojo::PendingAssociatedReceiver<mojom::blink::IDBDatabaseCallbacks>
         callbacks_receiver,
     mojo::PendingRemote<mojom::blink::ObservedFeature> connection_lifetime)
-    : ExecutionContextLifecycleObserver(context),
+    : ActiveScriptWrappable<IDBDatabase>({}),
+      ExecutionContextLifecycleObserver(context),
       backend_(std::move(backend)),
       connection_lifetime_(std::move(connection_lifetime)),
       event_queue_(

third_party/blink/renderer/modules/indexeddb/idb_request.cc

diff --git a/third_party/blink/renderer/modules/indexeddb/idb_request.cc b/third_party/blink/renderer/modules/indexeddb/idb_request.cc
index 9582116..9054edf 100644
--- a/third_party/blink/renderer/modules/indexeddb/idb_request.cc
+++ b/third_party/blink/renderer/modules/indexeddb/idb_request.cc
@@ -138,15 +138,15 @@
                        const Source* source,
                        IDBTransaction* transaction,
                        AsyncTraceState metrics)
-    : ExecutionContextLifecycleObserver(ExecutionContext::From(script_state)),
+    : ActiveScriptWrappable<IDBRequest>({}),
+      ExecutionContextLifecycleObserver(ExecutionContext::From(script_state)),
       transaction_(transaction),
       isolate_(script_state->GetIsolate()),
       metrics_(std::move(metrics)),
       source_(source),
       event_queue_(
           MakeGarbageCollected<EventQueue>(ExecutionContext::From(script_state),
-                                           TaskType::kDatabaseAccess)) {
-}
+                                           TaskType::kDatabaseAccess)) {}
 
 IDBRequest::~IDBRequest() {
   if (!GetExecutionContext())

third_party/blink/renderer/modules/indexeddb/idb_transaction.cc

diff --git a/third_party/blink/renderer/modules/indexeddb/idb_transaction.cc b/third_party/blink/renderer/modules/indexeddb/idb_transaction.cc
index 71337770..bb6fa63 100644
--- a/third_party/blink/renderer/modules/indexeddb/idb_transaction.cc
+++ b/third_party/blink/renderer/modules/indexeddb/idb_transaction.cc
@@ -30,6 +30,7 @@
 
 #include "base/feature_list.h"
 #include "third_party/blink/public/common/features.h"
+#include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable_creation_key.h"
 #include "third_party/blink/renderer/core/dom/dom_exception.h"
 #include "third_party/blink/renderer/core/dom/events/event_queue.h"
 #include "third_party/blink/renderer/core/execution_context/agent.h"
@@ -86,7 +87,8 @@
     mojom::IDBTransactionMode mode,
     mojom::IDBTransactionDurability durability,
     IDBDatabase* db)
-    : ExecutionContextLifecycleObserver(ExecutionContext::From(script_state)),
+    : ActiveScriptWrappable<IDBTransaction>({}),
+      ExecutionContextLifecycleObserver(ExecutionContext::From(script_state)),
       transaction_backend_(std::move(transaction_backend)),
       id_(id),
       database_(db),
@@ -129,7 +131,8 @@
     IDBDatabase* db,
     IDBOpenDBRequest* open_db_request,
     const IDBDatabaseMetadata& old_metadata)
-    : ExecutionContextLifecycleObserver(execution_context),
+    : ActiveScriptWrappable<IDBTransaction>({}),
+      ExecutionContextLifecycleObserver(execution_context),
       transaction_backend_(std::move(transaction_backend)),
       id_(id),
       database_(db),

third_party/blink/renderer/modules/indexeddb/inspector_indexed_db_agent.cc

diff --git a/third_party/blink/renderer/modules/indexeddb/inspector_indexed_db_agent.cc b/third_party/blink/renderer/modules/indexeddb/inspector_indexed_db_agent.cc
index 67c3dd30..a7602cb 100644
--- a/third_party/blink/renderer/modules/indexeddb/inspector_indexed_db_agent.cc
+++ b/third_party/blink/renderer/modules/indexeddb/inspector_indexed_db_agent.cc
@@ -70,6 +70,7 @@
 #include "third_party/blink/renderer/platform/wtf/vector.h"
 
 using blink::protocol::Array;
+using blink::protocol::Maybe;
 using blink::protocol::IndexedDB::DatabaseWithObjectStores;
 using blink::protocol::IndexedDB::DataEntry;
 using blink::protocol::IndexedDB::Key;
@@ -77,8 +78,6 @@
 using blink::protocol::IndexedDB::KeyRange;
 using blink::protocol::IndexedDB::ObjectStore;
 using blink::protocol::IndexedDB::ObjectStoreIndex;
-using blink::protocol::Maybe;
-using blink::protocol::Response;
 
 typedef blink::protocol::IndexedDB::Backend::RequestDatabaseNamesCallback
     RequestDatabaseNamesCallback;
@@ -101,15 +100,20 @@
 const char kIndexedDBObjectGroup[] = "indexeddb";
 const char kNoDocumentError[] = "No document for given frame found";
 
-Response AssertIDBFactory(LocalDOMWindow* dom_window, IDBFactory*& result) {
-  if (!dom_window)
-    return Response::ServerError("No IndexedDB factory for given frame found");
+protocol::Response AssertIDBFactory(LocalDOMWindow* dom_window,
+                                    IDBFactory*& result) {
+  if (!dom_window) {
+    return protocol::Response::ServerError(
+        "No IndexedDB factory for given frame found");
+  }
   IDBFactory* idb_factory = GlobalIndexedDB::indexedDB(*dom_window);
 
-  if (!idb_factory)
-    return Response::ServerError("No IndexedDB factory for given frame found");
+  if (!idb_factory) {
+    return protocol::Response::ServerError(
+        "No IndexedDB factory for given frame found");
+  }
   result = idb_factory;
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 class GetDatabaseNamesCallback final : public mojom::blink::IDBCallbacks {
@@ -121,7 +125,7 @@
 
   void Error(mojom::blink::IDBException code, const String& message) override {
     request_callback_->sendFailure(
-        Response::ServerError("Could not obtain database names."));
+        protocol::Response::ServerError("Could not obtain database names."));
   }
 
   void SuccessNamesAndVersionsList(
@@ -168,7 +172,7 @@
   void Invoke(ExecutionContext*, Event* event) override {
     if (event->type() != event_type_names::kSuccess) {
       request_callback_->sendFailure(
-          Response::ServerError("Failed to delete database."));
+          protocol::Response::ServerError("Failed to delete database."));
       return;
     }
     request_callback_->sendSuccess();
@@ -193,11 +197,12 @@
   virtual RequestCallback* GetRequestCallback() = 0;
   void Start(LocalFrame* frame, const String& database_name) {
     if (!frame) {
-      SendFailure(Response::ServerError(kNoDocumentError));
+      SendFailure(protocol::Response::ServerError(kNoDocumentError));
       return;
     }
     IDBFactory* idb_factory = nullptr;
-    Response response = AssertIDBFactory(frame->DomWindow(), idb_factory);
+    protocol::Response response =
+        AssertIDBFactory(frame->DomWindow(), idb_factory);
     if (!response.IsSuccess()) {
       SendFailure(response);
       return;
@@ -205,7 +210,7 @@
 
     ScriptState* script_state = ToScriptStateForMainWorld(frame);
     if (!script_state) {
-      SendFailure(Response::InternalError());
+      SendFailure(protocol::Response::InternalError());
       return;
     }
 
@@ -227,7 +232,7 @@
     IDBOpenDBRequest* idb_open_db_request =
         idb_factory->open(script_state, database_name, exception_state);
     if (exception_state.HadException()) {
-      SendFailure(Response::ServerError("Could not open database."));
+      SendFailure(protocol::Response::ServerError("Could not open database."));
       return;
     }
     idb_open_db_request->addEventListener(event_type_names::kUpgradeneeded,
@@ -236,7 +241,7 @@
                                           open_callback, false);
   }
 
-  void SendFailure(Response response) {
+  void SendFailure(protocol::Response response) {
     GetRequestCallback()->sendFailure(response);
   }
 };
@@ -261,7 +266,7 @@
   void Invoke(ExecutionContext* context, Event* event) override {
     if (event->type() != event_type_names::kSuccess) {
       executable_with_database_->GetRequestCallback()->sendFailure(
-          Response::ServerError("Unexpected event type."));
+          protocol::Response::ServerError("Unexpected event type."));
       return;
     }
 
@@ -270,7 +275,7 @@
     IDBAny* request_result = idb_open_db_request->ResultAsAny();
     if (request_result->GetType() != IDBAny::kIDBDatabaseType) {
       executable_with_database_->GetRequestCallback()->sendFailure(
-          Response::ServerError("Unexpected result type."));
+          protocol::Response::ServerError("Unexpected result type."));
       return;
     }
 
@@ -308,7 +313,7 @@
   void Invoke(ExecutionContext* context, Event* event) override {
     if (event->type() != event_type_names::kUpgradeneeded) {
       executable_with_database_->GetRequestCallback()->sendFailure(
-          Response::ServerError("Unexpected event type."));
+          protocol::Response::ServerError("Unexpected event type."));
       return;
     }
 
@@ -320,7 +325,7 @@
     NonThrowableExceptionState exception_state;
     idb_open_db_request->transaction()->abort(exception_state);
     executable_with_database_->GetRequestCallback()->sendFailure(
-        Response::ServerError("Aborted upgrade."));
+        protocol::Response::ServerError("Aborted upgrade."));
   }
 
  private:
@@ -550,7 +555,7 @@
   void Invoke(ExecutionContext*, Event* event) override {
     if (event->type() != event_type_names::kSuccess) {
       request_callback_->sendFailure(
-          Response::ServerError("Unexpected event type."));
+          protocol::Response::ServerError("Unexpected event type."));
       return;
     }
 
@@ -562,7 +567,7 @@
     }
     if (request_result->GetType() != IDBAny::kIDBCursorWithValueType) {
       request_callback_->sendFailure(
-          Response::ServerError("Unexpected result type."));
+          protocol::Response::ServerError("Unexpected result type."));
       return;
     }
 
@@ -573,7 +578,7 @@
       idb_cursor->advance(skip_count_, exception_state);
       if (exception_state.HadException()) {
         request_callback_->sendFailure(
-            Response::ServerError("Could not advance cursor."));
+            protocol::Response::ServerError("Could not advance cursor."));
       }
       skip_count_ = 0;
       return;
@@ -591,7 +596,7 @@
                          exception_state);
     if (exception_state.HadException()) {
       request_callback_->sendFailure(
-          Response::ServerError("Could not continue cursor."));
+          protocol::Response::ServerError("Could not continue cursor."));
       return;
     }
 
@@ -656,14 +661,14 @@
         TransactionForDatabase(script_state, idb_database, object_store_name_);
     if (!idb_transaction) {
       request_callback_->sendFailure(
-          Response::ServerError("Could not get transaction"));
+          protocol::Response::ServerError("Could not get transaction"));
       return;
     }
     IDBObjectStore* idb_object_store =
         ObjectStoreForTransaction(idb_transaction, object_store_name_);
     if (!idb_object_store) {
       request_callback_->sendFailure(
-          Response::ServerError("Could not get object store"));
+          protocol::Response::ServerError("Could not get object store"));
       return;
     }
 
@@ -672,7 +677,7 @@
       IDBIndex* idb_index = IndexForObjectStore(idb_object_store, index_name_);
       if (!idb_index) {
         request_callback_->sendFailure(
-            Response::ServerError("Could not get index"));
+            protocol::Response::ServerError("Could not get index"));
         return;
       }
 
@@ -740,26 +745,26 @@
   }
 }
 
-Response InspectorIndexedDBAgent::enable() {
+protocol::Response InspectorIndexedDBAgent::enable() {
   enabled_.Set(true);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorIndexedDBAgent::disable() {
+protocol::Response InspectorIndexedDBAgent::disable() {
   enabled_.Clear();
   v8_session_->releaseObjectGroup(
       ToV8InspectorStringView(kIndexedDBObjectGroup));
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 namespace {
 
-absl::variant<LocalFrame*, Response> ResolveFrame(
+absl::variant<LocalFrame*, protocol::Response> ResolveFrame(
     protocol::Maybe<String> security_origin,
     protocol::Maybe<String> storage_key,
     InspectedFrames* inspected_frames) {
   if (security_origin.isJust() == storage_key.isJust()) {
-    return Response::InvalidParams(
+    return protocol::Response::InvalidParams(
         "At least and at most one of security_origin, "
         "storage_key must be specified.");
   }
@@ -775,18 +780,22 @@
     protocol::Maybe<String> security_origin,
     protocol::Maybe<String> storage_key,
     std::unique_ptr<RequestDatabaseNamesCallback> request_callback) {
-  absl::variant<LocalFrame*, Response> frame_or_response = ResolveFrame(
-      std::move(security_origin), std::move(storage_key), inspected_frames_);
-  if (absl::holds_alternative<Response>(frame_or_response)) {
-    request_callback->sendFailure(absl::get<Response>(frame_or_response));
+  absl::variant<LocalFrame*, protocol::Response> frame_or_response =
+      ResolveFrame(std::move(security_origin), std::move(storage_key),
+                   inspected_frames_);
+  if (absl::holds_alternative<protocol::Response>(frame_or_response)) {
+    request_callback->sendFailure(
+        absl::get<protocol::Response>(frame_or_response));
   }
   LocalFrame* frame = absl::get<LocalFrame*>(frame_or_response);
   if (!frame) {
-    request_callback->sendFailure(Response::ServerError(kNoDocumentError));
+    request_callback->sendFailure(
+        protocol::Response::ServerError(kNoDocumentError));
     return;
   }
   IDBFactory* idb_factory = nullptr;
-  Response response = AssertIDBFactory(frame->DomWindow(), idb_factory);
+  protocol::Response response =
+      AssertIDBFactory(frame->DomWindow(), idb_factory);
   if (!response.IsSuccess()) {
     request_callback->sendFailure(response);
     return;
@@ -794,7 +803,7 @@
 
   ScriptState* script_state = ToScriptStateForMainWorld(frame);
   if (!script_state) {
-    request_callback->sendFailure(Response::InternalError());
+    request_callback->sendFailure(protocol::Response::InternalError());
     return;
   }
   idb_factory->GetDatabaseInfo(
@@ -807,10 +816,12 @@
     protocol::Maybe<String> storage_key,
     const String& database_name,
     std::unique_ptr<RequestDatabaseCallback> request_callback) {
-  absl::variant<LocalFrame*, Response> frame_or_response = ResolveFrame(
-      std::move(security_origin), std::move(storage_key), inspected_frames_);
-  if (absl::holds_alternative<Response>(frame_or_response)) {
-    request_callback->sendFailure(absl::get<Response>(frame_or_response));
+  absl::variant<LocalFrame*, protocol::Response> frame_or_response =
+      ResolveFrame(std::move(security_origin), std::move(storage_key),
+                   inspected_frames_);
+  if (absl::holds_alternative<protocol::Response>(frame_or_response)) {
+    request_callback->sendFailure(
+        absl::get<protocol::Response>(frame_or_response));
   }
   scoped_refptr<DatabaseLoader> database_loader =
       DatabaseLoader::Create(std::move(request_callback));
@@ -833,13 +844,15 @@
                          : nullptr;
   if (key_range.isJust() && !idb_key_range) {
     request_callback->sendFailure(
-        Response::ServerError("Can not parse key range."));
+        protocol::Response::ServerError("Can not parse key range."));
     return;
   }
-  absl::variant<LocalFrame*, Response> frame_or_response = ResolveFrame(
-      std::move(security_origin), std::move(storage_key), inspected_frames_);
-  if (absl::holds_alternative<Response>(frame_or_response)) {
-    request_callback->sendFailure(absl::get<Response>(frame_or_response));
+  absl::variant<LocalFrame*, protocol::Response> frame_or_response =
+      ResolveFrame(std::move(security_origin), std::move(storage_key),
+                   inspected_frames_);
+  if (absl::holds_alternative<protocol::Response>(frame_or_response)) {
+    request_callback->sendFailure(
+        absl::get<protocol::Response>(frame_or_response));
   }
   scoped_refptr<DataLoader> data_loader = DataLoader::Create(
       v8_session_, std::move(request_callback), object_store_name, index_name,
@@ -890,7 +903,8 @@
 
   void NotifySubtaskDone(const String& error) {
     if (!error.IsNull()) {
-      request_callback_->sendFailure(Response::ServerError(error.Utf8()));
+      request_callback_->sendFailure(
+          protocol::Response::ServerError(error.Utf8()));
       return;
     }
     if (--subtask_pending_ == 0) {
@@ -914,14 +928,14 @@
                                indexed_db_names::kReadonly);
     if (!idb_transaction) {
       request_callback_->sendFailure(
-          Response::ServerError("Could not get transaction"));
+          protocol::Response::ServerError("Could not get transaction"));
       return;
     }
     IDBObjectStore* idb_object_store =
         ObjectStoreForTransaction(idb_transaction, object_store_name_);
     if (!idb_object_store) {
       request_callback_->sendFailure(
-          Response::ServerError("Could not get object store"));
+          protocol::Response::ServerError("Could not get object store"));
       return;
     }
 
@@ -934,7 +948,7 @@
     DCHECK(!exception_state.HadException());
     if (exception_state.HadException()) {
       ExceptionCode ec = exception_state.Code();
-      request_callback_->sendFailure(Response::ServerError(
+      request_callback_->sendFailure(protocol::Response::ServerError(
           String::Format("Could not count entries in object store '%s': %d",
                          object_store_name_.Latin1().c_str(), ec)
               .Utf8()));
@@ -982,10 +996,12 @@
     const String& database_name,
     const String& object_store_name,
     std::unique_ptr<GetMetadataCallback> request_callback) {
-  absl::variant<LocalFrame*, Response> frame_or_response = ResolveFrame(
-      std::move(security_origin), std::move(storage_key), inspected_frames_);
-  if (absl::holds_alternative<Response>(frame_or_response)) {
-    request_callback->sendFailure(absl::get<Response>(frame_or_response));
+  absl::variant<LocalFrame*, protocol::Response> frame_or_response =
+      ResolveFrame(std::move(security_origin), std::move(storage_key),
+                   inspected_frames_);
+  if (absl::holds_alternative<protocol::Response>(frame_or_response)) {
+    request_callback->sendFailure(
+        absl::get<protocol::Response>(frame_or_response));
     return;
   }
   scoped_refptr<GetMetadata> get_metadata =
@@ -1002,8 +1018,8 @@
 
   void Invoke(ExecutionContext*, Event* event) override {
     if (event->type() != event_type_names::kSuccess) {
-      request_callback_->sendFailure(
-          Response::ServerError("Failed to delete specified entries"));
+      request_callback_->sendFailure(protocol::Response::ServerError(
+          "Failed to delete specified entries"));
       return;
     }
 
@@ -1039,14 +1055,14 @@
                                indexed_db_names::kReadwrite);
     if (!idb_transaction) {
       request_callback_->sendFailure(
-          Response::ServerError("Could not get transaction"));
+          protocol::Response::ServerError("Could not get transaction"));
       return;
     }
     IDBObjectStore* idb_object_store =
         ObjectStoreForTransaction(idb_transaction, object_store_name_);
     if (!idb_object_store) {
       request_callback_->sendFailure(
-          Response::ServerError("Could not get object store"));
+          protocol::Response::ServerError("Could not get object store"));
       return;
     }
 
@@ -1079,13 +1095,15 @@
   IDBKeyRange* idb_key_range = IdbKeyRangeFromKeyRange(key_range.get());
   if (!idb_key_range) {
     request_callback->sendFailure(
-        Response::ServerError("Can not parse key range"));
+        protocol::Response::ServerError("Can not parse key range"));
     return;
   }
-  absl::variant<LocalFrame*, Response> frame_or_response = ResolveFrame(
-      std::move(security_origin), std::move(storage_key), inspected_frames_);
-  if (absl::holds_alternative<Response>(frame_or_response)) {
-    request_callback->sendFailure(absl::get<Response>(frame_or_response));
+  absl::variant<LocalFrame*, protocol::Response> frame_or_response =
+      ResolveFrame(std::move(security_origin), std::move(storage_key),
+                   inspected_frames_);
+  if (absl::holds_alternative<protocol::Response>(frame_or_response)) {
+    request_callback->sendFailure(
+        absl::get<protocol::Response>(frame_or_response));
     return;
   }
   scoped_refptr<DeleteObjectStoreEntries> delete_object_store_entries =
@@ -1105,7 +1123,7 @@
   void Invoke(ExecutionContext*, Event* event) override {
     if (event->type() != event_type_names::kComplete) {
       request_callback_->sendFailure(
-          Response::ServerError("Unexpected event type."));
+          protocol::Response::ServerError("Unexpected event type."));
       return;
     }
 
@@ -1137,14 +1155,14 @@
                                indexed_db_names::kReadwrite);
     if (!idb_transaction) {
       request_callback_->sendFailure(
-          Response::ServerError("Could not get transaction"));
+          protocol::Response::ServerError("Could not get transaction"));
       return;
     }
     IDBObjectStore* idb_object_store =
         ObjectStoreForTransaction(idb_transaction, object_store_name_);
     if (!idb_object_store) {
       request_callback_->sendFailure(
-          Response::ServerError("Could not get object store"));
+          protocol::Response::ServerError("Could not get object store"));
       return;
     }
 
@@ -1153,7 +1171,7 @@
     DCHECK(!exception_state.HadException());
     if (exception_state.HadException()) {
       ExceptionCode ec = exception_state.Code();
-      request_callback_->sendFailure(Response::ServerError(
+      request_callback_->sendFailure(protocol::Response::ServerError(
           String::Format("Could not clear object store '%s': %d",
                          object_store_name_.Latin1().c_str(), ec)
               .Utf8()));
@@ -1181,10 +1199,12 @@
     const String& database_name,
     const String& object_store_name,
     std::unique_ptr<ClearObjectStoreCallback> request_callback) {
-  absl::variant<LocalFrame*, Response> frame_or_response = ResolveFrame(
-      std::move(security_origin), std::move(storage_key), inspected_frames_);
-  if (absl::holds_alternative<Response>(frame_or_response)) {
-    request_callback->sendFailure(absl::get<Response>(frame_or_response));
+  absl::variant<LocalFrame*, protocol::Response> frame_or_response =
+      ResolveFrame(std::move(security_origin), std::move(storage_key),
+                   inspected_frames_);
+  if (absl::holds_alternative<protocol::Response>(frame_or_response)) {
+    request_callback->sendFailure(
+        absl::get<protocol::Response>(frame_or_response));
     return;
   }
   scoped_refptr<ClearObjectStore> clear_object_store =
@@ -1198,19 +1218,23 @@
     protocol::Maybe<String> storage_key,
     const String& database_name,
     std::unique_ptr<DeleteDatabaseCallback> request_callback) {
-  absl::variant<LocalFrame*, Response> frame_or_response = ResolveFrame(
-      std::move(security_origin), std::move(storage_key), inspected_frames_);
-  if (absl::holds_alternative<Response>(frame_or_response)) {
-    request_callback->sendFailure(absl::get<Response>(frame_or_response));
+  absl::variant<LocalFrame*, protocol::Response> frame_or_response =
+      ResolveFrame(std::move(security_origin), std::move(storage_key),
+                   inspected_frames_);
+  if (absl::holds_alternative<protocol::Response>(frame_or_response)) {
+    request_callback->sendFailure(
+        absl::get<protocol::Response>(frame_or_response));
     return;
   }
   LocalFrame* frame = absl::get<LocalFrame*>(frame_or_response);
   if (!frame) {
-    request_callback->sendFailure(Response::ServerError(kNoDocumentError));
+    request_callback->sendFailure(
+        protocol::Response::ServerError(kNoDocumentError));
     return;
   }
   IDBFactory* idb_factory = nullptr;
-  Response response = AssertIDBFactory(frame->DomWindow(), idb_factory);
+  protocol::Response response =
+      AssertIDBFactory(frame->DomWindow(), idb_factory);
   if (!response.IsSuccess()) {
     request_callback->sendFailure(response);
     return;
@@ -1218,7 +1242,7 @@
 
   ScriptState* script_state = ToScriptStateForMainWorld(frame);
   if (!script_state) {
-    request_callback->sendFailure(Response::InternalError());
+    request_callback->sendFailure(protocol::Response::InternalError());
     return;
   }
   ScriptState::Scope scope(script_state);
@@ -1227,7 +1251,7 @@
       script_state, database_name, exception_state);
   if (exception_state.HadException()) {
     request_callback->sendFailure(
-        Response::ServerError("Could not delete database."));
+        protocol::Response::ServerError("Could not delete database."));
     return;
   }
   idb_request->addEventListener(

third_party/blink/renderer/modules/managed_device/navigator_managed_data.cc

diff --git a/third_party/blink/renderer/modules/managed_device/navigator_managed_data.cc b/third_party/blink/renderer/modules/managed_device/navigator_managed_data.cc
index 92af4bc..360de39 100644
--- a/third_party/blink/renderer/modules/managed_device/navigator_managed_data.cc
+++ b/third_party/blink/renderer/modules/managed_device/navigator_managed_data.cc
@@ -39,7 +39,8 @@
 }
 
 NavigatorManagedData::NavigatorManagedData(Navigator& navigator)
-    : Supplement<Navigator>(navigator),
+    : ActiveScriptWrappable<NavigatorManagedData>({}),
+      Supplement<Navigator>(navigator),
       device_api_service_(navigator.DomWindow()),
       managed_configuration_service_(navigator.DomWindow()),
       configuration_observer_(this, navigator.DomWindow()) {}

third_party/blink/renderer/modules/mediarecorder/media_recorder.cc

diff --git a/third_party/blink/renderer/modules/mediarecorder/media_recorder.cc b/third_party/blink/renderer/modules/mediarecorder/media_recorder.cc
index bfb5f7e..5baf2d7 100644
--- a/third_party/blink/renderer/modules/mediarecorder/media_recorder.cc
+++ b/third_party/blink/renderer/modules/mediarecorder/media_recorder.cc
@@ -203,7 +203,8 @@
                              MediaStream* stream,
                              const MediaRecorderOptions* options,
                              ExceptionState& exception_state)
-    : ExecutionContextLifecycleObserver(context),
+    : ActiveScriptWrappable<MediaRecorder>({}),
+      ExecutionContextLifecycleObserver(context),
       stream_(stream),
       mime_type_(options->mimeType()) {
   if (context->IsContextDestroyed()) {

third_party/blink/renderer/modules/mediasource/media_source.cc

diff --git a/third_party/blink/renderer/modules/mediasource/media_source.cc b/third_party/blink/renderer/modules/mediasource/media_source.cc
index a0ee20b9..5344c9d 100644
--- a/third_party/blink/renderer/modules/mediasource/media_source.cc
+++ b/third_party/blink/renderer/modules/mediasource/media_source.cc
@@ -113,7 +113,8 @@
 }
 
 MediaSource::MediaSource(ExecutionContext* context)
-    : ExecutionContextLifecycleObserver(context),
+    : ActiveScriptWrappable<MediaSource>({}),
+      ExecutionContextLifecycleObserver(context),
       ready_state_(ReadyState::kClosed),
       async_event_queue_(
           MakeGarbageCollected<EventQueue>(GetExecutionContext(),

third_party/blink/renderer/modules/mediasource/source_buffer.cc

diff --git a/third_party/blink/renderer/modules/mediasource/source_buffer.cc b/third_party/blink/renderer/modules/mediasource/source_buffer.cc
index a99ec3f2..3655eb8 100644
--- a/third_party/blink/renderer/modules/mediasource/source_buffer.cc
+++ b/third_party/blink/renderer/modules/mediasource/source_buffer.cc
@@ -200,7 +200,8 @@
 SourceBuffer::SourceBuffer(std::unique_ptr<WebSourceBuffer> web_source_buffer,
                            MediaSource* source,
                            EventQueue* async_event_queue)
-    : ExecutionContextLifecycleObserver(source->GetExecutionContext()),
+    : ActiveScriptWrappable<SourceBuffer>({}),
+      ExecutionContextLifecycleObserver(source->GetExecutionContext()),
       web_source_buffer_(std::move(web_source_buffer)),
       source_(source),
       track_defaults_(MakeGarbageCollected<TrackDefaultList>()),

third_party/blink/renderer/modules/mediastream/media_devices.cc

diff --git a/third_party/blink/renderer/modules/mediastream/media_devices.cc b/third_party/blink/renderer/modules/mediastream/media_devices.cc
index 141a66a..d9760c6 100644
--- a/third_party/blink/renderer/modules/mediastream/media_devices.cc
+++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc
@@ -365,7 +365,8 @@
 }
 
 MediaDevices::MediaDevices(Navigator& navigator)
-    : Supplement<Navigator>(navigator),
+    : ActiveScriptWrappable<MediaDevices>({}),
+      Supplement<Navigator>(navigator),
       ExecutionContextLifecycleObserver(navigator.DomWindow()),
       stopped_(false),
       dispatcher_host_(navigator.GetExecutionContext()),

third_party/blink/renderer/modules/mediastream/media_stream.cc

diff --git a/third_party/blink/renderer/modules/mediastream/media_stream.cc b/third_party/blink/renderer/modules/mediastream/media_stream.cc
index 7b69b683..c1f81f7 100644
--- a/third_party/blink/renderer/modules/mediastream/media_stream.cc
+++ b/third_party/blink/renderer/modules/mediastream/media_stream.cc
@@ -123,6 +123,7 @@
                          TransferredMediaStreamTrack* transferred_track,
                          base::OnceCallback<void(MediaStream*)> callback)
     : ExecutionContextClient(context),
+      ActiveScriptWrappable<MediaStream>({}),
       descriptor_(stream_descriptor),
       media_stream_initialized_callback_(std::move(callback)),
       scheduled_event_timer_(
@@ -183,6 +184,7 @@
                          const MediaStreamTrackVector& audio_tracks,
                          const MediaStreamTrackVector& video_tracks)
     : ExecutionContextClient(context),
+      ActiveScriptWrappable<MediaStream>({}),
       descriptor_(stream_descriptor),
       scheduled_event_timer_(
           context->GetTaskRunner(TaskType::kMediaElementEvent),
@@ -213,6 +215,7 @@
                          const MediaStreamTrackVector& audio_tracks,
                          const MediaStreamTrackVector& video_tracks)
     : ExecutionContextClient(context),
+      ActiveScriptWrappable<MediaStream>({}),
       scheduled_event_timer_(
           context->GetTaskRunner(TaskType::kMediaElementEvent),
           this,

third_party/blink/renderer/modules/mediastream/media_stream_track.cc

diff --git a/third_party/blink/renderer/modules/mediastream/media_stream_track.cc b/third_party/blink/renderer/modules/mediastream/media_stream_track.cc
index 8dc248d..f961aea5 100644
--- a/third_party/blink/renderer/modules/mediastream/media_stream_track.cc
+++ b/third_party/blink/renderer/modules/mediastream/media_stream_track.cc
@@ -29,6 +29,9 @@
 
 }  // namespace
 
+MediaStreamTrack::MediaStreamTrack()
+    : ActiveScriptWrappable<MediaStreamTrack>({}) {}
+
 String ContentHintToString(
     const WebMediaStreamTrack::ContentHintType& content_hint) {
   switch (content_hint) {

third_party/blink/renderer/modules/mediastream/media_stream_track.h

diff --git a/third_party/blink/renderer/modules/mediastream/media_stream_track.h b/third_party/blink/renderer/modules/mediastream/media_stream_track.h
index 75864f3..743afc5b 100644
--- a/third_party/blink/renderer/modules/mediastream/media_stream_track.h
+++ b/third_party/blink/renderer/modules/mediastream/media_stream_track.h
@@ -84,6 +84,8 @@
   static MediaStreamTrack* FromTransferredState(ScriptState* script_state,
                                                 const TransferredValues& data);
 
+  MediaStreamTrack();
+
   // MediaStreamTrack.idl
   virtual String kind() const = 0;
   virtual String id() const = 0;

third_party/blink/renderer/modules/netinfo/network_information.cc

diff --git a/third_party/blink/renderer/modules/netinfo/network_information.cc b/third_party/blink/renderer/modules/netinfo/network_information.cc
index 4a4455bb..30bfe76 100644
--- a/third_party/blink/renderer/modules/netinfo/network_information.cc
+++ b/third_party/blink/renderer/modules/netinfo/network_information.cc
@@ -273,7 +273,8 @@
 }
 
 NetworkInformation::NetworkInformation(NavigatorBase& navigator)
-    : Supplement<NavigatorBase>(navigator),
+    : ActiveScriptWrappable<NetworkInformation>({}),
+      Supplement<NavigatorBase>(navigator),
       ExecutionContextLifecycleObserver(navigator.GetExecutionContext()),
       web_holdback_console_message_shown_(false),
       context_stopped_(false) {

third_party/blink/renderer/modules/nfc/ndef_reader.cc

diff --git a/third_party/blink/renderer/modules/nfc/ndef_reader.cc b/third_party/blink/renderer/modules/nfc/ndef_reader.cc
index b458f24..19c25738 100644
--- a/third_party/blink/renderer/modules/nfc/ndef_reader.cc
+++ b/third_party/blink/renderer/modules/nfc/ndef_reader.cc
@@ -34,7 +34,6 @@
 
 using mojom::blink::PermissionName;
 using mojom::blink::PermissionService;
-using mojom::blink::PermissionStatus;
 
 namespace {
 
@@ -149,7 +148,8 @@
 }
 
 NDEFReader::NDEFReader(ExecutionContext* context)
-    : ExecutionContextLifecycleObserver(context),
+    : ActiveScriptWrappable<NDEFReader>({}),
+      ExecutionContextLifecycleObserver(context),
       nfc_proxy_(NFCProxy::From(*DomWindow())),
       permission_service_(context) {}
 
@@ -211,8 +211,9 @@
   return scan_resolver_->Promise();
 }
 
-void NDEFReader::ReadOnRequestPermission(const NDEFScanOptions* options,
-                                         PermissionStatus status) {
+void NDEFReader::ReadOnRequestPermission(
+    const NDEFScanOptions* options,
+    mojom::blink::PermissionStatus status) {
   if (!scan_resolver_)
     return;
 
@@ -226,7 +227,7 @@
 
   ScriptState::Scope script_state_scope(script_state);
 
-  if (status != PermissionStatus::GRANTED) {
+  if (status != mojom::blink::PermissionStatus::GRANTED) {
     scan_resolver_->Reject(V8ThrowDOMException::CreateOrDie(
         script_state->GetIsolate(), DOMExceptionCode::kNotAllowedError,
         "NFC permission request denied."));
@@ -378,7 +379,7 @@
     std::unique_ptr<ScopedAbortState> scoped_abort_state,
     const NDEFWriteOptions* options,
     device::mojom::blink::NDEFMessagePtr message,
-    PermissionStatus status) {
+    mojom::blink::PermissionStatus status) {
   DCHECK(resolver);
 
   ScriptState* script_state = resolver->GetScriptState();
@@ -390,7 +391,7 @@
 
   ScriptState::Scope script_state_scope(script_state);
 
-  if (status != PermissionStatus::GRANTED) {
+  if (status != mojom::blink::PermissionStatus::GRANTED) {
     resolver->Reject(V8ThrowDOMException::CreateOrDie(
         script_state->GetIsolate(), DOMExceptionCode::kNotAllowedError,
         "NFC permission request denied."));
@@ -500,7 +501,7 @@
     ScriptPromiseResolver* resolver,
     std::unique_ptr<ScopedAbortState> scoped_abort_state,
     const NDEFMakeReadOnlyOptions* options,
-    PermissionStatus status) {
+    mojom::blink::PermissionStatus status) {
   DCHECK(resolver);
 
   ScriptState* script_state = resolver->GetScriptState();
@@ -512,7 +513,7 @@
 
   ScriptState::Scope script_state_scope(resolver->GetScriptState());
 
-  if (status != PermissionStatus::GRANTED) {
+  if (status != mojom::blink::PermissionStatus::GRANTED) {
     resolver->Reject(V8ThrowDOMException::CreateOrDie(
         script_state->GetIsolate(), DOMExceptionCode::kNotAllowedError,
         "NFC permission request denied."));

third_party/blink/renderer/modules/notifications/notification.cc

diff --git a/third_party/blink/renderer/modules/notifications/notification.cc b/third_party/blink/renderer/modules/notifications/notification.cc
index 573fdede..9e8a67b 100644
--- a/third_party/blink/renderer/modules/notifications/notification.cc
+++ b/third_party/blink/renderer/modules/notifications/notification.cc
@@ -164,7 +164,8 @@
 Notification::Notification(ExecutionContext* context,
                            Type type,
                            mojom::blink::NotificationDataPtr data)
-    : ExecutionContextLifecycleObserver(context),
+    : ActiveScriptWrappable<Notification>({}),
+      ExecutionContextLifecycleObserver(context),
       type_(type),
       state_(State::kLoading),
       data_(std::move(data)),

third_party/blink/renderer/modules/payments/payment_request.cc

diff --git a/third_party/blink/renderer/modules/payments/payment_request.cc b/third_party/blink/renderer/modules/payments/payment_request.cc
index 509270e..3bda1295 100644
--- a/third_party/blink/renderer/modules/payments/payment_request.cc
+++ b/third_party/blink/renderer/modules/payments/payment_request.cc
@@ -1267,6 +1267,7 @@
         mock_payment_provider,
     ExceptionState& exception_state)
     : ExecutionContextLifecycleObserver(execution_context),
+      ActiveScriptWrappable<PaymentRequest>({}),
       options_(options),
       payment_provider_(execution_context),
       client_receiver_(this, execution_context),

third_party/blink/renderer/modules/payments/payment_response.cc

diff --git a/third_party/blink/renderer/modules/payments/payment_response.cc b/third_party/blink/renderer/modules/payments/payment_response.cc
index 88db8904..5ab415d 100644
--- a/third_party/blink/renderer/modules/payments/payment_response.cc
+++ b/third_party/blink/renderer/modules/payments/payment_response.cc
@@ -75,6 +75,7 @@
     PaymentStateResolver* payment_state_resolver,
     const String& request_id)
     : ExecutionContextClient(ExecutionContext::From(script_state)),
+      ActiveScriptWrappable<PaymentResponse>({}),
       request_id_(request_id),
       method_name_(response->method_name),
       shipping_address_(shipping_address),

third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc

diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc b/third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc
index 2e6e315..87feebc 100644
--- a/third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc
+++ b/third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc
@@ -305,7 +305,8 @@
     ExecutionContext* context,
     rtc::scoped_refptr<webrtc::DataChannelInterface> channel,
     RTCPeerConnectionHandler* peer_connection_handler)
-    : ExecutionContextLifecycleObserver(context),
+    : ActiveScriptWrappable<RTCDataChannel>({}),
+      ExecutionContextLifecycleObserver(context),
       scheduled_event_timer_(context->GetTaskRunner(TaskType::kNetworking),
                              this,
                              &RTCDataChannel::ScheduledEventTimerFired),

third_party/blink/renderer/modules/peerconnection/rtc_ice_transport.cc

diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_ice_transport.cc b/third_party/blink/renderer/modules/peerconnection/rtc_ice_transport.cc
index ce65a84..28ee1f0 100644
--- a/third_party/blink/renderer/modules/peerconnection/rtc_ice_transport.cc
+++ b/third_party/blink/renderer/modules/peerconnection/rtc_ice_transport.cc
@@ -92,7 +92,8 @@
     scoped_refptr<base::SingleThreadTaskRunner> host_thread,
     std::unique_ptr<IceTransportAdapterCrossThreadFactory> adapter_factory,
     RTCPeerConnection* peer_connection)
-    : ExecutionContextLifecycleObserver(context),
+    : ActiveScriptWrappable<RTCIceTransport>({}),
+      ExecutionContextLifecycleObserver(context),
       peer_connection_(peer_connection) {
   DCHECK(context);
   DCHECK(proxy_thread);

third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc

diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
index 1ac5983..e3e9203 100644
--- a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
+++ b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
@@ -583,7 +583,8 @@
     bool encoded_insertable_streams,
     GoogMediaConstraints* media_constraints,
     ExceptionState& exception_state)
-    : ExecutionContextLifecycleObserver(context),
+    : ActiveScriptWrappable<RTCPeerConnection>({}),
+      ExecutionContextLifecycleObserver(context),
       pending_local_description_(nullptr),
       current_local_description_(nullptr),
       pending_remote_description_(nullptr),

third_party/blink/renderer/modules/permissions/permission_status.cc

diff --git a/third_party/blink/renderer/modules/permissions/permission_status.cc b/third_party/blink/renderer/modules/permissions/permission_status.cc
index 49cdeeb..9a49685 100644
--- a/third_party/blink/renderer/modules/permissions/permission_status.cc
+++ b/third_party/blink/renderer/modules/permissions/permission_status.cc
@@ -27,7 +27,8 @@
 
 PermissionStatus::PermissionStatus(PermissionStatusListener* listener,
                                    ExecutionContext* execution_context)
-    : ExecutionContextLifecycleStateObserver(execution_context),
+    : ActiveScriptWrappable<PermissionStatus>({}),
+      ExecutionContextLifecycleStateObserver(execution_context),
       listener_(listener) {}
 
 PermissionStatus::~PermissionStatus() = default;

third_party/blink/renderer/modules/permissions/permission_utils.cc

diff --git a/third_party/blink/renderer/modules/permissions/permission_utils.cc b/third_party/blink/renderer/modules/permissions/permission_utils.cc
index 7ecbe43..e1b4c01 100644
--- a/third_party/blink/renderer/modules/permissions/permission_utils.cc
+++ b/third_party/blink/renderer/modules/permissions/permission_utils.cc
@@ -32,7 +32,6 @@
 using MojoPermissionDescriptor = mojom::blink::PermissionDescriptor;
 using mojom::blink::PermissionDescriptorPtr;
 using mojom::blink::PermissionName;
-using mojom::blink::PermissionStatus;
 
 void ConnectToPermissionService(
     ExecutionContext* execution_context,
@@ -41,13 +40,13 @@
       std::move(receiver));
 }
 
-String PermissionStatusToString(PermissionStatus status) {
+String PermissionStatusToString(mojom::blink::PermissionStatus status) {
   switch (status) {
-    case PermissionStatus::GRANTED:
+    case mojom::blink::PermissionStatus::GRANTED:
       return "granted";
-    case PermissionStatus::DENIED:
+    case mojom::blink::PermissionStatus::DENIED:
       return "denied";
-    case PermissionStatus::ASK:
+    case mojom::blink::PermissionStatus::ASK:
       return "prompt";
   }
   NOTREACHED();

third_party/blink/renderer/modules/picture_in_picture/picture_in_picture_window.cc

diff --git a/third_party/blink/renderer/modules/picture_in_picture/picture_in_picture_window.cc b/third_party/blink/renderer/modules/picture_in_picture/picture_in_picture_window.cc
index de13686..56390b6 100644
--- a/third_party/blink/renderer/modules/picture_in_picture/picture_in_picture_window.cc
+++ b/third_party/blink/renderer/modules/picture_in_picture/picture_in_picture_window.cc
@@ -14,7 +14,9 @@
 PictureInPictureWindow::PictureInPictureWindow(
     ExecutionContext* execution_context,
     const gfx::Size& size)
-    : ExecutionContextClient(execution_context), size_(size) {}
+    : ActiveScriptWrappable<PictureInPictureWindow>({}),
+      ExecutionContextClient(execution_context),
+      size_(size) {}
 
 void PictureInPictureWindow::OnClose() {
   size_ = gfx::Size();

third_party/blink/renderer/modules/presentation/presentation_availability.cc

diff --git a/third_party/blink/renderer/modules/presentation/presentation_availability.cc b/third_party/blink/renderer/modules/presentation/presentation_availability.cc
index caded34e..0973a968 100644
--- a/third_party/blink/renderer/modules/presentation/presentation_availability.cc
+++ b/third_party/blink/renderer/modules/presentation/presentation_availability.cc
@@ -34,7 +34,8 @@
     ExecutionContext* execution_context,
     const WTF::Vector<KURL>& urls,
     bool value)
-    : ExecutionContextLifecycleStateObserver(execution_context),
+    : ActiveScriptWrappable<PresentationAvailability>({}),
+      ExecutionContextLifecycleStateObserver(execution_context),
       PageVisibilityObserver(
           To<LocalDOMWindow>(execution_context)->GetFrame()->GetPage()),
       urls_(urls),

third_party/blink/renderer/modules/presentation/presentation_request.cc

diff --git a/third_party/blink/renderer/modules/presentation/presentation_request.cc b/third_party/blink/renderer/modules/presentation/presentation_request.cc
index 0e662cc6..9a3e5632 100644
--- a/third_party/blink/renderer/modules/presentation/presentation_request.cc
+++ b/third_party/blink/renderer/modules/presentation/presentation_request.cc
@@ -299,6 +299,8 @@
 
 PresentationRequest::PresentationRequest(ExecutionContext* execution_context,
                                          const Vector<KURL>& urls)
-    : ExecutionContextClient(execution_context), urls_(urls) {}
+    : ActiveScriptWrappable<PresentationRequest>({}),
+      ExecutionContextClient(execution_context),
+      urls_(urls) {}
 
 }  // namespace blink

third_party/blink/renderer/modules/quota/storage_manager.cc

diff --git a/third_party/blink/renderer/modules/quota/storage_manager.cc b/third_party/blink/renderer/modules/quota/storage_manager.cc
index 7014258..9732e10 100644
--- a/third_party/blink/renderer/modules/quota/storage_manager.cc
+++ b/third_party/blink/renderer/modules/quota/storage_manager.cc
@@ -30,7 +30,6 @@
 
 using mojom::blink::PermissionName;
 using mojom::blink::PermissionService;
-using mojom::blink::PermissionStatus;
 using mojom::blink::UsageBreakdownPtr;
 
 namespace {
@@ -229,12 +228,13 @@
   permission_service_.reset();
 }
 
-void StorageManager::PermissionRequestComplete(ScriptPromiseResolver* resolver,
-                                               PermissionStatus status) {
+void StorageManager::PermissionRequestComplete(
+    ScriptPromiseResolver* resolver,
+    mojom::blink::PermissionStatus status) {
   if (!resolver->GetExecutionContext() ||
       resolver->GetExecutionContext()->IsContextDestroyed())
     return;
-  resolver->Resolve(status == PermissionStatus::GRANTED);
+  resolver->Resolve(status == mojom::blink::PermissionStatus::GRANTED);
 }
 
 void StorageManager::StartObserving() {

third_party/blink/renderer/modules/remoteplayback/remote_playback.cc

diff --git a/third_party/blink/renderer/modules/remoteplayback/remote_playback.cc b/third_party/blink/renderer/modules/remoteplayback/remote_playback.cc
index 96e885ad..a627c98 100644
--- a/third_party/blink/renderer/modules/remoteplayback/remote_playback.cc
+++ b/third_party/blink/renderer/modules/remoteplayback/remote_playback.cc
@@ -102,6 +102,7 @@
 
 RemotePlayback::RemotePlayback(HTMLMediaElement& element)
     : ExecutionContextLifecycleObserver(element.GetExecutionContext()),
+      ActiveScriptWrappable<RemotePlayback>({}),
       RemotePlaybackController(element),
       state_(mojom::blink::PresentationConnectionState::CLOSED),
       availability_(mojom::ScreenAvailability::UNKNOWN),

third_party/blink/renderer/modules/sensor/sensor.cc

diff --git a/third_party/blink/renderer/modules/sensor/sensor.cc b/third_party/blink/renderer/modules/sensor/sensor.cc
index da2a3e24..f166640 100644
--- a/third_party/blink/renderer/modules/sensor/sensor.cc
+++ b/third_party/blink/renderer/modules/sensor/sensor.cc
@@ -43,7 +43,8 @@
                ExceptionState& exception_state,
                device::mojom::blink::SensorType type,
                const Vector<mojom::blink::PermissionsPolicyFeature>& features)
-    : ExecutionContextLifecycleObserver(execution_context),
+    : ActiveScriptWrappable<Sensor>({}),
+      ExecutionContextLifecycleObserver(execution_context),
       frequency_(0.0),
       type_(type),
       state_(SensorState::kIdle),

third_party/blink/renderer/modules/serial/serial_port.cc

diff --git a/third_party/blink/renderer/modules/serial/serial_port.cc b/third_party/blink/renderer/modules/serial/serial_port.cc
index bfcd8b9b..e7661cc 100644
--- a/third_party/blink/renderer/modules/serial/serial_port.cc
+++ b/third_party/blink/renderer/modules/serial/serial_port.cc
@@ -113,7 +113,8 @@
 }  // namespace
 
 SerialPort::SerialPort(Serial* parent, mojom::blink::SerialPortInfoPtr info)
-    : info_(std::move(info)),
+    : ActiveScriptWrappable<SerialPort>({}),
+      info_(std::move(info)),
       parent_(parent),
       port_(parent->GetExecutionContext()),
       client_receiver_(this, parent->GetExecutionContext()) {}

third_party/blink/renderer/modules/service_worker/fetch_event.cc

diff --git a/third_party/blink/renderer/modules/service_worker/fetch_event.cc b/third_party/blink/renderer/modules/service_worker/fetch_event.cc
index 80038ce..790fe9e0f 100644
--- a/third_party/blink/renderer/modules/service_worker/fetch_event.cc
+++ b/third_party/blink/renderer/modules/service_worker/fetch_event.cc
@@ -102,6 +102,7 @@
                        WaitUntilObserver* wait_until_observer,
                        bool navigation_preload_sent)
     : ExtendableEvent(type, initializer, wait_until_observer),
+      ActiveScriptWrappable<FetchEvent>({}),
       ExecutionContextClient(ExecutionContext::From(script_state)),
       observer_(respond_with_observer),
       preload_response_property_(MakeGarbageCollected<PreloadResponseProperty>(

third_party/blink/renderer/modules/service_worker/service_worker.cc

diff --git a/third_party/blink/renderer/modules/service_worker/service_worker.cc b/third_party/blink/renderer/modules/service_worker/service_worker.cc
index c5e8418..54e0225 100644
--- a/third_party/blink/renderer/modules/service_worker/service_worker.cc
+++ b/third_party/blink/renderer/modules/service_worker/service_worker.cc
@@ -199,6 +199,7 @@
 ServiceWorker::ServiceWorker(ExecutionContext* execution_context,
                              WebServiceWorkerObjectInfo info)
     : AbstractWorker(execution_context),
+      ActiveScriptWrappable<ServiceWorker>({}),
       url_(info.url),
       state_(info.state),
       host_(execution_context),

third_party/blink/renderer/modules/service_worker/service_worker_registration.cc

diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_registration.cc b/third_party/blink/renderer/modules/service_worker/service_worker_registration.cc
index c45ee57..f565fa3 100644
--- a/third_party/blink/renderer/modules/service_worker/service_worker_registration.cc
+++ b/third_party/blink/renderer/modules/service_worker/service_worker_registration.cc
@@ -140,7 +140,8 @@
 ServiceWorkerRegistration::ServiceWorkerRegistration(
     ExecutionContext* execution_context,
     WebServiceWorkerRegistrationObjectInfo info)
-    : ExecutionContextLifecycleObserver(execution_context),
+    : ActiveScriptWrappable<ServiceWorkerRegistration>({}),
+      ExecutionContextLifecycleObserver(execution_context),
       registration_id_(info.registration_id),
       scope_(std::move(info.scope)),
       stopped_(false) {
@@ -152,7 +153,8 @@
 ServiceWorkerRegistration::ServiceWorkerRegistration(
     ExecutionContext* execution_context,
     mojom::blink::ServiceWorkerRegistrationObjectInfoPtr info)
-    : ExecutionContextLifecycleObserver(execution_context),
+    : ActiveScriptWrappable<ServiceWorkerRegistration>({}),
+      ExecutionContextLifecycleObserver(execution_context),
       registration_id_(info->registration_id),
       scope_(std::move(info->scope)),
       stopped_(false) {

third_party/blink/renderer/modules/smart_card/smart_card_reader.cc

diff --git a/third_party/blink/renderer/modules/smart_card/smart_card_reader.cc b/third_party/blink/renderer/modules/smart_card/smart_card_reader.cc
index 7d2f60c..aab0870 100644
--- a/third_party/blink/renderer/modules/smart_card/smart_card_reader.cc
+++ b/third_party/blink/renderer/modules/smart_card/smart_card_reader.cc
@@ -34,6 +34,7 @@
 SmartCardReader::SmartCardReader(SmartCardReaderInfoPtr info,
                                  ExecutionContext* context)
     : ExecutionContextLifecycleObserver(context),
+      ActiveScriptWrappable<SmartCardReader>({}),
       name_(info->name),
       state_(V8StateFromMojoState(info->state)),
       atr_(info->atr) {}

third_party/blink/renderer/modules/smart_card/smart_card_reader_presence_observer.cc

diff --git a/third_party/blink/renderer/modules/smart_card/smart_card_reader_presence_observer.cc b/third_party/blink/renderer/modules/smart_card/smart_card_reader_presence_observer.cc
index 87cee54..93ae687 100644
--- a/third_party/blink/renderer/modules/smart_card/smart_card_reader_presence_observer.cc
+++ b/third_party/blink/renderer/modules/smart_card/smart_card_reader_presence_observer.cc
@@ -9,7 +9,8 @@
 
 SmartCardReaderPresenceObserver::SmartCardReaderPresenceObserver(
     ExecutionContext* context)
-    : ExecutionContextLifecycleObserver(context) {}
+    : ExecutionContextLifecycleObserver(context),
+      blink::ActiveScriptWrappable<SmartCardReaderPresenceObserver>({}) {}
 
 SmartCardReaderPresenceObserver::~SmartCardReaderPresenceObserver() = default;
 

third_party/blink/renderer/modules/speech/speech_recognition.cc

diff --git a/third_party/blink/renderer/modules/speech/speech_recognition.cc b/third_party/blink/renderer/modules/speech/speech_recognition.cc
index 3bb1f98..06ff605 100644
--- a/third_party/blink/renderer/modules/speech/speech_recognition.cc
+++ b/third_party/blink/renderer/modules/speech/speech_recognition.cc
@@ -246,7 +246,8 @@
 }
 
 SpeechRecognition::SpeechRecognition(LocalDOMWindow* window)
-    : ExecutionContextLifecycleObserver(window),
+    : ActiveScriptWrappable<SpeechRecognition>({}),
+      ExecutionContextLifecycleObserver(window),
       PageVisibilityObserver(window->GetFrame() ? window->GetFrame()->GetPage()
                                                 : nullptr),
       grammars_(SpeechGrammarList::Create()),  // FIXME: The spec is not clear

third_party/blink/renderer/modules/storage/inspector_dom_storage_agent.cc

diff --git a/third_party/blink/renderer/modules/storage/inspector_dom_storage_agent.cc b/third_party/blink/renderer/modules/storage/inspector_dom_storage_agent.cc
index 7d176f9e..50f285a 100644
--- a/third_party/blink/renderer/modules/storage/inspector_dom_storage_agent.cc
+++ b/third_party/blink/renderer/modules/storage/inspector_dom_storage_agent.cc
@@ -45,11 +45,10 @@
 #include "third_party/blink/renderer/platform/storage/blink_storage_key.h"
 
 namespace blink {
-using protocol::Response;
 
-static Response ToResponse(ExceptionState& exception_state) {
+static protocol::Response ToResponse(ExceptionState& exception_state) {
   if (!exception_state.HadException())
-    return Response::Success();
+    return protocol::Response::Success();
 
   String name_prefix = IsDOMExceptionCode(exception_state.Code())
                            ? DOMException::GetErrorName(
@@ -57,7 +56,7 @@
                                  " "
                            : g_empty_string;
   String msg = name_prefix + exception_state.Message();
-  return Response::ServerError(msg.Utf8());
+  return protocol::Response::ServerError(msg.Utf8());
 }
 
 InspectorDOMStorageAgent::InspectorDOMStorageAgent(
@@ -85,17 +84,17 @@
     ns->AddInspectorStorageAgent(this);
 }
 
-Response InspectorDOMStorageAgent::enable() {
+protocol::Response InspectorDOMStorageAgent::enable() {
   if (enabled_.Get())
-    return Response::Success();
+    return protocol::Response::Success();
   enabled_.Set(true);
   InnerEnable();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMStorageAgent::disable() {
+protocol::Response InspectorDOMStorageAgent::disable() {
   if (!enabled_.Get())
-    return Response::Success();
+    return protocol::Response::Success();
   enabled_.Set(false);
   StorageController::GetInstance()->RemoveLocalStorageInspectorStorageAgent(
       this);
@@ -103,27 +102,29 @@
       StorageNamespace::From(inspected_frames_->Root()->GetPage());
   if (ns)
     ns->RemoveInspectorStorageAgent(this);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMStorageAgent::clear(
+protocol::Response InspectorDOMStorageAgent::clear(
     std::unique_ptr<protocol::DOMStorage::StorageId> storage_id) {
   StorageArea* storage_area = nullptr;
-  Response response = FindStorageArea(std::move(storage_id), storage_area);
+  protocol::Response response =
+      FindStorageArea(std::move(storage_id), storage_area);
   if (!response.IsSuccess())
     return response;
   DummyExceptionStateForTesting exception_state;
   storage_area->clear(exception_state);
   if (exception_state.HadException())
-    return Response::ServerError("Could not clear the storage");
-  return Response::Success();
+    return protocol::Response::ServerError("Could not clear the storage");
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMStorageAgent::getDOMStorageItems(
+protocol::Response InspectorDOMStorageAgent::getDOMStorageItems(
     std::unique_ptr<protocol::DOMStorage::StorageId> storage_id,
     std::unique_ptr<protocol::Array<protocol::Array<String>>>* items) {
   StorageArea* storage_area = nullptr;
-  Response response = FindStorageArea(std::move(storage_id), storage_area);
+  protocol::Response response =
+      FindStorageArea(std::move(storage_id), storage_area);
   if (!response.IsSuccess())
     return response;
 
@@ -146,15 +147,16 @@
     storage_items->emplace_back(std::move(entry));
   }
   *items = std::move(storage_items);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDOMStorageAgent::setDOMStorageItem(
+protocol::Response InspectorDOMStorageAgent::setDOMStorageItem(
     std::unique_ptr<protocol::DOMStorage::StorageId> storage_id,
     const String& key,
     const String& value) {
   StorageArea* storage_area = nullptr;
-  Response response = FindStorageArea(std::move(storage_id), storage_area);
+  protocol::Response response =
+      FindStorageArea(std::move(storage_id), storage_area);
   if (!response.IsSuccess())
     return response;
 
@@ -163,11 +165,12 @@
   return ToResponse(exception_state);
 }
 
-Response InspectorDOMStorageAgent::removeDOMStorageItem(
+protocol::Response InspectorDOMStorageAgent::removeDOMStorageItem(
     std::unique_ptr<protocol::DOMStorage::StorageId> storage_id,
     const String& key) {
   StorageArea* storage_area = nullptr;
-  Response response = FindStorageArea(std::move(storage_id), storage_area);
+  protocol::Response response =
+      FindStorageArea(std::move(storage_id), storage_area);
   if (!response.IsSuccess())
     return response;
 
@@ -224,7 +227,7 @@
 }
 }  // namespace
 
-Response InspectorDOMStorageAgent::FindStorageArea(
+protocol::Response InspectorDOMStorageAgent::FindStorageArea(
     std::unique_ptr<protocol::DOMStorage::StorageId> storage_id,
     StorageArea*& storage_area) {
   String security_origin = storage_id->getSecurityOrigin("");
@@ -236,11 +239,12 @@
           : inspected_frames_->FrameWithSecurityOrigin(security_origin);
 
   if (!frame) {
-    return Response::ServerError("Frame not found for the given storage id");
+    return protocol::Response::ServerError(
+        "Frame not found for the given storage id");
   }
   if (is_local_storage) {
     if (!frame->DomWindow()->GetSecurityOrigin()->CanAccessLocalStorage()) {
-      return Response::ServerError(
+      return protocol::Response::ServerError(
           "Security origin cannot access local storage");
     }
     storage_area = StorageArea::CreateForInspectorAgent(
@@ -248,23 +252,23 @@
         StorageController::GetInstance()->GetLocalStorageArea(
             frame->DomWindow()),
         StorageArea::StorageType::kLocalStorage);
-    return Response::Success();
+    return protocol::Response::Success();
   }
 
   if (!frame->DomWindow()->GetSecurityOrigin()->CanAccessSessionStorage()) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "Security origin cannot access session storage");
   }
   StorageNamespace* session_namespace =
       StorageNamespace::From(frame->GetPage());
   if (!session_namespace)
-    return Response::ServerError("SessionStorage is not supported");
+    return protocol::Response::ServerError("SessionStorage is not supported");
   DCHECK(session_namespace->IsSessionStorage());
 
   storage_area = StorageArea::CreateForInspectorAgent(
       frame->DomWindow(), session_namespace->GetCachedArea(frame->DomWindow()),
       StorageArea::StorageType::kSessionStorage);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 }  // namespace blink

third_party/blink/renderer/modules/wake_lock/wake_lock.cc

diff --git a/third_party/blink/renderer/modules/wake_lock/wake_lock.cc b/third_party/blink/renderer/modules/wake_lock/wake_lock.cc
index fbb17041..880e31813 100644
--- a/third_party/blink/renderer/modules/wake_lock/wake_lock.cc
+++ b/third_party/blink/renderer/modules/wake_lock/wake_lock.cc
@@ -25,7 +25,6 @@
 namespace blink {
 
 using mojom::blink::PermissionService;
-using mojom::blink::PermissionStatus;
 
 // static
 const char WakeLock::kSupplementName[] = "WakeLock";
@@ -184,18 +183,19 @@
                         WrapPersistent(this), type)));
 }
 
-void WakeLock::DidReceivePermissionResponse(V8WakeLockType::Enum type,
-                                            ScriptPromiseResolver* resolver,
-                                            PermissionStatus status) {
+void WakeLock::DidReceivePermissionResponse(
+    V8WakeLockType::Enum type,
+    ScriptPromiseResolver* resolver,
+    mojom::blink::PermissionStatus status) {
   // https://w3c.github.io/screen-wake-lock/#the-request-method
-  DCHECK(status == PermissionStatus::GRANTED ||
-         status == PermissionStatus::DENIED);
+  DCHECK(status == mojom::blink::PermissionStatus::GRANTED ||
+         status == mojom::blink::PermissionStatus::DENIED);
   // 8.2. If state is "denied", then:
   // 8.2.1. Queue a global task on the screen wake lock task source given
   //        document's relevant global object to reject promise with a
   //        "NotAllowedError" DOMException.
   // 8.2.2. Abort these steps.
-  if (status != PermissionStatus::GRANTED) {
+  if (status != mojom::blink::PermissionStatus::GRANTED) {
     resolver->Reject(V8ThrowDOMException::CreateOrDie(
         resolver->GetScriptState()->GetIsolate(),
         DOMExceptionCode::kNotAllowedError,

third_party/blink/renderer/modules/wake_lock/wake_lock_sentinel.cc

diff --git a/third_party/blink/renderer/modules/wake_lock/wake_lock_sentinel.cc b/third_party/blink/renderer/modules/wake_lock/wake_lock_sentinel.cc
index c23bdf1..27aa6f5 100644
--- a/third_party/blink/renderer/modules/wake_lock/wake_lock_sentinel.cc
+++ b/third_party/blink/renderer/modules/wake_lock/wake_lock_sentinel.cc
@@ -16,7 +16,8 @@
 WakeLockSentinel::WakeLockSentinel(ScriptState* script_state,
                                    V8WakeLockType::Enum type,
                                    WakeLockManager* manager)
-    : ExecutionContextLifecycleObserver(ExecutionContext::From(script_state)),
+    : ActiveScriptWrappable<WakeLockSentinel>({}),
+      ExecutionContextLifecycleObserver(ExecutionContext::From(script_state)),
       manager_(manager),
       type_(type) {}
 

third_party/blink/renderer/modules/wake_lock/wake_lock_test_utils.cc

diff --git a/third_party/blink/renderer/modules/wake_lock/wake_lock_test_utils.cc b/third_party/blink/renderer/modules/wake_lock/wake_lock_test_utils.cc
index b3dcba47..8c1d45f8 100644
--- a/third_party/blink/renderer/modules/wake_lock/wake_lock_test_utils.cc
+++ b/third_party/blink/renderer/modules/wake_lock/wake_lock_test_utils.cc
@@ -28,7 +28,6 @@
 namespace blink {
 
 using mojom::blink::PermissionDescriptorPtr;
-using mojom::blink::PermissionStatus;
 
 namespace {
 
@@ -163,10 +162,11 @@
       &MockPermissionService::OnConnectionError, WTF::Unretained(this)));
 }
 
-void MockPermissionService::SetPermissionResponse(V8WakeLockType::Enum type,
-                                                  PermissionStatus status) {
-  DCHECK(status == PermissionStatus::GRANTED ||
-         status == PermissionStatus::DENIED);
+void MockPermissionService::SetPermissionResponse(
+    V8WakeLockType::Enum type,
+    mojom::blink::PermissionStatus status) {
+  DCHECK(status == mojom::blink::PermissionStatus::GRANTED ||
+         status == mojom::blink::PermissionStatus::DENIED);
   permission_responses_[static_cast<size_t>(type)] = status;
 }
 
@@ -201,13 +201,13 @@
                                           HasPermissionCallback callback) {
   V8WakeLockType::Enum type;
   if (!GetWakeLockTypeFromDescriptor(permission, &type)) {
-    std::move(callback).Run(PermissionStatus::DENIED);
+    std::move(callback).Run(mojom::blink::PermissionStatus::DENIED);
     return;
   }
   size_t pos = static_cast<size_t>(type);
   DCHECK(permission_responses_[pos].has_value());
-  std::move(callback).Run(
-      permission_responses_[pos].value_or(PermissionStatus::DENIED));
+  std::move(callback).Run(permission_responses_[pos].value_or(
+      mojom::blink::PermissionStatus::DENIED));
 }
 
 void MockPermissionService::RequestPermission(
@@ -216,7 +216,7 @@
     RequestPermissionCallback callback) {
   V8WakeLockType::Enum type;
   if (!GetWakeLockTypeFromDescriptor(permission, &type)) {
-    std::move(callback).Run(PermissionStatus::DENIED);
+    std::move(callback).Run(mojom::blink::PermissionStatus::DENIED);
     return;
   }
 
@@ -224,8 +224,8 @@
   DCHECK(permission_responses_[pos].has_value());
   if (request_permission_callbacks_[pos])
     std::move(request_permission_callbacks_[pos]).Run();
-  std::move(callback).Run(
-      permission_responses_[pos].value_or(PermissionStatus::DENIED));
+  std::move(callback).Run(permission_responses_[pos].value_or(
+      mojom::blink::PermissionStatus::DENIED));
 }
 
 void MockPermissionService::RequestPermissions(
@@ -242,7 +242,7 @@
 
 void MockPermissionService::AddPermissionObserver(
     PermissionDescriptorPtr permission,
-    PermissionStatus last_known_status,
+    mojom::blink::PermissionStatus last_known_status,
     mojo::PendingRemote<mojom::blink::PermissionObserver>) {
   NOTREACHED();
 }

third_party/blink/renderer/modules/webaudio/audio_scheduled_source_node.cc

diff --git a/third_party/blink/renderer/modules/webaudio/audio_scheduled_source_node.cc b/third_party/blink/renderer/modules/webaudio/audio_scheduled_source_node.cc
index 6b25505..a845b4f 100644
--- a/third_party/blink/renderer/modules/webaudio/audio_scheduled_source_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/audio_scheduled_source_node.cc
@@ -41,7 +41,7 @@
 namespace blink {
 
 AudioScheduledSourceNode::AudioScheduledSourceNode(BaseAudioContext& context)
-    : AudioNode(context) {}
+    : AudioNode(context), ActiveScriptWrappable<AudioScheduledSourceNode>({}) {}
 
 AudioScheduledSourceHandler&
 AudioScheduledSourceNode::GetAudioScheduledSourceHandler() const {

third_party/blink/renderer/modules/webaudio/audio_worklet_node.cc

diff --git a/third_party/blink/renderer/modules/webaudio/audio_worklet_node.cc b/third_party/blink/renderer/modules/webaudio/audio_worklet_node.cc
index d226460..fca07d7 100644
--- a/third_party/blink/renderer/modules/webaudio/audio_worklet_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/audio_worklet_node.cc
@@ -39,7 +39,9 @@
     const AudioWorkletNodeOptions* options,
     const Vector<CrossThreadAudioParamInfo> param_info_list,
     MessagePort* node_port)
-    : AudioNode(context), node_port_(node_port) {
+    : AudioNode(context),
+      ActiveScriptWrappable<AudioWorkletNode>({}),
+      node_port_(node_port) {
   HeapHashMap<String, Member<AudioParam>> audio_param_map;
   HashMap<String, scoped_refptr<AudioParamHandler>> param_handler_map;
   for (const auto& param_info : param_info_list) {

third_party/blink/renderer/modules/webaudio/base_audio_context.cc

diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc b/third_party/blink/renderer/modules/webaudio/base_audio_context.cc
index bd52135..14e86ce 100644
--- a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc
+++ b/third_party/blink/renderer/modules/webaudio/base_audio_context.cc
@@ -88,7 +88,8 @@
 // Constructor for rendering to the audio hardware.
 BaseAudioContext::BaseAudioContext(Document* document,
                                    enum ContextType context_type)
-    : ExecutionContextLifecycleStateObserver(document->GetExecutionContext()),
+    : ActiveScriptWrappable<BaseAudioContext>({}),
+      ExecutionContextLifecycleStateObserver(document->GetExecutionContext()),
       InspectorHelperMixin(*AudioGraphTracer::FromDocument(*document),
                            String()),
       destination_node_(nullptr),

third_party/blink/renderer/modules/webaudio/inspector_web_audio_agent.cc

diff --git a/third_party/blink/renderer/modules/webaudio/inspector_web_audio_agent.cc b/third_party/blink/renderer/modules/webaudio/inspector_web_audio_agent.cc
index ce1eb7a2..acff74ed1 100644
--- a/third_party/blink/renderer/modules/webaudio/inspector_web_audio_agent.cc
+++ b/third_party/blink/renderer/modules/webaudio/inspector_web_audio_agent.cc
@@ -55,8 +55,6 @@
 
 }  // namespace
 
-using protocol::Response;
-
 InspectorWebAudioAgent::InspectorWebAudioAgent(Page* page)
     : page_(page),
       enabled_(&agent_state_, /*default_value=*/false) {
@@ -73,41 +71,42 @@
   graph_tracer->SetInspectorAgent(this);
 }
 
-Response InspectorWebAudioAgent::enable() {
+protocol::Response InspectorWebAudioAgent::enable() {
   if (enabled_.Get()) {
-    return Response::Success();
+    return protocol::Response::Success();
   }
   enabled_.Set(true);
   AudioGraphTracer* graph_tracer = AudioGraphTracer::FromPage(page_);
   graph_tracer->SetInspectorAgent(this);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorWebAudioAgent::disable() {
+protocol::Response InspectorWebAudioAgent::disable() {
   if (!enabled_.Get()) {
-    return Response::Success();
+    return protocol::Response::Success();
   }
   enabled_.Clear();
   AudioGraphTracer* graph_tracer = AudioGraphTracer::FromPage(page_);
   graph_tracer->SetInspectorAgent(nullptr);
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorWebAudioAgent::getRealtimeData(
+protocol::Response InspectorWebAudioAgent::getRealtimeData(
     const protocol::WebAudio::GraphObjectId& contextId,
     std::unique_ptr<ContextRealtimeData>* out_data) {
   auto* const graph_tracer = AudioGraphTracer::FromPage(page_);
   if (!enabled_.Get()) {
-    return Response::ServerError("Enable agent first.");
+    return protocol::Response::ServerError("Enable agent first.");
   }
 
   BaseAudioContext* context = graph_tracer->GetContextById(contextId);
   if (!context) {
-    return Response::ServerError("Cannot find BaseAudioContext with such id.");
+    return protocol::Response::ServerError(
+        "Cannot find BaseAudioContext with such id.");
   }
 
   if (!context->HasRealtimeConstraint()) {
-    return Response::ServerError(
+    return protocol::Response::ServerError(
         "ContextRealtimeData is only avaliable for an AudioContext.");
   }
 
@@ -120,7 +119,7 @@
           .setCallbackIntervalMean(metric.mean_callback_interval)
           .setCallbackIntervalVariance(metric.variance_callback_interval)
           .build();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorWebAudioAgent::DidCreateBaseAudioContext(

third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.cc

diff --git a/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.cc b/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.cc
index ef60a484..4ac19fa3 100644
--- a/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/media_element_audio_source_node.cc
@@ -46,7 +46,9 @@
 MediaElementAudioSourceNode::MediaElementAudioSourceNode(
     AudioContext& context,
     HTMLMediaElement& media_element)
-    : AudioNode(context), media_element_(&media_element) {
+    : AudioNode(context),
+      ActiveScriptWrappable<MediaElementAudioSourceNode>({}),
+      media_element_(&media_element) {
   SetHandler(MediaElementAudioSourceHandler::Create(*this, media_element));
 }
 

third_party/blink/renderer/modules/webaudio/media_stream_audio_source_node.cc

diff --git a/third_party/blink/renderer/modules/webaudio/media_stream_audio_source_node.cc b/third_party/blink/renderer/modules/webaudio/media_stream_audio_source_node.cc
index deae021..ef62a1b 100644
--- a/third_party/blink/renderer/modules/webaudio/media_stream_audio_source_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/media_stream_audio_source_node.cc
@@ -41,6 +41,7 @@
     MediaStreamTrack* audio_track,
     std::unique_ptr<AudioSourceProvider> audio_source_provider)
     : AudioNode(context),
+      ActiveScriptWrappable<MediaStreamAudioSourceNode>({}),
       audio_track_(audio_track),
       media_stream_(media_stream) {
   SetHandler(MediaStreamAudioSourceHandler::Create(

third_party/blink/renderer/modules/webaudio/script_processor_node.cc

diff --git a/third_party/blink/renderer/modules/webaudio/script_processor_node.cc b/third_party/blink/renderer/modules/webaudio/script_processor_node.cc
index 6afc07f..91d824f 100644
--- a/third_party/blink/renderer/modules/webaudio/script_processor_node.cc
+++ b/third_party/blink/renderer/modules/webaudio/script_processor_node.cc
@@ -31,6 +31,7 @@
 #include "base/trace_event/trace_event.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/public/platform/task_type.h"
+#include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable_creation_key.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context.h"
 #include "third_party/blink/renderer/core/frame/local_dom_window.h"
 #include "third_party/blink/renderer/core/inspector/console_message.h"
@@ -92,7 +93,7 @@
                                          uint32_t buffer_size,
                                          uint32_t number_of_input_channels,
                                          uint32_t number_of_output_channels)
-    : AudioNode(context) {
+    : AudioNode(context), ActiveScriptWrappable<ScriptProcessorNode>({}) {
   // Regardless of the allowed buffer sizes, we still need to process at the
   // granularity of the AudioNode.
   if (buffer_size < context.GetDeferredTaskHandler().RenderQuantumFrames()) {

third_party/blink/renderer/modules/webcodecs/decoder_template.cc

diff --git a/third_party/blink/renderer/modules/webcodecs/decoder_template.cc b/third_party/blink/renderer/modules/webcodecs/decoder_template.cc
index 9471e97..6d047fc 100644
--- a/third_party/blink/renderer/modules/webcodecs/decoder_template.cc
+++ b/third_party/blink/renderer/modules/webcodecs/decoder_template.cc
@@ -73,7 +73,8 @@
 DecoderTemplate<Traits>::DecoderTemplate(ScriptState* script_state,
                                          const InitType* init,
                                          ExceptionState& exception_state)
-    : ReclaimableCodec(ReclaimableCodec::CodecType::kDecoder,
+    : ActiveScriptWrappable<DecoderTemplate<Traits>>({}),
+      ReclaimableCodec(ReclaimableCodec::CodecType::kDecoder,
                        ExecutionContext::From(script_state)),
       script_state_(script_state),
       state_(V8CodecState::Enum::kUnconfigured),

third_party/blink/renderer/modules/webcodecs/encoder_base.cc

diff --git a/third_party/blink/renderer/modules/webcodecs/encoder_base.cc b/third_party/blink/renderer/modules/webcodecs/encoder_base.cc
index 671758b6..3c325cd 100644
--- a/third_party/blink/renderer/modules/webcodecs/encoder_base.cc
+++ b/third_party/blink/renderer/modules/webcodecs/encoder_base.cc
@@ -62,7 +62,8 @@
 EncoderBase<Traits>::EncoderBase(ScriptState* script_state,
                                  const InitType* init,
                                  ExceptionState& exception_state)
-    : ReclaimableCodec(ReclaimableCodec::CodecType::kEncoder,
+    : ActiveScriptWrappable<EncoderBase<Traits>>({}),
+      ReclaimableCodec(ReclaimableCodec::CodecType::kEncoder,
                        ExecutionContext::From(script_state)),
       state_(V8CodecState::Enum::kUnconfigured),
       script_state_(script_state),

third_party/blink/renderer/modules/webcodecs/image_decoder_external.cc

diff --git a/third_party/blink/renderer/modules/webcodecs/image_decoder_external.cc b/third_party/blink/renderer/modules/webcodecs/image_decoder_external.cc
index c5741a9..4e9802a4 100644
--- a/third_party/blink/renderer/modules/webcodecs/image_decoder_external.cc
+++ b/third_party/blink/renderer/modules/webcodecs/image_decoder_external.cc
@@ -119,7 +119,8 @@
 ImageDecoderExternal::ImageDecoderExternal(ScriptState* script_state,
                                            const ImageDecoderInit* init,
                                            ExceptionState& exception_state)
-    : ExecutionContextLifecycleObserver(ExecutionContext::From(script_state)),
+    : ActiveScriptWrappable<ImageDecoderExternal>({}),
+      ExecutionContextLifecycleObserver(ExecutionContext::From(script_state)),
       script_state_(script_state),
       tracks_(MakeGarbageCollected<ImageTrackList>(this)),
       completed_property_(

third_party/blink/renderer/modules/webdatabase/inspector_database_agent.cc

diff --git a/third_party/blink/renderer/modules/webdatabase/inspector_database_agent.cc b/third_party/blink/renderer/modules/webdatabase/inspector_database_agent.cc
index eb217331..054330b 100644
--- a/third_party/blink/renderer/modules/webdatabase/inspector_database_agent.cc
+++ b/third_party/blink/renderer/modules/webdatabase/inspector_database_agent.cc
@@ -49,7 +49,6 @@
 
 namespace blink {
 using protocol::Maybe;
-using protocol::Response;
 
 namespace {
 
@@ -232,22 +231,22 @@
                          WrapPersistent(this)));
 }
 
-Response InspectorDatabaseAgent::enable() {
+protocol::Response InspectorDatabaseAgent::enable() {
   if (enabled_.Get())
-    return Response::Success();
+    return protocol::Response::Success();
   enabled_.Set(true);
   InnerEnable();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
-Response InspectorDatabaseAgent::disable() {
+protocol::Response InspectorDatabaseAgent::disable() {
   if (!enabled_.Get())
-    return Response::Success();
+    return protocol::Response::Success();
   enabled_.Set(false);
   if (DatabaseClient* client = DatabaseClient::FromPage(page_))
     client->SetInspectorAgent(nullptr);
   resources_.clear();
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorDatabaseAgent::Restore() {
@@ -255,11 +254,11 @@
     InnerEnable();
 }
 
-Response InspectorDatabaseAgent::getDatabaseTableNames(
+protocol::Response InspectorDatabaseAgent::getDatabaseTableNames(
     const String& database_id,
     std::unique_ptr<protocol::Array<String>>* names) {
   if (!enabled_.Get())
-    return Response::ServerError("Database agent is not enabled");
+    return protocol::Response::ServerError("Database agent is not enabled");
 
   blink::Database* database = DatabaseForId(database_id);
   if (database) {
@@ -269,7 +268,7 @@
   } else {
     *names = std::make_unique<protocol::Array<String>>();
   }
-  return Response::Success();
+  return protocol::Response::Success();
 }
 
 void InspectorDatabaseAgent::executeSQL(
@@ -278,13 +277,14 @@
     std::unique_ptr<ExecuteSQLCallback> request_callback) {
   if (!enabled_.Get()) {
     request_callback->sendFailure(
-        Response::ServerError("Database agent is not enabled"));
+        protocol::Response::ServerError("Database agent is not enabled"));
     return;
   }
 
   blink::Database* database = DatabaseForId(database_id);
   if (!database) {
-    request_callback->sendFailure(Response::ServerError("Database not found"));
+    request_callback->sendFailure(
+        protocol::Response::ServerError("Database not found"));
     return;
   }
 

third_party/blink/renderer/modules/webmidi/midi_access.cc

diff --git a/third_party/blink/renderer/modules/webmidi/midi_access.cc b/third_party/blink/renderer/modules/webmidi/midi_access.cc
index f5a8601..44b5734 100644
--- a/third_party/blink/renderer/modules/webmidi/midi_access.cc
+++ b/third_party/blink/renderer/modules/webmidi/midi_access.cc
@@ -69,7 +69,8 @@
     bool sysex_enabled,
     const Vector<MIDIAccessInitializer::PortDescriptor>& ports,
     ExecutionContext* execution_context)
-    : ExecutionContextLifecycleObserver(execution_context),
+    : ActiveScriptWrappable<MIDIAccess>({}),
+      ExecutionContextLifecycleObserver(execution_context),
       dispatcher_(dispatcher),
       sysex_enabled_(sysex_enabled),
       has_pending_activity_(false) {

third_party/blink/renderer/modules/webmidi/midi_access_initializer.cc

diff --git a/third_party/blink/renderer/modules/webmidi/midi_access_initializer.cc b/third_party/blink/renderer/modules/webmidi/midi_access_initializer.cc
index 042965e..220185b 100644
--- a/third_party/blink/renderer/modules/webmidi/midi_access_initializer.cc
+++ b/third_party/blink/renderer/modules/webmidi/midi_access_initializer.cc
@@ -26,7 +26,6 @@
 
 using midi::mojom::PortState;
 using midi::mojom::Result;
-using mojom::blink::PermissionStatus;
 
 MIDIAccessInitializer::MIDIAccessInitializer(ScriptState* script_state,
                                              const MIDIOptions* options)
@@ -136,9 +135,10 @@
   dispatcher_->SetClient(this);
 }
 
-void MIDIAccessInitializer::OnPermissionsUpdated(PermissionStatus status) {
+void MIDIAccessInitializer::OnPermissionsUpdated(
+    mojom::blink::PermissionStatus status) {
   permission_service_.reset();
-  if (status == PermissionStatus::GRANTED) {
+  if (status == mojom::blink::PermissionStatus::GRANTED) {
     StartSession();
   } else {
     Reject(
@@ -146,9 +146,10 @@
   }
 }
 
-void MIDIAccessInitializer::OnPermissionUpdated(PermissionStatus status) {
+void MIDIAccessInitializer::OnPermissionUpdated(
+    mojom::blink::PermissionStatus status) {
   permission_service_.reset();
-  if (status == PermissionStatus::GRANTED) {
+  if (status == mojom::blink::PermissionStatus::GRANTED) {
     StartSession();
   } else {
     Reject(

third_party/blink/renderer/modules/webmidi/midi_port.cc

diff --git a/third_party/blink/renderer/modules/webmidi/midi_port.cc b/third_party/blink/renderer/modules/webmidi/midi_port.cc
index 73be814..35c0ac0b 100644
--- a/third_party/blink/renderer/modules/webmidi/midi_port.cc
+++ b/third_party/blink/renderer/modules/webmidi/midi_port.cc
@@ -53,7 +53,8 @@
                    MIDIPortType type,
                    const String& version,
                    PortState state)
-    : ExecutionContextLifecycleObserver(access->GetExecutionContext()),
+    : ActiveScriptWrappable<MIDIPort>({}),
+      ExecutionContextLifecycleObserver(access->GetExecutionContext()),
       id_(id),
       manufacturer_(manufacturer),
       name_(name),

third_party/blink/renderer/modules/websockets/dom_websocket.cc

diff --git a/third_party/blink/renderer/modules/websockets/dom_websocket.cc b/third_party/blink/renderer/modules/websockets/dom_websocket.cc
index 467102d..556e5ae 100644
--- a/third_party/blink/renderer/modules/websockets/dom_websocket.cc
+++ b/third_party/blink/renderer/modules/websockets/dom_websocket.cc
@@ -172,7 +172,8 @@
 constexpr WebSocketCommon::State DOMWebSocket::kClosed;
 
 DOMWebSocket::DOMWebSocket(ExecutionContext* context)
-    : ExecutionContextLifecycleStateObserver(context),
+    : ActiveScriptWrappable<DOMWebSocket>({}),
+      ExecutionContextLifecycleStateObserver(context),
       buffered_amount_(0),
       consumed_buffered_amount_(0),
       buffered_amount_after_close_(0),

third_party/blink/renderer/modules/websockets/websocket_stream.cc

diff --git a/third_party/blink/renderer/modules/websockets/websocket_stream.cc b/third_party/blink/renderer/modules/websockets/websocket_stream.cc
index 72f5fc0..6a350358 100644
--- a/third_party/blink/renderer/modules/websockets/websocket_stream.cc
+++ b/third_party/blink/renderer/modules/websockets/websocket_stream.cc
@@ -436,7 +436,8 @@
 
 WebSocketStream::WebSocketStream(ExecutionContext* execution_context,
                                  ScriptState* script_state)
-    : ExecutionContextLifecycleObserver(execution_context),
+    : ActiveScriptWrappable<WebSocketStream>({}),
+      ExecutionContextLifecycleObserver(execution_context),
       script_state_(script_state),
       connection_resolver_(
           MakeGarbageCollected<ScriptPromiseResolver>(script_state)),

third_party/blink/renderer/modules/webtransport/web_transport.cc

diff --git a/third_party/blink/renderer/modules/webtransport/web_transport.cc b/third_party/blink/renderer/modules/webtransport/web_transport.cc
index e23787b1..5be71aa 100644
--- a/third_party/blink/renderer/modules/webtransport/web_transport.cc
+++ b/third_party/blink/renderer/modules/webtransport/web_transport.cc
@@ -754,7 +754,8 @@
 WebTransport::WebTransport(ScriptState* script_state,
                            const String& url,
                            ExecutionContext* context)
-    : ExecutionContextLifecycleObserver(context),
+    : ActiveScriptWrappable<WebTransport>({}),
+      ExecutionContextLifecycleObserver(context),
       script_state_(script_state),
       url_(NullURL(), url),
       connector_(context),

third_party/blink/renderer/modules/xr/xr_session.cc

diff --git a/third_party/blink/renderer/modules/xr/xr_session.cc b/third_party/blink/renderer/modules/xr/xr_session.cc
index 768ff34..cce8a6ec 100644
--- a/third_party/blink/renderer/modules/xr/xr_session.cc
+++ b/third_party/blink/renderer/modules/xr/xr_session.cc
@@ -344,7 +344,8 @@
     device::mojom::blink::XRSessionDeviceConfigPtr device_config,
     bool sensorless_session,
     XRSessionFeatureSet enabled_features)
-    : xr_(xr),
+    : ActiveScriptWrappable<XRSession>({}),
+      xr_(xr),
       mode_(mode),
       environment_integration_(
           mode == device::mojom::blink::XRSessionMode::kImmersiveAr),

third_party/blink/renderer/platform/RuntimeEnabledFeatures.md

diff --git a/third_party/blink/renderer/platform/RuntimeEnabledFeatures.md b/third_party/blink/renderer/platform/RuntimeEnabledFeatures.md
index 742578b..f837b86 100644
--- a/third_party/blink/renderer/platform/RuntimeEnabledFeatures.md
+++ b/third_party/blink/renderer/platform/RuntimeEnabledFeatures.md
@@ -1,6 +1,6 @@
 # Runtime Enabled Features
 ## Overview
-Runtime flags enable Blink developers the ability to control access Chromium users have to new features they implement. Features that are hidden behind a runtime flag are known as Runtime Enabled Features. It is a requirement of the Blink Launch Process to implement new web exposed features behind a runtime flag until an Intent To Ship has been approved. Additionally, all changes with non-trivial compatibility risk [should be guarded](/docs/flag_guarding_guidelines.md) by a Runtime Enabled Feature (or other base::Feature) so that they can be disabled quickly.
+Runtime flags enable Blink to control access to new features. Features that are hidden behind a runtime flag are known as Runtime Enabled Features. It is a requirement of the Blink Launch Process to implement new web exposed features behind a runtime flag until an Intent To Ship has been approved. Additionally, all changes with non-trivial compatibility risk [should be guarded](/docs/flag_guarding_guidelines.md) by a Runtime Enabled Feature (or other base::Feature) so that they can be disabled quickly.
 
 ## Adding A Runtime Enabled Feature
 Runtime Enabled Features are defined in runtime_enabled_features.json5 in alphabetical order. Add your feature's flag to [runtime_enabled_features.json5] and the rest will be generated for you automatically.

third_party/blink/renderer/platform/graphics/compositing/paint_artifact_compositor.cc

diff --git a/third_party/blink/renderer/platform/graphics/compositing/paint_artifact_compositor.cc b/third_party/blink/renderer/platform/graphics/compositing/paint_artifact_compositor.cc
index bcb7865..3b201cc1 100644
--- a/third_party/blink/renderer/platform/graphics/compositing/paint_artifact_compositor.cc
+++ b/third_party/blink/renderer/platform/graphics/compositing/paint_artifact_compositor.cc
@@ -171,7 +171,7 @@
     auto it = scroll_translation_nodes_.find(&scroll_translation);
     if (it == scroll_translation_nodes_.end()) {
       // Negative z-index scrolling contents in a non-stacking-context scroller
-      // appears earlier than the ScrollHitTest of the scroller, and this
+      // appear earlier than the ScrollHitTest of the scroller, and this
       // method can be called before ComputeNeedsCompositedScrolling() for the
       // ScrollHitTest. If LCD-text is strongly preferred, here we assume the
       // scroller is not composited. Even if later the scroller is found to
@@ -217,6 +217,9 @@
   if (lcd_text_preference_ != LCDTextPreference::kStronglyPreferred) {
     return true;
   }
+  if (scroll_translation.ScrollNode()->PrefersCompositedScrolling()) {
+    return true;
+  }
   // Find the chunk containing the scrolling background which normally defines
   // the opaqueness of the scrolling contents. If it has an opaque rect
   // covering the whole scrolling contents, we can use composited scrolling
@@ -1033,7 +1036,8 @@
     const TransformPaintPropertyNode& transform) {
   // We can only directly-update compositor values if all content associated
   // with the node is known to be composited.
-  DCHECK(transform.HasDirectCompositingReasons());
+  DCHECK(RuntimeEnabledFeatures::CompositeScrollAfterPaintEnabled() ||
+         transform.HasDirectCompositingReasons());
   if (CanDirectlyUpdateProperties()) {
     return PropertyTreeManager::DirectlyUpdateScrollOffsetTransform(
         *root_layer_->layer_tree_host(), transform);

third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.cc

diff --git a/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.cc b/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.cc
index e4cfe3c..9fd36bd 100644
--- a/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.cc
+++ b/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.cc
@@ -36,6 +36,7 @@
           other.prevent_viewport_scrolling_from_inner ||
       max_scroll_offset_affected_by_page_scale !=
           other.max_scroll_offset_affected_by_page_scale ||
+      prefers_composited_scrolling != other.prefers_composited_scrolling ||
       main_thread_scrolling_reasons != other.main_thread_scrolling_reasons ||
       compositor_element_id != other.compositor_element_id ||
       overscroll_behavior != other.overscroll_behavior ||

third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h

diff --git a/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h b/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h
index 2e374a4..fbbfa1bf 100644
--- a/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h
+++ b/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h
@@ -17,6 +17,7 @@
 #include "third_party/blink/renderer/platform/graphics/paint/clip_paint_property_node.h"
 #include "third_party/blink/renderer/platform/graphics/paint/paint_property_node.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
+#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -63,6 +64,8 @@
     bool prevent_viewport_scrolling_from_inner = false;
 
     bool max_scroll_offset_affected_by_page_scale = false;
+    // Used in CompositeScrollAfterPaint.
+    bool prefers_composited_scrolling = false;
     MainThreadScrollingReasons main_thread_scrolling_reasons =
         cc::MainThreadScrollingReason::kNotScrollingOnMain;
     // The scrolling element id is stored directly on the scroll node and not
@@ -152,6 +155,10 @@
   bool MaxScrollOffsetAffectedByPageScale() const {
     return state_.max_scroll_offset_affected_by_page_scale;
   }
+  bool PrefersCompositedScrolling() const {
+    DCHECK(RuntimeEnabledFeatures::CompositeScrollAfterPaintEnabled());
+    return state_.prefers_composited_scrolling;
+  }
 
   // Return reason bitfield with values from cc::MainThreadScrollingReason.
   MainThreadScrollingReasons GetMainThreadScrollingReasons() const {

third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc

diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
index b0f88a0..e03c6a1 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
@@ -1363,8 +1363,10 @@
   return resource;
 }
 
-void ResourceFetcher::RemoveResourceStrongReference(Resource* image_resource) {
-  document_resource_strong_refs_.erase(image_resource);
+void ResourceFetcher::RemoveResourceStrongReference(Resource* resource) {
+  if (resource) {
+    document_resource_strong_refs_.erase(resource);
+  }
 }
 
 void ResourceFetcher::ResourceTimingReportTimerFired(TimerBase* timer) {

third_party/blink/web_tests/TestExpectations

diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
index a2d8de58..432cd602 100644
--- a/third_party/blink/web_tests/TestExpectations
+++ b/third_party/blink/web_tests/TestExpectations
@@ -6662,7 +6662,6 @@
 # Sheriff 2023-02-14
 crbug.com/1414978 external/wpt/webrtc/RTCPeerConnection-GC.https.html [ Failure Pass ]
 crbug.com/1417178 [ Linux ] external/wpt/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-cross-document-nav.html [ Failure Pass ]
-crbug.com/1416271 [ Linux ] external/wpt/js-self-profiling/time-domain.window.html [ Failure Pass ]
 
 # By default, WPTs run with "RTCLegacyCallbackBasedGetStats" enabled, which
 # suppresses the warning that is expected in this test causing it to timeout.
@@ -6704,3 +6703,9 @@
 crbug.com/1362106 [ Linux ] media/video-source.html [ Failure Pass ]
 crbug.com/1430215 external/wpt/dom/events/scrolling/overscroll-deltas.html [ Failure Pass ]
 crbug.com/1431085 external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-source-media.html [ Failure Pass ]
+
+# Sheriff 2023-04-07
+crbug.com/1431236 external/wpt/long-animation-frame/tentative/loaf-user-callback.html [ Failure Pass ]
+crbug.com/1416265 external/wpt/js-self-profiling/class-names.https.html [ Crash Pass ]
+crbug.com/1416265 external/wpt/js-self-profiling/cross-origin-script-no-cors.sub.html [ Crash Pass ]
+crbug.com/1416271 external/wpt/js-self-profiling/time-domain.window.html [ Crash Failure Pass ]

third_party/blink/web_tests/external/wpt/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js

diff --git a/third_party/blink/web_tests/external/wpt/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js b/third_party/blink/web_tests/external/wpt/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js
index 9c843321..f4615d92 100644
--- a/third_party/blink/web_tests/external/wpt/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js
+++ b/third_party/blink/web_tests/external/wpt/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js
@@ -482,8 +482,7 @@
       assert_true(joinExceptionThrown, 'Exception not thrown on join.');
     }
 
-    let leave_promise = navigator.leaveAdInterestGroup(testCase.interestGroup,
-                                                       INTEREST_GROUP_LIFETIME_SECS);
+    let leave_promise = navigator.leaveAdInterestGroup(testCase.interestGroup);
     assert_true(leave_promise instanceof Promise, "leave should return a promise");
     if (testCase.expectLeaveSucces) {
       assert_equals(await leave_promise, undefined);

third_party/blink/web_tests/external/wpt/fs/root-name.https.any.js

diff --git a/third_party/blink/web_tests/external/wpt/fs/root-name.https.any.js b/third_party/blink/web_tests/external/wpt/fs/root-name.https.any.js
new file mode 100644
index 0000000..650a7a64
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/fs/root-name.https.any.js
@@ -0,0 +1,6 @@
+'use strict';
+
+promise_test(async test => {
+  let root = await navigator.storage.getDirectory();
+  assert_equals(root.name, '');
+}, 'getDirectory returns a directory whose name is the empty string');

third_party/blink/web_tests/external/wpt/storage-access-api/helpers.js

diff --git a/third_party/blink/web_tests/external/wpt/storage-access-api/helpers.js b/third_party/blink/web_tests/external/wpt/storage-access-api/helpers.js
index 728b098..0a89c6d 100644
--- a/third_party/blink/web_tests/external/wpt/storage-access-api/helpers.js
+++ b/third_party/blink/web_tests/external/wpt/storage-access-api/helpers.js
@@ -227,10 +227,17 @@
   return load;
 }
 
-// Makes a subresource request to the provided host in the given frame, and returns the cookies in the response.
-function FetchFromFrame(frame, host) {
+// Makes a subresource request to the provided host in the given frame, and
+// returns the cookies that were included in the request.
+function FetchSubresourceCookiesFromFrame(frame, host) {
+  return FetchFromFrame(frame, `${host}/storage-access-api/resources/echo-cookie-header.py`);
+}
+
+// Makes a subresource request to the provided host in the given frame, and
+// returns the response.
+function FetchFromFrame(frame, url) {
   return PostMessageAndAwaitReply(
-    { command: "subresource cookies", host }, frame.contentWindow);
+    { command: "cors fetch", url }, frame.contentWindow);
 }
 
 // Tries to set storage access policy, ignoring any errors.

third_party/blink/web_tests/external/wpt/storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js

diff --git a/third_party/blink/web_tests/external/wpt/storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js b/third_party/blink/web_tests/external/wpt/storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js
index 5496e89..c936738 100644
--- a/third_party/blink/web_tests/external/wpt/storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js
+++ b/third_party/blink/web_tests/external/wpt/storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js
@@ -70,11 +70,11 @@
     await SetDocumentCookieFromFrame(crossOriginFrame, `cookie=monster;Secure;SameSite=None;Path=/`);
     await SetDocumentCookieFromFrame(crossSiteFrame, `foo=bar;Secure;SameSite=None;Path=/`);
 
-    assert_true(cookieStringHasCookie("cookie", "monster", await FetchFromFrame(crossOriginFrame, www)),"crossOriginFrame making same-origin subresource request can access cookies.");
-    assert_true(cookieStringHasCookie("foo", "bar", await FetchFromFrame(crossSiteFrame, wwwAlt)),"crossSiteFrame making same-origin subresource request can access cookies.");
+    assert_true(cookieStringHasCookie("cookie", "monster", await FetchSubresourceCookiesFromFrame(crossOriginFrame, www)),"crossOriginFrame making same-origin subresource request can access cookies.");
+    assert_true(cookieStringHasCookie("foo", "bar", await FetchSubresourceCookiesFromFrame(crossSiteFrame, wwwAlt)),"crossSiteFrame making same-origin subresource request can access cookies.");
 
-    assert_false(cookieStringHasCookie("foo", "bar",  await FetchFromFrame(crossOriginFrame, wwwAlt)), "crossOriginFrame making cross-site subresource request to sibling iframe's host should not include cookies.");
-    assert_false(cookieStringHasCookie("cookie", "monster", await FetchFromFrame(crossSiteFrame, www)),"crossSiteFrame making cross-site subresource request to sibling iframe's host should not include cookies.");
+    assert_false(cookieStringHasCookie("foo", "bar",  await FetchSubresourceCookiesFromFrame(crossOriginFrame, wwwAlt)), "crossOriginFrame making cross-site subresource request to sibling iframe's host should not include cookies.");
+    assert_false(cookieStringHasCookie("cookie", "monster", await FetchSubresourceCookiesFromFrame(crossSiteFrame, www)),"crossSiteFrame making cross-site subresource request to sibling iframe's host should not include cookies.");
 
   }, "Cross-site sibling iframes should not be able to take advantage of the existing permission grant requested by others.");
 

third_party/blink/web_tests/external/wpt/storage-access-api/resources/embedded_responder.js

diff --git a/third_party/blink/web_tests/external/wpt/storage-access-api/resources/embedded_responder.js b/third_party/blink/web_tests/external/wpt/storage-access-api/resources/embedded_responder.js
index ab1ab30f6..6340792 100644
--- a/third_party/blink/web_tests/external/wpt/storage-access-api/resources/embedded_responder.js
+++ b/third_party/blink/web_tests/external/wpt/storage-access-api/resources/embedded_responder.js
@@ -48,9 +48,8 @@
       // script-with-cookie-header.py.
       reply(httpCookies);
       break;
-    case "subresource cookies":
-      const cookie = await fetch(`${event.data.host}/storage-access-api/resources/echo-cookie-header.py`, {mode: 'cors', credentials: 'include'}).then((resp) => resp.text());
-      reply(cookie);
+    case "cors fetch":
+      reply(await fetch(event.data.url, {mode: 'cors', credentials: 'include'}).then((resp) => resp.text()));
       break;
     default:
   }

third_party/blink/web_tests/external/wpt/top-level-storage-access-api/tentative/requestStorageAccessFor.sub.https.window.js

diff --git a/third_party/blink/web_tests/external/wpt/top-level-storage-access-api/tentative/requestStorageAccessFor.sub.https.window.js b/third_party/blink/web_tests/external/wpt/top-level-storage-access-api/tentative/requestStorageAccessFor.sub.https.window.js
index c5735670..e82cce6 100644
--- a/third_party/blink/web_tests/external/wpt/top-level-storage-access-api/tentative/requestStorageAccessFor.sub.https.window.js
+++ b/third_party/blink/web_tests/external/wpt/top-level-storage-access-api/tentative/requestStorageAccessFor.sub.https.window.js
@@ -3,27 +3,14 @@
 // META: script=/resources/testdriver-vendor.js
 'use strict';
 
-// Note that this file follows the pattern in:
-// storage-access-api/requestStorageAccess.sub.window.js
-//
-// Some tests are run at the top-level, and an iframe is added to validate API
-// behavior in that context.
-
-const {testPrefix, topLevelDocument} = processQueryParams();
-if (!topLevelDocument) {
-  test_driver.set_test_context(window.top);
-}
-
 const requestedOrigin = 'https://foo.com';
 const altOrigin = 'https://{{hosts[alt][www]}}:{{ports[https][0]}}';
 
-// Common tests to run in all frames.
 promise_test(
     async () => {
       assert_not_equals(document.requestStorageAccessFor, undefined);
     },
-    '[' + testPrefix +
-        '] document.requestStorageAccessFor() should be supported on the document interface');
+    '[top-level-context] document.requestStorageAccessFor() should be supported on the document interface');
 
 promise_test(
   t => {
@@ -31,8 +18,7 @@
       document.requestStorageAccessFor(),
       'document.requestStorageAccessFor() call without origin argument');
   },
-  '[' + testPrefix +
-      '] document.requestStorageAccessFor() should be rejected when called with no argument');
+  '[top-level-context] document.requestStorageAccessFor() should be rejected when called with no argument');
 
 // Most tests need to start with the feature in "prompt" state.
 // For tests that rely on the permission state, this function is intended to be
@@ -45,169 +31,168 @@
     { name: 'top-level-storage-access', requestedOrigin: altOrigin }, 'prompt');
 }
 
-if (topLevelDocument) {
-  promise_test(async t => {
-        await CommonSetup();
-        return promise_rejects_dom(t, 'NotAllowedError',
-          document.requestStorageAccessFor(requestedOrigin),
-         'document.requestStorageAccessFor() call without user gesture');
-      },
-      '[' + testPrefix +
-          '] document.requestStorageAccessFor() should be rejected by default with no user gesture');
+promise_test(async t => {
+      await CommonSetup();
+      return promise_rejects_dom(t, 'NotAllowedError',
+        document.requestStorageAccessFor(requestedOrigin),
+        'document.requestStorageAccessFor() call without user gesture');
+    },
+    '[top-level-context] document.requestStorageAccessFor() should be rejected by default with no user gesture');
 
-  promise_test(async t => {
-    const description =
-        'document.requestStorageAccessFor() call in a detached frame';
-    // Can't use promise_rejects_dom here because the exception is from the wrong global.
-    return CreateDetachedFrame().requestStorageAccessFor(requestedOrigin)
-        .then(t.unreached_func('Should have rejected: ' + description))
-        .catch((e) => {
-          assert_equals(e.name, 'InvalidStateError', description);
-        });
-  }, '[non-fully-active] document.requestStorageAccessFor() should not resolve when run in a detached frame');
+promise_test(async t => {
+  const description =
+      'document.requestStorageAccessFor() call in a detached frame';
+  // Can't use promise_rejects_dom here because the exception is from the wrong global.
+  return CreateDetachedFrame().requestStorageAccessFor(requestedOrigin)
+      .then(t.unreached_func('Should have rejected: ' + description))
+      .catch((e) => {
+        assert_equals(e.name, 'InvalidStateError', description);
+      });
+}, '[non-fully-active] document.requestStorageAccessFor() should not resolve when run in a detached frame');
 
-  promise_test(async t => {
-    const description =
-        'document.requestStorageAccessFor() in a detached DOMParser result';
-    return CreateDocumentViaDOMParser().requestStorageAccessFor(requestedOrigin)
-        .then(t.unreached_func('Should have rejected: ' + description))
-        .catch((e) => {
-          assert_equals(e.name, 'InvalidStateError', description);
-        });
-  }, '[non-fully-active] document.requestStorageAccessFor() should not resolve when run in a detached DOMParser document');
+promise_test(async t => {
+  const description =
+      'document.requestStorageAccessFor() in a detached DOMParser result';
+  return CreateDocumentViaDOMParser().requestStorageAccessFor(requestedOrigin)
+      .then(t.unreached_func('Should have rejected: ' + description))
+      .catch((e) => {
+        assert_equals(e.name, 'InvalidStateError', description);
+      });
+}, '[non-fully-active] document.requestStorageAccessFor() should not resolve when run in a detached DOMParser document');
 
-  promise_test(
-      async t => {
-        await CommonSetup();
-        await test_driver.set_permission(
-            {name: 'top-level-storage-access', requestedOrigin}, 'granted');
+promise_test(
+    async t => {
+      await CommonSetup();
+      await test_driver.set_permission(
+          {name: 'top-level-storage-access', requestedOrigin}, 'granted');
 
-        await document.requestStorageAccessFor(requestedOrigin);
-      },
-      '[' + testPrefix +
-          '] document.requestStorageAccessFor() should be resolved without a user gesture with an existing permission');
+      await document.requestStorageAccessFor(requestedOrigin);
+    },
+    '[top-level-context] document.requestStorageAccessFor() should be resolved without a user gesture with an existing permission');
 
-  promise_test(
-      async t => {
-        await CommonSetup();
-        await test_driver.set_permission(
-            {name: 'top-level-storage-access', requestedOrigin: altOrigin},
-            'granted');
+promise_test(
+    async t => {
+      await CommonSetup();
+      await test_driver.set_permission(
+          {name: 'top-level-storage-access', requestedOrigin: altOrigin},
+          'granted');
 
-        await RunCallbackWithGesture(() => {
-          return document.requestStorageAccessFor(altOrigin).then(() => {
-            return RunTestsInIFrame(
-                'https://{{hosts[alt][www]}}:{{ports[https][0]}}/top-level-storage-access-api/tentative/resources/requestStorageAccess-integration-iframe.https.html');
-          });
-        });
-      },
-      '[' + testPrefix +
-          '] document.requestStorageAccess() should be resolved without a user gesture after a successful requestStorageAccessFor() call');
+      const frame = await CreateFrame(
+        '/storage-access-api/resources/script-with-cookie-header.py?script=embedded_responder.js');
 
-  promise_test(() => {
-  // Create a test with a single-child same-origin iframe.
-  // This will validate that calls to requestStorageAccessFor are rejected
-  // in non-top-level contexts.
-    return RunTestsInIFrame(
-      './resources/requestStorageAccessFor-iframe.https.html?testCase=same-origin-frame');
-  });
+      await RunCallbackWithGesture(() => document.requestStorageAccessFor(altOrigin));
+      assert_true(await RequestStorageAccessInFrame(frame));
+    },
+    '[top-level-context] document.requestStorageAccess() should be resolved without a user gesture after a successful requestStorageAccessFor() call');
 
-  promise_test(
-      async t => {
-        await RunCallbackWithGesture(
-          () => document.requestStorageAccessFor(document.location.origin));
-      },
-      '[' + testPrefix +
-          '] document.requestStorageAccessFor() should be resolved when called properly with a user gesture and the same origin');
+promise_test(
+    async t => {
+      await RunCallbackWithGesture(
+        () => document.requestStorageAccessFor(document.location.origin));
+    },
+    '[top-level-context] document.requestStorageAccessFor() should be resolved when called properly with a user gesture and the same origin');
 
-  promise_test(
-      async t => {
-        await RunCallbackWithGesture(
-          () => promise_rejects_dom(t, 'NotAllowedError', document.requestStorageAccessFor('bogus-url'),
-            'document.requestStorageAccessFor() call with bogus URL'));
-      },
-      '[' + testPrefix +
-          '] document.requestStorageAccessFor() should be rejected when called with an invalid origin');
+promise_test(
+    async t => {
+      await RunCallbackWithGesture(
+        () => promise_rejects_dom(t, 'NotAllowedError', document.requestStorageAccessFor('bogus-url'),
+          'document.requestStorageAccessFor() call with bogus URL'));
+    },
+    '[top-level-context] document.requestStorageAccessFor() should be rejected when called with an invalid origin');
 
-  promise_test(
-      async t => {
-        await RunCallbackWithGesture(
-          () => promise_rejects_dom(t, 'NotAllowedError', document.requestStorageAccessFor('data:,Hello%2C%20World%21'),
-            'document.requestStorageAccessFor() call with data URL'));
-      },
-      '[' + testPrefix +
-          '] document.requestStorageAccessFor() should be rejected when called with an opaque origin');
+promise_test(
+    async t => {
+      await RunCallbackWithGesture(
+        () => promise_rejects_dom(t, 'NotAllowedError', document.requestStorageAccessFor('data:,Hello%2C%20World%21'),
+          'document.requestStorageAccessFor() call with data URL'));
+    },
+    '[top-level-context] document.requestStorageAccessFor() should be rejected when called with an opaque origin');
 
-  promise_test(
-      async (t) => {
-        const altEchoCookieHeaderUrl =
-            `${altOrigin}/storage-access-api/resources/echo-cookie-header.py`;
+promise_test(
+    async (t) => {
+      const altEchoCookieHeaderUrl =
+          `${altOrigin}/storage-access-api/resources/echo-cookie-header.py`;
 
-        await MaybeSetStorageAccess('*', '*', 'blocked');
-        await CommonSetup();
+      await MaybeSetStorageAccess('*', '*', 'blocked');
+      await CommonSetup();
 
-        await test_driver.set_permission(
-            {name: 'top-level-storage-access', requestedOrigin: altOrigin},
-            'granted');
+      await test_driver.set_permission(
+          {name: 'top-level-storage-access', requestedOrigin: altOrigin},
+          'granted');
 
-        // Set cross-site cookie for altOrigin. Note that this only works with
-        // an existing top-level storage access permission.
-        await fetch(
-            `${altOrigin}/cookies/resources/set-cookie.py?name=cookie&path=/&samesite=None&secure=`,
-            {mode: 'cors', credentials: 'include'});
+      // Set cross-site cookie for altOrigin. Note that this only works with
+      // an existing top-level storage access permission.
+      await fetch(
+          `${altOrigin}/cookies/resources/set-cookie.py?name=cookie&path=/&samesite=None&secure=`,
+          {mode: 'cors', credentials: 'include'});
 
-        const httpCookies1 = await fetch(altEchoCookieHeaderUrl, {
-                               mode: 'cors',
-                               credentials: 'include'
-                             }).then((resp) => resp.text());
-        assert_true(
-            httpCookies1.includes('cookie=1'),
-            'After obtaining top-level storage access, cross-site subresource requests with CORS mode should have cookie access.');
+      const httpCookies1 = await fetch(altEchoCookieHeaderUrl, {
+                              mode: 'cors',
+                              credentials: 'include'
+                            }).then((resp) => resp.text());
+      assert_true(
+          httpCookies1.includes('cookie=1'),
+          'After obtaining top-level storage access, cross-site subresource requests with CORS mode should have cookie access.');
 
-        const httpCookies2 = await fetch(altEchoCookieHeaderUrl, {
-                               mode: 'no-cors',
-                               credentials: 'include'
-                             }).then((resp) => resp.text());
-        assert_false(
-            httpCookies2.includes('cookie=1'),
-            'Cross-site subresource requests without CORS mode cannot access cookie even with an existing permission.');
-      },
-      '[' + testPrefix +
-          '] Top-level storage access only allows cross-site subresource requests to access cookie when using CORS mode.');
+      const httpCookies2 = await fetch(altEchoCookieHeaderUrl, {
+                              mode: 'no-cors',
+                              credentials: 'include'
+                            }).then((resp) => resp.text());
+      assert_false(
+          httpCookies2.includes('cookie=1'),
+          'Cross-site subresource requests without CORS mode cannot access cookie even with an existing permission.');
+    },
+    '[top-level-context] Top-level storage access only allows cross-site subresource requests to access cookie when using CORS mode.');
 
-} else {
-  promise_test(
-      async t => {
-        await RunCallbackWithGesture(
-          () => promise_rejects_dom(t, 'NotAllowedError', document.requestStorageAccessFor(document.location.origin),
+promise_test(
+    async () => {
+      const frame = await CreateFrame(
+        '/storage-access-api/resources/script-with-cookie-header.py?script=embedded_responder.js');
+      assert_not_equals(frame.contentWindow.document.requestStorageAccessFor, undefined);
+    },
+    '[same-origin-iframe] document.requestStorageAccessFor() should be supported on the document interface');
+
+promise_test(
+    async t => {
+      const frame = await CreateFrame(
+        '/storage-access-api/resources/script-with-cookie-header.py?script=embedded_responder.js');
+      return promise_rejects_js(t, frame.contentWindow.TypeError,
+        frame.contentWindow.document.requestStorageAccessFor(),
+        'document.requestStorageAccessFor() call without origin argument');
+    },
+    '[same-origin-iframe] document.requestStorageAccessFor() should be rejected when called with no argument');
+
+promise_test(
+    async t => {
+      const frame = await CreateFrame(
+        '/storage-access-api/resources/script-with-cookie-header.py?script=embedded_responder.js');
+
+      await RunCallbackWithGesture(() =>
+          promise_rejects_dom(t, 'NotAllowedError', frame.contentWindow.DOMException,
+            frame.contentWindow.document.requestStorageAccessFor(document.location.origin),
             'document.requestStorageAccessFor() call in a non-top-level context'));
-      },
-      '[' + testPrefix +
-          '] document.requestStorageAccessFor() should be rejected when called in an iframe');
+    },
+    '[same-origin-iframe] document.requestStorageAccessFor() should be rejected when called in an iframe');
 
-  promise_test(
-      async (t) => {
-        await MaybeSetStorageAccess('*', '*', 'blocked');
-        await CommonSetup();
+promise_test(
+    async (t) => {
+      await MaybeSetStorageAccess('*', '*', 'blocked');
+      await CommonSetup();
 
-        // Set cross-site cookie for altOrigin. Note that cookie won't be set
-        // even with an existing top-level storage access permission in an
-        // iframe.
-        await fetch(
-            `${altOrigin}/cookies/resources/set-cookie.py?name=cookie&path=/&samesite=None&secure=`,
-            {mode: 'cors', credentials: 'include'});
+      const frame = await CreateFrame(
+        `/storage-access-api/resources/script-with-cookie-header.py?script=embedded_responder.js`);
 
-        await test_driver.set_permission(
-            {name: 'top-level-storage-access', requestedOrigin: altOrigin},
-            'granted');
+      // Set cross-site cookie for altOrigin. Note that cookie won't be set
+      // even with an existing top-level storage access permission in an
+      // iframe.
+      await FetchFromFrame(frame,
+          `${altOrigin}/cookies/resources/set-cookie.py?name=cookie&path=/&samesite=None&secure=`);
 
-        const httpCookies =
-            await fetch(
-                `${altOrigin}/storage-access-api/resources/echo-cookie-header.py`,
-                {mode: 'cors', credentials: 'include'})
-                .then((resp) => resp.text());
-        assert_false(httpCookies.includes('cookie=1'));
-      },
-      '[' + testPrefix +
-          '] Existing top-level storage access permission should not allow cookie access for the cross-site subresource requests made in a non-top-level context.');
-}
+      await test_driver.set_permission(
+          {name: 'top-level-storage-access', requestedOrigin: altOrigin},
+          'granted');
+
+      const httpCookies = await FetchSubresourceCookiesFromFrame(frame, altOrigin);
+      assert_false(httpCookies.includes('cookie=1'));
+    },
+    '[same-origin-iframe] Existing top-level storage access permission should not allow cookie access for the cross-site subresource requests made in a non-top-level context.');

third_party/blink/web_tests/external/wpt/top-level-storage-access-api/tentative/resources/requestStorageAccess-integration-iframe.https.html

diff --git a/third_party/blink/web_tests/external/wpt/top-level-storage-access-api/tentative/resources/requestStorageAccess-integration-iframe.https.html b/third_party/blink/web_tests/external/wpt/top-level-storage-access-api/tentative/resources/requestStorageAccess-integration-iframe.https.html
deleted file mode 100644
index f4db5cf6..0000000
--- a/third_party/blink/web_tests/external/wpt/top-level-storage-access-api/tentative/resources/requestStorageAccess-integration-iframe.https.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<!-- no testharnessreport.js -->
-<script src="../../storage-access-api/helpers.js"></script>
-<div id=log></div>
-<script>
-  promise_test(
-  async t =>  document.requestStorageAccess(),
-  '[request-storage-access-integration] ' +
-  'document.requestStorageAccess() should be resolved without a user gesture with an existing top-level-storage-access permission');
-</script>

third_party/blink/web_tests/external/wpt/web-locks/partitioned-web-locks.tentative.https.html

diff --git a/third_party/blink/web_tests/external/wpt/web-locks/partitioned-web-locks.tentative.https.html b/third_party/blink/web_tests/external/wpt/web-locks/partitioned-web-locks.tentative.https.html
index a426737..2f166e6 100644
--- a/third_party/blink/web_tests/external/wpt/web-locks/partitioned-web-locks.tentative.https.html
+++ b/third_party/blink/web_tests/external/wpt/web-locks/partitioned-web-locks.tentative.https.html
@@ -18,12 +18,29 @@
 const held = new Map();
 let next_lock_id = 1;
 
+// How this test works:
+// Step 1 (top-frame): request an exclusive web-lock and store its id
+// and release for clean-up.
+// Step 2 (top-frame): open a pop-up window and load a not-same-site
+// ./web-locks/resources/partitioned-parent.html
+// Step 3 (pop-up): load a same-site iframe inside the pop-up.
+// Step 4 (pop-up): send a web-lock request to the same-site iframe.
+// Step 5 (iframe): process the web-lock request and message the result
+// back to the pop-up.
+// Step 6 (pop-up): intercept the result message from the iframe and
+// send it to the top-frame.
+// Step 7 (top-frame): ensure that the same-site iframe's web-lock
+// request succeeds since it and the top-level site are successfully
+// partitioned and each can hold an exclusive lock.
+// Step 8 (top-frame): clean up.
+
 async function third_party_test(t) {
   let target_url = HTTPS_ORIGIN + '/web-locks/resources/iframe.html';
   target_url = new URL(
     `/web-locks/resources/partitioned-parent.html?target=${encodeURIComponent(target_url)}`,
     HTTPS_NOTSAMESITE_ORIGIN + self.location.pathname);
 
+  // Step 1.
   navigator.locks.request('testLock', {mode: 'exclusive', ifAvailable: true},
         lock => {
           if (lock === null) {
@@ -37,15 +54,18 @@
           return promise;
         });
 
+  // Step 2.
   const w = window.open(target_url);
   const result = await new Promise(resolve => window.onmessage = resolve);
 
+  // Step 7.
   // When 3rd party storage partitioning is enabled, the iframe should be able
   // to aquire a lock with the same name as one exclusively held by the opener
   // of its top window, even when that opener has the same origin.
   assert_equals(result.data.failed, undefined,
       'The 1p iframe failed to acquire the lock');
 
+  // Step 8.
   t.add_cleanup(() => {
     w.close()
     for(let i = 1; i < next_lock_id; i++){
@@ -61,6 +81,30 @@
 
 // Optional Test: Checking for partitioned web locks in an A->B->A
 // (nested-iframe with cross-site ancestor chain) scenario.
+//
+// How this test works:
+// Nested Step 1 (top frame): request an exclusive web-lock and
+// store its id and release for clean-up.
+// Nested Step 2 (top frame): open a pop-up window and load a
+// same-site /web-locks/resources/partitioned-parent.html.
+// Nested Step 3 (pop-up): load a not-same-site "parent" iframe (A->B)
+// (/web-locks/resources/iframe-parent.html) inside the pop-up.
+// Nested Step 4 (pop-up): send a web-lock request to the parent iframe.
+// Nested Step 5 (parent iframe): load a "child" iframe (A->B->A)
+// (/web-locks/resources/iframe.html) that is same-site with the
+// pop-up inside the "parent" iframe.
+// Nested Step 6 (parent iframe): pass on the web-lock request message to
+// the "child" iframe.
+// Nested Step 7 (child iframe): process the web-lock request and message
+// the result to the parent iframe.
+// Nested Step 8 (parent iframe): intercept the result message from the
+// child iframe and send it to the pop-up.
+// Nested Step 9 (pop-up): intercept the result message from the parent
+// iframe and send it to the top frame.
+// Nested Step 10 (top frame): ensure that the same-site iframe's web-lock
+// request succeeds since it and the top-level are successfully
+// partitioned and each can hold an exclusive lock.
+// Nested Step 11 (top frame): clean up.
 
 // Map of lock_id => function that releases a lock.
 const held_2 = new Map();
@@ -78,6 +122,7 @@
     `/web-locks/resources/partitioned-parent.html?target=${encodeURIComponent(middle_url)}`,
     HTTPS_ORIGIN + self.location.pathname);
 
+  // Nested Step 1.
   // Request the weblock for the top-level site.
   navigator.locks.request('testLock', {mode: 'exclusive', ifAvailable: true},
         lock => {
@@ -93,17 +138,20 @@
           return promise;
         }).catch(error => alert(error.message));
 
+  // Nested Step 2.
   // Open the nested iframes. The script in the innermost child iframe
   // will attempt to obtain the same weblock as above.
   const w = window.open(top_url);
   const result = await new Promise(resolve => window.onmessage = resolve);
 
+  // Nested Step 10.
   // With third-party storage partitioning enabled, the same-site iframe
   // should be able to acquire the lock as it has a cross-site ancestor
   // and is partitioned separately from the top-level site.
   assert_equals(result.data.failed, undefined,
       'The 1p iframe failed to acquire the lock');
 
+  // Nested Step 11.
   t.add_cleanup(() => {
     w.close()
     for(let i = 1; i < next_lock_id_2; i++){

third_party/blink/web_tests/external/wpt/web-locks/resources/iframe-parent.html

diff --git a/third_party/blink/web_tests/external/wpt/web-locks/resources/iframe-parent.html b/third_party/blink/web_tests/external/wpt/web-locks/resources/iframe-parent.html
index 021fffa..ec63045b 100644
--- a/third_party/blink/web_tests/external/wpt/web-locks/resources/iframe-parent.html
+++ b/third_party/blink/web_tests/external/wpt/web-locks/resources/iframe-parent.html
@@ -4,6 +4,7 @@
 'use strict';
 
 async function onLoad() {
+  // Nested Step 5: wpt/web-locks/partitioned-web-locks.tentative.https.html
   // Load the innermost child iframe and its content.
   const params = new URLSearchParams(self.location.search);
   const frame = document.createElement('iframe');
@@ -11,6 +12,7 @@
   document.body.appendChild(frame);
 
   self.addEventListener('message', evt => {
+    // Nested Step 6: wpt/web-locks/partitioned-web-locks.tentative.https.html
     // Pass any operations request messages to the
     // innermost child iframe.
     if (evt.data.op){
@@ -20,6 +22,7 @@
         frame.contentWindow.postMessage(evt.data, '*');
       });
     }
+    // Nested Step 8: wpt/web-locks/partitioned-web-locks.tentative.https.html
     else {
       // All other messages, should be sent back to the
       // top-level site.

third_party/blink/web_tests/external/wpt/web-locks/resources/partitioned-parent.html

diff --git a/third_party/blink/web_tests/external/wpt/web-locks/resources/partitioned-parent.html b/third_party/blink/web_tests/external/wpt/web-locks/resources/partitioned-parent.html
index 5dafce49..ec19c8dba 100644
--- a/third_party/blink/web_tests/external/wpt/web-locks/resources/partitioned-parent.html
+++ b/third_party/blink/web_tests/external/wpt/web-locks/resources/partitioned-parent.html
@@ -3,6 +3,8 @@
 <meta name="referrer" content="origin">
 <script>
 async function onLoad() {
+  // Step 6 and Nested Step 9:
+  // wpt/web-locks/partitioned-web-locks.tentative.https.html
   self.addEventListener('message', evt => {
     if (self.opener)
       self.opener.postMessage(evt.data, '*');
@@ -10,11 +12,15 @@
       self.top.postMessage(evt.data, '*');
   }, { once: true });
 
+  // Step 3 and Nested Step 3:
+  // wpt/web-locks/partitioned-web-locks.tentative.https.html
   const params = new URLSearchParams(self.location.search);
   const frame = document.createElement('iframe');
   frame.src = params.get('target');
   document.body.appendChild(frame);
 
+  // Step 4 and Nested Step 4:
+  // wpt/web-locks/partitioned-web-locks.tentative.https.html
   frame.addEventListener('load', function(){
     frame.contentWindow.postMessage({op: 'request',
         name: 'testLock', ifAvailable: true}, '*');

third_party/blink/web_tests/platform/mac-mac11/external/wpt/resource-timing/nested-context-navigations-object-expected.txt

diff --git a/third_party/blink/web_tests/platform/mac-mac11/external/wpt/resource-timing/nested-context-navigations-object-expected.txt b/third_party/blink/web_tests/platform/mac-mac11/external/wpt/resource-timing/nested-context-navigations-object-expected.txt
deleted file mode 100644
index d79a79c8..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11/external/wpt/resource-timing/nested-context-navigations-object-expected.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-This is a testharness.js-based test.
-FAIL Test that object navigations are not observable by the parent, even after history navigations by the parent promise_test: Unhandled rejection with value: "FAIL - first document not exposed. navigated_back is undefined"
-PASS Test that crossorigin object navigations are not observable by the parent, even after history navigations by the parent
-PASS Test that cross-site object navigations are not observable by the parent, even after history navigations by the parent
-PASS Test that object navigations are not observable by the parent
-PASS Test that crossorigin object navigations are not observable by the parent
-PASS Test that cross-site object navigations are not observable by the parent
-PASS Test that object refreshes are not observable by the parent
-PASS Test that crossorigin object refreshes are not observable by the parent
-PASS Test that cross-site object refreshes are not observable by the parent
-Harness: the test ran to completion.
-

third_party/blink/web_tests/wpt_internal/web-locks/resources/partitioned-parent-copy-not-same-site.html

diff --git a/third_party/blink/web_tests/wpt_internal/web-locks/resources/partitioned-parent-copy-not-same-site.html b/third_party/blink/web_tests/wpt_internal/web-locks/resources/partitioned-parent-copy-not-same-site.html
index e722bc3..bb052fe0 100644
--- a/third_party/blink/web_tests/wpt_internal/web-locks/resources/partitioned-parent-copy-not-same-site.html
+++ b/third_party/blink/web_tests/wpt_internal/web-locks/resources/partitioned-parent-copy-not-same-site.html
@@ -9,6 +9,8 @@
 </head>
 <script>
 async function onLoad() {
+  // Step 6:
+  // wpt_internal/web-locks/storage-deprecation-trial-enabled.https.html
   self.addEventListener('message', evt => {
     if (self.opener)
       self.opener.postMessage(evt.data, '*');
@@ -16,11 +18,15 @@
       self.top.postMessage(evt.data, '*');
   }, { once: true });
 
+  // Step 3:
+  // wpt_internal/web-locks/storage-deprecation-trial-enabled.https.html
   const params = new URLSearchParams(self.location.search);
   const frame = document.createElement('iframe');
   frame.src = params.get('target');
   document.body.appendChild(frame);
 
+  // Step 4:
+  // wpt_internal/web-locks/storage-deprecation-trial-enabled.https.html
   frame.addEventListener('load', function(){
     frame.contentWindow.postMessage({op: 'request',
         name: 'testLock', ifAvailable: true}, '*');

third_party/blink/web_tests/wpt_internal/web-locks/resources/partitioned-parent-copy-same-site.html

diff --git a/third_party/blink/web_tests/wpt_internal/web-locks/resources/partitioned-parent-copy-same-site.html b/third_party/blink/web_tests/wpt_internal/web-locks/resources/partitioned-parent-copy-same-site.html
index dc62509..76bd639c 100644
--- a/third_party/blink/web_tests/wpt_internal/web-locks/resources/partitioned-parent-copy-same-site.html
+++ b/third_party/blink/web_tests/wpt_internal/web-locks/resources/partitioned-parent-copy-same-site.html
@@ -9,6 +9,8 @@
 </head>
 <script>
 async function onLoad() {
+  // Nested Step 9:
+  // wpt_internal/web-locks/storage-deprecation-trial-enabled.https.html
   self.addEventListener('message', evt => {
     if (self.opener)
       self.opener.postMessage(evt.data, '*');
@@ -16,11 +18,15 @@
       self.top.postMessage(evt.data, '*');
   }, { once: true });
 
+  // Nested Step 3:
+  // wpt_internal/web-locks/storage-deprecation-trial-enabled.https.html
   const params = new URLSearchParams(self.location.search);
   const frame = document.createElement('iframe');
   frame.src = params.get('target');
   document.body.appendChild(frame);
 
+  // Nested Step 4:
+  // wpt_internal/web-locks/storage-deprecation-trial-enabled.https.html
   frame.addEventListener('load', function(){
     frame.contentWindow.postMessage({op: 'request',
         name: 'testLock', ifAvailable: true}, '*');

third_party/blink/web_tests/wpt_internal/web-locks/storage-deprecation-trial-enabled.https.html

diff --git a/third_party/blink/web_tests/wpt_internal/web-locks/storage-deprecation-trial-enabled.https.html b/third_party/blink/web_tests/wpt_internal/web-locks/storage-deprecation-trial-enabled.https.html
index c4d20169..bfd81e0 100644
--- a/third_party/blink/web_tests/wpt_internal/web-locks/storage-deprecation-trial-enabled.https.html
+++ b/third_party/blink/web_tests/wpt_internal/web-locks/storage-deprecation-trial-enabled.https.html
@@ -26,6 +26,22 @@
 // - tools/origin_trials/generate_token.py https://not-web-platform.test:8444
 //   DisableThirdPartyStoragePartitioning --expire-timestamp=2000000000
 
+// How this test works:
+// Step 1 (top-frame): request an exclusive web-lock and store its id
+// and release for clean-up.
+// Step 2 (top-frame): open a pop-up window and load a not-same-site
+// ./resources/partitioned-parent-copy-not-same-site.html.
+// Step 3 (pop-up): load a same-site iframe inside the pop-up.
+// Step 4 (pop-up): send a web-lock request to the same-site iframe.
+// Step 5 (iframe): process the web-lock request and message the result
+// back to the pop-up.
+// Step 6 (pop-up): intercept the result message from the iframe and
+// send it to the top-frame.
+// Step 7 (top-frame): ensure that the same-site iframe's web-lock
+// request failed since it and the top-level site are in the same
+// partition and an exclusive lock has already been granted.
+// Step 8 (top-frame): clean up.
+
 const { HTTPS_ORIGIN, HTTPS_NOTSAMESITE_ORIGIN } = get_host_info();
 // Map of lock_id => function that releases a lock.
 const held = new Map();
@@ -37,6 +53,7 @@
     `./resources/partitioned-parent-copy-not-same-site.html?target=${encodeURIComponent(target_url)}`,
     HTTPS_NOTSAMESITE_ORIGIN + self.location.pathname);
 
+  // Step 1.
   navigator.locks.request('testLock', {mode: 'exclusive', ifAvailable: true},
         lock => {
           if (lock === null) {
@@ -50,14 +67,17 @@
           return promise;
         });
 
+  // Step 2.
   const w = window.open(target_url);
   const result = await new Promise(resolve => window.onmessage = resolve);
 
+  // Step 7.
   // With third-party storage partitioning disabled, the same-site iframe
   // lives in the same partition as the previously acquired lock, so an
   // additional lock is not granted.
   assert_equals(result.data.failed, true);
 
+  // Step 8.
   t.add_cleanup(() => {
     w.close()
     for(let i = 1; i < next_lock_id; i++){
@@ -74,6 +94,30 @@
 // Optional Test: Checking for partitioned web locks in an A->B->A
 // (nested-iframe with cross-site ancestor chain) scenario.
 
+// How this test works:
+// Nested Step 1 (top frame): request an exclusive web-lock and
+// store its id and release for clean-up.
+// Nested Step 2 (top frame): open a pop-up window and load a
+// same-site ./resources/partitioned-parent-copy-same-site.html.
+// Nested Step 3 (pop-up): load a not-same-site "parent" iframe (A->B)
+// (/web-locks/resources/iframe-parent.html) inside the pop-up.
+// Nested Step 4 (pop-up): send a web-lock request to the parent iframe.
+// Nested Step 5 (parent iframe): load a "child" iframe (A->B->A)
+// (/web-locks/resources/iframe.html) that is same-site with the
+// pop-up inside the "parent" iframe.
+// Nested Step 6 (parent iframe): pass on the web-lock request message to
+// the "child" iframe.
+// Nested Step 7 (child iframe): process the web-lock request and message
+// the result to the parent iframe.
+// Nested Step 8 (parent iframe): intercept the result message from the
+// child iframe and send it to the pop-up.
+// Nested Step 9 (pop-up): intercept the result message from the parent
+// iframe and send it to the top frame.
+// Nested Step 10 (top frame): ensure that the same-site iframe's web-lock
+// request failed since it and the top-level site are in the same
+// partition and an exclusive lock has already been granted.
+// Nested Step 11 (top frame): clean up.
+
 // Map of lock_id => function that releases a lock.
 const held_2 = new Map();
 let next_lock_id_2 = 1;
@@ -90,6 +134,7 @@
     `./resources/partitioned-parent-copy-same-site.html?target=${encodeURIComponent(middle_url)}`,
     HTTPS_ORIGIN + self.location.pathname);
 
+  // Nested Step 1.
   // Request the weblock for the top-level site.
   navigator.locks.request('testLock', {mode: 'exclusive', ifAvailable: true},
         lock => {
@@ -105,16 +150,19 @@
           return promise;
         }).catch(error => alert(error.message));
 
+  // Nested Step 2.
   // Open the nested iframes. The script in the innermost child iframe
   // will attempt to obtain the same weblock as above.
   const w = window.open(top_url);
   const result = await new Promise(resolve => window.onmessage = resolve);
 
+  // Nested Step 10.
   // With third-party storage partitioning disabled, the same-site iframe
   // lives in the same partition as the previously acquired lock, so an
   // additional lock is not granted.
   assert_equals(result.data.failed, true);
 
+  // Nested Step 11.
   t.add_cleanup(() => {
     w.close()
     for(let i = 1; i < next_lock_id_2; i++){

tools/metrics/histograms/enums.xml

diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index 48512f5..63fd2c2 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -3787,6 +3787,7 @@
   <int value="51" label="Bruschetta app"/>
   <int value="52" label="System Info"/>
   <int value="53" label="Local image search"/>
+  <int value="54" label="Zero State Desks Admin Template"/>
 </enum>
 
 <enum name="AppListShowSource">
@@ -95373,7 +95374,8 @@
   <int value="11" label="[Tests] Force sign-out">
     Signout is forced. Used only for tests.
   </int>
-  <int value="12" label="User deleted account cookies">
+  <int value="12"
+      label="(Obsolete) User deleted account cookies. Deprecated in M114">
     User cleared account cookies when there's no sync consent, which has caused
     sign out.
   </int>
@@ -95421,6 +95423,13 @@
   <int value="23" label="AccountReconcilor Reconcile">
     The reconcilor cleared the signin primary account during reconcilation.
   </int>
+  <int value="24" label="SigninManager UpdateUnconsentedPrimaryAccount">
+    SigninManager decides to clear the prrimary (includes web sign out).
+  </int>
+  <int value="25" label="User deleted account cookies">
+    User cleared account cookies when there's no sync consent, which has caused
+    sign out.
+  </int>
 </enum>
 
 <enum name="SigninSSOAuthGetIdentitiesErrorCode">

tools/metrics/histograms/metadata/apps/histograms.xml

diff --git a/tools/metrics/histograms/metadata/apps/histograms.xml b/tools/metrics/histograms/metadata/apps/histograms.xml
index 749af908..33b6572 100644
--- a/tools/metrics/histograms/metadata/apps/histograms.xml
+++ b/tools/metrics/histograms/metadata/apps/histograms.xml
@@ -476,7 +476,7 @@
 </histogram>
 
 <histogram name="Apps.AppList.ContinueSectionHiddenByUser{TabletOrClamshell}"
-    enum="Boolean" expires_after="2023-05-01">
+    enum="Boolean" expires_after="2023-11-01">
   <owner>jamescook@chromium.org</owner>
   <owner>tbarzic@chromium.org</owner>
   <summary>

tools/metrics/histograms/metadata/content/histograms.xml

diff --git a/tools/metrics/histograms/metadata/content/histograms.xml b/tools/metrics/histograms/metadata/content/histograms.xml
index 5b2e2da0..61df4572 100644
--- a/tools/metrics/histograms/metadata/content/histograms.xml
+++ b/tools/metrics/histograms/metadata/content/histograms.xml
@@ -549,7 +549,7 @@
 
 <histogram
     name="ContentSettings.{RegularProfileFiltered}DefaultRequestDesktopSiteSetting"
-    enum="ContentSetting" expires_after="2023-06-26">
+    enum="ContentSetting" expires_after="2024-04-06">
   <owner>shuyng@google.com</owner>
   <owner>twellington@chromium.org</owner>
   <summary>

tools/metrics/histograms/metadata/families/histograms.xml

diff --git a/tools/metrics/histograms/metadata/families/histograms.xml b/tools/metrics/histograms/metadata/families/histograms.xml
index a61353e..eaf492a5 100644
--- a/tools/metrics/histograms/metadata/families/histograms.xml
+++ b/tools/metrics/histograms/metadata/families/histograms.xml
@@ -567,6 +567,17 @@
   </summary>
 </histogram>
 
+<histogram name="ManagedUsers.ClassifyUrlRequest.NetOrHttpStatus"
+    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2023-11-01">
+  <owner>tju@google.com</owner>
+  <owner>chrome-kids-eng@google.com</owner>
+  <summary>
+    The status of the net or http communication to the Kids Management
+    API::ClassifyURL with JSON message format in expected response. This is
+    recorded for each request to the Kids Management API.
+  </summary>
+</histogram>
+
 <histogram name="ManagedUsers.FilteringResult"
     enum="SupervisedUserSafetyFilterResult" expires_after="2023-12-12">
   <owner>agawronska@chromium.org</owner>

tools/metrics/histograms/metadata/gpu/histograms.xml

diff --git a/tools/metrics/histograms/metadata/gpu/histograms.xml b/tools/metrics/histograms/metadata/gpu/histograms.xml
index 188d784..42a160f 100644
--- a/tools/metrics/histograms/metadata/gpu/histograms.xml
+++ b/tools/metrics/histograms/metadata/gpu/histograms.xml
@@ -1196,6 +1196,16 @@
   </summary>
 </histogram>
 
+<histogram name="GPU.RasterDecoder.TimeToFlush" units="microseconds"
+    expires_after="2023-08-01">
+  <owner>sky@chromium.org</owner>
+  <owner>graphics-dev@chromium.org</owner>
+  <summary>
+    Time it takes for RasterDecoderImpl::FlushSurfaces() to complete. Recorded
+    for the first 100 flushes.
+  </summary>
+</histogram>
+
 <histogram name="Gpu.Rasterization.Raster.MSAASampleCountLog2" units="count"
     expires_after="2023-06-04">
   <owner>penghuang@chromium.org</owner>

tools/metrics/histograms/metadata/history/histograms.xml

diff --git a/tools/metrics/histograms/metadata/history/histograms.xml b/tools/metrics/histograms/metadata/history/histograms.xml
index db4d4e0..99336a53 100644
--- a/tools/metrics/histograms/metadata/history/histograms.xml
+++ b/tools/metrics/histograms/metadata/history/histograms.xml
@@ -2112,27 +2112,6 @@
   </summary>
 </histogram>
 
-<histogram name="History.ExpireVisits.GetRedirectsDurationPercentage" units="%"
-    expires_after="M90">
-  <owner>calamity@chromium.org</owner>
-  <component>UI&gt;Browser&gt;History</component>
-  <summary>
-    The percentage of time taken in ExpireHistoryBackend::ExpireVisits for
-    calculating the redirect parent.
-  </summary>
-</histogram>
-
-<histogram name="History.ExpireVisits.TotalDuration" units="ms"
-    expires_after="M90">
-  <owner>calamity@chromium.org</owner>
-  <component>UI&gt;Browser&gt;History</component>
-  <summary>
-    The time taken to expire a list of visits. This is not scaled to the number
-    of visits deleted, but gives an idea of how long a single request to
-    ExpireHistoryBackend::ExpireVisits takes.
-  </summary>
-</histogram>
-
 <histogram name="History.FaviconDatabaseAdvancedMetricsTime" units="ticks"
     expires_after="M77">
   <owner>rogerm@chromium.org</owner>
@@ -2290,27 +2269,6 @@
   </summary>
 </histogram>
 
-<histogram name="History.InMemoryDBKeywordTermsCount" units="items"
-    expires_after="2020-02-16">
-  <owner>sky@chromium.org</owner>
-  <owner>mpearson@chromium.org</owner>
-  <component>UI&gt;Browser&gt;History</component>
-  <summary>
-    Number of items in in-memory keyword_search_terms table. Recorded on profile
-    open.
-  </summary>
-</histogram>
-
-<histogram name="History.InMemoryDBKeywordURLItemCount" units="items"
-    expires_after="2020-02-16">
-  <owner>sky@chromium.org</owner>
-  <owner>mpearson@chromium.org</owner>
-  <component>UI&gt;Browser&gt;History</component>
-  <summary>
-    Number of items in in-memory urls table. Recorded on profile open.
-  </summary>
-</histogram>
-
 <histogram name="History.InMemoryURLHistoryItems" units="items"
     expires_after="2023-08-13">
   <owner>mpearson@chromium.org</owner>

tools/metrics/histograms/metadata/page/histograms.xml

diff --git a/tools/metrics/histograms/metadata/page/histograms.xml b/tools/metrics/histograms/metadata/page/histograms.xml
index fe8c131..c66ae1a 100644
--- a/tools/metrics/histograms/metadata/page/histograms.xml
+++ b/tools/metrics/histograms/metadata/page/histograms.xml
@@ -1254,6 +1254,43 @@
     The time from navigation start to the first contentful paint of third-party
     (in respect to scheme://eTLD+1) frames on pages. Note that this can be
     significantly delayed due to lazy loading.
+
+    Note also that all of the PageLoad.Clients.ThirdParty.Frames metrics will
+    only be recorded for the first kMaxRecordedFrames (50) active iframe
+    RenderFrameHosts (at any given time).
+  </summary>
+</histogram>
+
+<histogram
+    name="PageLoad.Clients.ThirdParty.Frames.Opaque.NavigationToFirstContentfulPaint"
+    units="ms" expires_after="2023-09-03">
+  <owner>awillia@chromium.org</owner>
+  <owner>djmitche@chromium.org</owner>
+  <summary>
+    The time from navigation start to the first contentful paint of third-party
+    opaque origin frames on pages. Note that this metric is only collected when
+    the top-level origin is not opaque. Also, this metric can be significantly
+    delayed due to lazy loading.
+
+    Note also that all of the PageLoad.Clients.ThirdParty.Frames metrics will
+    only be recorded for the first kMaxRecordedFrames (50) active iframe
+    RenderFrameHosts (at any given time).
+  </summary>
+</histogram>
+
+<histogram
+    name="PageLoad.Clients.ThirdParty.Frames.Opaque.NavigationToLargestContentfulPaint"
+    units="ms" expires_after="2023-09-03">
+  <owner>awillia@chromium.org</owner>
+  <owner>djmitche@chromium.org</owner>
+  <summary>
+    The time from navigation start to the largest contentful paint of
+    third-party opaque origin frames on pages. Note that this metric is only
+    collected when the top-level origin is not opaque.
+
+    Note also that all of the PageLoad.Clients.ThirdParty.Frames metrics will
+    only be recorded for the first kMaxRecordedFrames (50) active iframe
+    RenderFrameHosts (at any given time).
   </summary>
 </histogram>
 

tools/metrics/histograms/metadata/safe_browsing/histograms.xml

diff --git a/tools/metrics/histograms/metadata/safe_browsing/histograms.xml b/tools/metrics/histograms/metadata/safe_browsing/histograms.xml
index afb2383..e1ccd08d 100644
--- a/tools/metrics/histograms/metadata/safe_browsing/histograms.xml
+++ b/tools/metrics/histograms/metadata/safe_browsing/histograms.xml
@@ -2220,6 +2220,16 @@
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsing.V4GetHash.CacheFullyHit" enum="BooleanCacheHit"
+    expires_after="2023-07-07">
+  <owner>thefrog@chromium.org</owner>
+  <owner>chrome-counter-abuse-alerts@google.com</owner>
+  <summary>
+    Track whether a V4 request was able to be skipped because all parts of it
+    were found in the local cache. Logged after the V4 local cache is checked.
+  </summary>
+</histogram>
+
 <histogram name="SafeBrowsing.V4GetHash.CacheHit.Result"
     enum="SafeBrowsingV4FullHashCacheResult" expires_after="2023-09-03">
   <owner>vakh@chromium.org</owner>

ui/accessibility/BUILD.gn

diff --git a/ui/accessibility/BUILD.gn b/ui/accessibility/BUILD.gn
index 1c1e963..18fa280 100644
--- a/ui/accessibility/BUILD.gn
+++ b/ui/accessibility/BUILD.gn
@@ -135,8 +135,6 @@
     "ax_computed_node_data.cc",
     "ax_computed_node_data.h",
     "ax_coordinate_system.h",
-    "ax_dummy_tree_manager.cc",
-    "ax_dummy_tree_manager.h",
     "ax_event_generator.cc",
     "ax_event_generator.h",
     "ax_export.h",
@@ -183,6 +181,8 @@
     "ax_tree_update_util.h",
     "null_ax_action_target.cc",
     "null_ax_action_target.h",
+    "single_ax_tree_manager.cc",
+    "single_ax_tree_manager.h",
   ]
 
   deps = [
@@ -239,8 +239,6 @@
   sources = [
     "test_ax_node_helper.cc",
     "test_ax_node_helper.h",
-    "test_ax_tree_manager.cc",
-    "test_ax_tree_manager.h",
     "test_ax_tree_update.cc",
     "test_ax_tree_update.h",
     "test_ax_tree_update_json_reader.cc",

ui/accessibility/ax_computed_node_data_unittest.cc

diff --git a/ui/accessibility/ax_computed_node_data_unittest.cc b/ui/accessibility/ax_computed_node_data_unittest.cc
index 45cf08f0..b7d2a07 100644
--- a/ui/accessibility/ax_computed_node_data_unittest.cc
+++ b/ui/accessibility/ax_computed_node_data_unittest.cc
@@ -18,14 +18,14 @@
 #include "ui/accessibility/ax_tree.h"
 #include "ui/accessibility/ax_tree_data.h"
 #include "ui/accessibility/ax_tree_id.h"
-#include "ui/accessibility/test_ax_tree_manager.h"
+#include "ui/accessibility/single_ax_tree_manager.h"
 
 namespace ui {
 
 namespace {
 
 class AXComputedNodeDataTest : public ::testing::Test,
-                               public TestAXTreeManager {
+                               public SingleAXTreeManager {
  public:
   AXComputedNodeDataTest();
   ~AXComputedNodeDataTest() override;
@@ -146,7 +146,7 @@
   root_node_ = tree->root();
   ASSERT_EQ(root_.id, root_node_->id());
 
-  // `SetTree` is defined in our `TestAXTreeManager` superclass and it passes
+  // `SetTree` is defined in our `SingleAXTreeManager` superclass and it passes
   // ownership of the created AXTree to the manager.
   SetTree(std::move(tree));
 }

ui/accessibility/ax_dummy_tree_manager.cc

diff --git a/ui/accessibility/ax_dummy_tree_manager.cc b/ui/accessibility/ax_dummy_tree_manager.cc
deleted file mode 100644
index 38c94c2..0000000
--- a/ui/accessibility/ax_dummy_tree_manager.cc
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2022 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/accessibility/ax_dummy_tree_manager.h"
-
-#include "ui/accessibility/ax_node.h"
-#include "ui/accessibility/ax_tree_data.h"
-#include "ui/accessibility/ax_tree_manager_map.h"
-
-namespace ui {
-
-AXDummyTreeManager::AXDummyTreeManager() = default;
-
-AXDummyTreeManager::AXDummyTreeManager(std::unique_ptr<AXTree> tree)
-    : AXTreeManager(std::move(tree)) {}
-
-AXDummyTreeManager::AXDummyTreeManager(AXDummyTreeManager&& manager)
-    : AXTreeManager(std::move(manager.ax_tree_)) {
-  if (ax_tree_) {
-    GetMap().RemoveTreeManager(GetTreeID());
-    GetMap().AddTreeManager(GetTreeID(), this);
-  }
-}
-
-AXDummyTreeManager& AXDummyTreeManager::operator=(
-    AXDummyTreeManager&& manager) {
-  if (this == &manager)
-    return *this;
-  if (manager.HasValidTreeID()) {
-    GetMap().RemoveTreeManager(manager.GetTreeID());
-  }
-  // std::move(nullptr) == nullptr, so no need to check if `manager.tree_` is
-  // assigned.
-  SetTree(std::move(manager.ax_tree_));
-  return *this;
-}
-
-AXDummyTreeManager::~AXDummyTreeManager() = default;
-
-void AXDummyTreeManager::DestroyTree() {
-  if (HasValidTreeID()) {
-    GetMap().RemoveTreeManager(GetTreeID());
-  }
-  ax_tree_.reset();
-}
-
-AXTree* AXDummyTreeManager::GetTree() const {
-  DCHECK(ax_tree_) << "Did you forget to call SetTree?";
-  return ax_tree_.get();
-}
-
-void AXDummyTreeManager::SetTree(std::unique_ptr<AXTree> tree) {
-  if (HasValidTreeID()) {
-    GetMap().RemoveTreeManager(GetTreeID());
-  }
-
-  ax_tree_ = std::move(tree);
-  if (HasValidTreeID()) {
-    GetMap().AddTreeManager(GetTreeID(), this);
-  }
-}
-
-AXNode* AXDummyTreeManager::GetParentNodeFromParentTree() const {
-  AXTreeID parent_tree_id = GetParentTreeID();
-  AXDummyTreeManager* parent_manager =
-      static_cast<AXDummyTreeManager*>(AXTreeManager::FromID(parent_tree_id));
-  if (!parent_manager)
-    return nullptr;
-
-  std::set<AXNodeID> host_node_ids =
-      parent_manager->GetTree()->GetNodeIdsForChildTreeId(GetTreeID());
-
-  for (AXNodeID host_node_id : host_node_ids) {
-    AXNode* parent_node =
-        parent_manager->GetNodeFromTree(parent_tree_id, host_node_id);
-    if (parent_node)
-      return parent_node;
-  }
-
-  return nullptr;
-}
-
-}  // namespace ui

ui/accessibility/ax_dummy_tree_manager.h

diff --git a/ui/accessibility/ax_dummy_tree_manager.h b/ui/accessibility/ax_dummy_tree_manager.h
deleted file mode 100644
index a0807e5..0000000
--- a/ui/accessibility/ax_dummy_tree_manager.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2022 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef UI_ACCESSIBILITY_AX_DUMMY_TREE_MANAGER_H_
-#define UI_ACCESSIBILITY_AX_DUMMY_TREE_MANAGER_H_
-
-#include <memory>
-
-#include "ui/accessibility/ax_export.h"
-#include "ui/accessibility/ax_tree.h"
-#include "ui/accessibility/ax_tree_id.h"
-#include "ui/accessibility/ax_tree_manager.h"
-
-namespace ui {
-
-class AXNode;
-
-// A basic implementation of AXTreeManager.
-//
-// For simplicity, this class supports only a single tree and doesn't perform
-// any walking across multiple trees.
-class AX_EXPORT AXDummyTreeManager : public AXTreeManager {
- public:
-  // This constructor does not create an empty AXTree. Call "SetTree" if you
-  // need to manage a specific tree. Useful when you need to test for the
-  // situation when no AXTree has been loaded yet.
-  AXDummyTreeManager();
-
-  // Takes ownership of |tree|.
-  explicit AXDummyTreeManager(std::unique_ptr<AXTree> tree);
-
-  ~AXDummyTreeManager() override;
-
-  AXDummyTreeManager(const AXDummyTreeManager& manager) = delete;
-  AXDummyTreeManager& operator=(const AXDummyTreeManager& manager) = delete;
-
-  AXDummyTreeManager(AXDummyTreeManager&& manager);
-  AXDummyTreeManager& operator=(AXDummyTreeManager&& manager);
-
-  void DestroyTree();
-  AXTree* GetTree() const;
-  // Takes ownership of |tree|.
-  void SetTree(std::unique_ptr<AXTree> tree);
-
-  // AXTreeManager implementation.
-  AXNode* GetParentNodeFromParentTree() const override;
-};
-
-}  // namespace ui
-
-#endif  // UI_ACCESSIBILITY_AX_DUMMY_TREE_MANAGER_H_

ui/accessibility/ax_node_position_perftest.cc

diff --git a/ui/accessibility/ax_node_position_perftest.cc b/ui/accessibility/ax_node_position_perftest.cc
index 820f839..be5b66e 100644
--- a/ui/accessibility/ax_node_position_perftest.cc
+++ b/ui/accessibility/ax_node_position_perftest.cc
@@ -9,7 +9,7 @@
 #include "ui/accessibility/ax_node_position.h"
 #include "ui/accessibility/ax_tree_id.h"
 #include "ui/accessibility/ax_tree_update.h"
-#include "ui/accessibility/test_ax_tree_manager.h"
+#include "ui/accessibility/single_ax_tree_manager.h"
 
 namespace ui {
 
@@ -21,7 +21,7 @@
 constexpr int kWarmupLaps = 5;
 constexpr char kMetricCallsPerSecondRunsPerS[] = "calls_per_second";
 
-class AXPositionPerfTest : public ::testing::Test, public TestAXTreeManager {
+class AXPositionPerfTest : public ::testing::Test, public SingleAXTreeManager {
  public:
   AXPositionPerfTest() = default;
 

ui/accessibility/ax_node_position_unittest.cc

diff --git a/ui/accessibility/ax_node_position_unittest.cc b/ui/accessibility/ax_node_position_unittest.cc
index 9ebad1e6..fb99516 100644
--- a/ui/accessibility/ax_node_position_unittest.cc
+++ b/ui/accessibility/ax_node_position_unittest.cc
@@ -25,7 +25,7 @@
 #include "ui/accessibility/ax_tree_data.h"
 #include "ui/accessibility/ax_tree_id.h"
 #include "ui/accessibility/ax_tree_update.h"
-#include "ui/accessibility/test_ax_tree_manager.h"
+#include "ui/accessibility/single_ax_tree_manager.h"
 
 namespace ui {
 
@@ -61,7 +61,7 @@
     L"\x0E01",
 };
 
-class AXPositionTest : public ::testing::Test, public TestAXTreeManager {
+class AXPositionTest : public ::testing::Test, public SingleAXTreeManager {
  public:
   AXPositionTest();
 
@@ -91,14 +91,15 @@
   // additional tree representing an out-of-process iframe. Returns a vector
   // containing the three managers for the trees in an out argument. (Note that
   // fatal assertions can only be propagated from a `void` method.)
-  void CreateBrowserWindow(AXNodeData& window,
-                           AXNodeData& back_button,
-                           AXNodeData& web_view,
-                           AXNodeData& root_web_area,
-                           AXNodeData& iframe_root,
-                           AXNodeData& paragraph,
-                           AXNodeData& address_bar,
-                           std::vector<TestAXTreeManager>& out_managers) const;
+  void CreateBrowserWindow(
+      AXNodeData& window,
+      AXNodeData& back_button,
+      AXNodeData& web_view,
+      AXNodeData& root_web_area,
+      AXNodeData& iframe_root,
+      AXNodeData& paragraph,
+      AXNodeData& address_bar,
+      std::vector<SingleAXTreeManager>& out_managers) const;
 
   // Creates a document with three static text objects each containing text in a
   // different language.
@@ -127,7 +128,7 @@
  private:
   ScopedAXEmbeddedObjectBehaviorSetter ax_embedded_object_behaviour_;
   // Manages a minimalistic Views tree that is hosting the test webpage.
-  TestAXTreeManager views_tree_manager_;
+  SingleAXTreeManager views_tree_manager_;
 };
 
 // Used by AXPositionExpandToEnclosingTextBoundaryTestWithParam.
@@ -406,15 +407,15 @@
   initial_state.tree_data.parent_tree_id = views_tree->GetAXTreeID();
   initial_state.tree_data.title = "Dialog title";
 
-  // "SetTree" is defined in "TestAXTreeManager" and it passes ownership of the
-  // created AXTree to the manager.
+  // "SetTree" is defined in "SingleAXTreeManager" and it passes ownership of
+  // the created AXTree to the manager.
   SetTree(std::make_unique<AXTree>(initial_state));
 
   AXTreeUpdate views_tree_update;
   web_view.AddChildTreeId(GetTreeID());
   views_tree_update.nodes = {web_view};
   ASSERT_TRUE(views_tree->Unserialize(views_tree_update));
-  views_tree_manager_ = TestAXTreeManager(std::move(views_tree));
+  views_tree_manager_ = SingleAXTreeManager(std::move(views_tree));
 }
 
 std::unique_ptr<AXTree> AXPositionTest::CreateMultipageDocument(
@@ -477,7 +478,7 @@
     AXNodeData& iframe_root,
     AXNodeData& paragraph,
     AXNodeData& address_bar,
-    std::vector<TestAXTreeManager>& out_managers) const {
+    std::vector<SingleAXTreeManager>& out_managers) const {
   // First tree: Views.
   window.id = 1;
   window.role = ax::mojom::Role::kWindow;
@@ -5945,7 +5946,7 @@
   // ++++TextField (Address bar - part of first tree.)
   AXNodeData window, back_button, web_view, root_web_area, iframe_root,
       paragraph, address_bar;
-  std::vector<TestAXTreeManager> trees;
+  std::vector<SingleAXTreeManager> trees;
   ASSERT_NO_FATAL_FAILURE(CreateBrowserWindow(window, back_button, web_view,
                                               root_web_area, iframe_root,
                                               paragraph, address_bar, trees));
@@ -5975,7 +5976,7 @@
   // ++++TextField (Address bar - part of first tree.)
   AXNodeData window, back_button, web_view, root_web_area, iframe_root,
       paragraph, address_bar;
-  std::vector<TestAXTreeManager> trees;
+  std::vector<SingleAXTreeManager> trees;
   ASSERT_NO_FATAL_FAILURE(CreateBrowserWindow(window, back_button, web_view,
                                               root_web_area, iframe_root,
                                               paragraph, address_bar, trees));
@@ -6135,7 +6136,7 @@
   // ++++TextField (Address bar - part of first tree.)
   AXNodeData window, back_button, web_view, root_web_area, iframe_root,
       paragraph, address_bar;
-  std::vector<TestAXTreeManager> trees;
+  std::vector<SingleAXTreeManager> trees;
   ASSERT_NO_FATAL_FAILURE(CreateBrowserWindow(window, back_button, web_view,
                                               root_web_area, iframe_root,
                                               paragraph, address_bar, trees));
@@ -6307,7 +6308,7 @@
   // ++++TextField (Address bar - part of first tree.)
   AXNodeData window, back_button, web_view, root_web_area, iframe_root,
       paragraph, address_bar;
-  std::vector<TestAXTreeManager> trees;
+  std::vector<SingleAXTreeManager> trees;
   ASSERT_NO_FATAL_FAILURE(CreateBrowserWindow(window, back_button, web_view,
                                               root_web_area, iframe_root,
                                               paragraph, address_bar, trees));
@@ -6336,7 +6337,7 @@
   // ++++TextField (Address bar - part of first tree.)
   AXNodeData window, back_button, web_view, root_web_area, iframe_root,
       paragraph, address_bar;
-  std::vector<TestAXTreeManager> trees;
+  std::vector<SingleAXTreeManager> trees;
   ASSERT_NO_FATAL_FAILURE(CreateBrowserWindow(window, back_button, web_view,
                                               root_web_area, iframe_root,
                                               paragraph, address_bar, trees));
@@ -6495,7 +6496,7 @@
   // ++++TextField (Address bar - part of first tree.)
   AXNodeData window, back_button, web_view, root_web_area, iframe_root,
       paragraph, address_bar;
-  std::vector<TestAXTreeManager> trees;
+  std::vector<SingleAXTreeManager> trees;
   ASSERT_NO_FATAL_FAILURE(CreateBrowserWindow(window, back_button, web_view,
                                               root_web_area, iframe_root,
                                               paragraph, address_bar, trees));
@@ -6665,7 +6666,7 @@
   // ++++TextField (Address bar - part of first tree.)
   AXNodeData window, back_button, web_view, root_web_area, iframe_root,
       paragraph, address_bar;
-  std::vector<TestAXTreeManager> trees;
+  std::vector<SingleAXTreeManager> trees;
   ASSERT_NO_FATAL_FAILURE(CreateBrowserWindow(window, back_button, web_view,
                                               root_web_area, iframe_root,
                                               paragraph, address_bar, trees));
@@ -6694,7 +6695,7 @@
   // ++++TextField (Address bar - part of first tree.)
   AXNodeData window, back_button, web_view, root_web_area, iframe_root,
       paragraph, address_bar;
-  std::vector<TestAXTreeManager> trees;
+  std::vector<SingleAXTreeManager> trees;
   ASSERT_NO_FATAL_FAILURE(CreateBrowserWindow(window, back_button, web_view,
                                               root_web_area, iframe_root,
                                               paragraph, address_bar, trees));
@@ -6853,7 +6854,7 @@
   // ++++TextField (Address bar - part of first tree.)
   AXNodeData window, back_button, web_view, root_web_area, iframe_root,
       paragraph, address_bar;
-  std::vector<TestAXTreeManager> trees;
+  std::vector<SingleAXTreeManager> trees;
   ASSERT_NO_FATAL_FAILURE(CreateBrowserWindow(window, back_button, web_view,
                                               root_web_area, iframe_root,
                                               paragraph, address_bar, trees));
@@ -7024,7 +7025,7 @@
   // ++++TextField (Address bar - part of first tree.)
   AXNodeData window, back_button, web_view, root_web_area, iframe_root,
       paragraph, address_bar;
-  std::vector<TestAXTreeManager> trees;
+  std::vector<SingleAXTreeManager> trees;
   ASSERT_NO_FATAL_FAILURE(CreateBrowserWindow(window, back_button, web_view,
                                               root_web_area, iframe_root,
                                               paragraph, address_bar, trees));
@@ -7053,7 +7054,7 @@
   // ++++TextField (Address bar - part of first tree.)
   AXNodeData window, back_button, web_view, root_web_area, iframe_root,
       paragraph, address_bar;
-  std::vector<TestAXTreeManager> trees;
+  std::vector<SingleAXTreeManager> trees;
   ASSERT_NO_FATAL_FAILURE(CreateBrowserWindow(window, back_button, web_view,
                                               root_web_area, iframe_root,
                                               paragraph, address_bar, trees));
@@ -7212,7 +7213,7 @@
   // ++++TextField (Address bar - part of first tree.)
   AXNodeData window, back_button, web_view, root_web_area, iframe_root,
       paragraph, address_bar;
-  std::vector<TestAXTreeManager> trees;
+  std::vector<SingleAXTreeManager> trees;
   ASSERT_NO_FATAL_FAILURE(CreateBrowserWindow(window, back_button, web_view,
                                               root_web_area, iframe_root,
                                               paragraph, address_bar, trees));
@@ -12166,7 +12167,7 @@
   update.has_tree_data = true;
   update.root_id = child_root.id;
   update.nodes.push_back(child_root);
-  TestAXTreeManager child_tree_manager(std::make_unique<AXTree>(update));
+  SingleAXTreeManager child_tree_manager(std::make_unique<AXTree>(update));
 
   // Verify that kEmbeddedObject node with child tree is not treated as an
   // empty object.

ui/accessibility/ax_node_unittest.cc

diff --git a/ui/accessibility/ax_node_unittest.cc b/ui/accessibility/ax_node_unittest.cc
index cb18972..bc39008 100644
--- a/ui/accessibility/ax_node_unittest.cc
+++ b/ui/accessibility/ax_node_unittest.cc
@@ -18,9 +18,9 @@
 #include "ui/accessibility/ax_tree.h"
 #include "ui/accessibility/ax_tree_data.h"
 #include "ui/accessibility/ax_tree_id.h"
-#include "ui/accessibility/test_ax_tree_manager.h"
-#include "ui/gfx/geometry/rect_f.h"
+#include "ui/accessibility/single_ax_tree_manager.h"
 #include "ui/accessibility/test_ax_tree_update.h"
+#include "ui/gfx/geometry/rect_f.h"
 
 namespace ui {
 
@@ -371,9 +371,9 @@
   initial_state_2.tree_data = tree_data_2;
 
   auto tree_1 = std::make_unique<AXTree>(initial_state_1);
-  TestAXTreeManager tree_manager_1(std::move(tree_1));
+  SingleAXTreeManager tree_manager_1(std::move(tree_1));
   auto tree_2 = std::make_unique<AXTree>(initial_state_2);
-  TestAXTreeManager tree_manager_2(std::move(tree_2));
+  SingleAXTreeManager tree_manager_2(std::move(tree_2));
 
   const AXNode* root_node_1 = tree_manager_1.GetRoot();
   ASSERT_EQ(root_1.id, root_node_1->id());
@@ -477,7 +477,7 @@
                   rich_text_field_line_2};
 
   auto tree = std::make_unique<AXTree>(update);
-  TestAXTreeManager manager(std::move(tree));
+  SingleAXTreeManager manager(std::move(tree));
 
   {
     const AXNode* text_field_node =

ui/accessibility/ax_range_unittest.cc

diff --git a/ui/accessibility/ax_range_unittest.cc b/ui/accessibility/ax_range_unittest.cc
index 0b261c8..78b2de4 100644
--- a/ui/accessibility/ax_range_unittest.cc
+++ b/ui/accessibility/ax_range_unittest.cc
@@ -18,8 +18,8 @@
 #include "ui/accessibility/ax_tree.h"
 #include "ui/accessibility/ax_tree_id.h"
 #include "ui/accessibility/ax_tree_update.h"
+#include "ui/accessibility/single_ax_tree_manager.h"
 #include "ui/accessibility/test_ax_node_helper.h"
-#include "ui/accessibility/test_ax_tree_manager.h"
 
 namespace ui {
 
@@ -51,7 +51,7 @@
 
 class TestAXRangeScreenRectDelegate : public AXRangeRectDelegate {
  public:
-  explicit TestAXRangeScreenRectDelegate(TestAXTreeManager* tree_manager)
+  explicit TestAXRangeScreenRectDelegate(SingleAXTreeManager* tree_manager)
       : tree_manager_(tree_manager) {}
   virtual ~TestAXRangeScreenRectDelegate() = default;
   TestAXRangeScreenRectDelegate(const TestAXRangeScreenRectDelegate& delegate) =
@@ -98,10 +98,10 @@
   }
 
  private:
-  const raw_ptr<TestAXTreeManager> tree_manager_;
+  const raw_ptr<SingleAXTreeManager> tree_manager_;
 };
 
-class AXRangeTest : public ::testing::Test, public TestAXTreeManager {
+class AXRangeTest : public ::testing::Test, public SingleAXTreeManager {
  public:
   const std::u16string EMPTY = u"";
   const std::u16string NEWLINE = u"\n";

ui/accessibility/ax_selection_unittest.cc

diff --git a/ui/accessibility/ax_selection_unittest.cc b/ui/accessibility/ax_selection_unittest.cc
index b9913aa..2d09fe3 100644
--- a/ui/accessibility/ax_selection_unittest.cc
+++ b/ui/accessibility/ax_selection_unittest.cc
@@ -5,7 +5,7 @@
 #include "ui/accessibility/ax_selection.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/accessibility/test_ax_tree_manager.h"
+#include "ui/accessibility/single_ax_tree_manager.h"
 
 // Helper macro for testing selection values and maintain
 // correct stack tracing and failure causality.
@@ -124,7 +124,8 @@
   tree_update.nodes[15].role = ax::mojom::Role::kStaticText;
   tree_update.nodes[15].SetName("text");
 
-  TestAXTreeManager test_ax_tree_manager(std::make_unique<AXTree>(tree_update));
+  SingleAXTreeManager test_ax_tree_manager(
+      std::make_unique<AXTree>(tree_update));
   AXSelection unignored_selection =
       test_ax_tree_manager.GetTree()->GetUnignoredSelection();
 

ui/accessibility/ax_tree_fuzzer_util.h

diff --git a/ui/accessibility/ax_tree_fuzzer_util.h b/ui/accessibility/ax_tree_fuzzer_util.h
index 88f41d9b..1f838806 100644
--- a/ui/accessibility/ax_tree_fuzzer_util.h
+++ b/ui/accessibility/ax_tree_fuzzer_util.h
@@ -8,7 +8,7 @@
 #include "ui/accessibility/ax_tree_data.h"
 #include "ui/accessibility/ax_tree_id.h"
 #include "ui/accessibility/ax_tree_update.h"
-#include "ui/accessibility/test_ax_tree_manager.h"
+#include "ui/accessibility/single_ax_tree_manager.h"
 
 // TODO(janewman): Replace usage with ...FuzzedDataProvider...
 class FuzzerData {
@@ -85,6 +85,6 @@
   std::u16string GenerateInterestingText(const unsigned char* data,
                                          size_t size);
   ui::AXNodeID max_assigned_node_id_;
-  ui::TestAXTreeManager tree_manager_;
+  ui::SingleAXTreeManager tree_manager_;
 };
 #endif  //  UI_ACCESSIBILITY_AX_TREE_FUZZER_UTIL_H_

ui/accessibility/ax_tree_manager.h

diff --git a/ui/accessibility/ax_tree_manager.h b/ui/accessibility/ax_tree_manager.h
index 3f6853e..efad000 100644
--- a/ui/accessibility/ax_tree_manager.h
+++ b/ui/accessibility/ax_tree_manager.h
@@ -176,8 +176,7 @@
   static absl::optional<AXTreeID> last_focused_node_tree_id_;
 
  private:
-  friend class AXDummyTreeManager;
-  friend class TestAXTreeManager;
+  friend class SingleAXTreeManager;
 
   static AXTreeManagerMap& GetMap();
 

ui/accessibility/ax_tree_manager_unittest.cc

diff --git a/ui/accessibility/ax_tree_manager_unittest.cc b/ui/accessibility/ax_tree_manager_unittest.cc
index ecd4dd3..985af3c 100644
--- a/ui/accessibility/ax_tree_manager_unittest.cc
+++ b/ui/accessibility/ax_tree_manager_unittest.cc
@@ -7,7 +7,7 @@
 #include "ui/accessibility/ax_serializable_tree.h"
 #include "ui/accessibility/ax_tree_id.h"
 #include "ui/accessibility/ax_tree_update.h"
-#include "ui/accessibility/test_ax_tree_manager.h"
+#include "ui/accessibility/single_ax_tree_manager.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -25,7 +25,7 @@
   initial_state.nodes.push_back(root);
   initial_state.has_tree_data = true;
 
-  TestAXTreeManager manager(std::make_unique<AXSerializableTree>());
+  SingleAXTreeManager manager(std::make_unique<AXSerializableTree>());
 
   manager.Initialize(initial_state);
 
@@ -107,9 +107,9 @@
 
   // Create the managers. We don't `Initialize` the middle manager to test the
   // scenario where the parent manager is not serialized yet.
-  TestAXTreeManager first_manager(std::make_unique<AXSerializableTree>());
+  SingleAXTreeManager first_manager(std::make_unique<AXSerializableTree>());
   first_manager.Initialize(first_state);
-  TestAXTreeManager last_manager(std::make_unique<AXSerializableTree>());
+  SingleAXTreeManager last_manager(std::make_unique<AXSerializableTree>());
   last_manager.Initialize(last_state);
 
   ASSERT_EQ(first_manager.GetRootManager(), &first_manager);
@@ -189,11 +189,11 @@
   generic_container_5.AddChildTreeId(last_state.tree_data.tree_id);
 
   // Create the managers.
-  TestAXTreeManager first_manager(std::make_unique<AXSerializableTree>());
+  SingleAXTreeManager first_manager(std::make_unique<AXSerializableTree>());
   first_manager.Initialize(first_state);
-  TestAXTreeManager middle_manager(std::make_unique<AXSerializableTree>());
+  SingleAXTreeManager middle_manager(std::make_unique<AXSerializableTree>());
   middle_manager.Initialize(middle_state);
-  TestAXTreeManager last_manager(std::make_unique<AXSerializableTree>());
+  SingleAXTreeManager last_manager(std::make_unique<AXSerializableTree>());
   last_manager.Initialize(last_state);
 
   ASSERT_EQ(first_manager.GetRootManager(), &first_manager);

ui/accessibility/ax_tree_unittest.cc

diff --git a/ui/accessibility/ax_tree_unittest.cc b/ui/accessibility/ax_tree_unittest.cc
index 797d950..910c033 100644
--- a/ui/accessibility/ax_tree_unittest.cc
+++ b/ui/accessibility/ax_tree_unittest.cc
@@ -12,8 +12,8 @@
 #include "ui/accessibility/ax_enum_util.h"
 #include "ui/accessibility/ax_node.h"
 #include "ui/accessibility/ax_serializable_tree.h"
+#include "ui/accessibility/ax_tree_observer.h"
 #include "ui/accessibility/ax_tree_serializer.h"
-#include "ui/accessibility/test_ax_tree_manager.h"
 
 namespace ui {
 

ui/accessibility/platform/ax_platform_node_base_unittest.cc

diff --git a/ui/accessibility/platform/ax_platform_node_base_unittest.cc b/ui/accessibility/platform/ax_platform_node_base_unittest.cc
index 31d6fe8..e8024ac2 100644
--- a/ui/accessibility/platform/ax_platform_node_base_unittest.cc
+++ b/ui/accessibility/platform/ax_platform_node_base_unittest.cc
@@ -41,7 +41,28 @@
   // ++++StaticText "text1" #2
   // ++++StaticText "text2" #3
   // ++++StaticText "text3" #4
-  AXTree* tree = Init({Role::kRootWebArea, {{"text1"}, {"text2"}, {"text3"}}});
+  AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kRootWebArea;
+
+  AXNodeData item1, item2, item3;
+  item1.id = 2;
+  item1.role = ax::mojom::Role::kStaticText;
+  item1.SetName("text1");
+  item2.id = 3;
+  item2.role = ax::mojom::Role::kStaticText;
+  item2.SetName("text2");
+  item3.id = 4;
+  item3.role = ax::mojom::Role::kStaticText;
+  item3.SetName("text3");
+
+  root_data.child_ids = {item1.id, item2.id, item3.id};
+
+  AXTreeUpdate update;
+  update.root_id = 1;
+  update.nodes = {root_data, item1, item2, item3};
+
+  AXTree* tree = Init(update);
 
   // Set an AXMode on the AXPlatformNode as some platforms (auralinux) use it to
   // determine if it should enable accessibility.
@@ -73,11 +94,42 @@
   // ++++StaticText "text2" #5
   // ++genericContainer IGNORED #6
   // ++++StaticText "text3" #7
-  AXTree* tree =
-      Init({Role::kRootWebArea,
-            {{Role::kGenericContainer, State::kIgnored, {{"text1"}}},
-             {Role::kGenericContainer, State::kIgnored, {{"text2"}}},
-             {Role::kGenericContainer, State::kIgnored, {{"text3"}}}}});
+  AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kRootWebArea;
+  root_data.child_ids = {2, 4, 6};
+
+  AXNodeData container1, container2, container3;
+  container1.id = 2;
+  container1.role = ax::mojom::Role::kGenericContainer;
+  container1.AddState(ax::mojom::State::kIgnored);
+  container1.child_ids = {3};
+  container2.id = 4;
+  container2.role = ax::mojom::Role::kGenericContainer;
+  container2.AddState(ax::mojom::State::kIgnored);
+  container2.child_ids = {5};
+  container3.id = 6;
+  container3.role = ax::mojom::Role::kGenericContainer;
+  container3.AddState(ax::mojom::State::kIgnored);
+  container3.child_ids = {7};
+
+  AXNodeData item1, item2, item3;
+  item1.id = 3;
+  item1.role = ax::mojom::Role::kStaticText;
+  item1.SetName("text1");
+  item2.id = 5;
+  item2.role = ax::mojom::Role::kStaticText;
+  item2.SetName("text2");
+  item3.id = 7;
+  item3.role = ax::mojom::Role::kStaticText;
+  item3.SetName("text3");
+
+  AXTreeUpdate update;
+  update.root_id = 1;
+  update.nodes = {root_data, container1, container2, container3,
+                  item1,     item2,      item3};
+
+  AXTree* tree = Init(update);
 
   // Set an AXMode on the AXPlatformNode as some platforms (auralinux) use it to
   // determine if it should enable accessibility.
@@ -111,8 +163,36 @@
   // ++kGroup
   // ++++kStaticText "d"
   // ++++kStaticText "e"
-  AXTree* tree =
-      Init({Role::kGroup, {{"a"}, {"b"}, {Role::kGroup, {{"d"}, {"e"}}}}});
+
+  AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kGroup;
+  root_data.child_ids = {2, 3, 4};
+
+  AXNodeData item1, item2, group1, item3, item4;
+  item1.id = 2;
+  item1.role = ax::mojom::Role::kStaticText;
+  item1.SetName("a");
+  item2.id = 3;
+  item2.role = ax::mojom::Role::kStaticText;
+  item2.SetName("b");
+
+  group1.id = 4;
+  group1.role = ax::mojom::Role::kGroup;
+  group1.child_ids = {5, 6};
+
+  item3.id = 5;
+  item3.role = ax::mojom::Role::kStaticText;
+  item3.SetName("d");
+  item4.id = 6;
+  item4.role = ax::mojom::Role::kStaticText;
+  item4.SetName("e");
+
+  AXTreeUpdate update;
+  update.root_id = 1;
+  update.nodes = {root_data, item1, item2, group1, item3, item4};
+
+  AXTree* tree = Init(update);
   auto* root = static_cast<AXPlatformNodeBase*>(
       TestAXNodeWrapper::GetOrCreate(tree, tree->root())->ax_platform_node());
 
@@ -527,9 +607,30 @@
   // ++++kLink
   // ++++++kStaticText "link"
   // ++++++kStaticText "link#2"
-  AXTree* tree =
-      Init({Role::kRootWebArea,
-            {{Role::kParagraph, {{Role::kLink, {{"link"}, {"link#2"}}}}}}});
+  AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kRootWebArea;
+  root_data.child_ids = {2};
+
+  AXNodeData container1, link1, item1, item2;
+  container1.id = 2;
+  container1.role = ax::mojom::Role::kParagraph;
+  container1.child_ids = {3};
+  link1.id = 3;
+  link1.role = ax::mojom::Role::kLink;
+  link1.child_ids = {4, 5};
+  item1.id = 4;
+  item1.role = ax::mojom::Role::kStaticText;
+  item1.SetName("link");
+  item2.id = 5;
+  item2.role = ax::mojom::Role::kStaticText;
+  item2.SetName("link#2");
+
+  AXTreeUpdate update;
+  update.root_id = 1;
+  update.nodes = {root_data, container1, link1, item1, item2};
+
+  AXTree* tree = Init(update);
   auto* root = static_cast<AXPlatformNodeBase*>(
       TestAXNodeWrapper::GetOrCreate(tree, tree->root())->ax_platform_node());
 

ui/accessibility/platform/ax_platform_node_textrangeprovider_win_fuzzer.cc

diff --git a/ui/accessibility/platform/ax_platform_node_textrangeprovider_win_fuzzer.cc b/ui/accessibility/platform/ax_platform_node_textrangeprovider_win_fuzzer.cc
index 54113bd..199fb3c 100644
--- a/ui/accessibility/platform/ax_platform_node_textrangeprovider_win_fuzzer.cc
+++ b/ui/accessibility/platform/ax_platform_node_textrangeprovider_win_fuzzer.cc
@@ -35,7 +35,6 @@
 #include "ui/accessibility/platform/ax_fragment_root_win.h"
 #include "ui/accessibility/platform/ax_platform_node_textrangeprovider_win.h"
 #include "ui/accessibility/platform/test_ax_node_wrapper.h"
-#include "ui/accessibility/test_ax_tree_manager.h"
 
 using Microsoft::WRL::ComPtr;
 

ui/accessibility/platform/ax_platform_node_unittest.h

diff --git a/ui/accessibility/platform/ax_platform_node_unittest.h b/ui/accessibility/platform/ax_platform_node_unittest.h
index 69ebae6..80e16e6 100644
--- a/ui/accessibility/platform/ax_platform_node_unittest.h
+++ b/ui/accessibility/platform/ax_platform_node_unittest.h
@@ -12,12 +12,12 @@
 #include "ui/accessibility/ax_tree_id.h"
 #include "ui/accessibility/ax_tree_update.h"
 #include "ui/accessibility/platform/ax_platform_node.h"
-#include "ui/accessibility/test_ax_tree_manager.h"
+#include "ui/accessibility/single_ax_tree_manager.h"
 #include "ui/accessibility/test_ax_tree_update.h"
 
 namespace ui {
 
-class AXPlatformNodeTest : public ::testing::Test, public TestAXTreeManager {
+class AXPlatformNodeTest : public ::testing::Test, public SingleAXTreeManager {
  public:
   AXPlatformNodeTest();
   ~AXPlatformNodeTest() override;

ui/accessibility/single_ax_tree_manager.cc

diff --git a/ui/accessibility/test_ax_tree_manager.cc b/ui/accessibility/single_ax_tree_manager.cc
similarity index 67%
rename from ui/accessibility/test_ax_tree_manager.cc
rename to ui/accessibility/single_ax_tree_manager.cc
index 11764d68..ff103a7 100644
--- a/ui/accessibility/test_ax_tree_manager.cc
+++ b/ui/accessibility/single_ax_tree_manager.cc
@@ -2,21 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/accessibility/test_ax_tree_manager.h"
+#include "ui/accessibility/single_ax_tree_manager.h"
 
 #include "ui/accessibility/ax_node.h"
 #include "ui/accessibility/ax_tree_data.h"
 #include "ui/accessibility/ax_tree_manager_map.h"
-#include "ui/accessibility/test_ax_tree_update.h"
 
 namespace ui {
 
-TestAXTreeManager::TestAXTreeManager() = default;
+SingleAXTreeManager::SingleAXTreeManager() = default;
 
-TestAXTreeManager::TestAXTreeManager(std::unique_ptr<AXTree> tree)
+SingleAXTreeManager::SingleAXTreeManager(std::unique_ptr<AXTree> tree)
     : AXTreeManager(std::move(tree)) {}
 
-TestAXTreeManager::TestAXTreeManager(TestAXTreeManager&& manager)
+SingleAXTreeManager::SingleAXTreeManager(SingleAXTreeManager&& manager)
     : AXTreeManager(std::move(manager.ax_tree_)) {
   if (ax_tree_) {
     GetMap().RemoveTreeManager(GetTreeID());
@@ -24,9 +23,11 @@
   }
 }
 
-TestAXTreeManager& TestAXTreeManager::operator=(TestAXTreeManager&& manager) {
-  if (this == &manager)
+SingleAXTreeManager& SingleAXTreeManager::operator=(
+    SingleAXTreeManager&& manager) {
+  if (this == &manager) {
     return *this;
+  }
   if (manager.HasValidTreeID()) {
     GetMap().RemoveTreeManager(manager.GetTreeID());
   }
@@ -36,21 +37,21 @@
   return *this;
 }
 
-TestAXTreeManager::~TestAXTreeManager() = default;
+SingleAXTreeManager::~SingleAXTreeManager() = default;
 
-void TestAXTreeManager::DestroyTree() {
+void SingleAXTreeManager::DestroyTree() {
   if (HasValidTreeID()) {
     GetMap().RemoveTreeManager(GetTreeID());
   }
   ax_tree_.reset();
 }
 
-AXTree* TestAXTreeManager::GetTree() const {
+AXTree* SingleAXTreeManager::GetTree() const {
   DCHECK(ax_tree_) << "Did you forget to call SetTree?";
   return ax_tree_.get();
 }
 
-void TestAXTreeManager::SetTree(std::unique_ptr<AXTree> tree) {
+void SingleAXTreeManager::SetTree(std::unique_ptr<AXTree> tree) {
   if (HasValidTreeID()) {
     GetMap().RemoveTreeManager(GetTreeID());
   }
@@ -61,19 +62,16 @@
   }
 }
 
-AXTree* TestAXTreeManager::Init(AXTreeUpdate tree_update) {
+AXTree* SingleAXTreeManager::Init(AXTreeUpdate tree_update) {
   tree_update.has_tree_data = true;
-  if (tree_update.tree_data.tree_id == AXTreeIDUnknown())
+  if (tree_update.tree_data.tree_id == AXTreeIDUnknown()) {
     tree_update.tree_data.tree_id = AXTreeID::CreateNewAXTreeID();
+  }
   SetTree(std::make_unique<AXTree>(tree_update));
   return ax_tree_.get();
 }
 
-AXTree* TestAXTreeManager::Init(const TestAXTreeUpdateNode& tree_update_root) {
-  return Init(TestAXTreeUpdate(tree_update_root));
-}
-
-AXTree* TestAXTreeManager::Init(
+AXTree* SingleAXTreeManager::Init(
     const ui::AXNodeData& node1,
     const ui::AXNodeData& node2 /* = ui::AXNodeData() */,
     const ui::AXNodeData& node3 /* = ui::AXNodeData() */,
@@ -90,38 +88,49 @@
   update.root_id = node1.id;
   update.tree_data.title = "Dialog title";
   update.nodes.push_back(node1);
-  if (node2.id != kInvalidAXNodeID)
+  if (node2.id != kInvalidAXNodeID) {
     update.nodes.push_back(node2);
-  if (node3.id != kInvalidAXNodeID)
+  }
+  if (node3.id != kInvalidAXNodeID) {
     update.nodes.push_back(node3);
-  if (node4.id != kInvalidAXNodeID)
+  }
+  if (node4.id != kInvalidAXNodeID) {
     update.nodes.push_back(node4);
-  if (node5.id != kInvalidAXNodeID)
+  }
+  if (node5.id != kInvalidAXNodeID) {
     update.nodes.push_back(node5);
-  if (node6.id != kInvalidAXNodeID)
+  }
+  if (node6.id != kInvalidAXNodeID) {
     update.nodes.push_back(node6);
-  if (node7.id != kInvalidAXNodeID)
+  }
+  if (node7.id != kInvalidAXNodeID) {
     update.nodes.push_back(node7);
-  if (node8.id != kInvalidAXNodeID)
+  }
+  if (node8.id != kInvalidAXNodeID) {
     update.nodes.push_back(node8);
-  if (node9.id != kInvalidAXNodeID)
+  }
+  if (node9.id != kInvalidAXNodeID) {
     update.nodes.push_back(node9);
-  if (node10.id != kInvalidAXNodeID)
+  }
+  if (node10.id != kInvalidAXNodeID) {
     update.nodes.push_back(node10);
-  if (node11.id != kInvalidAXNodeID)
+  }
+  if (node11.id != kInvalidAXNodeID) {
     update.nodes.push_back(node11);
-  if (node12.id != kInvalidAXNodeID)
+  }
+  if (node12.id != kInvalidAXNodeID) {
     update.nodes.push_back(node12);
+  }
   return Init(update);
 }
 
-AXNodePosition::AXPositionInstance TestAXTreeManager::CreateTreePosition(
+AXNodePosition::AXPositionInstance SingleAXTreeManager::CreateTreePosition(
     const AXNode& anchor,
     int child_index) const {
   return AXNodePosition::CreateTreePosition(anchor, child_index);
 }
 
-AXNodePosition::AXPositionInstance TestAXTreeManager::CreateTreePosition(
+AXNodePosition::AXPositionInstance SingleAXTreeManager::CreateTreePosition(
     const AXTree* tree,
     const AXNodeData& anchor_data,
     int child_index) const {
@@ -129,20 +138,20 @@
   return CreateTreePosition(*anchor, child_index);
 }
 
-AXNodePosition::AXPositionInstance TestAXTreeManager::CreateTreePosition(
+AXNodePosition::AXPositionInstance SingleAXTreeManager::CreateTreePosition(
     const AXNodeData& anchor_data,
     int child_index) const {
   return CreateTreePosition(ax_tree(), anchor_data, child_index);
 }
 
-AXNodePosition::AXPositionInstance TestAXTreeManager::CreateTextPosition(
+AXNodePosition::AXPositionInstance SingleAXTreeManager::CreateTextPosition(
     const AXNode& anchor,
     int text_offset,
     ax::mojom::TextAffinity affinity) const {
   return AXNodePosition::CreateTextPosition(anchor, text_offset, affinity);
 }
 
-AXNodePosition::AXPositionInstance TestAXTreeManager::CreateTextPosition(
+AXNodePosition::AXPositionInstance SingleAXTreeManager::CreateTextPosition(
     const AXTree* tree,
     const AXNodeData& anchor_data,
     int text_offset,
@@ -151,14 +160,14 @@
   return CreateTextPosition(*anchor, text_offset, affinity);
 }
 
-AXNodePosition::AXPositionInstance TestAXTreeManager::CreateTextPosition(
+AXNodePosition::AXPositionInstance SingleAXTreeManager::CreateTextPosition(
     const AXNodeData& anchor_data,
     int text_offset,
     ax::mojom::TextAffinity affinity) const {
   return CreateTextPosition(ax_tree(), anchor_data, text_offset, affinity);
 }
 
-AXNodePosition::AXPositionInstance TestAXTreeManager::CreateTextPosition(
+AXNodePosition::AXPositionInstance SingleAXTreeManager::CreateTextPosition(
     const AXNodeID& anchor_id,
     int text_offset,
     ax::mojom::TextAffinity affinity) const {
@@ -166,12 +175,13 @@
   return CreateTextPosition(*anchor, text_offset, affinity);
 }
 
-AXNode* TestAXTreeManager::GetParentNodeFromParentTree() const {
+AXNode* SingleAXTreeManager::GetParentNodeFromParentTree() const {
   AXTreeID parent_tree_id = GetParentTreeID();
-  TestAXTreeManager* parent_manager =
-      static_cast<TestAXTreeManager*>(AXTreeManager::FromID(parent_tree_id));
-  if (!parent_manager)
+  SingleAXTreeManager* parent_manager =
+      static_cast<SingleAXTreeManager*>(AXTreeManager::FromID(parent_tree_id));
+  if (!parent_manager) {
     return nullptr;
+  }
 
   std::set<AXNodeID> host_node_ids =
       parent_manager->GetTree()->GetNodeIdsForChildTreeId(GetTreeID());
@@ -179,8 +189,9 @@
   for (AXNodeID host_node_id : host_node_ids) {
     AXNode* parent_node =
         parent_manager->GetNodeFromTree(parent_tree_id, host_node_id);
-    if (parent_node)
+    if (parent_node) {
       return parent_node;
+    }
   }
 
   return nullptr;

ui/accessibility/single_ax_tree_manager.h

diff --git a/ui/accessibility/test_ax_tree_manager.h b/ui/accessibility/single_ax_tree_manager.h
similarity index 79%
rename from ui/accessibility/test_ax_tree_manager.h
rename to ui/accessibility/single_ax_tree_manager.h
index dc6f387c..7e1d267 100644
--- a/ui/accessibility/test_ax_tree_manager.h
+++ b/ui/accessibility/single_ax_tree_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_ACCESSIBILITY_TEST_AX_TREE_MANAGER_H_
-#define UI_ACCESSIBILITY_TEST_AX_TREE_MANAGER_H_
+#ifndef UI_ACCESSIBILITY_SINGLE_AX_TREE_MANAGER_H_
+#define UI_ACCESSIBILITY_SINGLE_AX_TREE_MANAGER_H_
 
 #include <memory>
 
@@ -16,29 +16,28 @@
 
 class AXNode;
 struct AXTreeUpdate;
-struct TestAXTreeUpdateNode;
 
-// A basic implementation of AXTreeManager that can be used in tests.
+// A basic implementation of AXTreeManager that supports a single tree,
+// and doesn't perform any walking across multiple trees.
 //
-// For simplicity, this class supports only a single tree and doesn't perform
-// any walking across multiple trees.
-class TestAXTreeManager : public AXTreeManager {
+// This class can be used in tests.
+class AX_EXPORT SingleAXTreeManager : public AXTreeManager {
  public:
   // This constructor does not create an empty AXTree. Call "SetTree" if you
   // need to manage a specific tree. Useful when you need to test for the
   // situation when no AXTree has been loaded yet.
-  TestAXTreeManager();
+  SingleAXTreeManager();
 
   // Takes ownership of |tree|.
-  explicit TestAXTreeManager(std::unique_ptr<AXTree> tree);
+  explicit SingleAXTreeManager(std::unique_ptr<AXTree> tree);
 
-  ~TestAXTreeManager() override;
+  ~SingleAXTreeManager() override;
 
-  TestAXTreeManager(const TestAXTreeManager& manager) = delete;
-  TestAXTreeManager& operator=(const TestAXTreeManager& manager) = delete;
+  SingleAXTreeManager(const SingleAXTreeManager& manager) = delete;
+  SingleAXTreeManager& operator=(const SingleAXTreeManager& manager) = delete;
 
-  TestAXTreeManager(TestAXTreeManager&& manager);
-  TestAXTreeManager& operator=(TestAXTreeManager&& manager);
+  SingleAXTreeManager(SingleAXTreeManager&& manager);
+  SingleAXTreeManager& operator=(SingleAXTreeManager&& manager);
 
   void DestroyTree();
   AXTree* GetTree() const;
@@ -49,9 +48,6 @@
   // Creates and set the tree by a given AXTreeUpdate instance.
   AXTree* Init(AXTreeUpdate tree_update);
 
-  // Set the tree by a given TestAXTreeUpdateNode instance.
-  AXTree* Init(const TestAXTreeUpdateNode& tree_update_root);
-
   // Convenience functions to initialize directly from a few AXNodeData objects.
   AXTree* Init(const AXNodeData& node1,
                const AXNodeData& node2 = AXNodeData(),
@@ -119,4 +115,4 @@
 
 }  // namespace ui
 
-#endif  // UI_ACCESSIBILITY_TEST_AX_TREE_MANAGER_H_
+#endif  // UI_ACCESSIBILITY_SINGLE_AX_TREE_MANAGER_H_

ui/base/default_style.h

diff --git a/ui/base/default_style.h b/ui/base/default_style.h
index e2a43d2e..c21b17d84 100644
--- a/ui/base/default_style.h
+++ b/ui/base/default_style.h
@@ -17,29 +17,32 @@
 // native MessageBox dialogs. On Mac, it is [NSFont systemFontSize]. Linux
 // consults the default font description for a GTK Widget context. On ChromeOS,
 // ui::ResourceBundle provides a description via IDS_UI_FONT_FAMILY_CROS.
-const int kMessageFontSizeDelta = 0;
+constexpr int kMessageFontSizeDelta = 0;
 
 // Default font size delta for views::Badge.
 #if BUILDFLAG(IS_APPLE)
 // Aim for 9pt for Cocoa labels ([NSFont systemFontSize] is typically 13pt).
-const int kBadgeFontSizeDelta = -4;
+constexpr int kBadgeFontSizeDelta = -4;
 #else
-const int kBadgeFontSizeDelta = -3;
+constexpr int kBadgeFontSizeDelta = -3;
 #endif
 
 // Default font size delta for dialog buttons, textfields, and labels.
+// Default font size for ChromeRefresh2023 is 13 instead of 12.
 #if BUILDFLAG(IS_APPLE)
 // Aim for 12pt for Cocoa labels ([NSFont systemFontSize] is typically 13pt).
-const int kLabelFontSizeDelta = -1;
+constexpr int kLabelFontSizeDelta = -1;
+constexpr int kLabelFontSizeDeltaChromeRefresh2023 = 0;
 #else
-const int kLabelFontSizeDelta = 0;
+constexpr int kLabelFontSizeDelta = 0;
+constexpr int kLabelFontSizeDeltaChromeRefresh2023 = 1;
 #endif
 
 // Font size delta for dialog titles.
 #if BUILDFLAG(IS_APPLE)
-const int kTitleFontSizeDelta = 1;
+constexpr int kTitleFontSizeDelta = 1;
 #else
-const int kTitleFontSizeDelta = 3;
+constexpr int kTitleFontSizeDelta = 3;
 #endif
 
 }  // namespace ui

ui/chromeos/events/keyboard_capability.cc

diff --git a/ui/chromeos/events/keyboard_capability.cc b/ui/chromeos/events/keyboard_capability.cc
index 4470649..4318f925 100644
--- a/ui/chromeos/events/keyboard_capability.cc
+++ b/ui/chromeos/events/keyboard_capability.cc
@@ -177,12 +177,21 @@
           KeyboardCode::VKEY_BROWSER_REFRESH,
           KeyboardCode::VKEY_ZOOM,
           KeyboardCode::VKEY_MEDIA_LAUNCH_APP1,
+          KeyboardCode::VKEY_ALL_APPLICATIONS,
+          KeyboardCode::VKEY_SNAPSHOT,
           KeyboardCode::VKEY_BRIGHTNESS_DOWN,
           KeyboardCode::VKEY_BRIGHTNESS_UP,
+          KeyboardCode::VKEY_PRIVACY_SCREEN_TOGGLE,
+          KeyboardCode::VKEY_MICROPHONE_MUTE_TOGGLE,
           KeyboardCode::VKEY_MEDIA_PLAY_PAUSE,
           KeyboardCode::VKEY_VOLUME_MUTE,
           KeyboardCode::VKEY_VOLUME_DOWN,
           KeyboardCode::VKEY_VOLUME_UP,
+          KeyboardCode::VKEY_KBD_BACKLIGHT_TOGGLE,
+          KeyboardCode::VKEY_KBD_BRIGHTNESS_DOWN,
+          KeyboardCode::VKEY_KBD_BRIGHTNESS_UP,
+          KeyboardCode::VKEY_MEDIA_NEXT_TRACK,
+          KeyboardCode::VKEY_MEDIA_PREV_TRACK,
       });
   return base::Contains(*top_row_action_keys, key_code);
 }

ui/color/color_id.h

diff --git a/ui/color/color_id.h b/ui/color/color_id.h
index 52320d02..782cc65 100644
--- a/ui/color/color_id.h
+++ b/ui/color/color_id.h
@@ -250,6 +250,7 @@
   E_CPONLY(kColorButtonForegroundDisabled) \
   E_CPONLY(kColorButtonForegroundProminent) \
   E_CPONLY(kColorButtonForegroundTonal) \
+  E_CPONLY(kColorButtonHoverBackgroundText) \
   E_CPONLY(kColorMultitaskFeedbackButtonLabelBackground) \
   E_CPONLY(kColorMultitaskFeedbackButtonLabelForeground) \
   E_CPONLY(kColorMultitaskMenuNudgePulse) \
@@ -391,6 +392,8 @@
   E_CPONLY(kColorTextfieldForegroundPlaceholder) \
   E_CPONLY(kColorTextfieldSelectionBackground) \
   E_CPONLY(kColorTextfieldSelectionForeground) \
+  E_CPONLY(kColorTextfieldOutline) \
+  E_CPONLY(kColorTextfieldDisabledOutline) \
   E_CPONLY(kColorTextfieldInvalidOutline) \
   E_CPONLY(kColorThrobber) \
   E_CPONLY(kColorThrobberPreconnect) \

ui/color/material_ui_color_mixer.cc

diff --git a/ui/color/material_ui_color_mixer.cc b/ui/color/material_ui_color_mixer.cc
index 32c5510..35ba7bb 100644
--- a/ui/color/material_ui_color_mixer.cc
+++ b/ui/color/material_ui_color_mixer.cc
@@ -34,7 +34,7 @@
       {kColorSysStateDisabledContainer}, {kColorButtonBackground})};
   mixer[kColorButtonBackgroundProminentFocused] = {GetResultingPaintColor(
       {kColorSysStateFocus}, {kColorButtonBackgroundProminent})};
-  mixer[kColorButtonBorder] = {kColorSysOutline};
+  mixer[kColorButtonBorder] = {kColorSysTonalOutline};
   mixer[kColorButtonBorderDisabled] = {kColorSysStateDisabled};
   mixer[kColorButtonForeground] = {kColorSysPrimary};
   mixer[kColorButtonForegroundDisabled] = {kColorSysStateDisabled};
@@ -72,6 +72,8 @@
       BlendForMinContrast(kColorSysError, kColorTextfieldBackground)};
   mixer[kColorTextfieldForegroundDisabled] = {kColorSysStateDisabled};
   mixer[kColorTextfieldForegroundPlaceholder] = {kColorSysOnSurfaceSubtle};
+  mixer[kColorTextfieldOutline] = {kColorSysNeutralOutline};
+  mixer[kColorTextfieldDisabledOutline] = {SK_ColorTRANSPARENT};
   mixer[kColorTextfieldInvalidOutline] = {
       kColorTextfieldForegroundPlaceholderInvalid};
   mixer[kColorTextfieldSelectionBackground] = {kColorSysTonalContainer};

ui/color/ui_color_mixer.cc

diff --git a/ui/color/ui_color_mixer.cc b/ui/color/ui_color_mixer.cc
index 59a9de5..d6b1fe8 100644
--- a/ui/color/ui_color_mixer.cc
+++ b/ui/color/ui_color_mixer.cc
@@ -59,6 +59,7 @@
   mixer[kColorButtonForegroundProminent] =
       GetColorWithMaxContrast(kColorButtonBackgroundProminent);
   mixer[kColorButtonForegroundTonal] = {kColorSysOnPrimaryContainer};
+  mixer[kColorButtonHoverBackgroundText] = {kColorSysStateHoverOnSubtle};
   mixer[kColorCheckboxForegroundUnchecked] = {kColorSecondaryForeground};
   mixer[kColorCheckboxForegroundChecked] = {kColorButtonForeground};
   mixer[kColorMultitaskFeedbackButtonLabelBackground] = {
@@ -265,6 +266,8 @@
       kColorTextfieldForegroundPlaceholder};
   mixer[kColorTextfieldSelectionBackground] = {kColorTextSelectionBackground};
   mixer[kColorTextfieldSelectionForeground] = {kColorTextSelectionForeground};
+  mixer[kColorTextfieldOutline] = {kColorFocusableBorderUnfocused};
+  mixer[kColorTextfieldDisabledOutline] = {kColorFocusableBorderUnfocused};
   mixer[kColorTextfieldInvalidOutline] = {kColorAlertHighSeverity};
   mixer[kColorThrobber] =
       PickGoogleColor(kColorAccent, kColorDialogBackground,

ui/strings/translations/ui_strings_bs.xtb

diff --git a/ui/strings/translations/ui_strings_bs.xtb b/ui/strings/translations/ui_strings_bs.xtb
index 5443e2a..be847a7b 100644
--- a/ui/strings/translations/ui_strings_bs.xtb
+++ b/ui/strings/translations/ui_strings_bs.xtb
@@ -201,6 +201,7 @@
 <translation id="8393700583063109961">Pošalji poruku</translation>
 <translation id="8394908167088220973">Reproduciraj/pauziraj medij</translation>
 <translation id="8458811141851741261">{YEARS,plural, =1{1 g}one{# g}few{# g}other{# g}}</translation>
+<translation id="8598144894266192959"><ph name="NUMBER" />%</translation>
 <translation id="8602707065186045623"><ph name="SAVEAS_EXTENSION_TYPE" /> Fajl (.<ph name="SAVEAS_EXTENSION_NAME" />)</translation>
 <translation id="8677655579646609597"><ph name="QUANTITY" /> KB/s</translation>
 <translation id="8725488761726303204">Još <ph name="NUMBER" /></translation>

ui/strings/translations/ui_strings_de.xtb

diff --git a/ui/strings/translations/ui_strings_de.xtb b/ui/strings/translations/ui_strings_de.xtb
index dbc42f88..f225234 100644
--- a/ui/strings/translations/ui_strings_de.xtb
+++ b/ui/strings/translations/ui_strings_de.xtb
@@ -201,6 +201,7 @@
 <translation id="8393700583063109961">Nachricht senden</translation>
 <translation id="8394908167088220973">Medien – Wiedergabe/Pause</translation>
 <translation id="8458811141851741261">{YEARS,plural, =1{1 Jahr}other{# Jahre}}</translation>
+<translation id="8598144894266192959"><ph name="NUMBER" /> %</translation>
 <translation id="8602707065186045623"><ph name="SAVEAS_EXTENSION_TYPE" />-Datei (.<ph name="SAVEAS_EXTENSION_NAME" />)</translation>
 <translation id="8677655579646609597"><ph name="QUANTITY" /> KB/s</translation>
 <translation id="8725488761726303204">+<ph name="NUMBER" /> weitere</translation>

ui/strings/translations/ui_strings_hr.xtb

diff --git a/ui/strings/translations/ui_strings_hr.xtb b/ui/strings/translations/ui_strings_hr.xtb
index 548e247..b3089d0 100644
--- a/ui/strings/translations/ui_strings_hr.xtb
+++ b/ui/strings/translations/ui_strings_hr.xtb
@@ -201,6 +201,7 @@
 <translation id="8393700583063109961">Pošaljite poruku</translation>
 <translation id="8394908167088220973">Reproduciraj/pauziraj Medije</translation>
 <translation id="8458811141851741261">{YEARS,plural, =1{1 g}one{# g}few{# g}other{# g}}</translation>
+<translation id="8598144894266192959"><ph name="NUMBER" />%</translation>
 <translation id="8602707065186045623"><ph name="SAVEAS_EXTENSION_TYPE" /> Datoteka (.<ph name="SAVEAS_EXTENSION_NAME" />)</translation>
 <translation id="8677655579646609597"><ph name="QUANTITY" /> KB/s</translation>
 <translation id="8725488761726303204">Još <ph name="NUMBER" /></translation>

ui/strings/translations/ui_strings_it.xtb

diff --git a/ui/strings/translations/ui_strings_it.xtb b/ui/strings/translations/ui_strings_it.xtb
index 8009c25..ad7964f4 100644
--- a/ui/strings/translations/ui_strings_it.xtb
+++ b/ui/strings/translations/ui_strings_it.xtb
@@ -201,6 +201,7 @@
 <translation id="8393700583063109961">Invia messaggio</translation>
 <translation id="8394908167088220973">Play/Pausa contenuti multimediali</translation>
 <translation id="8458811141851741261">{YEARS,plural, =1{1 a}other{# a}}</translation>
+<translation id="8598144894266192959"><ph name="NUMBER" />%</translation>
 <translation id="8602707065186045623">File <ph name="SAVEAS_EXTENSION_TYPE" /> (.<ph name="SAVEAS_EXTENSION_NAME" />)</translation>
 <translation id="8677655579646609597"><ph name="QUANTITY" /> kB/s</translation>
 <translation id="8725488761726303204">+ altre <ph name="NUMBER" /></translation>

ui/strings/translations/ui_strings_km.xtb

diff --git a/ui/strings/translations/ui_strings_km.xtb b/ui/strings/translations/ui_strings_km.xtb
index 7f779455..45b98f3e 100644
--- a/ui/strings/translations/ui_strings_km.xtb
+++ b/ui/strings/translations/ui_strings_km.xtb
@@ -201,6 +201,7 @@
 <translation id="8393700583063109961">ផ្ញើ​សារ</translation>
 <translation id="8394908167088220973">លេង/ផ្អាក កំសាន្ត</translation>
 <translation id="8458811141851741261">{YEARS,plural, =1{1 ឆ្នាំ}other{# ឆ្នាំ}}</translation>
+<translation id="8598144894266192959"><ph name="NUMBER" />%</translation>
 <translation id="8602707065186045623"><ph name="SAVEAS_EXTENSION_TYPE" /> ឯកសារ (.<ph name="SAVEAS_EXTENSION_NAME" />)</translation>
 <translation id="8677655579646609597"><ph name="QUANTITY" /> KB/វិនាទី</translation>
 <translation id="8725488761726303204">+<ph name="NUMBER" /> ទៀត</translation>

ui/strings/translations/ui_strings_kn.xtb

diff --git a/ui/strings/translations/ui_strings_kn.xtb b/ui/strings/translations/ui_strings_kn.xtb
index 622e1cf..df64c63 100644
--- a/ui/strings/translations/ui_strings_kn.xtb
+++ b/ui/strings/translations/ui_strings_kn.xtb
@@ -201,6 +201,7 @@
 <translation id="8393700583063109961">ಸಂದೇಶ ಕಳುಹಿಸು</translation>
 <translation id="8394908167088220973">ಮೀಡಿಯಾ ಪ್ಲೇ/ವಿರಾಮ</translation>
 <translation id="8458811141851741261">{YEARS,plural, =1{1ವ}one{#ವ}other{#ವ}}</translation>
+<translation id="8598144894266192959"><ph name="NUMBER" />%</translation>
 <translation id="8602707065186045623"><ph name="SAVEAS_EXTENSION_TYPE" /> ಫೈಲ್ (.<ph name="SAVEAS_EXTENSION_NAME" />)</translation>
 <translation id="8677655579646609597"><ph name="QUANTITY" /> KB/s </translation>
 <translation id="8725488761726303204">+ <ph name="NUMBER" /> ಇನ್ನಷ್ಟು</translation>

ui/strings/translations/ui_strings_lo.xtb

diff --git a/ui/strings/translations/ui_strings_lo.xtb b/ui/strings/translations/ui_strings_lo.xtb
index ddc66cd..44361287 100644
--- a/ui/strings/translations/ui_strings_lo.xtb
+++ b/ui/strings/translations/ui_strings_lo.xtb
@@ -201,6 +201,7 @@
 <translation id="8393700583063109961">ສົ່ງຂໍ້ຄວາມ</translation>
 <translation id="8394908167088220973">ຫຼິ້ນ/</translation>
 <translation id="8458811141851741261">{YEARS,plural, =1{1 ປີ}other{# ປີ}}</translation>
+<translation id="8598144894266192959"><ph name="NUMBER" />%</translation>
 <translation id="8602707065186045623">ໄຟລ໌ <ph name="SAVEAS_EXTENSION_TYPE" /> (.<ph name="SAVEAS_EXTENSION_NAME" />)</translation>
 <translation id="8677655579646609597"><ph name="QUANTITY" /> KB/ວິນາທີ</translation>
 <translation id="8725488761726303204">ອີກ +<ph name="NUMBER" /></translation>

ui/strings/translations/ui_strings_nl.xtb

diff --git a/ui/strings/translations/ui_strings_nl.xtb b/ui/strings/translations/ui_strings_nl.xtb
index e5c2547..1c411b1 100644
--- a/ui/strings/translations/ui_strings_nl.xtb
+++ b/ui/strings/translations/ui_strings_nl.xtb
@@ -201,6 +201,7 @@
 <translation id="8393700583063109961">Bericht verzenden</translation>
 <translation id="8394908167088220973">Media afspelen/onderbreken</translation>
 <translation id="8458811141851741261">{YEARS,plural, =1{1 j}other{# j}}</translation>
+<translation id="8598144894266192959"><ph name="NUMBER" />%</translation>
 <translation id="8602707065186045623"><ph name="SAVEAS_EXTENSION_TYPE" />-bestand (.<ph name="SAVEAS_EXTENSION_NAME" />)</translation>
 <translation id="8677655579646609597"><ph name="QUANTITY" />  KB/s</translation>
 <translation id="8725488761726303204">+ nog <ph name="NUMBER" /></translation>

ui/strings/translations/ui_strings_pl.xtb

diff --git a/ui/strings/translations/ui_strings_pl.xtb b/ui/strings/translations/ui_strings_pl.xtb
index c7e3774..5423512 100644
--- a/ui/strings/translations/ui_strings_pl.xtb
+++ b/ui/strings/translations/ui_strings_pl.xtb
@@ -201,6 +201,7 @@
 <translation id="8393700583063109961">Wyślij wiadomość</translation>
 <translation id="8394908167088220973">Odtwórz/wstrzymaj multimedia</translation>
 <translation id="8458811141851741261">{YEARS,plural, =1{1 rok}few{# lata}many{# lat}other{# roku}}</translation>
+<translation id="8598144894266192959"><ph name="NUMBER" />%</translation>
 <translation id="8602707065186045623">Plik <ph name="SAVEAS_EXTENSION_TYPE" /> (.<ph name="SAVEAS_EXTENSION_NAME" />)</translation>
 <translation id="8677655579646609597"><ph name="QUANTITY" /> kB/s</translation>
 <translation id="8725488761726303204">i jeszcze <ph name="NUMBER" /></translation>

ui/strings/translations/ui_strings_pt-BR.xtb

diff --git a/ui/strings/translations/ui_strings_pt-BR.xtb b/ui/strings/translations/ui_strings_pt-BR.xtb
index 322331c..f4b7be7 100644
--- a/ui/strings/translations/ui_strings_pt-BR.xtb
+++ b/ui/strings/translations/ui_strings_pt-BR.xtb
@@ -201,6 +201,7 @@
 <translation id="8393700583063109961">Enviar mensagem</translation>
 <translation id="8394908167088220973">Reproduzir/pausar mídia</translation>
 <translation id="8458811141851741261">{YEARS,plural, =1{1 a}one{# a}other{# a}}</translation>
+<translation id="8598144894266192959"><ph name="NUMBER" />%</translation>
 <translation id="8602707065186045623">Arquivo <ph name="SAVEAS_EXTENSION_TYPE" /> (.<ph name="SAVEAS_EXTENSION_NAME" />)</translation>
 <translation id="8677655579646609597"><ph name="QUANTITY" /> KB/s</translation>
 <translation id="8725488761726303204">mais <ph name="NUMBER" /></translation>

ui/strings/translations/ui_strings_ru.xtb

diff --git a/ui/strings/translations/ui_strings_ru.xtb b/ui/strings/translations/ui_strings_ru.xtb
index 5579ce7..853cb12 100644
--- a/ui/strings/translations/ui_strings_ru.xtb
+++ b/ui/strings/translations/ui_strings_ru.xtb
@@ -201,6 +201,7 @@
 <translation id="8393700583063109961">Отправить сообщение</translation>
 <translation id="8394908167088220973">Воспроизведение/пауза</translation>
 <translation id="8458811141851741261">{YEARS,plural, =1{1 г.}one{# г.}few{# г.}many{# л.}other{# г.}}</translation>
+<translation id="8598144894266192959"><ph name="NUMBER" /> %</translation>
 <translation id="8602707065186045623">Файл <ph name="SAVEAS_EXTENSION_TYPE" /> (.<ph name="SAVEAS_EXTENSION_NAME" />)</translation>
 <translation id="8677655579646609597"><ph name="QUANTITY" /> КБ/с</translation>
 <translation id="8725488761726303204">Ещё <ph name="NUMBER" /></translation>

ui/strings/translations/ui_strings_th.xtb

diff --git a/ui/strings/translations/ui_strings_th.xtb b/ui/strings/translations/ui_strings_th.xtb
index 58ae9a1..600c274 100644
--- a/ui/strings/translations/ui_strings_th.xtb
+++ b/ui/strings/translations/ui_strings_th.xtb
@@ -201,6 +201,7 @@
 <translation id="8393700583063109961">ส่งข้อความ</translation>
 <translation id="8394908167088220973">เล่น/หยุดสื่อชั่วคราว</translation>
 <translation id="8458811141851741261">{YEARS,plural, =1{1 ปี}other{# ปี}}</translation>
+<translation id="8598144894266192959"><ph name="NUMBER" />%</translation>
 <translation id="8602707065186045623">ไฟล์ <ph name="SAVEAS_EXTENSION_TYPE" /> (.<ph name="SAVEAS_EXTENSION_NAME" />)</translation>
 <translation id="8677655579646609597"><ph name="QUANTITY" /> KB/วินาที</translation>
 <translation id="8725488761726303204">และอีก <ph name="NUMBER" /> รายการ</translation>

ui/strings/translations/ui_strings_uz.xtb

diff --git a/ui/strings/translations/ui_strings_uz.xtb b/ui/strings/translations/ui_strings_uz.xtb
index bf333ed..869d649 100644
--- a/ui/strings/translations/ui_strings_uz.xtb
+++ b/ui/strings/translations/ui_strings_uz.xtb
@@ -201,6 +201,7 @@
 <translation id="8393700583063109961">Xabar yuborish</translation>
 <translation id="8394908167088220973">Ijro/pauza</translation>
 <translation id="8458811141851741261">{YEARS,plural, =1{1 yil}other{# yil}}</translation>
+<translation id="8598144894266192959"><ph name="NUMBER" />%</translation>
 <translation id="8602707065186045623"><ph name="SAVEAS_EXTENSION_TYPE" /> fayl (.<ph name="SAVEAS_EXTENSION_NAME" />)</translation>
 <translation id="8677655579646609597"><ph name="QUANTITY" /> KB/s</translation>
 <translation id="8725488761726303204">yana <ph name="NUMBER" /> ta</translation>

ui/strings/translations/ui_strings_zh-CN.xtb

diff --git a/ui/strings/translations/ui_strings_zh-CN.xtb b/ui/strings/translations/ui_strings_zh-CN.xtb
index 5e90c7c..9747f970 100644
--- a/ui/strings/translations/ui_strings_zh-CN.xtb
+++ b/ui/strings/translations/ui_strings_zh-CN.xtb
@@ -201,6 +201,7 @@
 <translation id="8393700583063109961">发送消息</translation>
 <translation id="8394908167088220973">媒体播放/暂停</translation>
 <translation id="8458811141851741261">{YEARS,plural, =1{1 年}other{# 年}}</translation>
+<translation id="8598144894266192959"><ph name="NUMBER" />%</translation>
 <translation id="8602707065186045623"><ph name="SAVEAS_EXTENSION_TYPE" /> 文件 (.<ph name="SAVEAS_EXTENSION_NAME" />)</translation>
 <translation id="8677655579646609597"><ph name="QUANTITY" /> KB/s</translation>
 <translation id="8725488761726303204">+ 另外 <ph name="NUMBER" /> 项</translation>

ui/views/accessibility/view_ax_platform_node_delegate.cc

diff --git a/ui/views/accessibility/view_ax_platform_node_delegate.cc b/ui/views/accessibility/view_ax_platform_node_delegate.cc
index 23523b5..6989d991 100644
--- a/ui/views/accessibility/view_ax_platform_node_delegate.cc
+++ b/ui/views/accessibility/view_ax_platform_node_delegate.cc
@@ -17,7 +17,6 @@
 #include "base/task/single_thread_task_runner.h"
 #include "build/build_config.h"
 #include "ui/accessibility/ax_action_data.h"
-#include "ui/accessibility/ax_dummy_tree_manager.h"
 #include "ui/accessibility/ax_enums.mojom.h"
 #include "ui/accessibility/ax_role_properties.h"
 #include "ui/accessibility/ax_tree.h"
@@ -27,6 +26,7 @@
 #include "ui/accessibility/platform/ax_platform_node.h"
 #include "ui/accessibility/platform/ax_platform_node_base.h"
 #include "ui/accessibility/platform/ax_unique_id.h"
+#include "ui/accessibility/single_ax_tree_manager.h"
 #include "ui/base/layout.h"
 #include "ui/events/event_utils.h"
 #include "ui/views/accessibility/view_accessibility_utils.h"
@@ -446,24 +446,24 @@
   if (!IsDescendantOfAtomicTextField())
     return ui::AXNodePosition::CreateNullPosition();
 
-  if (!dummy_tree_manager_) {
+  if (!single_tree_manager_) {
     ui::AXTreeUpdate initial_state;
     initial_state.root_id = GetData().id;
     initial_state.nodes = {GetData()};
     initial_state.has_tree_data = true;
     initial_state.tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
-    auto dummy_tree = std::make_unique<ui::AXTree>(initial_state);
-    dummy_tree_manager_ =
-        std::make_unique<ui::AXDummyTreeManager>(std::move(dummy_tree));
+    auto tree = std::make_unique<ui::AXTree>(initial_state);
+    single_tree_manager_ =
+        std::make_unique<ui::SingleAXTreeManager>(std::move(tree));
   } else {
-    DCHECK(dummy_tree_manager_->ax_tree());
+    DCHECK(single_tree_manager_->ax_tree());
     ui::AXTreeUpdate update;
     update.nodes = {GetData()};
-    const_cast<ui::AXTree*>(dummy_tree_manager_->ax_tree())
+    const_cast<ui::AXTree*>(single_tree_manager_->ax_tree())
         ->Unserialize(update);
   }
 
-  return ui::AXNodePosition::CreatePosition(*dummy_tree_manager_->GetRoot(),
+  return ui::AXNodePosition::CreatePosition(*single_tree_manager_->GetRoot(),
                                             offset, affinity);
 }
 

ui/views/accessibility/view_ax_platform_node_delegate.h

diff --git a/ui/views/accessibility/view_ax_platform_node_delegate.h b/ui/views/accessibility/view_ax_platform_node_delegate.h
index 916702e..406cddf 100644
--- a/ui/views/accessibility/view_ax_platform_node_delegate.h
+++ b/ui/views/accessibility/view_ax_platform_node_delegate.h
@@ -29,7 +29,7 @@
 
 struct AXActionData;
 class AXUniqueId;
-class AXDummyTreeManager;
+class SingleAXTreeManager;
 
 }  // namespace ui
 
@@ -161,7 +161,7 @@
 
   // A tree manager that is used to hook up `AXPosition` to text fields in
   // Views.
-  mutable std::unique_ptr<ui::AXDummyTreeManager> dummy_tree_manager_;
+  mutable std::unique_ptr<ui::SingleAXTreeManager> single_tree_manager_;
 
   // We own this, but it is reference-counted on some platforms so we can't use
   // a unique_ptr. It is destroyed in the destructor.

ui/views/controls/button/md_text_button.cc

diff --git a/ui/views/controls/button/md_text_button.cc b/ui/views/controls/button/md_text_button.cc
index bb789a78..27b74538 100644
--- a/ui/views/controls/button/md_text_button.cc
+++ b/ui/views/controls/button/md_text_button.cc
@@ -44,15 +44,15 @@
   SetHasInkDropActionOnClick(true);
   SetShowInkDropWhenHotTracked(true);
   InkDrop::Get(this)->SetBaseColorCallback(base::BindRepeating(
-      [](MdTextButton* host) {
-        return color_utils::DeriveDefaultIconColor(
-            host->label()->GetEnabledColor());
-      },
+      [](MdTextButton* host) { return host->GetHoverColor(host->GetStyle()); },
       this));
 
   if (features::IsChromeRefresh2023()) {
     constexpr int kImageSpacing = 8;
     SetImageLabelSpacing(kImageSpacing);
+    // Highlight button colors already have opacity applied.
+    // Set the opacity to 1 so the two values do not compound.
+    InkDrop::Get(this)->SetHighlightOpacity(1);
   } else {
     SetCornerRadius(LayoutProvider::Get()->GetCornerRadiusMetric(
         ShapeContextTokens::kButtonRadius));
@@ -103,6 +103,22 @@
   return style_;
 }
 
+SkColor MdTextButton::GetHoverColor(Style button_style) {
+  if (!features::IsChromeRefresh2023()) {
+    return color_utils::DeriveDefaultIconColor(label()->GetEnabledColor());
+  }
+
+  switch (button_style) {
+    case Style::kProminent:
+      return GetColorProvider()->GetColor(ui::kColorSysStateHoverOnProminent);
+    case Style::kDefault:
+    case Style::kText:
+    case Style::kTonal:
+    default:
+      return GetColorProvider()->GetColor(ui::kColorSysStateHoverOnSubtle);
+  }
+}
+
 void MdTextButton::SetBgColorOverride(const absl::optional<SkColor>& color) {
   if (color == bg_color_override_)
     return;
@@ -289,7 +305,8 @@
 
   SkColor stroke_color = color_provider->GetColor(
       is_disabled ? ui::kColorButtonBorderDisabled : ui::kColorButtonBorder);
-  if (style_ == Style::kProminent || style_ == Style::kText) {
+  if (style_ == Style::kProminent || style_ == Style::kText ||
+      style_ == Style::kTonal) {
     stroke_color = SK_ColorTRANSPARENT;
   }
 

ui/views/controls/button/md_text_button.h

diff --git a/ui/views/controls/button/md_text_button.h b/ui/views/controls/button/md_text_button.h
index 0c8f68d0..6cd98b3 100644
--- a/ui/views/controls/button/md_text_button.h
+++ b/ui/views/controls/button/md_text_button.h
@@ -49,6 +49,9 @@
   void SetStyle(views::MdTextButton::Style button_style);
   Style GetStyle() const;
 
+  // Returns the hover color depending on the button style.
+  SkColor GetHoverColor(Style button_style);
+
   // See |bg_color_override_|.
   void SetBgColorOverride(const absl::optional<SkColor>& color);
   absl::optional<SkColor> GetBgColorOverride() const;

ui/views/controls/textfield/textfield.cc

diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc
index b0e752e..9bd8b4a 100644
--- a/ui/views/controls/textfield/textfield.cc
+++ b/ui/views/controls/textfield/textfield.cc
@@ -240,6 +240,7 @@
   views::InstallRoundRectHighlightPathGenerator(this, gfx::Insets(),
                                                 GetCornerRadius());
   FocusRing::Install(this);
+  FocusRing::Get(this)->SetOutsetFocusRingDisabled();
 
 #if !BUILDFLAG(IS_MAC)
   // Do not map accelerators on Mac. E.g. They might not reflect custom
@@ -293,6 +294,7 @@
     SetColor(GetTextColor());
     UpdateBackgroundColor();
   }
+  UpdateBorder();
   OnPropertyChanged(&read_only_, kPropertyEffectsPaint);
 }
 
@@ -2493,6 +2495,7 @@
 void Textfield::UpdateBorder() {
   auto border = std::make_unique<views::FocusableBorder>();
   const LayoutProvider* provider = LayoutProvider::Get();
+  border->SetColorId(ui::kColorTextfieldOutline);
   border->SetInsets(gfx::Insets::TLBR(
       extra_insets_.top() +
           provider->GetDistanceMetric(DISTANCE_CONTROL_VERTICAL_TEXT_PADDING),
@@ -2504,6 +2507,8 @@
                                   DISTANCE_TEXTFIELD_HORIZONTAL_TEXT_PADDING)));
   if (invalid_) {
     border->SetColorId(ui::kColorTextfieldInvalidOutline);
+  } else if (!GetEnabled() || GetReadOnly()) {
+    border->SetColorId(ui::kColorTextfieldDisabledOutline);
   }
   border->SetCornerRadius(GetCornerRadius());
   View::SetBorder(std::move(border));
@@ -2810,6 +2815,7 @@
 void Textfield::OnEnabledChanged() {
   if (GetInputMethod())
     GetInputMethod()->OnTextInputTypeChanged(this);
+  UpdateBorder();
 }
 
 void Textfield::DropDraggedText(

ui/views/style/typography_provider.cc

diff --git a/ui/views/style/typography_provider.cc b/ui/views/style/typography_provider.cc
index 0531d5a..28530d9 100644
--- a/ui/views/style/typography_provider.cc
+++ b/ui/views/style/typography_provider.cc
@@ -9,6 +9,7 @@
 #include "build/build_config.h"
 #include "ui/base/default_style.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/base/ui_base_features.h"
 #include "ui/color/color_id.h"
 #include "ui/views/style/typography.h"
 
@@ -80,7 +81,9 @@
       details.weight = gfx::Font::Weight::BOLD;
       break;
     case style::CONTEXT_BUTTON_MD:
-      details.size_delta = ui::kLabelFontSizeDelta;
+      details.size_delta = features::IsChromeRefresh2023()
+                               ? ui::kLabelFontSizeDeltaChromeRefresh2023
+                               : ui::kLabelFontSizeDelta;
       details.weight = TypographyProvider::MediumWeightForUI();
       break;
     case style::CONTEXT_DIALOG_TITLE:

ui/webui/resources/cr_components/omnibox/realbox_dropdown.html

diff --git a/ui/webui/resources/cr_components/omnibox/realbox_dropdown.html b/ui/webui/resources/cr_components/omnibox/realbox_dropdown.html
index 00abd5b..3cba6fa 100644
--- a/ui/webui/resources/cr_components/omnibox/realbox_dropdown.html
+++ b/ui/webui/resources/cr_components/omnibox/realbox_dropdown.html
@@ -82,7 +82,7 @@
   }
 </style>
 <div id="content">
-  <template is="dom-repeat" items="[[sideTypes_(canShowSecondaryMatches)]]"
+  <template is="dom-repeat" items="[[sideTypes_(canShowSecondarySide)]]"
       as="side">
     <div class$="[[classForSide_(side)]]">
       <template is="dom-repeat" items="[[groupIdsForSide_(side, result.matches.*)]]"

ui/webui/resources/cr_components/omnibox/realbox_dropdown.ts

diff --git a/ui/webui/resources/cr_components/omnibox/realbox_dropdown.ts b/ui/webui/resources/cr_components/omnibox/realbox_dropdown.ts
index feb61ab..4f94798 100644
--- a/ui/webui/resources/cr_components/omnibox/realbox_dropdown.ts
+++ b/ui/webui/resources/cr_components/omnibox/realbox_dropdown.ts
@@ -41,23 +41,30 @@
       // Public properties
       //========================================================================
 
-      /** Whether secondary matches can be shown. */
-      canShowSecondaryMatches: {
+      /**
+       * Whether the secondary side can be shown based on the feature state and
+       * the width available to the dropdown.
+       */
+      canShowSecondarySide: {
         type: Boolean,
         value: false,
       },
 
-      /** Whether secondary matches were at any point available to show. */
-      hadSecondaryMatches: {
+      /**
+       * Whether the secondary side was at any point available to be shown.
+       */
+      hadSecondarySide: {
         type: Boolean,
         value: false,
         notify: true,
       },
 
-      /** Whether secondary matches are currently available to show. */
-      hasSecondaryMatches: {
+      /*
+       * Whether the secondary side is currently available to be shown.
+       */
+      hasSecondarySide: {
         type: Boolean,
-        value: false,
+        computed: `computeHasSecondarySide_(result)`,
         notify: true,
       },
 
@@ -97,9 +104,9 @@
     };
   }
 
-  canShowSecondaryMatches: boolean;
-  hadSecondaryMatches: boolean;
-  hasSecondaryMatches: boolean;
+  canShowSecondarySide: boolean;
+  hadSecondarySide: boolean;
+  hasSecondarySide: boolean;
   result: AutocompleteResult;
   roundCorners: boolean;
   selectedMatchIndex: number;
@@ -121,7 +128,7 @@
   get selectableMatchElements() {
     return this.selectableMatchElements_.filter(
         matchEl => matchEl.sideType === SideType.kDefaultPrimary ||
-            this.canShowSecondaryMatches);
+            this.canShowSecondarySide);
   }
 
   /** Unselects the currently selected match, if any. */
@@ -242,6 +249,15 @@
                                                'secondary-side';
   }
 
+  private computeHasSecondarySide_(): boolean {
+    const hasSecondarySide =
+        !!this.groupIdsForSide_(SideType.kSecondary).length;
+    if (!this.hadSecondarySide) {
+      this.hadSecondarySide = hasSecondarySide;
+    }
+    return hasSecondarySide;
+  }
+
   private computeHiddenGroupIds_(): number[] {
     return Object.keys(this.result?.suggestionGroupsMap ?? {})
         .map(groupId => Number.parseInt(groupId, 10))
@@ -308,26 +324,16 @@
    *     secondary matches are currently or were at any point available to show.
    */
   private matchesForSide_(side: SideType): AutocompleteMatch[] {
-    const matches = (this.result?.matches ?? [])
-                        .filter(
-                            match => this.sideTypeForGroup_(
-                                         match.suggestionGroupId) === side);
-
-    if (side === SideType.kSecondary) {
-      this.hasSecondaryMatches = !!matches.length;
-      if (!this.hadSecondaryMatches) {
-        this.hadSecondaryMatches = this.hasSecondaryMatches;
-      }
-    }
-
-    return matches;
+    return (this.result?.matches ?? [])
+        .filter(
+            match => this.sideTypeForGroup_(match.suggestionGroupId) === side);
   }
 
   /**
-   * @returns The list of side type to show.
+   * @returns The list of side types to show.
    */
   private sideTypes_(): SideType[] {
-    return this.canShowSecondaryMatches ?
+    return this.canShowSecondarySide ?
         [SideType.kDefaultPrimary, SideType.kSecondary] :
         [SideType.kDefaultPrimary];
   }